tmp fixes

This commit is contained in:
Andrei Yankovich 2023-08-11 15:09:35 +02:00
parent 2c9df3de4d
commit 596fd87c1d
17 changed files with 22 additions and 21 deletions

@ -9,7 +9,7 @@
#ifndef BASEMOTION_H #ifndef BASEMOTION_H
#define BASEMOTION_H #define BASEMOTION_H
#include "Crawl/irender.h" #include "ButterflyEngine/interfaces/irender.h"
#include <QQuaternion> #include <QQuaternion>

@ -8,7 +8,7 @@
#ifndef CIRCULARMOTION_H #ifndef CIRCULARMOTION_H
#define CIRCULARMOTION_H #define CIRCULARMOTION_H
#include <Extensions/basemotion.h> #include <ButterflyEngine/components/basemotion.h>
#include <QVector3D> #include <QVector3D>

@ -8,7 +8,7 @@
#ifndef CLASTER_H #ifndef CLASTER_H
#define CLASTER_H #define CLASTER_H
#include "ButterflyEngine/interfaces/iworlditem.h" #include "ButterflyEngine/global.h"
namespace ButterflyEngine { namespace ButterflyEngine {

@ -9,7 +9,7 @@
#ifndef MOVABLEOBJECT_H #ifndef MOVABLEOBJECT_H
#define MOVABLEOBJECT_H #define MOVABLEOBJECT_H
#include "Extensions/basemotion.h" #include "ButterflyEngine/components/basemotion.h"
#include <QQuaternion> #include <QQuaternion>
#include <QVector3D> #include <QVector3D>

@ -1,7 +1,7 @@
#ifndef AFFECTOR_H #ifndef AFFECTOR_H
#define AFFECTOR_H #define AFFECTOR_H
#include "iworlditem.h" #include "ButterflyEngine/interfaces/iworlditem.h"
namespace ButterflyEngine { namespace ButterflyEngine {

@ -5,7 +5,7 @@
//# of this license document, but changing it is not allowed. //# of this license document, but changing it is not allowed.
//# //#
#include "Extensions/claster.h" #include "ButterflyEngine/components/claster.h"
#include "clasteritem.h" #include "clasteritem.h"
namespace ButterflyEngine { namespace ButterflyEngine {

@ -5,14 +5,15 @@
//# of this license document, but changing it is not allowed. //# of this license document, but changing it is not allowed.
//# //#
#include "iworlditem.h"
#include <QSet>
#ifndef CLASTERITEM_H #ifndef CLASTERITEM_H
#define CLASTERITEM_H #define CLASTERITEM_H
#include "ButterflyEngine/interfaces/iworlditem.h"
#include <QSet>
namespace ButterflyEngine { namespace ButterflyEngine {
class Claster; class Claster;

@ -8,7 +8,7 @@
#ifndef DAY_H #ifndef DAY_H
#define DAY_H #define DAY_H
#include "Extensions/claster.h" #include "ButterflyEngine/components/claster.h"
#include "dayitem.h" #include "dayitem.h"
#include "iworlditem.h" #include "iworlditem.h"
#include "math.h" #include "math.h"

@ -8,8 +8,8 @@
#ifndef DAYITEM_H #ifndef DAYITEM_H
#define DAYITEM_H #define DAYITEM_H
#include "iworldlight.h" #include "ButterflyEngine/interfaces/iworldlight.h"
#include "Extensions/circularmotion.h" #include "ButterflyEngine/components/circularmotion.h"
namespace ButterflyEngine { namespace ButterflyEngine {
/** /**

@ -13,7 +13,7 @@
#include <QQuaternion> #include <QQuaternion>
#include <QRectF> #include <QRectF>
#include <QVector3D> #include <QVector3D>
#include "Crawl/irender.h" #include "ButterflyEngine/interfaces/irender.h"
#define DEFAULT_VIEW_TEMPLATE "qrc:/CrawlModule/GraphicItem.qml" #define DEFAULT_VIEW_TEMPLATE "qrc:/CrawlModule/GraphicItem.qml"
/** the AUTO_CLASS_NAME define gets name from the class and namespace. /** the AUTO_CLASS_NAME define gets name from the class and namespace.

@ -10,7 +10,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#define BUTTERFLY_ENGINE_VERSION "0.5.dcf74f0" #define BUTTERFLY_ENGINE_VERSION "0.6.2c9df3d"
#if defined(BUTTERFLY_ENGINE_LIBRARY) #if defined(BUTTERFLY_ENGINE_LIBRARY)
# define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT # define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT

@ -5,10 +5,10 @@
//# of this license document, but changing it is not allowed. //# of this license document, but changing it is not allowed.
//# //#
#include "ButterflyEngine/core/clasteritem.h"
#ifndef IWORLDLIGHT_H #ifndef IWORLDLIGHT_H
#define IWORLDLIGHT_H #define IWORLDLIGHT_H
#include "ButterflyEngine/core/clasteritem.h"
namespace ButterflyEngine { namespace ButterflyEngine {

@ -4,11 +4,11 @@
"src/build/Debug/ButterflyEngineEaxample.exe" "src/build/Debug/ButterflyEngineEaxample.exe"
], ],
"clear": true, "clear": true,
"binPrefix": "/home/andrei/git/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug", "binPrefix": "/media/D/builds/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug",
"libDir": [ "libDir": [
"/home/andrei/git/ButterflyEngine", "/media/D/builds/ButterflyEngine",
"/home/andrei/Qt/6.5.2/gcc_64", "/home/andrei/Qt/6.5.2/gcc_64",
"/home/andrei/git/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug" "/media/D/builds/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug"
], ],
"recursiveDepth": "10", "recursiveDepth": "10",
"deploySystem": false, "deploySystem": false,
@ -17,11 +17,11 @@
"qif": true, "qif": true,
"zip": true, "zip": true,
"ignoreEnv": [ "ignoreEnv": [
"/home/andrei/git/ButterflyEngine/Distro" "/media/D/builds/ButterflyEngine/Distro"
], ],
"extraLib": "crypto", "extraLib": "crypto",
"targetDir": "/home/andrei/git/ButterflyEngine/Distro", "targetDir": "/media/D/builds/ButterflyEngine/Distro",
"deployVersion": "0.5.dcf74f0", "deployVersion": "0.6.2c9df3d",
} }