diff --git a/CMakeLists.txt b/CMakeLists.txt index 45be82a..d34f083 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ # of this license document, but changing it is not allowed. # -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.19) project(Butterfly LANGUAGES CXX) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") @@ -17,7 +17,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) if (ANDROID OR IOS) diff --git a/src/engine/src/private/asyncimageresponse.cpp b/src/engine/src/private/asyncimageresponse.cpp index 5e1ed73..bfcebec 100644 --- a/src/engine/src/private/asyncimageresponse.cpp +++ b/src/engine/src/private/asyncimageresponse.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/asyncimageresponse.h b/src/engine/src/private/asyncimageresponse.h index d6b2db4..79500fb 100644 --- a/src/engine/src/private/asyncimageresponse.h +++ b/src/engine/src/private/asyncimageresponse.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/availablelevelsmodel.cpp b/src/engine/src/private/availablelevelsmodel.cpp index 96f5cb4..d0f0088 100644 --- a/src/engine/src/private/availablelevelsmodel.cpp +++ b/src/engine/src/private/availablelevelsmodel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "user.h" #include -namespace CRAWL { +namespace ButterflyEngine { AvailableLevelsModel::AvailableLevelsModel() { diff --git a/src/engine/src/private/availablelevelsmodel.h b/src/engine/src/private/availablelevelsmodel.h index 010478b..d272105 100644 --- a/src/engine/src/private/availablelevelsmodel.h +++ b/src/engine/src/private/availablelevelsmodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "baseuserlistmodel.h" -namespace CRAWL { +namespace ButterflyEngine { class User; class IItem; diff --git a/src/engine/src/private/baseuserlistmodel.cpp b/src/engine/src/private/baseuserlistmodel.cpp index 05933e5..78dbfa5 100644 --- a/src/engine/src/private/baseuserlistmodel.cpp +++ b/src/engine/src/private/baseuserlistmodel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "store.h" #include -namespace CRAWL { +namespace ButterflyEngine { BaseUserListModel::BaseUserListModel() { diff --git a/src/engine/src/private/baseuserlistmodel.h b/src/engine/src/private/baseuserlistmodel.h index 1bfaaf5..5f9048f 100644 --- a/src/engine/src/private/baseuserlistmodel.h +++ b/src/engine/src/private/baseuserlistmodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { class User; class IItem; diff --git a/src/engine/src/private/defaultbackgroundai.cpp b/src/engine/src/private/defaultbackgroundai.cpp index eaf7980..b4673ce 100644 --- a/src/engine/src/private/defaultbackgroundai.cpp +++ b/src/engine/src/private/defaultbackgroundai.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "defaultbackgroundai.h" #include -namespace CRAWL { +namespace ButterflyEngine { DefaultBackgroundAI::DefaultBackgroundAI() { _timer = new QTimer(); diff --git a/src/engine/src/private/defaultbackgroundai.h b/src/engine/src/private/defaultbackgroundai.h index e4dc8eb..b9cd662 100644 --- a/src/engine/src/private/defaultbackgroundai.h +++ b/src/engine/src/private/defaultbackgroundai.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include class QTimer; -namespace CRAWL { +namespace ButterflyEngine { class DefaultBackgroundAI: public DefaultControl, public IAI { Q_OBJECT diff --git a/src/engine/src/private/engine.cpp b/src/engine/src/private/engine.cpp index 7be0bff..e1afd8e 100644 --- a/src/engine/src/private/engine.cpp +++ b/src/engine/src/private/engine.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -21,7 +21,7 @@ #include "QtConcurrent" #include "store.h" -namespace CRAWL { +namespace ButterflyEngine { Engine::Engine(QObject *parent): QObject(parent) { _store = new Store(); diff --git a/src/engine/src/private/engine.h b/src/engine/src/private/engine.h index 5e2af5d..868eb2e 100644 --- a/src/engine/src/private/engine.h +++ b/src/engine/src/private/engine.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -14,7 +14,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { class IWorld; class Store; @@ -78,7 +78,7 @@ public: QObject* world() const; /** - * @brief currentUser This method return pointer too current user. + * @brief currentUser This method return pointer to current user. * @return pointer too current user. */ User *currentUser() const; diff --git a/src/engine/src/private/eventserver.cpp b/src/engine/src/private/eventserver.cpp index 923a00c..e51ef36 100644 --- a/src/engine/src/private/eventserver.cpp +++ b/src/engine/src/private/eventserver.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { EventServer::EventServer(IWorld *instance) { debug_assert(instance, "Invalid World pointer in EventServer"); diff --git a/src/engine/src/private/eventserver.h b/src/engine/src/private/eventserver.h index 3e2494f..0c8b871 100644 --- a/src/engine/src/private/eventserver.h +++ b/src/engine/src/private/eventserver.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ #ifndef EVENTSERVER_H #define EVENTSERVER_H -namespace CRAWL { +namespace ButterflyEngine { class IWorldItem; class IWorld; diff --git a/src/engine/src/private/imageprovider.cpp b/src/engine/src/private/imageprovider.cpp index 0177a4f..f51db8d 100644 --- a/src/engine/src/private/imageprovider.cpp +++ b/src/engine/src/private/imageprovider.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/imageprovider.h b/src/engine/src/private/imageprovider.h index 58f0fe9..eb7bdf9 100644 --- a/src/engine/src/private/imageprovider.h +++ b/src/engine/src/private/imageprovider.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/mainmenumodel.cpp b/src/engine/src/private/mainmenumodel.cpp index 49ef03c..86076be 100644 --- a/src/engine/src/private/mainmenumodel.cpp +++ b/src/engine/src/private/mainmenumodel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { MainMenuModel::MainMenuModel(QObject *ptr): QObject (ptr) { diff --git a/src/engine/src/private/mainmenumodel.h b/src/engine/src/private/mainmenumodel.h index 68e7493..356161f 100644 --- a/src/engine/src/private/mainmenumodel.h +++ b/src/engine/src/private/mainmenumodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ namespace ViewSolutions { class ListViewModel; } -namespace CRAWL { +namespace ButterflyEngine { class WorldInfo; class StoreViewModel; diff --git a/src/engine/src/private/pluginloader.cpp b/src/engine/src/private/pluginloader.cpp index a588a48..ef0dd99 100644 --- a/src/engine/src/private/pluginloader.cpp +++ b/src/engine/src/private/pluginloader.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/pluginloader.h b/src/engine/src/private/pluginloader.h index b767e64..cb56388 100644 --- a/src/engine/src/private/pluginloader.h +++ b/src/engine/src/private/pluginloader.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/settings.cpp b/src/engine/src/private/settings.cpp index 75dd5a3..ab52832 100644 --- a/src/engine/src/private/settings.cpp +++ b/src/engine/src/private/settings.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/settings.h b/src/engine/src/private/settings.h index 8f365fb..b56b42e 100644 --- a/src/engine/src/private/settings.h +++ b/src/engine/src/private/settings.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/settingsviewmodel.cpp b/src/engine/src/private/settingsviewmodel.cpp index 7503ff1..b7e8f93 100644 --- a/src/engine/src/private/settingsviewmodel.cpp +++ b/src/engine/src/private/settingsviewmodel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/settingsviewmodel.h b/src/engine/src/private/settingsviewmodel.h index f906952..4ba1ad5 100644 --- a/src/engine/src/private/settingsviewmodel.h +++ b/src/engine/src/private/settingsviewmodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/store.cpp b/src/engine/src/private/store.cpp index 68da23c..02749bc 100644 --- a/src/engine/src/private/store.cpp +++ b/src/engine/src/private/store.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "store.h" #include -namespace CRAWL { +namespace ButterflyEngine { Store::Store() { diff --git a/src/engine/src/private/store.h b/src/engine/src/private/store.h index d3b04cb..506e8f6 100644 --- a/src/engine/src/private/store.h +++ b/src/engine/src/private/store.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "user.h" -namespace CRAWL { +namespace ButterflyEngine { class IItem; diff --git a/src/engine/src/private/storeviewmodel.cpp b/src/engine/src/private/storeviewmodel.cpp index 466f475..849280f 100644 --- a/src/engine/src/private/storeviewmodel.cpp +++ b/src/engine/src/private/storeviewmodel.cpp @@ -4,7 +4,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { StoreViewModel::StoreViewModel() { diff --git a/src/engine/src/private/storeviewmodel.h b/src/engine/src/private/storeviewmodel.h index 606e17f..303c440 100644 --- a/src/engine/src/private/storeviewmodel.h +++ b/src/engine/src/private/storeviewmodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "baseuserlistmodel.h" -namespace CRAWL { +namespace ButterflyEngine { class Store; class User; diff --git a/src/engine/src/private/targetdirection.cpp b/src/engine/src/private/targetdirection.cpp index 1e7cd68..c9081bb 100644 --- a/src/engine/src/private/targetdirection.cpp +++ b/src/engine/src/private/targetdirection.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "targetdirection.h" -namespace CRAWL { +namespace ButterflyEngine { TargetDirection::TargetDirection(float velosityMagnitude, float velosityMagnitudeVariation, diff --git a/src/engine/src/private/targetdirection.h b/src/engine/src/private/targetdirection.h index 567d26a..be459da 100644 --- a/src/engine/src/private/targetdirection.h +++ b/src/engine/src/private/targetdirection.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #ifndef TARGETDIRECTION_H #define TARGETDIRECTION_H -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The TargetDirection class. diff --git a/src/engine/src/private/user.cpp b/src/engine/src/private/user.cpp index f15c0f6..df0086c 100644 --- a/src/engine/src/private/user.cpp +++ b/src/engine/src/private/user.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "user.h" -namespace CRAWL { +namespace ButterflyEngine { constexpr float tierMul = 1.2; constexpr int firstTierCount = 10; diff --git a/src/engine/src/private/user.h b/src/engine/src/private/user.h index e8f96db..4d8081c 100644 --- a/src/engine/src/private/user.h +++ b/src/engine/src/private/user.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #ifndef USER_H #define USER_H -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The User class This is internal class for collection all user data and user state. diff --git a/src/engine/src/private/vectordirection.cpp b/src/engine/src/private/vectordirection.cpp index a52d0f3..21cc9c6 100644 --- a/src/engine/src/private/vectordirection.cpp +++ b/src/engine/src/private/vectordirection.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "vectordirection.h" -namespace CRAWL { +namespace ButterflyEngine { VectorDirection::VectorDirection(const QVector3D &direction, const QVector3D &directionValatility, diff --git a/src/engine/src/private/vectordirection.h b/src/engine/src/private/vectordirection.h index 3982e3c..d1e0a16 100644 --- a/src/engine/src/private/vectordirection.h +++ b/src/engine/src/private/vectordirection.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include #include "global.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The VectorDirection class. diff --git a/src/engine/src/private/worldstatus.cpp b/src/engine/src/private/worldstatus.cpp index 869af32..4209774 100644 --- a/src/engine/src/private/worldstatus.cpp +++ b/src/engine/src/private/worldstatus.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/private/worldstatus.h b/src/engine/src/private/worldstatus.h index 8004ab8..fdc699c 100644 --- a/src/engine/src/private/worldstatus.h +++ b/src/engine/src/private/worldstatus.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.cpp b/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.cpp index 07fd467..cd0826c 100644 --- a/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.cpp +++ b/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "autogenerateclaster.h" -namespace CRAWL { +namespace ButterflyEngine { AutoGenerateClaster::AutoGenerateClaster() { } diff --git a/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.h b/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.h index 3e230c2..166a61b 100644 --- a/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.h +++ b/src/engine/src/public/ButterflyEngine/components/autogenerateclaster.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,12 +10,12 @@ #include "claster.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The AutoGenerateClaster class hs support the registration default claster item class and factory method for the items. */ -class CRAWL_EXPORT AutoGenerateClaster: public Claster +class BUTTERFLY_ENGINE_EXPORT AutoGenerateClaster: public Claster { public: AutoGenerateClaster(); diff --git a/src/engine/src/public/ButterflyEngine/components/basemotion.cpp b/src/engine/src/public/ButterflyEngine/components/basemotion.cpp index 14458b2..8ade517 100644 --- a/src/engine/src/public/ButterflyEngine/components/basemotion.cpp +++ b/src/engine/src/public/ButterflyEngine/components/basemotion.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "basemotion.h" #include "Crawl/guiobject.h" -namespace CRAWL { +namespace ButterflyEngine { BaseMotion::BaseMotion() { diff --git a/src/engine/src/public/ButterflyEngine/components/basemotion.h b/src/engine/src/public/ButterflyEngine/components/basemotion.h index 69da274..30a1901 100644 --- a/src/engine/src/public/ButterflyEngine/components/basemotion.h +++ b/src/engine/src/public/ButterflyEngine/components/basemotion.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { class GuiObject; @@ -24,7 +24,7 @@ class GuiObject; * * renderRotation * */ -class CRAWL_EXPORT BaseMotion : public virtual IRender +class BUTTERFLY_ENGINE_EXPORT BaseMotion : public virtual IRender { public: BaseMotion(); diff --git a/src/engine/src/public/ButterflyEngine/components/circularmotion.cpp b/src/engine/src/public/ButterflyEngine/components/circularmotion.cpp index c52197b..c298cc6 100644 --- a/src/engine/src/public/ButterflyEngine/components/circularmotion.cpp +++ b/src/engine/src/public/ButterflyEngine/components/circularmotion.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include #include "cmath" -namespace CRAWL { +namespace ButterflyEngine { CircularMotion::CircularMotion(const QVector3D *center) { _center = center; diff --git a/src/engine/src/public/ButterflyEngine/components/circularmotion.h b/src/engine/src/public/ButterflyEngine/components/circularmotion.h index 7c6b7a7..da7a228 100644 --- a/src/engine/src/public/ButterflyEngine/components/circularmotion.h +++ b/src/engine/src/public/ButterflyEngine/components/circularmotion.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { class GuiObject; @@ -20,7 +20,7 @@ class GuiObject; * @brief The CircularMotion class. This class contains render function for the moving guiobject by round. * @note For motion set motion asix and angular velocity */ -class CRAWL_EXPORT CircularMotion: public BaseMotion +class BUTTERFLY_ENGINE_EXPORT CircularMotion: public BaseMotion { public: CircularMotion(const QVector3D* center); diff --git a/src/engine/src/public/ButterflyEngine/components/claster.cpp b/src/engine/src/public/ButterflyEngine/components/claster.cpp index f315657..2fd75db 100644 --- a/src/engine/src/public/ButterflyEngine/components/claster.cpp +++ b/src/engine/src/public/ButterflyEngine/components/claster.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "claster.h" #include "Crawl/singleclasterworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { Claster::Claster() {} diff --git a/src/engine/src/public/ButterflyEngine/components/claster.h b/src/engine/src/public/ButterflyEngine/components/claster.h index 4a1f1e3..ee732ec 100644 --- a/src/engine/src/public/ButterflyEngine/components/claster.h +++ b/src/engine/src/public/ButterflyEngine/components/claster.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "Crawl/iworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { class ClasterItem; @@ -20,7 +20,7 @@ class ClasterItem; * For example snake with 20 points of the snake blocks. * @note The claster object is extansion for the IWorldItems objects. */ -class CRAWL_EXPORT Claster +class BUTTERFLY_ENGINE_EXPORT Claster { public: Claster(); diff --git a/src/engine/src/public/ButterflyEngine/components/movableobject.cpp b/src/engine/src/public/ButterflyEngine/components/movableobject.cpp index 2c42ad1..fd36d9b 100644 --- a/src/engine/src/public/ButterflyEngine/components/movableobject.cpp +++ b/src/engine/src/public/ButterflyEngine/components/movableobject.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { MovableObject::MovableObject() { diff --git a/src/engine/src/public/ButterflyEngine/components/movableobject.h b/src/engine/src/public/ButterflyEngine/components/movableobject.h index d47f18e..3fc5c56 100644 --- a/src/engine/src/public/ButterflyEngine/components/movableobject.h +++ b/src/engine/src/public/ButterflyEngine/components/movableobject.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { class GuiObject; @@ -27,7 +27,7 @@ class GuiObject; * * **Angular velocity** This property sets spead of the angle moving. * * **Braking force** This property are delta decriment the Power of the movable vector on time. */ -class CRAWL_EXPORT MovableObject: public BaseMotion +class BUTTERFLY_ENGINE_EXPORT MovableObject: public BaseMotion { public: diff --git a/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.cpp b/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.cpp index f90b8a9..9effc5b 100644 --- a/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.cpp +++ b/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { RotationAroundAxis::RotationAroundAxis(): CircularMotion(nullptr) { diff --git a/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.h b/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.h index f82fcad..6572338 100644 --- a/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.h +++ b/src/engine/src/public/ButterflyEngine/components/rotationaroundaxis.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "circularmotion.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The RotationAroundAxis class This class provide the rotation of our axis diff --git a/src/engine/src/public/ButterflyEngine/core/affector.cpp b/src/engine/src/public/ButterflyEngine/core/affector.cpp index e8559dd..6df4224 100644 --- a/src/engine/src/public/ButterflyEngine/core/affector.cpp +++ b/src/engine/src/public/ButterflyEngine/core/affector.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "affector.h" -namespace CRAWL { +namespace ButterflyEngine { Affector::Affector(const QString &name, const QString &viewTempalte, diff --git a/src/engine/src/public/ButterflyEngine/core/affector.h b/src/engine/src/public/ButterflyEngine/core/affector.h index d8fefeb..fcd348a 100644 --- a/src/engine/src/public/ButterflyEngine/core/affector.h +++ b/src/engine/src/public/ButterflyEngine/core/affector.h @@ -4,7 +4,7 @@ #include "iworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Affector class is an abstract base class of affectors like Gravity3D, Wander3D, and PointRotator3D. By default affectors affect all particles in the system, @@ -37,7 +37,7 @@ namespace CRAWL { @endcode */ -class CRAWL_EXPORT Affector : public IWorldItem +class BUTTERFLY_ENGINE_EXPORT Affector : public IWorldItem { Q_OBJECT diff --git a/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp b/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp index 21225ed..f99a0a5 100644 --- a/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp +++ b/src/engine/src/public/ButterflyEngine/core/clasteritem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "Extensions/claster.h" #include "clasteritem.h" -namespace CRAWL { +namespace ButterflyEngine { ClasterItem::ClasterItem(const QString &name, diff --git a/src/engine/src/public/ButterflyEngine/core/clasteritem.h b/src/engine/src/public/ButterflyEngine/core/clasteritem.h index 70ea6f5..491b09f 100644 --- a/src/engine/src/public/ButterflyEngine/core/clasteritem.h +++ b/src/engine/src/public/ButterflyEngine/core/clasteritem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #ifndef CLASTERITEM_H #define CLASTERITEM_H -namespace CRAWL { +namespace ButterflyEngine { class Claster; @@ -21,7 +21,7 @@ class Claster; * @brief The ClasterItem class This is item of the claster object. Thi class can be used as a one element of the claster class. * @note This object invoke the Claster::remove method in destructor. */ -class CRAWL_EXPORT ClasterItem: public IWorldItem +class BUTTERFLY_ENGINE_EXPORT ClasterItem: public IWorldItem { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/clientapp.cpp b/src/engine/src/public/ButterflyEngine/core/clientapp.cpp index c2c1b8f..4d450ff 100644 --- a/src/engine/src/public/ButterflyEngine/core/clientapp.cpp +++ b/src/engine/src/public/ButterflyEngine/core/clientapp.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -25,7 +25,7 @@ #include "worldstatus.h" #include "user.h" -namespace CRAWL { +namespace ButterflyEngine { QByteArray ClientApp::initTheme() { diff --git a/src/engine/src/public/ButterflyEngine/core/clientapp.h b/src/engine/src/public/ButterflyEngine/core/clientapp.h index 8880bac..b9456a5 100644 --- a/src/engine/src/public/ButterflyEngine/core/clientapp.h +++ b/src/engine/src/public/ButterflyEngine/core/clientapp.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -17,7 +17,7 @@ class QQmlApplicationEngine; inline void initCrawlResources() { Q_INIT_RESOURCE(Crawl); } -namespace CRAWL { +namespace ButterflyEngine { class Engine; @@ -29,7 +29,7 @@ class Store; /** * @brief The ClientApp class This is main class of the Game engine. */ -class CRAWL_EXPORT ClientApp : public QObject +class BUTTERFLY_ENGINE_EXPORT ClientApp : public QObject { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/day.cpp b/src/engine/src/public/ButterflyEngine/core/day.cpp index 0c0d8b8..3c1fe0f 100644 --- a/src/engine/src/public/ButterflyEngine/core/day.cpp +++ b/src/engine/src/public/ButterflyEngine/core/day.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/public/ButterflyEngine/core/day.h b/src/engine/src/public/ButterflyEngine/core/day.h index a509b06..b25d3d5 100644 --- a/src/engine/src/public/ButterflyEngine/core/day.h +++ b/src/engine/src/public/ButterflyEngine/core/day.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include "iworlditem.h" #include "math.h" -namespace CRAWL { +namespace ButterflyEngine { template @@ -26,11 +26,11 @@ template * **Example:** * * ```cpp - * CRAWL::WorldRule *World::initWorldRules() { + * ButterflyEngine::WorldRule *World::initWorldRules() { - using Day = CRAWL::Day; + using Day = ButterflyEngine::Day; - return new CRAWL::WorldRule { + return new ButterflyEngine::WorldRule { {0, { {registerObject(), 1}, } diff --git a/src/engine/src/public/ButterflyEngine/core/dayitem.cpp b/src/engine/src/public/ButterflyEngine/core/dayitem.cpp index 2698161..4d0b155 100644 --- a/src/engine/src/public/ButterflyEngine/core/dayitem.cpp +++ b/src/engine/src/public/ButterflyEngine/core/dayitem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "dayitem.h" -namespace CRAWL { +namespace ButterflyEngine { DayItem::DayItem( const QVector3D* center, diff --git a/src/engine/src/public/ButterflyEngine/core/dayitem.h b/src/engine/src/public/ButterflyEngine/core/dayitem.h index 330c7fd..c0ef8e8 100644 --- a/src/engine/src/public/ButterflyEngine/core/dayitem.h +++ b/src/engine/src/public/ButterflyEngine/core/dayitem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "iworldlight.h" #include "Extensions/circularmotion.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The DayItem class This is base class of the sun of moon of anther movable around center objects. diff --git a/src/engine/src/public/ButterflyEngine/core/defaultcontrol.cpp b/src/engine/src/public/ButterflyEngine/core/defaultcontrol.cpp index e99e3d8..1a486de 100644 --- a/src/engine/src/public/ButterflyEngine/core/defaultcontrol.cpp +++ b/src/engine/src/public/ButterflyEngine/core/defaultcontrol.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "defaultcontrol.h" -namespace CRAWL { +namespace ButterflyEngine { DefaultControl::DefaultControl() { diff --git a/src/engine/src/public/ButterflyEngine/core/defaultcontrol.h b/src/engine/src/public/ButterflyEngine/core/defaultcontrol.h index fc65cc7..5812e23 100644 --- a/src/engine/src/public/ButterflyEngine/core/defaultcontrol.h +++ b/src/engine/src/public/ButterflyEngine/core/defaultcontrol.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,13 +10,13 @@ #include "player.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The DefaultControl class This class contains default implementation of the game menu. */ -class CRAWL_EXPORT DefaultControl : public Player { +class BUTTERFLY_ENGINE_EXPORT DefaultControl : public Player { Q_OBJECT public: DefaultControl(); diff --git a/src/engine/src/public/ButterflyEngine/core/defaultlight.cpp b/src/engine/src/public/ButterflyEngine/core/defaultlight.cpp index f0c915f..5eb1852 100644 --- a/src/engine/src/public/ButterflyEngine/core/defaultlight.cpp +++ b/src/engine/src/public/ButterflyEngine/core/defaultlight.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "defaultlight.h" -namespace CRAWL { +namespace ButterflyEngine { DefaultLight::DefaultLight(): IWorldLight(AUTO_CLASS_NAME) { setColor("#fff8e7"); diff --git a/src/engine/src/public/ButterflyEngine/core/defaultlight.h b/src/engine/src/public/ButterflyEngine/core/defaultlight.h index 1343365..c2c9901 100644 --- a/src/engine/src/public/ButterflyEngine/core/defaultlight.h +++ b/src/engine/src/public/ButterflyEngine/core/defaultlight.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "iworldlight.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The DefaultLight class This is default implementation of the world light. diff --git a/src/engine/src/public/ButterflyEngine/core/diff.cpp b/src/engine/src/public/ButterflyEngine/core/diff.cpp index a4356c8..2802896 100644 --- a/src/engine/src/public/ButterflyEngine/core/diff.cpp +++ b/src/engine/src/public/ButterflyEngine/core/diff.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "diff.h" -namespace CRAWL { +namespace ButterflyEngine { QList Diff::getAddedIds() const { return addedIds; diff --git a/src/engine/src/public/ButterflyEngine/core/diff.h b/src/engine/src/public/ButterflyEngine/core/diff.h index 3d10a94..1262ff8 100644 --- a/src/engine/src/public/ButterflyEngine/core/diff.h +++ b/src/engine/src/public/ButterflyEngine/core/diff.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { class GuiObject; @@ -30,6 +30,6 @@ public: }; } -Q_DECLARE_METATYPE(CRAWL::Diff) +Q_DECLARE_METATYPE(ButterflyEngine::Diff) #endif // DIFF_H diff --git a/src/engine/src/public/ButterflyEngine/core/dynamicwint.cpp b/src/engine/src/public/ButterflyEngine/core/dynamicwint.cpp index c687279..d5a7aa9 100644 --- a/src/engine/src/public/ButterflyEngine/core/dynamicwint.cpp +++ b/src/engine/src/public/ButterflyEngine/core/dynamicwint.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "dynamicwint.h" -namespace CRAWL { +namespace ButterflyEngine { DynamicWint::DynamicWint() { diff --git a/src/engine/src/public/ButterflyEngine/core/dynamicwint.h b/src/engine/src/public/ButterflyEngine/core/dynamicwint.h index 0da96ad..8737b3d 100644 --- a/src/engine/src/public/ButterflyEngine/core/dynamicwint.h +++ b/src/engine/src/public/ButterflyEngine/core/dynamicwint.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,12 +10,12 @@ #define DYNAMICWINT_H #include "wint.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The DynamicWint class This implementation dynamicly change wint direction and magnituede per day. */ -class CRAWL_EXPORT DynamicWint : public Wint +class BUTTERFLY_ENGINE_EXPORT DynamicWint : public Wint { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/fire.cpp b/src/engine/src/public/ButterflyEngine/core/fire.cpp index e3b67f6..26fa954 100644 --- a/src/engine/src/public/ButterflyEngine/core/fire.cpp +++ b/src/engine/src/public/ButterflyEngine/core/fire.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "fire.h" #include "vectordirection.h" -namespace CRAWL { +namespace ButterflyEngine { Fire::Fire(): ParticleEffect(AUTO_CLASS_NAME, "qrc:/CrawlModule/particles/Fire.qml") { @@ -27,7 +27,7 @@ Fire::Fire(): ParticleEffect(AUTO_CLASS_NAME, "qrc:/CrawlModule/particles/Fire.q setFireStrength(100); } -void CRAWL::Fire::onIntersects(const IWorldItem *) { +void ButterflyEngine::Fire::onIntersects(const IWorldItem *) { } diff --git a/src/engine/src/public/ButterflyEngine/core/fire.h b/src/engine/src/public/ButterflyEngine/core/fire.h index 97d1381..2216eb2 100644 --- a/src/engine/src/public/ButterflyEngine/core/fire.h +++ b/src/engine/src/public/ButterflyEngine/core/fire.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "particleeffect.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Fire class This is default implementation of the Fire on game. diff --git a/src/engine/src/public/ButterflyEngine/core/gameresult.cpp b/src/engine/src/public/ButterflyEngine/core/gameresult.cpp index 4150ff9..bedbb69 100644 --- a/src/engine/src/public/ButterflyEngine/core/gameresult.cpp +++ b/src/engine/src/public/ButterflyEngine/core/gameresult.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. diff --git a/src/engine/src/public/ButterflyEngine/core/gameresult.h b/src/engine/src/public/ButterflyEngine/core/gameresult.h index 21930e2..db5f00b 100644 --- a/src/engine/src/public/ButterflyEngine/core/gameresult.h +++ b/src/engine/src/public/ButterflyEngine/core/gameresult.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #ifndef GAMERESULT_H #define GAMERESULT_H -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The GameResult struct This is simple structure with game statistic. diff --git a/src/engine/src/public/ButterflyEngine/core/global.h b/src/engine/src/public/ButterflyEngine/core/global.h index 83f6891..1c13d29 100644 --- a/src/engine/src/public/ButterflyEngine/core/global.h +++ b/src/engine/src/public/ButterflyEngine/core/global.h @@ -4,9 +4,9 @@ #include #if defined(CRAWL_LIBRARY) -# define CRAWL_EXPORT Q_DECL_EXPORT +# define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT #else -# define CRAWL_EXPORT Q_DECL_IMPORT +# define BUTTERFLY_ENGINE_EXPORT Q_DECL_IMPORT #endif #endif // QTSECRET_GLOBAL_H diff --git a/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp b/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp index e1a451e..70ab4b1 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp +++ b/src/engine/src/public/ButterflyEngine/core/groundclaster.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "groundclaster.h" #include "iworld.h" -namespace CRAWL { +namespace ButterflyEngine { GroundClaster::GroundClaster(const QString &name, diff --git a/src/engine/src/public/ButterflyEngine/core/groundclaster.h b/src/engine/src/public/ButterflyEngine/core/groundclaster.h index 60e040a..510b7cc 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundclaster.h +++ b/src/engine/src/public/ButterflyEngine/core/groundclaster.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include "global.h" #include "Crawl/iworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The GroundClaster class This is main control class for background plates of the world. @@ -20,7 +20,7 @@ namespace CRAWL { * * @note use This class with child classes of the GroundTile class. */ -class CRAWL_EXPORT GroundClaster: public IWorldItem, public AutoGenerateClaster { +class BUTTERFLY_ENGINE_EXPORT GroundClaster: public IWorldItem, public AutoGenerateClaster { Q_OBJECT diff --git a/src/engine/src/public/ButterflyEngine/core/groundtile.cpp b/src/engine/src/public/ButterflyEngine/core/groundtile.cpp index 33afab4..e34f99f 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundtile.cpp +++ b/src/engine/src/public/ButterflyEngine/core/groundtile.cpp @@ -1,5 +1,5 @@ #include "groundtile.h" -namespace CRAWL { +namespace ButterflyEngine { GroundTile::GroundTile(const QString &name, const QString &viewTempalte, @@ -8,7 +8,7 @@ GroundTile::GroundTile(const QString &name, } -void CRAWL::GroundTile::render(unsigned int) { +void ButterflyEngine::GroundTile::render(unsigned int) { } } diff --git a/src/engine/src/public/ButterflyEngine/core/groundtile.h b/src/engine/src/public/ButterflyEngine/core/groundtile.h index 5d14c97..cc33c02 100644 --- a/src/engine/src/public/ButterflyEngine/core/groundtile.h +++ b/src/engine/src/public/ButterflyEngine/core/groundtile.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,14 +11,14 @@ #include "clasteritem.h" #include "iworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The GroundTile class It reimplementation of the ClasterItem. The groundTile do not heve own render function because the GroundClaster class control position of this class. * * @note use This class with the GroundClaster class. */ -class CRAWL_EXPORT GroundTile: public ClasterItem +class BUTTERFLY_ENGINE_EXPORT GroundTile: public ClasterItem { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/groupobject.cpp b/src/engine/src/public/ButterflyEngine/core/groupobject.cpp index 96e2cc9..af3a144 100644 --- a/src/engine/src/public/ButterflyEngine/core/groupobject.cpp +++ b/src/engine/src/public/ButterflyEngine/core/groupobject.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "clasteritem.h" #include "groupobject.h" -namespace CRAWL { +namespace ButterflyEngine { GroupObject::GroupObject() { diff --git a/src/engine/src/public/ButterflyEngine/core/groupobject.h b/src/engine/src/public/ButterflyEngine/core/groupobject.h index f8208d9..cbfc5ac 100644 --- a/src/engine/src/public/ButterflyEngine/core/groupobject.h +++ b/src/engine/src/public/ButterflyEngine/core/groupobject.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,7 +13,7 @@ #include #include -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Localpropertys struct This structure contains local propertys of the all childs object of a GroupObject class object. diff --git a/src/engine/src/public/ButterflyEngine/core/guiobject.cpp b/src/engine/src/public/ButterflyEngine/core/guiobject.cpp index 9642fb3..38b885c 100644 --- a/src/engine/src/public/ButterflyEngine/core/guiobject.cpp +++ b/src/engine/src/public/ButterflyEngine/core/guiobject.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { GuiObject::GuiObject(const QString &name, const QString &viewTempalte, QObject *ptr): diff --git a/src/engine/src/public/ButterflyEngine/core/guiobject.h b/src/engine/src/public/ButterflyEngine/core/guiobject.h index ab362be..63a3067 100644 --- a/src/engine/src/public/ButterflyEngine/core/guiobject.h +++ b/src/engine/src/public/ButterflyEngine/core/guiobject.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -20,7 +20,7 @@ */ #define AUTO_CLASS_NAME typeid(this).name() -namespace CRAWL { +namespace ButterflyEngine { /** @@ -58,7 +58,7 @@ namespace CRAWL { * } * ``` */ -class CRAWL_EXPORT GuiObject: public ViewTemaplateModel, virtual public IRender { +class BUTTERFLY_ENGINE_EXPORT GuiObject: public ViewTemaplateModel, virtual public IRender { Q_OBJECT Q_PROPERTY(int guiId READ guiId NOTIFY guiIdChanged) Q_PROPERTY(QString color READ color WRITE setColor NOTIFY colorChanged) diff --git a/src/engine/src/public/ButterflyEngine/core/layout.cpp b/src/engine/src/public/ButterflyEngine/core/layout.cpp index a08db99..e431ba1 100644 --- a/src/engine/src/public/ButterflyEngine/core/layout.cpp +++ b/src/engine/src/public/ButterflyEngine/core/layout.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "clasteritem.h" #include -namespace CRAWL { +namespace ButterflyEngine { Layout::Layout() { diff --git a/src/engine/src/public/ButterflyEngine/core/layout.h b/src/engine/src/public/ButterflyEngine/core/layout.h index 502bbfa..c96f083 100644 --- a/src/engine/src/public/ButterflyEngine/core/layout.h +++ b/src/engine/src/public/ButterflyEngine/core/layout.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The LayoutType enum Lists the shapes to convert the group object to. @@ -49,13 +49,13 @@ enum LayoutType { * * ```cpp * - * class GroupObjObstacle: public CRAWL::Layout, public CRAWL::IWorldItem { + * class GroupObjObstacle: public ButterflyEngine::Layout, public ButterflyEngine::IWorldItem { * * // sets the distance to the object from the center. * setDistance(20); * * // Set the property of grouping objects - * changeLayout(CRAWL::LayoutType::CIRCLE); + * changeLayout(ButterflyEngine::LayoutType::CIRCLE); * * for(int i(0); i < 20; i++) { * add(new BoxItem); diff --git a/src/engine/src/public/ButterflyEngine/core/moon.cpp b/src/engine/src/public/ButterflyEngine/core/moon.cpp index 298a185..22a7d88 100644 --- a/src/engine/src/public/ButterflyEngine/core/moon.cpp +++ b/src/engine/src/public/ButterflyEngine/core/moon.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "moon.h" -namespace CRAWL { +namespace ButterflyEngine { Moon::Moon(const QVector3D* center): DayItem(center, AUTO_CLASS_NAME) { diff --git a/src/engine/src/public/ButterflyEngine/core/moon.h b/src/engine/src/public/ButterflyEngine/core/moon.h index 6764f83..4f7f8ae 100644 --- a/src/engine/src/public/ButterflyEngine/core/moon.h +++ b/src/engine/src/public/ButterflyEngine/core/moon.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,12 +11,12 @@ #include "Crawl/dayitem.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Moon class This is default implementation of the moon for the Dat class. */ -class CRAWL_EXPORT Moon: public DayItem { +class BUTTERFLY_ENGINE_EXPORT Moon: public DayItem { Q_OBJECT public: Moon(const QVector3D *center); diff --git a/src/engine/src/public/ButterflyEngine/core/particleeffect.cpp b/src/engine/src/public/ButterflyEngine/core/particleeffect.cpp index e998e11..dd30923 100644 --- a/src/engine/src/public/ButterflyEngine/core/particleeffect.cpp +++ b/src/engine/src/public/ButterflyEngine/core/particleeffect.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "particleeffect.h" #include "targetdirection.h" #include "vectordirection.h" -namespace CRAWL { +namespace ButterflyEngine { ParticleEffect::ParticleEffect(const QString &name, diff --git a/src/engine/src/public/ButterflyEngine/core/particleeffect.h b/src/engine/src/public/ButterflyEngine/core/particleeffect.h index 23d8d42..7510521 100644 --- a/src/engine/src/public/ButterflyEngine/core/particleeffect.h +++ b/src/engine/src/public/ButterflyEngine/core/particleeffect.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "iworlditem.h" -namespace CRAWL { +namespace ButterflyEngine { /** @@ -44,7 +44,7 @@ At least one emitter is required to have particles in the ParticleSystem3D. @endcode */ -class CRAWL_EXPORT ParticleEffect : public IWorldItem +class BUTTERFLY_ENGINE_EXPORT ParticleEffect : public IWorldItem { Q_OBJECT /** diff --git a/src/engine/src/public/ButterflyEngine/core/playableobject.cpp b/src/engine/src/public/ButterflyEngine/core/playableobject.cpp index a9f187e..a83e4de 100644 --- a/src/engine/src/public/ButterflyEngine/core/playableobject.cpp +++ b/src/engine/src/public/ButterflyEngine/core/playableobject.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "defaultcontrol.h" #include "playableobject.h" -namespace CRAWL { +namespace ButterflyEngine { PlayableObject::PlayableObject(const QString &name, diff --git a/src/engine/src/public/ButterflyEngine/core/playableobject.h b/src/engine/src/public/ButterflyEngine/core/playableobject.h index e6a39f6..fec5dce 100644 --- a/src/engine/src/public/ButterflyEngine/core/playableobject.h +++ b/src/engine/src/public/ButterflyEngine/core/playableobject.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include "iworlditem.h" #include "Extensions/movableobject.h" -namespace CRAWL { +namespace ButterflyEngine { class IControl; @@ -21,7 +21,7 @@ class IControl; * @brief The PlayableObject class support works withe the IControl child classes. * **How to is works**? You need to override the PlayableObject::setControl method for adding your own cpntroll classes. By Default This class use The DefaultControl class. */ -class CRAWL_EXPORT PlayableObject: public IWorldItem, public MovableObject { +class BUTTERFLY_ENGINE_EXPORT PlayableObject: public IWorldItem, public MovableObject { Q_OBJECT public: PlayableObject(const QString& name, diff --git a/src/engine/src/public/ButterflyEngine/core/player.cpp b/src/engine/src/public/ButterflyEngine/core/player.cpp index 0bb6bdf..b7cee19 100644 --- a/src/engine/src/public/ButterflyEngine/core/player.cpp +++ b/src/engine/src/public/ButterflyEngine/core/player.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "player.h" #include -namespace CRAWL { +namespace ButterflyEngine { Player::Player() { diff --git a/src/engine/src/public/ButterflyEngine/core/player.h b/src/engine/src/public/ButterflyEngine/core/player.h index 5808846..e9ba490 100644 --- a/src/engine/src/public/ButterflyEngine/core/player.h +++ b/src/engine/src/public/ButterflyEngine/core/player.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,14 +12,14 @@ #include "icontrol.h" -namespace CRAWL { +namespace ButterflyEngine { class User; /** * @brief The Player class is main class of users. */ -class CRAWL_EXPORT Player: public IControl +class BUTTERFLY_ENGINE_EXPORT Player: public IControl { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/previewcontrol.cpp b/src/engine/src/public/ButterflyEngine/core/previewcontrol.cpp index 3d89dbe..4d5196f 100644 --- a/src/engine/src/public/ButterflyEngine/core/previewcontrol.cpp +++ b/src/engine/src/public/ButterflyEngine/core/previewcontrol.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "previewcontrol.h" -namespace CRAWL { +namespace ButterflyEngine { PreviewControl::PreviewControl() { diff --git a/src/engine/src/public/ButterflyEngine/core/previewcontrol.h b/src/engine/src/public/ButterflyEngine/core/previewcontrol.h index cc18584..32ceb12 100644 --- a/src/engine/src/public/ButterflyEngine/core/previewcontrol.h +++ b/src/engine/src/public/ButterflyEngine/core/previewcontrol.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,12 +10,12 @@ #include "icontrol.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The PreviewControl class This is base class of the preview popup control. */ -class CRAWL_EXPORT PreviewControl: public IControl +class BUTTERFLY_ENGINE_EXPORT PreviewControl: public IControl { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.cpp b/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.cpp index 6e2f22f..72feba4 100644 --- a/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.cpp +++ b/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "singleclasterworlditem.h" #include "quasarapp.h" -namespace CRAWL { +namespace ButterflyEngine { SingleClasterWorldItem::SingleClasterWorldItem(const QString &name, diff --git a/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.h b/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.h index 1a05d72..5b140de 100644 --- a/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.h +++ b/src/engine/src/public/ButterflyEngine/core/singleclasterworlditem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "clasteritem.h" -namespace CRAWL { +namespace ButterflyEngine { class Claster; @@ -19,7 +19,7 @@ class Claster; * @brief The SingleClasterWorldItem class This is wraper of the OWorldOitem for the controll parent clasters. * This object can belong to only one cluster in one time */ -class CRAWL_EXPORT SingleClasterWorldItem: public ClasterItem +class BUTTERFLY_ENGINE_EXPORT SingleClasterWorldItem: public ClasterItem { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/snake.cpp b/src/engine/src/public/ButterflyEngine/core/snake.cpp index d50538d..f4b5beb 100644 --- a/src/engine/src/public/ButterflyEngine/core/snake.cpp +++ b/src/engine/src/public/ButterflyEngine/core/snake.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include #include "iworld.h" -namespace CRAWL { +namespace ButterflyEngine { Snake::Snake(const QString &name, const QString &viewTempalte, QObject *ptr): @@ -104,7 +104,7 @@ void Snake::onTap() { setMovableVector(_vectors[_clickIndex++ % 2]); } -float CRAWL::Snake::getValueFromMap(const QMap &map, +float ButterflyEngine::Snake::getValueFromMap(const QMap &map, float position, float defaultValue) { auto it = map.cbegin(); diff --git a/src/engine/src/public/ButterflyEngine/core/snake.h b/src/engine/src/public/ButterflyEngine/core/snake.h index 6afa0de..0a2f500 100644 --- a/src/engine/src/public/ButterflyEngine/core/snake.h +++ b/src/engine/src/public/ButterflyEngine/core/snake.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,14 +12,14 @@ #include "playableobject.h" #include "Extensions/autogenerateclaster.h" -namespace CRAWL { +namespace ButterflyEngine { class SnakeItem; /** * @brief The Snake class This class implement render mehod for snake object. */ -class CRAWL_EXPORT Snake : public PlayableObject, public AutoGenerateClaster, public IItem +class BUTTERFLY_ENGINE_EXPORT Snake : public PlayableObject, public AutoGenerateClaster, public IItem { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/snakeitem.cpp b/src/engine/src/public/ButterflyEngine/core/snakeitem.cpp index 1be6f53..798df5c 100644 --- a/src/engine/src/public/ButterflyEngine/core/snakeitem.cpp +++ b/src/engine/src/public/ButterflyEngine/core/snakeitem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "snake.h" #include "snakeitem.h" -namespace CRAWL { +namespace ButterflyEngine { SnakeItem::SnakeItem(const QString &name, const QString &viewTempalte, QObject *ptr): diff --git a/src/engine/src/public/ButterflyEngine/core/snakeitem.h b/src/engine/src/public/ButterflyEngine/core/snakeitem.h index ea7eac4..247cfdb 100644 --- a/src/engine/src/public/ButterflyEngine/core/snakeitem.h +++ b/src/engine/src/public/ButterflyEngine/core/snakeitem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -13,10 +13,10 @@ #include "singleclasterworlditem.h" #include "Extensions/movableobject.h" -namespace CRAWL { +namespace ButterflyEngine { -class CRAWL_EXPORT SnakeItem: public SingleClasterWorldItem, public MovableObject +class BUTTERFLY_ENGINE_EXPORT SnakeItem: public SingleClasterWorldItem, public MovableObject { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/startdata.cpp b/src/engine/src/public/ButterflyEngine/core/startdata.cpp index f0c3e12..9be2d81 100644 --- a/src/engine/src/public/ButterflyEngine/core/startdata.cpp +++ b/src/engine/src/public/ButterflyEngine/core/startdata.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "startdata.h" -namespace CRAWL { +namespace ButterflyEngine { StartData::StartData() { diff --git a/src/engine/src/public/ButterflyEngine/core/startdata.h b/src/engine/src/public/ButterflyEngine/core/startdata.h index 3320f48..3383342 100644 --- a/src/engine/src/public/ButterflyEngine/core/startdata.h +++ b/src/engine/src/public/ButterflyEngine/core/startdata.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #ifndef STARTDATA_H #define STARTDATA_H -namespace CRAWL { +namespace ButterflyEngine { class User; class PlayableObject; @@ -20,7 +20,7 @@ class PlayableObject; /** * @brief The StartData class This class contains arguments for starting new game session. */ -class CRAWL_EXPORT StartData +class BUTTERFLY_ENGINE_EXPORT StartData { public: StartData(); diff --git a/src/engine/src/public/ButterflyEngine/core/sun.cpp b/src/engine/src/public/ButterflyEngine/core/sun.cpp index 6788cea..ade20b7 100644 --- a/src/engine/src/public/ButterflyEngine/core/sun.cpp +++ b/src/engine/src/public/ButterflyEngine/core/sun.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "sun.h" -namespace CRAWL { +namespace ButterflyEngine { Sun::Sun(const QVector3D* center): DayItem(center, AUTO_CLASS_NAME) { diff --git a/src/engine/src/public/ButterflyEngine/core/sun.h b/src/engine/src/public/ButterflyEngine/core/sun.h index 913c5bd..90a707f 100644 --- a/src/engine/src/public/ButterflyEngine/core/sun.h +++ b/src/engine/src/public/ButterflyEngine/core/sun.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,12 +11,12 @@ #include "Crawl/dayitem.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Sun class This is default implementation of the sun for the Day class. */ -class CRAWL_EXPORT Sun: public DayItem +class BUTTERFLY_ENGINE_EXPORT Sun: public DayItem { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.cpp b/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.cpp index 16f8534..335a9ea 100644 --- a/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.cpp +++ b/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "viewtemaplatemodel.h" -namespace CRAWL { +namespace ButterflyEngine { ViewTemaplateModel::ViewTemaplateModel(const QString &viewTempalte, QObject *ptr): QObject(ptr) { _viewTemplate = viewTempalte; diff --git a/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.h b/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.h index d39a9c5..244f865 100644 --- a/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.h +++ b/src/engine/src/public/ButterflyEngine/core/viewtemaplatemodel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -12,7 +12,7 @@ #include "global.h" #include -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The ViewTemaplateModel class This is base class for supporting model view template in qml. @@ -20,7 +20,7 @@ namespace CRAWL { * All qml viewObjects will be generated using the ViewTemaplateModel::viewTemplate method on The main QML scane. * */ -class CRAWL_EXPORT ViewTemaplateModel: public QObject +class BUTTERFLY_ENGINE_EXPORT ViewTemaplateModel: public QObject { Q_OBJECT diff --git a/src/engine/src/public/ButterflyEngine/core/wint.cpp b/src/engine/src/public/ButterflyEngine/core/wint.cpp index 19cbc1e..b25ae1e 100644 --- a/src/engine/src/public/ButterflyEngine/core/wint.cpp +++ b/src/engine/src/public/ButterflyEngine/core/wint.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "wint.h" -namespace CRAWL { +namespace ButterflyEngine { Wint::Wint(): Affector(AUTO_CLASS_NAME, "qrc:/CrawlModule/particles/Wint.qml") { } diff --git a/src/engine/src/public/ButterflyEngine/core/wint.h b/src/engine/src/public/ButterflyEngine/core/wint.h index c3cb74f..e048cdd 100644 --- a/src/engine/src/public/ButterflyEngine/core/wint.h +++ b/src/engine/src/public/ButterflyEngine/core/wint.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,13 +11,13 @@ #include "affector.h" #include "Extensions/rotationaroundaxis.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Wint class This is example of the using Affector class. * implementation of the wint. */ -class CRAWL_EXPORT Wint: public Affector +class BUTTERFLY_ENGINE_EXPORT Wint: public Affector { Q_OBJECT diff --git a/src/engine/src/public/ButterflyEngine/global.h b/src/engine/src/public/ButterflyEngine/global.h index b8da8d5..ddfaa65 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.3.5aa2b28" +#define BUTTERFLY_ENGINE_VERSION "0.4.d1c1d18" #if defined(BUTTERFLY_ENGINE_LIBRARY) # define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT diff --git a/src/engine/src/public/ButterflyEngine/core/iai.cpp b/src/engine/src/public/ButterflyEngine/interfaces/iai.cpp similarity index 78% rename from src/engine/src/public/ButterflyEngine/core/iai.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/iai.cpp index 33aa30f..1b5e474 100644 --- a/src/engine/src/public/ButterflyEngine/core/iai.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/iai.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "iai.h" -namespace CRAWL { +namespace ButterflyEngine { IAI::IAI() { diff --git a/src/engine/src/public/ButterflyEngine/core/iai.h b/src/engine/src/public/ButterflyEngine/interfaces/iai.h similarity index 87% rename from src/engine/src/public/ButterflyEngine/core/iai.h rename to src/engine/src/public/ButterflyEngine/interfaces/iai.h index 5c61f9f..a806e62 100644 --- a/src/engine/src/public/ButterflyEngine/core/iai.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iai.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #include "global.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The IAI class Is default interface for ai classes. @@ -22,7 +22,7 @@ namespace CRAWL { * } * ``` */ -class CRAWL_EXPORT IAI { +class BUTTERFLY_ENGINE_EXPORT IAI { public: IAI(); virtual ~IAI() = default; diff --git a/src/engine/src/public/ButterflyEngine/core/icontrol.cpp b/src/engine/src/public/ButterflyEngine/interfaces/icontrol.cpp similarity index 89% rename from src/engine/src/public/ButterflyEngine/core/icontrol.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/icontrol.cpp index 7588f86..c9f1bb2 100644 --- a/src/engine/src/public/ButterflyEngine/core/icontrol.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/icontrol.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -7,7 +7,7 @@ #include "icontrol.h" -namespace CRAWL { +namespace ButterflyEngine { IControl::IControl() { diff --git a/src/engine/src/public/ButterflyEngine/core/icontrol.h b/src/engine/src/public/ButterflyEngine/interfaces/icontrol.h similarity index 91% rename from src/engine/src/public/ButterflyEngine/core/icontrol.h rename to src/engine/src/public/ButterflyEngine/interfaces/icontrol.h index 9f5cd10..b7bdb21 100644 --- a/src/engine/src/public/ButterflyEngine/core/icontrol.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/icontrol.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include #include "global.h" -namespace CRAWL { +namespace ButterflyEngine { /** @@ -23,7 +23,7 @@ namespace CRAWL { * For more information see the DefaultControl class. * */ -class CRAWL_EXPORT IControl : public QObject { +class BUTTERFLY_ENGINE_EXPORT IControl : public QObject { Q_OBJECT Q_PROPERTY(QString view READ view NOTIFY viewChanged) diff --git a/src/engine/src/public/ButterflyEngine/core/iitem.cpp b/src/engine/src/public/ButterflyEngine/interfaces/iitem.cpp similarity index 96% rename from src/engine/src/public/ButterflyEngine/core/iitem.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/iitem.cpp index b16e11b..3f46839 100644 --- a/src/engine/src/public/ButterflyEngine/core/iitem.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/iitem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "iitem.h" #include -namespace CRAWL { +namespace ButterflyEngine { IItem::IItem() { diff --git a/src/engine/src/public/ButterflyEngine/core/iitem.h b/src/engine/src/public/ButterflyEngine/interfaces/iitem.h similarity index 98% rename from src/engine/src/public/ButterflyEngine/core/iitem.h rename to src/engine/src/public/ButterflyEngine/interfaces/iitem.h index cd7b98c..1eacc4b 100644 --- a/src/engine/src/public/ButterflyEngine/core/iitem.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iitem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -14,12 +14,12 @@ #include #include "global.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The IItem class contains base description of the game items (player perks, game levels, and levels items.) */ -class CRAWL_EXPORT IItem +class BUTTERFLY_ENGINE_EXPORT IItem { public: IItem(); diff --git a/src/engine/src/public/ButterflyEngine/core/ilevel.cpp b/src/engine/src/public/ButterflyEngine/interfaces/ilevel.cpp similarity index 91% rename from src/engine/src/public/ButterflyEngine/core/ilevel.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/ilevel.cpp index 7fdf80f..1ee3f91 100644 --- a/src/engine/src/public/ButterflyEngine/core/ilevel.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/ilevel.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "ilevel.h" #include "ipreviewscaneworld.h" -namespace CRAWL { +namespace ButterflyEngine { ILevel::~ILevel() { delete _world; diff --git a/src/engine/src/public/ButterflyEngine/core/ilevel.h b/src/engine/src/public/ButterflyEngine/interfaces/ilevel.h similarity index 96% rename from src/engine/src/public/ButterflyEngine/core/ilevel.h rename to src/engine/src/public/ButterflyEngine/interfaces/ilevel.h index bc21c36..4fe86d9 100644 --- a/src/engine/src/public/ButterflyEngine/core/ilevel.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/ilevel.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #ifndef LEVEL_H #define LEVEL_H -namespace CRAWL { +namespace ButterflyEngine { class IWorld; diff --git a/src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.cpp b/src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.cpp similarity index 97% rename from src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.cpp index 87fdb27..d7c9f16 100644 --- a/src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -8,7 +8,7 @@ #include "ipreviewscaneworld.h" #include "previewcontrol.h" -namespace CRAWL { +namespace ButterflyEngine { IPreviewScaneWorld::IPreviewScaneWorld(const IWorld* mainWorld) { debug_assert(mainWorld, "The mainWorld world option should be initialized."); diff --git a/src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.h b/src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.h similarity index 93% rename from src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.h rename to src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.h index afedd26..c8c198d 100644 --- a/src/engine/src/public/ButterflyEngine/core/ipreviewscaneworld.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/ipreviewscaneworld.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,12 +10,12 @@ #include "iworld.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The IPreviewScaneWorld class is interface of the all preview scanes models. */ -class CRAWL_EXPORT IPreviewScaneWorld: public IWorld +class BUTTERFLY_ENGINE_EXPORT IPreviewScaneWorld: public IWorld { Q_OBJECT public: diff --git a/src/engine/src/public/ButterflyEngine/core/irender.cpp b/src/engine/src/public/ButterflyEngine/interfaces/irender.cpp similarity index 79% rename from src/engine/src/public/ButterflyEngine/core/irender.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/irender.cpp index 2b30996..2d2812e 100644 --- a/src/engine/src/public/ButterflyEngine/core/irender.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/irender.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "irender.h" -namespace CRAWL { +namespace ButterflyEngine { IRender::IRender() { diff --git a/src/engine/src/public/ButterflyEngine/core/irender.h b/src/engine/src/public/ButterflyEngine/interfaces/irender.h similarity index 93% rename from src/engine/src/public/ButterflyEngine/core/irender.h rename to src/engine/src/public/ButterflyEngine/interfaces/irender.h index a8d35a6..de30bb0 100644 --- a/src/engine/src/public/ButterflyEngine/core/irender.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/irender.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,7 +11,7 @@ #include "global.h" #include "quasarapp.h" -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The IRender class This interface provide render functionality for all objects. @@ -22,7 +22,7 @@ namespace CRAWL { * You can create child class of the IRender class and override the render method. But the render method will works with another class object using dynamic_cast of this pointer. * */ -class CRAWL_EXPORT IRender { +class BUTTERFLY_ENGINE_EXPORT IRender { public: IRender(); virtual ~IRender() = default; diff --git a/src/engine/src/public/ButterflyEngine/core/iworld.cpp b/src/engine/src/public/ButterflyEngine/interfaces/iworld.cpp similarity index 99% rename from src/engine/src/public/ButterflyEngine/core/iworld.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/iworld.cpp index 0aed561..1823371 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworld.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworld.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -23,7 +23,7 @@ #include "player.h" #include -namespace CRAWL { +namespace ButterflyEngine { IWorld::IWorld() { diff --git a/src/engine/src/public/ButterflyEngine/core/iworld.h b/src/engine/src/public/ButterflyEngine/interfaces/iworld.h similarity index 98% rename from src/engine/src/public/ButterflyEngine/core/iworld.h rename to src/engine/src/public/ButterflyEngine/interfaces/iworld.h index 30e97e8..b4c9e21 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworld.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworld.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -27,7 +27,7 @@ class ClastersTest; -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The Events enum contains availabele events of the World. @@ -59,7 +59,7 @@ typedef QMap WorldRule; /** * @brief The IWorld class use this interface for implementation your own game levels */ -class CRAWL_EXPORT IWorld : public QObject, public IRender, public IItem +class BUTTERFLY_ENGINE_EXPORT IWorld : public QObject, public IRender, public IItem { Q_OBJECT Q_PROPERTY(QVector3D cameraReleativePosition READ cameraReleativePosition NOTIFY cameraReleativePositionChanged) @@ -272,7 +272,7 @@ signals: * @brief sigOBjctsListChanged This signal emited when lvel status are changed. * @brief diff This is list of removed and addeds items */ - void sigOBjctsListChanged(CRAWL::Diff diff); + void sigOBjctsListChanged(ButterflyEngine::Diff diff); /** * @brief cameraReleativePositionChanged This signal emot when releative position of camera cahged. diff --git a/src/engine/src/public/ButterflyEngine/core/iworlditem.cpp b/src/engine/src/public/ButterflyEngine/interfaces/iworlditem.cpp similarity index 97% rename from src/engine/src/public/ButterflyEngine/core/iworlditem.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/iworlditem.cpp index d08a21d..ee9984b 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworlditem.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworlditem.cpp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -9,7 +9,7 @@ #include "iworld.h" #include "quasarapp.h" -namespace CRAWL { +namespace ButterflyEngine { IWorldItem::IWorldItem(const QString& name, diff --git a/src/engine/src/public/ButterflyEngine/core/iworlditem.h b/src/engine/src/public/ButterflyEngine/interfaces/iworlditem.h similarity index 95% rename from src/engine/src/public/ButterflyEngine/core/iworlditem.h rename to src/engine/src/public/ButterflyEngine/interfaces/iworlditem.h index e069165..e9c3a7a 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworlditem.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworlditem.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -11,13 +11,13 @@ #include #include "global.h" -namespace CRAWL { +namespace ButterflyEngine { class IWorld; /** * @brief The IWorldItem class This is World item. This class contains functions for control event system. */ -class CRAWL_EXPORT IWorldItem: public GuiObject { +class BUTTERFLY_ENGINE_EXPORT IWorldItem: public GuiObject { Q_OBJECT public: @@ -43,7 +43,7 @@ public: bool isDecorative() const; /** - * @brief supportedEvents This method return mask of the supported events. For get more information about events see the CRAWL::Events enum. + * @brief supportedEvents This method return mask of the supported events. For get more information about events see the ButterflyEngine::Events enum. * @return integer mask of the supported events. * @see IWorldItem::setSupportedEvents * @see IWorldItem::addSupportOfEvent diff --git a/src/engine/src/public/ButterflyEngine/core/iworldlight.cpp b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.cpp similarity index 96% rename from src/engine/src/public/ButterflyEngine/core/iworldlight.cpp rename to src/engine/src/public/ButterflyEngine/interfaces/iworldlight.cpp index c2c6f04..ae4a8f7 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworldlight.cpp +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.cpp @@ -1,12 +1,12 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. //# #include "iworldlight.h" -namespace CRAWL { +namespace ButterflyEngine { IWorldLight::IWorldLight(const QString &name, const QString &viewTempalte, diff --git a/src/engine/src/public/ButterflyEngine/core/iworldlight.h b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h similarity index 96% rename from src/engine/src/public/ButterflyEngine/core/iworldlight.h rename to src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h index 0ca1568..cc28db9 100644 --- a/src/engine/src/public/ButterflyEngine/core/iworldlight.h +++ b/src/engine/src/public/ButterflyEngine/interfaces/iworldlight.h @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2021-2021 QuasarApp. +//# Copyright (C) 2021-2024 QuasarApp. //# Distributed under the GPLv3 software license, see the accompanying //# Everyone is permitted to copy and distribute verbatim copies //# of this license document, but changing it is not allowed. @@ -10,7 +10,7 @@ #ifndef IWORLDLIGHT_H #define IWORLDLIGHT_H -namespace CRAWL { +namespace ButterflyEngine { /** * @brief The IWorldLight class Is base interaface of the light object. @@ -24,9 +24,9 @@ namespace CRAWL { * **Example:** * * ```cpp - * CRAWL::WorldRule *World::initWorldRules() { + * ButterflyEngine::WorldRule *World::initWorldRules() { - return new CRAWL::WorldRule { + return new ButterflyEngine::WorldRule { {0, { {registerObject(), 1}, } @@ -41,7 +41,7 @@ namespace CRAWL { * * For integration This object you world see the IWorld::initWorldRules method */ -class CRAWL_EXPORT IWorldLight: public ClasterItem +class BUTTERFLY_ENGINE_EXPORT IWorldLight: public ClasterItem { Q_OBJECT Q_PROPERTY(int lightForce READ lightForce WRITE setLightForce NOTIFY lightForceChanged) diff --git a/src/example/Deploy/ButterflyEngine.json b/src/example/Deploy/ButterflyEngine.json index c79ca3f..44c5c3d 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/gitHub/build-ButterflyEngine-Desktop_Qt_6_5_1_GCC_64bit-Debug", + "binPrefix": "/media/D/builds/build-ButterflyEngine-Desktop_Qt_6_5_2_GCC_64bit-Debug", "libDir": [ - "/home/andrei/gitHub/ButterflyEngine", - "/home/andrei/Qt/6.5.1/gcc_64", - "/home/andrei/gitHub/build-ButterflyEngine-Desktop_Qt_6_5_1_GCC_64bit-Debug" + "/media/D/builds/ButterflyEngine", + "/home/andrei/Qt/6.5.2/gcc_64", + "/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/gitHub/ButterflyEngine/Distro" + "/media/D/builds/ButterflyEngine/Distro" ], "extraLib": "crypto", - "targetDir": "/home/andrei/gitHub/ButterflyEngine/Distro", - "deployVersion": "0.3.5aa2b28", + "targetDir": "/media/D/builds/ButterflyEngine/Distro", + "deployVersion": "0.4.d1c1d18", }