Huge cleanups and added open gl window

2022-01-15 01:52:55 +01:00
parent a477581f6f
commit ffd4c821ef
525 changed files with 1320 additions and 35862 deletions
@@ -1,131 +1,148 @@
-QT = core gui widgets multimedia
+QT += \
+    core \
+    gui \
+    widgets \
+    multimedia \
+    opengl

 CONFIG += c++latest
 QMAKE_CXXFLAGS += \
    -std=c++23 \
    -Wno-missing-field-initializers \
-    -Wno-sign-compare
+    -Wno-unused-variable \
+    -Wall \
+    -Wpedantic \
+    -Werror

 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000

-HEADERS += \
-    dialogs/deletemomentsdialog.h \
-    models/actionscontainermodel.h \
-    widgets/actionscontainerwidget.h \
-    widgets/codeeditorwidget.h \
-    models/constantsmodel.h \
-    dialogs/addeventdialog.h \
-    dialogs/codeactiondialog.h \
-    dialogs/codeeditordialog.h \
-    dialogs/createspritedialog.h \
-    dialogs/fontpropertiesdialog.h \
-    dialogs/imageeditordialog.h \
-    dialogs/includedfilesdialog.h \
-    dialogs/installextensiondialog.h \
-    dialogs/maskpropertiesdialog.h \
-    dialogs/objectinformationdialog.h \
-    dialogs/objectpropertiesdialog.h \
-    dialogs/pathpropertiesdialog.h \
-    dialogs/roompropertiesdialog.h \
-    dialogs/scriptpropertiesdialog.h \
-    dialogs/timelinepropertiesdialog.h \
-    dialogs/triggerconditiondialog.h \
-    dialogs/triggersdialog.h \
-    dialogs/userdefinedconstantsdialog.h \
-    widgets/drawingcanvaswidget.h \
-    futurecpp.h \
-    models/includedfilesmodel.h \
-    jshighlighter.h \
-    mainwindow.h \
-    models/objecteventsmodel.h \
-    models/pathpointsmodel.h \
-    widgets/pathpointswidget.h \
-    projectcontainer.h \
-    models/projecttreemodel.h \
-    dialogs/backgroundpropertiesdialog.h \
-    dialogs/editspritedialog.h \
-    dialogs/extensionpackagesdialog.h \
-    dialogs/gameinformationdialog.h \
-    dialogs/globalgamesettingsdialog.h \
-    dialogs/preferencesdialog.h \
-    dialogs/soundpropertiesdialog.h \
-    dialogs/spritepropertiesdialog.h \
-    models/spritesmodel.h \
-    models/timelinemomentsmodel.h \
-    models/triggersmodel.h
+INCLUDEPATH += \
+    $$PWD/src \
+    $$PWD/src/editor

