Merge branch 'development' into ModuleMan

Author: Causeless

.github/parameters/macports.yml

@@ -0,0 +1,14 @@
+version: "2.8.1"
+prefix: "/opt/local"
+ports:
+  - name: gcc13
+  - name: pkgconfig
+  - name: meson
+  - name: libsdl2
+  - name: onetbb
+  - name: lz4
+  - name: libpng
+  - name: minizip
+  - name: luajit
+  - name: flac
+  - name: dylibbundler

.github/workflows/meson.yml

@@ -38,17 +38,13 @@ on:
         type: string
         required: false
         default: "release"
-      debug_level:  # "full" | "minimal" | "release" 
+      debug_level: # "full" | "minimal" | "release"
         type: string
         required: false
         default: "release"
 
-env: 
-  MESON_VERSION: "0.60.3"
-
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
     name: Linux Build
 
@@ -60,30 +56,30 @@ jobs:
       - name: Install Dependencies
         run: |
           sudo apt-get update -yq
-          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libopengl-dev libfuse2 ninja-build
-          sudo pip install meson==${{env.MESON_VERSION}}
+          sudo apt-get install --no-install-recommends wget liballegro4-dev libloadpng4-dev libflac++-dev luajit-5.1-dev liblua5.2-dev libminizip-dev liblz4-dev libpng++-dev libx11-dev libboost-dev libtbb-dev libsdl2-dev libsdl2-image-dev libopengl-dev libfuse2 ninja-build
+          sudo pip install meson
 
       - name: Setup Meson
         env:
           CC: "gcc"
           CXX: "g++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} build
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=true build
 
       - name: Configure for AppImage
         if: ${{inputs.upload_artefacts}}
         env:
           CC: "gcc"
           CXX: "g++"
         run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
-          
+
       - name: Build
         env:
           CC: "gcc"
           CXX: "g++"
         run: |
           meson compile -C build
-        
+
       - name: Create AppDir
         if: ${{inputs.upload_artefacts}}
         run: |
@@ -116,32 +112,91 @@ jobs:
           if-no-files-found: error
 
   build-macos:
-    runs-on: macos-latest
+    runs-on: macos-11
     name: MacOS Build
-
+        
+    env:
+      GCC_VERSION: "13"
+      MACOSX_DEPLOYMENT_TARGET: 10.15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
 
-      - name: Install Dependencies
+      - name: "Install Dependencies"
+        uses: melusina-org/setup-macports@v1
+        with: 
+          parameters:  ".github/parameters/macports.yml"
+
+      - name: Setup Meson
+        env:
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
+          LDFLAGS: "-static-libgcc -static-libstdc++"
+        run: |
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
+
+      - name: Configure for App Bundle
+        if: ${{inputs.upload_artefacts}}
+        env:
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
+          LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          brew install pkg-config tbb sdl2 minizip lz4 flac luajit [email protected] libpng gcc@12 ninja meson
-          
+          meson configure \
+          -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
+          --bindir=Contents/MacOS \
+          --prefix="/" \
+          build
+
       - name: Build
         env:
-          CC: "gcc-12"
-          CXX: "g++-12"
+          CC: "gcc-${{env.GCC_VERSION}}"
+          CXX: "g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}}  build
           meson compile -C build
 
+      - name: Create App Bundle
+        if: ${{inputs.upload_artefacts}}
+        run: |
+          DESTDIR="/tmp/Cortex Command.app" meson install -C build
+
+      - name: Tar files
+        if: ${{inputs.upload_artefacts}}
+        run: |
+          tree /tmp/
+          cd /tmp/
+          tar -cvf CortexCommand.tar "Cortex Command.app"
+
+      - name: Move artefact
+        if: ${{inputs.upload_artefacts}}
+        run: cp /tmp/CortexCommand.tar .
+
       - name: Artifact Deploy
         if: ${{inputs.upload_artefacts}}
         uses: actions/upload-artifact@v3
         with:
           name: CortexCommand (macOS)
           path: |
-            build/CortexCommand
-            build/CortexCommand_debug
+            CortexCommand.tar
           if-no-files-found: error
+
+  build-windows:
+    runs-on: windows-latest
+    name: Windows Build
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+
+      - name: Install Dependencies
+        run: |
+          pip install meson
+
+      - name: Setup
+        run: |
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} --vsenv build
+
+      - name: Build
+        run: |
+          meson compile -Cbuild

.gitignore

@@ -8,13 +8,16 @@
 *.APS
 *.user
 
+/.idea
+
 compile_commands.json
 /.ccls-cache
 
 /build*
 
 /enc_temp_folder
 
+/.idea
 /_Bin
 /NATPunchServer/Server/NATCompleteServer/Debug
 /NATPunchServer/Server/NATCompleteServer/Release

Activities/ActorEditor.cpp

@@ -12,9 +12,11 @@
 // Inclusions of header files
 
 #include "ActorEditor.h"
+
 #include "ModuleMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "FrameMan.h"
 #include "CameraMan.h"
 #include "UInputMan.h"
 //#include "AHuman.h"
@@ -91,18 +93,13 @@ int ActorEditor::Create(const ActorEditor &reference)
 
 int ActorEditor::ReadProperty(const std::string_view &propName, Reader &reader)
 {
+    StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
 /*
-    if (propName == "CPUTeam")
-        reader >> m_CPUTeam;
-    else if (propName == "Difficulty")
-        reader >> m_Difficulty;
-    else if (propName == "DeliveryDelay")
-        reader >> m_DeliveryDelay;
-    else
+    MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
+    MatchProperty("Difficulty", { reader >> m_Difficulty; });
+    MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
 */
-        return EditorActivity::ReadProperty(propName, reader);
-
-    return 0;
+    EndPropertyList;
 }
 
 
