fix some syntax issues

This commit is contained in:
Andrei Yankovich 2023-08-22 21:30:27 +02:00
parent f68816a3e6
commit 03e1259a37
14 changed files with 27 additions and 35 deletions

View File

@ -13,8 +13,6 @@
#include "ButterflyEngine/interfaces/iworld.h"
#include <QThread>
#include <quasarapp.h>
#include <storeviewmodel.h>
#include "Crawl/icontrol.h"
#include "QDateTime"
#include "QtConcurrent"
#include "store.h"
@ -133,15 +131,12 @@ void Engine::stop() const {
}
void Engine::handleUnlockedItem(int item) {
static_cast<AvailableLevelsModel*>(_menu->selectLevelModle())->addKey(item);
}
void Engine::handleDroppedItem(int item) {
static_cast<AvailableLevelsModel*>(_menu->selectLevelModle())->removeKey(item);
}
void Engine::handleUnlockedItemsListChanged(const QSet<int> &newSet) {
static_cast<AvailableLevelsModel*>(_menu->selectLevelModle())->setKeys(QList<int>(newSet.begin(), newSet.end()));
}
void Engine::handleLevelChanged(int levelId) {

View File

@ -166,6 +166,7 @@ private:
void renderLoop();
QObject *_menu = nullptr;
QObject *_scane = nullptr;
ILevel* _currentLevel = nullptr;
QHash<int, ILevel*> _availableLvls;

View File

@ -10,6 +10,8 @@
#include "ButterflyEngine/global.h"
#include <QHash>
namespace ButterflyEngine {

View File

@ -6,7 +6,6 @@
//#
#include "fire.h"
#include "vectordirection.h"
namespace ButterflyEngine {
@ -44,10 +43,6 @@ void Fire::setFireStrength(float newFireStrength) {
setEmitRate(10 + _fireStrength);
setLifeSpan(1000 + _fireStrength);
auto vel = static_cast<VectorDirection*>(velocity());
vel->setVelosityDirection({0, 0 , _fireStrength / 4});
vel->setVelosityDirectionValatility({10, 10, 0});
emit fireStrengthChanged();
}

View File

@ -7,7 +7,6 @@
#include "clasteritem.h"
#include "groundclaster.h"
#include "iworld.h"
namespace ButterflyEngine {

View File

@ -8,9 +8,9 @@
#ifndef GROUNDCLASTER_H
#define GROUNDCLASTER_H
#include "Extensions/autogenerateclaster.h"
#include "ButterflyEngine/components/autogenerateclaster.h"
#include "global.h"
#include "Crawl/iworlditem.h"
#include "ButterflyEngine/interfaces/iworlditem.h"
namespace ButterflyEngine {

View File

@ -5,11 +5,11 @@
//# of this license document, but changing it is not allowed.
//#
#ifndef MOON_H
#define MOON_H
#include "Crawl/dayitem.h"
#include "dayitem.h"
namespace ButterflyEngine {

View File

@ -8,9 +8,9 @@
#ifndef PLAYABLEOBJECT_H
#define PLAYABLEOBJECT_H
#include "global.h"
#include "iworlditem.h"
#include "Extensions/movableobject.h"
#include <ButterflyEngine/interfaces/iworlditem.h>
#include <ButterflyEngine/components/movableobject.h>
namespace ButterflyEngine {

View File

@ -8,7 +8,7 @@
#ifndef PREVIEWCONTROL_H
#define PREVIEWCONTROL_H
#include "icontrol.h"
#include <ButterflyEngine/interfaces/icontrol.h>
namespace ButterflyEngine {

View File

@ -8,9 +8,11 @@
#ifndef CRAWL_SNAKE_H
#define CRAWL_SNAKE_H
#include "iitem.h"
#include "playableobject.h"
#include "Extensions/autogenerateclaster.h"
#include <ButterflyEngine/interfaces/iitem.h>
#include <ButterflyEngine/components/autogenerateclaster.h>
namespace ButterflyEngine {

View File

@ -9,9 +9,9 @@
#ifndef SNAKEITEM_H
#define SNAKEITEM_H
#include "iworlditem.h"
#include "singleclasterworlditem.h"
#include "Extensions/movableobject.h"
#include <ButterflyEngine/components/movableobject.h>
namespace ButterflyEngine {

View File

@ -10,7 +10,7 @@
#include <QtCore/qglobal.h>
#define BUTTERFLY_ENGINE_VERSION "0.7.596fd87"
#define BUTTERFLY_ENGINE_VERSION "0.8.f68816a"
#if defined(BUTTERFLY_ENGINE_LIBRARY)
# define BUTTERFLY_ENGINE_EXPORT Q_DECL_EXPORT

View File

@ -8,10 +8,10 @@
#ifndef CRAWL_IWORLD_H
#define CRAWL_IWORLD_H
#include "ButterflyEngine/core/gameresult.h"
#include "ButterflyEngine/core/diff.h"
#include <ButterflyEngine/core/startdata.h>
#include "iitem.h"
#include "playableobject.h"
#include "startdata.h"
#include <QFuture>
#include <QHash>
@ -21,9 +21,7 @@
#include <QQuaternion>
#include <QString>
#include "irender.h"
#include "global.h"
#include <QMutex>
#include "Crawl/diff.h"
class ClastersTest;

View File

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