-SOURCES += main.cpp \
-    dialogs/deletemomentsdialog.cpp \
-    models/actionscontainermodel.cpp \
-    widgets/actionscontainerwidget.cpp \
-    widgets/codeeditorwidget.cpp \
-    models/constantsmodel.cpp \
-    dialogs/addeventdialog.cpp \
-    dialogs/codeactiondialog.cpp \
-    dialogs/codeeditordialog.cpp \
-    dialogs/createspritedialog.cpp \
-    dialogs/fontpropertiesdialog.cpp \
-    dialogs/imageeditordialog.cpp \
-    dialogs/includedfilesdialog.cpp \
-    dialogs/installextensiondialog.cpp \
-    dialogs/maskpropertiesdialog.cpp \
-    dialogs/objectinformationdialog.cpp \
-    dialogs/objectpropertiesdialog.cpp \
-    dialogs/pathpropertiesdialog.cpp \
-    dialogs/roompropertiesdialog.cpp \
-    dialogs/scriptpropertiesdialog.cpp \
-    dialogs/timelinepropertiesdialog.cpp \
-    dialogs/triggerconditiondialog.cpp \
-    dialogs/triggersdialog.cpp \
-    dialogs/userdefinedconstantsdialog.cpp \
-    widgets/drawingcanvaswidget.cpp \
-    models/includedfilesmodel.cpp \
-    jshighlighter.cpp \
-    mainwindow.cpp \
-    models/objecteventsmodel.cpp \
-    models/pathpointsmodel.cpp \
-    widgets/pathpointswidget.cpp \
-    projectcontainer.cpp \
-    models/projecttreemodel.cpp \
-    dialogs/backgroundpropertiesdialog.cpp \
-    dialogs/editspritedialog.cpp \
-    dialogs/extensionpackagesdialog.cpp \
-    dialogs/gameinformationdialog.cpp \
-    dialogs/globalgamesettingsdialog.cpp \
-    dialogs/preferencesdialog.cpp \
-    dialogs/soundpropertiesdialog.cpp \
-    dialogs/spritepropertiesdialog.cpp \
-    models/spritesmodel.cpp \
-    models/timelinemomentsmodel.cpp \
-    models/triggersmodel.cpp
+HEADERS += \
+    src/closeeventfilter.h \
+    src/futurecpp.h \
+    src/projectcontainer.h \
+    src/editor/jshighlighter.h \
+    src/editor/mainwindow.h \
+    src/editor/dialogs/addeventdialog.h \
+    src/editor/dialogs/backgroundpropertiesdialog.h \
+    src/editor/dialogs/codeactiondialog.h \
+    src/editor/dialogs/codeeditordialog.h \
+    src/editor/dialogs/createspritedialog.h \
+    src/editor/dialogs/deletemomentsdialog.h \
+    src/editor/dialogs/editspritedialog.h \
+    src/editor/dialogs/extensionpackagesdialog.h \
+    src/editor/dialogs/fontpropertiesdialog.h \
+    src/editor/dialogs/gameinformationdialog.h \
+    src/editor/dialogs/globalgamesettingsdialog.h \
+    src/editor/dialogs/imageeditordialog.h \
+    src/editor/dialogs/includedfilesdialog.h \
+    src/editor/dialogs/installextensiondialog.h \
+    src/editor/dialogs/maskpropertiesdialog.h \
+    src/editor/dialogs/objectinformationdialog.h \
+    src/editor/dialogs/objectpropertiesdialog.h \
+    src/editor/dialogs/pathpropertiesdialog.h \
+    src/editor/dialogs/preferencesdialog.h \
+    src/editor/dialogs/roompropertiesdialog.h \
+    src/editor/dialogs/scriptpropertiesdialog.h \
+    src/editor/dialogs/soundpropertiesdialog.h \
+    src/editor/dialogs/spritepropertiesdialog.h \
+    src/editor/dialogs/timelinepropertiesdialog.h \
+    src/editor/dialogs/triggerconditiondialog.h \
+    src/editor/dialogs/triggersdialog.h \
+    src/editor/dialogs/userdefinedconstantsdialog.h \
+    src/editor/models/actionscontainermodel.h \
+    src/editor/models/constantsmodel.h \
+    src/editor/models/includedfilesmodel.h \
+    src/editor/models/objecteventsmodel.h \
+    src/editor/models/pathpointsmodel.h \
+    src/editor/models/projecttreemodel.h \
+    src/editor/models/spritesmodel.h \
+    src/editor/models/timelinemomentsmodel.h \
+    src/editor/models/triggersmodel.h \
+    src/editor/widgets/actionscontainerwidget.h \
+    src/editor/widgets/codeeditorwidget.h \
+    src/editor/widgets/drawingcanvaswidget.h \
+    src/editor/widgets/pathpointswidget.h \
+    src/engine/gamewindow.h
+
+SOURCES += \
+    src/closeeventfilter.cpp \
+    src/main.cpp \
+    src/projectcontainer.cpp \
+    src/editor/jshighlighter.cpp \
+    src/editor/mainwindow.cpp \
+    src/editor/dialogs/addeventdialog.cpp \
+    src/editor/dialogs/backgroundpropertiesdialog.cpp \
+    src/editor/dialogs/codeactiondialog.cpp \
+    src/editor/dialogs/codeeditordialog.cpp \
+    src/editor/dialogs/createspritedialog.cpp \
+    src/editor/dialogs/deletemomentsdialog.cpp \
+    src/editor/dialogs/editspritedialog.cpp \
+    src/editor/dialogs/extensionpackagesdialog.cpp \
+    src/editor/dialogs/fontpropertiesdialog.cpp \
+    src/editor/dialogs/gameinformationdialog.cpp \
+    src/editor/dialogs/globalgamesettingsdialog.cpp \
+    src/editor/dialogs/imageeditordialog.cpp \
+    src/editor/dialogs/includedfilesdialog.cpp \
+    src/editor/dialogs/installextensiondialog.cpp \
+    src/editor/dialogs/maskpropertiesdialog.cpp \
+    src/editor/dialogs/objectinformationdialog.cpp \
+    src/editor/dialogs/objectpropertiesdialog.cpp \
+    src/editor/dialogs/pathpropertiesdialog.cpp \
+    src/editor/dialogs/preferencesdialog.cpp \
+    src/editor/dialogs/roompropertiesdialog.cpp \
+    src/editor/dialogs/scriptpropertiesdialog.cpp \
+    src/editor/dialogs/soundpropertiesdialog.cpp \
+    src/editor/dialogs/spritepropertiesdialog.cpp \
+    src/editor/dialogs/timelinepropertiesdialog.cpp \
+    src/editor/dialogs/triggerconditiondialog.cpp \
+    src/editor/dialogs/triggersdialog.cpp \
+    src/editor/dialogs/userdefinedconstantsdialog.cpp \
+    src/editor/models/actionscontainermodel.cpp \
+    src/editor/models/constantsmodel.cpp \
+    src/editor/models/includedfilesmodel.cpp \
+    src/editor/models/objecteventsmodel.cpp \
+    src/editor/models/pathpointsmodel.cpp \
+    src/editor/models/projecttreemodel.cpp \
+    src/editor/models/spritesmodel.cpp \
+    src/editor/models/timelinemomentsmodel.cpp \
+    src/editor/models/triggersmodel.cpp \
+    src/editor/widgets/actionscontainerwidget.cpp \
+    src/editor/widgets/codeeditorwidget.cpp \
+    src/editor/widgets/drawingcanvaswidget.cpp \
+    src/editor/widgets/pathpointswidget.cpp \
+    src/engine/gamewindow.cpp

 FORMS += \
