Change project structure

base/base.pro

@@ -0,0 +1,51 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2017-09-18T18:53:55
+#
+#-------------------------------------------------
+
+QT       += quick
+
+QT       -= gui
+
+TARGET = base
+TEMPLATE = lib
+
+DEFINES += BASE_LIBRARY
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which has been marked as deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += \
+    baseitem.cpp \
+    bcobject.cpp \
+    board.cpp \
+    global.cpp \
+    informationpanel.cpp \
+    movableitem.cpp \
+    shootableitem.cpp \
+    tile.cpp
+
+HEADERS += \
+        base_global.h \ 
+    baseitem.h \
+    bcobject.h \
+    board.h \
+    global.h \
+    informationpanel.h \
+    movableitem.h \
+    shootableitem.h \
+    tile.h
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}

base/base_global.h

@@ -0,0 +1,12 @@
+#ifndef BASE_GLOBAL_H
+#define BASE_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(BASE_LIBRARY)
+#  define BASESHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define BASESHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // BASE_GLOBAL_H

battle-city.pro

@@ -1,63 +1,9 @@
-TEMPLATE = app
-
-QT += qml quick
-CONFIG += c++11
-
-SOURCES += src/main.cpp \
-    src/board.cpp \
-    src/tile.cpp \
-    src/baseitem.cpp \
-    src/movableitem.cpp \
-    src/gamecontroller.cpp \
-    src/collider.cpp \
-    src/shootableitem.cpp \
-    src/informationpanel.cpp \
-    src/enemydriver.cpp \
-    src/bcsreader.cpp \
-    src/global.cpp \
-    src/gameresult.cpp \
-    src/bonustimer.cpp \
-    src/stageiterator.cpp \
-    src/bcobject.cpp
-
-RESOURCES += qml.qrc \
-    images.qrc \
-    stages.qrc
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-HEADERS += \
-    src/board.h \
-    src/tile.h \
-    src/baseitem.h \
-    src/movableitem.h \
-    src/gamecontroller.h \
-    src/collider.h \
-    src/shootableitem.h \
-    src/informationpanel.h \
-    src/enemydriver.h \
-    src/bcsreader.h \
-    src/global.h \
-    src/gameresult.h \
-    src/bonustimer.h \
-    src/stageiterator.h \
-    src/bcobject.h
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += \
+    base \
+    utils \
+    controller \
+    battlecity \
+    construction

battlecity/battlecity.pro

@@ -0,0 +1,51 @@
+QT += quick
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which as been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc \
+    images.qrc \
+    stages.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../base/release/ -lbase
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../base/debug/ -lbase
+else:unix: LIBS += -L$$OUT_PWD/../base/ -lbase
+
+INCLUDEPATH += $$PWD/../base
+DEPENDPATH += $$PWD/../base
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../controller/release/ -lcontroller
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../controller/debug/ -lcontroller
+else:unix: LIBS += -L$$OUT_PWD/../controller/ -lcontroller
+
+INCLUDEPATH += $$PWD/../controller
+DEPENDPATH += $$PWD/../controller
+
+win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../utils/release/ -lutils
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../utils/debug/ -lutils
+else:unix: LIBS += -L$$OUT_PWD/../utils/ -lutils
+
+INCLUDEPATH += $$PWD/../utils
+DEPENDPATH += $$PWD/../utils

images.qrc → battlecity/images.qrc

@@ -1,35 +1,35 @@
 <RCC>
     <qresource prefix="/">
-        <file>images/obstacles/bricks.png</file>
-        <file>images/obstacles/concrete.png</file>
-        <file>images/tanks/player/one_star_tank.png</file>
-        <file>images/tanks/player/simple_tank.png</file>
-        <file>images/tanks/player/three_stars_tank.png</file>
-        <file>images/tanks/player/two_stars_tank.png</file>
-        <file>images/projectiles/projectile.png</file>
-        <file>images/tanks/enemy/simple_tank.png</file>
+        <file>images/bonuses/grenade.png</file>
+        <file>images/bonuses/helmet.png</file>
+        <file>images/bonuses/shovel.png</file>
+        <file>images/bonuses/star.png</file>
+        <file>images/bonuses/tank.png</file>
+        <file>images/bonuses/timer.png</file>
+        <file>images/control_panel/enemy_marker.png</file>
+        <file>images/control_panel/flag.png</file>
+        <file>images/control_panel/player_marker.png</file>
         <file>images/eagles/destroyed_eagle.png</file>
         <file>images/eagles/normal_eagle.png</file>
         <file>images/explosions/projectile_explosion.gif</file>
         <file>images/explosions/tank_explosion.gif</file>
