diff --git a/src/engine/src/public/ButterflyEngine/components/basemotion.h b/src/engine/src/public/ButterflyEngine/components/basemotion.h index 30a1901..e8e7e5c 100644 --- a/src/engine/src/public/ButterflyEngine/components/basemotion.h +++ b/src/engine/src/public/ButterflyEngine/components/basemotion.h @@ -9,7 +9,7 @@ #ifndef BASEMOTION_H #define BASEMOTION_H -#include "Crawl/irender.h" +#include "ButterflyEngine/interfaces/irender.h" #include diff --git a/src/engine/src/public/ButterflyEngine/components/circularmotion.h b/src/engine/src/public/ButterflyEngine/components/circularmotion.h index da7a228..d3f35bd 100644 --- a/src/engine/src/public/ButterflyEngine/components/circularmotion.h +++ b/src/engine/src/public/ButterflyEngine/components/circularmotion.h @@ -8,7 +8,7 @@ #ifndef CIRCULARMOTION_H #define CIRCULARMOTION_H -#include +#include #include diff --git a/src/engine/src/public/ButterflyEngine/components/claster.h b/src/engine/src/public/ButterflyEngine/components/claster.h index 66cf4c8..a439879 100644 --- a/src/engine/src/public/ButterflyEngine/components/claster.h +++ b/src/engine/src/public/ButterflyEngine/components/claster.h @@ -8,7 +8,7 @@ #ifndef CLASTER_H #define CLASTER_H -#include "ButterflyEngine/interfaces/iworlditem.h" +#include "ButterflyEngine/global.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/components/movableobject.h b/src/engine/src/public/ButterflyEngine/components/movableobject.h index 3fc5c56..0fff8de 100644 --- a/src/engine/src/public/ButterflyEngine/components/movableobject.h +++ b/src/engine/src/public/ButterflyEngine/components/movableobject.h @@ -9,7 +9,7 @@ #ifndef MOVABLEOBJECT_H #define MOVABLEOBJECT_H -#include "Extensions/basemotion.h" +#include "ButterflyEngine/components/basemotion.h" #include #include diff --git a/src/engine/src/public/ButterflyEngine/core/affector.h b/src/engine/src/public/ButterflyEngine/core/affector.h index fcd348a..1be616e 100644 --- a/src/engine/src/public/ButterflyEngine/core/affector.h +++ b/src/engine/src/public/ButterflyEngine/core/affector.h @@ -1,7 +1,7 @@ #ifndef AFFECTOR_H #define AFFECTOR_H -#include "iworlditem.h" +#include "ButterflyEngine/interfaces/iworlditem.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp b/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp index f99a0a5..4f16b22 100644 --- a/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp +++ b/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp @@ -5,7 +5,7 @@ //# of this license document, but changing it is not allowed. //# -#include "Extensions/claster.h" +#include "ButterflyEngine/components/claster.h" #include "clasteritem.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/clasteritem.h b/src/engine/src/public/ButterflyEngine/core/clasteritem.h index 491b09f..7a97a99 100644 --- a/src/engine/src/public/ButterflyEngine/core/clasteritem.h +++ b/src/engine/src/public/ButterflyEngine/core/clasteritem.h @@ -5,14 +5,15 @@ //# of this license document, but changing it is not allowed. //# -#include "iworlditem.h" - -#include #ifndef CLASTERITEM_H #define CLASTERITEM_H + +#include "ButterflyEngine/interfaces/iworlditem.h" +#include + namespace ButterflyEngine { class Claster; diff --git a/src/engine/src/public/ButterflyEngine/core/day.h b/src/engine/src/public/ButterflyEngine/core/day.h index b25d3d5..2446d26 100644 --- a/src/engine/src/public/ButterflyEngine/core/day.h +++ b/src/engine/src/public/ButterflyEngine/core/day.h @@ -8,7 +8,7 @@ #ifndef DAY_H #define DAY_H -#include "Extensions/claster.h" +#include "ButterflyEngine/components/claster.h" #include "dayitem.h" #include "iworlditem.h" #include "math.h" diff --git a/src/engine/src/public/ButterflyEngine/core/dayitem.h b/src/engine/src/public/ButterflyEngine/core/dayitem.h index c0ef8e8..f349580 100644 --- a/src/engine/src/public/ButterflyEngine/core/dayitem.h +++ b/src/engine/src/public/ButterflyEngine/core/dayitem.h @@ -8,8 +8,8 @@ #ifndef DAYITEM_H #define DAYITEM_H -#include "iworldlight.h" -#include "Extensions/circularmotion.h" +#include "ButterflyEngine/interfaces/iworldlight.h" +#include "ButterflyEngine/components/circularmotion.h" namespace ButterflyEngine { /** diff --git a/src/engine/src/public/ButterflyEngine/core/guiobject.h b/src/engine/src/public/ButterflyEngine/core/guiobject.h index 63a3067..c72e35f 100644 --- a/src/engine/src/public/ButterflyEngine/core/guiobject.h +++ b/src/engine/src/public/ButterflyEngine/core/guiobject.h @@ -13,7 +13,7 @@ #include #include #include -#include "Crawl/irender.h" +#include "ButterflyEngine/interfaces/irender.h" #define DEFAULT_VIEW_TEMPLATE "qrc:/CrawlModule/GraphicItem.qml" /** the AUTO_CLASS_NAME define gets name from the class and namespace. diff --git a/src/engine/src/public/ButterflyEngine/global.h b/src/engine/src/public/ButterflyEngine/global.h index 4e83ffd..340e5c8 100644 --- a/src/engine/src/public/ButterflyEngine/global.h +++ b/src/engine/src/public/ButterflyEngine/global.h @@ -10,7 +10,7 @@ #include -#define BUTTERFLY_ENGINE_VERSION "0.5.dcf74f0" +#define BUTTERFLY_ENGINE_VERSION "0.6.2c9df3d" #if defined(BUTTERFLY_ENGINE_LIBRARY) # define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT diff --git a/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h index 57ccc2b..45af370 100644 --- a/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h @@ -5,10 +5,10 @@ //# of this license document, but changing it is not allowed. //# -#include "ButterflyEngine/core/clasteritem.h" #ifndef IWORLDLIGHT_H #define IWORLDLIGHT_H +#include "ButterflyEngine/core/clasteritem.h" namespace ButterflyEngine { diff --git a/src/example/Deploy/ButterflyEngine.json b/src/example/Deploy/ButterflyEngine.json index 5897a56..e8b50fa 100644 --- a/src/example/Deploy/ButterflyEngine.json +++ b/src/example/Deploy/ButterflyEngine.json @@ -4,11 +4,11 @@ "src/build/Debug/ButterflyEngineEaxample.exe" ], "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": [ - "/home/andrei/git/ButterflyEngine", + "/media/D/builds/ButterflyEngine", "/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", "deploySystem": false, @@ -17,11 +17,11 @@ "qif": true, "zip": true, "ignoreEnv": [ - "/home/andrei/git/ButterflyEngine/Distro" + "/media/D/builds/ButterflyEngine/Distro" ], "extraLib": "crypto", - "targetDir": "/home/andrei/git/ButterflyEngine/Distro", - "deployVersion": "0.5.dcf74f0", + "targetDir": "/media/D/builds/ButterflyEngine/Distro", + "deployVersion": "0.6.2c9df3d", } diff --git a/src/engine/src/private/targetdirection.cpp b/src/example/src/targetdirection.cpp similarity index 100% rename from src/engine/src/private/targetdirection.cpp rename to src/example/src/targetdirection.cpp diff --git a/src/engine/src/private/targetdirection.h b/src/example/src/targetdirection.h similarity index 100% rename from src/engine/src/private/targetdirection.h rename to src/example/src/targetdirection.h diff --git a/src/engine/src/private/vectordirection.cpp b/src/example/src/vectordirection.cpp similarity index 100% rename from src/engine/src/private/vectordirection.cpp rename to src/example/src/vectordirection.cpp diff --git a/src/engine/src/private/vectordirection.h b/src/example/src/vectordirection.h similarity index 100% rename from src/engine/src/private/vectordirection.h rename to src/example/src/vectordirection.h