-    dialogs/addeventdialog.ui \
-    dialogs/codeeditordialog.ui \
-    dialogs/createspritedialog.ui \
-    dialogs/deletemomentsdialog.ui \
-    dialogs/fontpropertiesdialog.ui \
-    dialogs/imageeditordialog.ui \
-    dialogs/includedfilesdialog.ui \
-    dialogs/installextensiondialog.ui \
-    dialogs/maskpropertiesdialog.ui \
-    dialogs/objectinformationdialog.ui \
-    dialogs/objectpropertiesdialog.ui \
-    dialogs/pathpropertiesdialog.ui \
-    dialogs/roompropertiesdialog.ui \
-    dialogs/timelinepropertiesdialog.ui \
-    dialogs/triggersdialog.ui \
-    dialogs/userdefinedconstantsdialog.ui \
-    mainwindow.ui \
-    dialogs/backgroundpropertiesdialog.ui \
-    dialogs/editspritedialog.ui \
-    dialogs/extensionpackagesdialog.ui \
-    dialogs/gameinformationdialog.ui \
-    dialogs/globalgamesettingsdialog.ui \
-    dialogs/preferencesdialog.ui \
-    dialogs/soundpropertiesdialog.ui \
-    dialogs/spritepropertiesdialog.ui \
-    widgets/actionscontainerwidget.ui
+    src/editor/mainwindow.ui \
+    src/editor/dialogs/addeventdialog.ui \
+    src/editor/dialogs/backgroundpropertiesdialog.ui \
+    src/editor/dialogs/codeeditordialog.ui \
+    src/editor/dialogs/createspritedialog.ui \
+    src/editor/dialogs/deletemomentsdialog.ui \
+    src/editor/dialogs/editspritedialog.ui \
+    src/editor/dialogs/extensionpackagesdialog.ui \
+    src/editor/dialogs/fontpropertiesdialog.ui \
+    src/editor/dialogs/gameinformationdialog.ui \
+    src/editor/dialogs/globalgamesettingsdialog.ui \
+    src/editor/dialogs/imageeditordialog.ui \
+    src/editor/dialogs/includedfilesdialog.ui \
+    src/editor/dialogs/installextensiondialog.ui \
+    src/editor/dialogs/maskpropertiesdialog.ui \
+    src/editor/dialogs/objectinformationdialog.ui \
+    src/editor/dialogs/objectpropertiesdialog.ui \
+    src/editor/dialogs/pathpropertiesdialog.ui \
+    src/editor/dialogs/preferencesdialog.ui \
+    src/editor/dialogs/roompropertiesdialog.ui \
+    src/editor/dialogs/soundpropertiesdialog.ui \
+    src/editor/dialogs/spritepropertiesdialog.ui \
+    src/editor/dialogs/timelinepropertiesdialog.ui \
+    src/editor/dialogs/triggersdialog.ui \
+    src/editor/dialogs/userdefinedconstantsdialog.ui \
+    src/editor/widgets/actionscontainerwidget.ui

 RESOURCES += \
    resources.qrc