-        <file>images/control_panel/enemy_marker.png</file>
-        <file>images/control_panel/flag.png</file>
-        <file>images/control_panel/player_marker.png</file>
-        <file>images/tanks/enemy/fast.png</file>
-        <file>images/tanks/enemy/bursting.png</file>
+        <file>images/obstacles/bricks.png</file>
+        <file>images/obstacles/bush.png</file>
+        <file>images/obstacles/concrete.png</file>
+        <file>images/pages/game_over.png</file>
+        <file>images/pages/stage_result.png</file>
+        <file>images/pages/start.png</file>
+        <file>images/projectiles/projectile.png</file>
         <file>images/tanks/enemy/armored.png</file>
         <file>images/tanks/enemy/armored_1_hit.png</file>
         <file>images/tanks/enemy/armored_2_hit.png</file>
         <file>images/tanks/enemy/armored_3_hit.png</file>
-        <file>images/bonuses/grenade.png</file>
-        <file>images/bonuses/helmet.png</file>
-        <file>images/bonuses/shovel.png</file>
-        <file>images/bonuses/star.png</file>
-        <file>images/bonuses/timer.png</file>
-        <file>images/bonuses/tank.png</file>
-        <file>images/pages/stage_result.png</file>
-        <file>images/pages/start.png</file>
-        <file>images/pages/game_over.png</file>
-        <file>images/obstacles/bush.png</file>
+        <file>images/tanks/enemy/bursting.png</file>
+        <file>images/tanks/enemy/fast.png</file>
+        <file>images/tanks/enemy/simple_tank.png</file>
+        <file>images/tanks/player/one_star_tank.png</file>
+        <file>images/tanks/player/simple_tank.png</file>
+        <file>images/tanks/player/three_stars_tank.png</file>
+        <file>images/tanks/player/two_stars_tank.png</file>
     </qresource>
 </RCC>

battlecity/images/bonuses/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,16,17,54,0
+Version=4

battlecity/images/control_panel/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,12,17,28,12
+Version=4

battlecity/images/eagles/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,11,20,14,16
+Version=4

battlecity/images/explosions/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,12,13,3,32
+Version=4

battlecity/images/obstacles/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,6,14,36,45
+Version=4

battlecity/images/pages/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,17,11,19,47
+Version=4

battlecity/images/projectiles/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,10,11,55,40
+Version=4

battlecity/images/tanks/enemy/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,15,13,45,48
+Version=4

battlecity/images/tanks/player/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2017,9,7,15,14,19
+Version=4

qml.qrc → battlecity/qml.qrc

@@ -1,20 +1,20 @@
 <RCC>
     <qresource prefix="/">
-        <file>qml/main.qml</file>
-        <file>qml/Playground.qml</file>
-        <file>qml/InformationPanel.qml</file>
         <file>qml/Board.qml</file>
-        <file>qml/Tile.qml</file>
-        <file>qml/PlayerTank.qml</file>
-        <file>qml/Projectile.qml</file>
-        <file>qml/EnemyTank.qml</file>
+        <file>qml/Bonus.qml</file>
         <file>qml/Eagle.qml</file>
-        <file>qml/Explosion.qml</file>
         <file>qml/EnemyMarker.qml</file>
-        <file>qml/Bonus.qml</file>
-        <file>qml/StartPage.qml</file>
+        <file>qml/EnemyTank.qml</file>
+        <file>qml/Explosion.qml</file>
+        <file>qml/GameOverPage.qml</file>
+        <file>qml/InformationPanel.qml</file>
+        <file>qml/main.qml</file>
+        <file>qml/PlayerTank.qml</file>
+        <file>qml/Playground.qml</file>
+        <file>qml/Projectile.qml</file>
         <file>qml/StagePage.qml</file>
         <file>qml/StageResultPage.qml</file>
-        <file>qml/GameOverPage.qml</file>
+        <file>qml/StartPage.qml</file>
+        <file>qml/Tile.qml</file>
     </qresource>
 </RCC>

construction/construction.pro

@@ -0,0 +1,28 @@
+QT += quick
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which as been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target

construction/main.cpp

@@ -0,0 +1,14 @@
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}