@@ -224,7 +221,7 @@ void ActorEditor::Update()
     if (m_pEditedActor)
     {
         m_pEditedActor->SetPos(g_SceneMan.GetSceneDim() * 0.5);
-        m_pEditedActor->Update();
+        m_pEditedActor->FullUpdate();
         g_CameraMan.SetScrollTarget(m_pEditedActor->GetPos());
     }
 
@@ -324,6 +321,9 @@ bool ActorEditor::LoadActor(const Entity *pActorToLoad)
         return false;
 
     // Replace the old one
+    if (MovableObject* asMo = dynamic_cast<MovableObject*>(m_pEditedActor)) {
+        asMo->DestroyScriptState();
+    }
     delete m_pEditedActor;
     // Make a copy of the picked object reference
     m_pEditedActor = dynamic_cast<Actor *>(pActorToLoad->Clone());

Activities/AreaEditor.cpp

@@ -17,6 +17,7 @@
 #include "ModuleMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "FrameMan.h"
 #include "UInputMan.h"
 #include "SettingsMan.h"
 #include "SLTerrain.h"
@@ -98,18 +99,13 @@ int AreaEditor::Create(const AreaEditor &reference)
 
 int AreaEditor::ReadProperty(const std::string_view &propName, Reader &reader)
 {
+    StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
 /*
-    if (propName == "CPUTeam")
-        reader >> m_CPUTeam;
-    else if (propName == "Difficulty")
-        reader >> m_Difficulty;
-    else if (propName == "DeliveryDelay")
-        reader >> m_DeliveryDelay;
-    else
+    MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
+    MatchProperty("Difficulty", { reader >> m_Difficulty; });
+    MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
 */
-        return EditorActivity::ReadProperty(propName, reader);
-
-    return 0;
+    EndPropertyList;
 }
 
 

Activities/AssemblyEditor.cpp

@@ -17,6 +17,7 @@
 #include "ModuleMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "FrameMan.h"
 #include "UInputMan.h"
 #include "SettingsMan.h"
 #include "SLTerrain.h"
@@ -98,18 +99,13 @@ int AssemblyEditor::Create(const AssemblyEditor &reference)
 
 int AssemblyEditor::ReadProperty(const std::string_view &propName, Reader &reader)
 {
+    StartPropertyList(return EditorActivity::ReadProperty(propName, reader));
 /*
-    if (propName == "CPUTeam")
-        reader >> m_CPUTeam;
-    else if (propName == "Difficulty")
-        reader >> m_Difficulty;
-    else if (propName == "DeliveryDelay")
-        reader >> m_DeliveryDelay;
-    else
+    MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
+    MatchProperty("Difficulty", { reader >> m_Difficulty; });
+    MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
 */
-        return EditorActivity::ReadProperty(propName, reader);
-
-    return 0;
+    EndPropertyList;
 }
 
 

Activities/BaseEditor.cpp

@@ -16,6 +16,7 @@
 #include "CameraMan.h"
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "FrameMan.h"
 #include "UInputMan.h"
 #include "SceneMan.h"
 #include "MetaMan.h"
@@ -91,18 +92,13 @@ int BaseEditor::Create(const BaseEditor &reference)
 
 int BaseEditor::ReadProperty(const std::string_view &propName, Reader &reader)
 {
+    StartPropertyList(return Activity::ReadProperty(propName, reader));
 /*
-    if (propName == "CPUTeam")
-        reader >> m_CPUTeam;
-    else if (propName == "Difficulty")
-        reader >> m_Difficulty;
-    else if (propName == "DeliveryDelay")
-        reader >> m_DeliveryDelay;
-    else
+    MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
+    MatchProperty("Difficulty", { reader >> m_Difficulty; });
+    MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
 */
-        return Activity::ReadProperty(propName, reader);
-
-    return 0;
+    EndPropertyList;
 }
 
 

Activities/EditorActivity.cpp

@@ -12,8 +12,10 @@
 // Inclusions of header files
 
 #include "EditorActivity.h"
+
 #include "PresetMan.h"
 #include "MovableMan.h"
+#include "FrameMan.h"
 #include "UInputMan.h"
 #include "AudioMan.h"
 #include "SLTerrain.h"
@@ -128,18 +130,13 @@ int EditorActivity::Create(const EditorActivity &reference)
 
 int EditorActivity::ReadProperty(const std::string_view &propName, Reader &reader)
 {
+    StartPropertyList(Activity::ReadProperty(propName, reader));
 /*
-    if (propName == "CPUTeam")
-        reader >> m_CPUTeam;
-    else if (propName == "Difficulty")
-        reader >> m_Difficulty;
-    else if (propName == "DeliveryDelay")
-        reader >> m_DeliveryDelay;
-    else
+    MatchProperty("CPUTeam", { reader >> m_CPUTeam; });
+    MatchProperty("Difficulty", { reader >> m_Difficulty; });
+    MatchProperty("DeliveryDelay", { reader >> m_DeliveryDelay; });
 */
-        return Activity::ReadProperty(propName, reader);
-
-    return 0;
+    EndPropertyList;
 }