From 03e1259a3741705c0e9fffffd2dd0c34f83e76a7 Mon Sep 17 00:00:00 2001 From: EndrII Date: Tue, 22 Aug 2023 21:30:27 +0200 Subject: [PATCH] fix some syntax issues --- src/engine/src/private/engine.cpp | 5 ----- src/engine/src/private/engine.h | 1 + .../src/public/ButterflyEngine/components/claster.h | 2 ++ src/engine/src/public/ButterflyEngine/core/fire.cpp | 5 ----- .../public/ButterflyEngine/core/groundclaster.cpp | 1 - .../src/public/ButterflyEngine/core/groundclaster.h | 4 ++-- src/engine/src/public/ButterflyEngine/core/moon.h | 4 ++-- .../src/public/ButterflyEngine/core/playableobject.h | 6 +++--- .../src/public/ButterflyEngine/core/previewcontrol.h | 2 +- src/engine/src/public/ButterflyEngine/core/snake.h | 6 ++++-- .../src/public/ButterflyEngine/core/snakeitem.h | 4 ++-- src/engine/src/public/ButterflyEngine/global.h | 2 +- .../src/public/ButterflyEngine/interfaces/iworld.h | 8 +++----- src/example/Deploy/ButterflyEngine.json | 12 ++++++------ 14 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/engine/src/private/engine.cpp b/src/engine/src/private/engine.cpp index e3c1bba..d7ca18a 100644 --- a/src/engine/src/private/engine.cpp +++ b/src/engine/src/private/engine.cpp @@ -13,8 +13,6 @@ #include "ButterflyEngine/interfaces/iworld.h" #include #include -#include -#include "Crawl/icontrol.h" #include "QDateTime" #include "QtConcurrent" #include "store.h" @@ -133,15 +131,12 @@ void Engine::stop() const { } void Engine::handleUnlockedItem(int item) { - static_cast(_menu->selectLevelModle())->addKey(item); } void Engine::handleDroppedItem(int item) { - static_cast(_menu->selectLevelModle())->removeKey(item); } void Engine::handleUnlockedItemsListChanged(const QSet &newSet) { - static_cast(_menu->selectLevelModle())->setKeys(QList(newSet.begin(), newSet.end())); } void Engine::handleLevelChanged(int levelId) { diff --git a/src/engine/src/private/engine.h b/src/engine/src/private/engine.h index 9465657..e05c07f 100644 --- a/src/engine/src/private/engine.h +++ b/src/engine/src/private/engine.h @@ -166,6 +166,7 @@ private: void renderLoop(); + QObject *_menu = nullptr; QObject *_scane = nullptr; ILevel* _currentLevel = nullptr; QHash _availableLvls; diff --git a/src/engine/src/public/ButterflyEngine/components/claster.h b/src/engine/src/public/ButterflyEngine/components/claster.h index a439879..2fcb5bc 100644 --- a/src/engine/src/public/ButterflyEngine/components/claster.h +++ b/src/engine/src/public/ButterflyEngine/components/claster.h @@ -10,6 +10,8 @@ #include "ButterflyEngine/global.h" +#include + namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/fire.cpp b/src/engine/src/public/ButterflyEngine/core/fire.cpp index 26fa954..e906506 100644 --- a/src/engine/src/public/ButterflyEngine/core/fire.cpp +++ b/src/engine/src/public/ButterflyEngine/core/fire.cpp @@ -6,7 +6,6 @@ //# #include "fire.h" -#include "vectordirection.h" namespace ButterflyEngine { @@ -44,10 +43,6 @@ void Fire::setFireStrength(float newFireStrength) { setEmitRate(10 + _fireStrength); setLifeSpan(1000 + _fireStrength); - auto vel = static_cast(velocity()); - vel->setVelosityDirection({0, 0 , _fireStrength / 4}); - vel->setVelosityDirectionValatility({10, 10, 0}); - emit fireStrengthChanged(); } diff --git a/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp b/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp index 70ab4b1..972320d 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp +++ b/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp @@ -7,7 +7,6 @@ #include "clasteritem.h" #include "groundclaster.h" -#include "iworld.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/groundclaster.h b/src/engine/src/public/ButterflyEngine/core/groundclaster.h index 510b7cc..d176f0b 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundclaster.h +++ b/src/engine/src/public/ButterflyEngine/core/groundclaster.h @@ -8,9 +8,9 @@ #ifndef GROUNDCLASTER_H #define GROUNDCLASTER_H -#include "Extensions/autogenerateclaster.h" +#include "ButterflyEngine/components/autogenerateclaster.h" #include "global.h" -#include "Crawl/iworlditem.h" +#include "ButterflyEngine/interfaces/iworlditem.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/moon.h b/src/engine/src/public/ButterflyEngine/core/moon.h index 4f7f8ae..4ee1ef6 100644 --- a/src/engine/src/public/ButterflyEngine/core/moon.h +++ b/src/engine/src/public/ButterflyEngine/core/moon.h @@ -5,11 +5,11 @@ //# of this license document, but changing it is not allowed. //# + #ifndef MOON_H #define MOON_H -#include "Crawl/dayitem.h" - +#include "dayitem.h" namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/playableobject.h b/src/engine/src/public/ButterflyEngine/core/playableobject.h index fec5dce..5824a3c 100644 --- a/src/engine/src/public/ButterflyEngine/core/playableobject.h +++ b/src/engine/src/public/ButterflyEngine/core/playableobject.h @@ -8,9 +8,9 @@ #ifndef PLAYABLEOBJECT_H #define PLAYABLEOBJECT_H -#include "global.h" -#include "iworlditem.h" -#include "Extensions/movableobject.h" + +#include +#include namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/previewcontrol.h b/src/engine/src/public/ButterflyEngine/core/previewcontrol.h index 32ceb12..e953a19 100644 --- a/src/engine/src/public/ButterflyEngine/core/previewcontrol.h +++ b/src/engine/src/public/ButterflyEngine/core/previewcontrol.h @@ -8,7 +8,7 @@ #ifndef PREVIEWCONTROL_H #define PREVIEWCONTROL_H -#include "icontrol.h" +#include namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/snake.h b/src/engine/src/public/ButterflyEngine/core/snake.h index 0a2f500..268606e 100644 --- a/src/engine/src/public/ButterflyEngine/core/snake.h +++ b/src/engine/src/public/ButterflyEngine/core/snake.h @@ -8,9 +8,11 @@ #ifndef CRAWL_SNAKE_H #define CRAWL_SNAKE_H -#include "iitem.h" #include "playableobject.h" -#include "Extensions/autogenerateclaster.h" + +#include + +#include namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/core/snakeitem.h b/src/engine/src/public/ButterflyEngine/core/snakeitem.h index 247cfdb..a18fc1c 100644 --- a/src/engine/src/public/ButterflyEngine/core/snakeitem.h +++ b/src/engine/src/public/ButterflyEngine/core/snakeitem.h @@ -9,9 +9,9 @@ #ifndef SNAKEITEM_H #define SNAKEITEM_H -#include "iworlditem.h" #include "singleclasterworlditem.h" -#include "Extensions/movableobject.h" + +#include namespace ButterflyEngine { diff --git a/src/engine/src/public/ButterflyEngine/global.h b/src/engine/src/public/ButterflyEngine/global.h index cd939e1..ef64528 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.7.596fd87" +#define BUTTERFLY_ENGINE_VERSION "0.8.f68816a" #if defined(BUTTERFLY_ENGINE_LIBRARY) # define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT diff --git a/src/engine/src/public/ButterflyEngine/interfaces/iworld.h b/src/engine/src/public/ButterflyEngine/interfaces/iworld.h index ff60231..fed6922 100644 --- a/src/engine/src/public/ButterflyEngine/interfaces/iworld.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworld.h @@ -8,10 +8,10 @@ #ifndef CRAWL_IWORLD_H #define CRAWL_IWORLD_H -#include "ButterflyEngine/core/gameresult.h" +#include "ButterflyEngine/core/diff.h" +#include + #include "iitem.h" -#include "playableobject.h" -#include "startdata.h" #include #include @@ -21,9 +21,7 @@ #include #include #include "irender.h" -#include "global.h" #include -#include "Crawl/diff.h" class ClastersTest; diff --git a/src/example/Deploy/ButterflyEngine.json b/src/example/Deploy/ButterflyEngine.json index 907af50..b2ad5bc 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": "/media/D/builds/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug", + "binPrefix": "/home/andrei/git/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug", "libDir": [ - "/media/D/builds/ButterflyEngine", + "/home/andrei/git/ButterflyEngine", "/home/andrei/Qt/6.5.2/gcc_64", - "/media/D/builds/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug" + "/home/andrei/git/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug" ], "recursiveDepth": "10", "deploySystem": false, @@ -17,11 +17,11 @@ "qif": true, "zip": true, "ignoreEnv": [ - "/media/D/builds/ButterflyEngine/Distro" + "/home/andrei/git/ButterflyEngine/Distro" ], "extraLib": "crypto", - "targetDir": "/media/D/builds/ButterflyEngine/Distro", - "deployVersion": "0.7.596fd87", + "targetDir": "/home/andrei/git/ButterflyEngine/Distro", + "deployVersion": "0.8.f68816a", }