Texture Editor

.github/workflows/build.yml

@@ -40,12 +40,13 @@ jobs:
         id: conan
         uses: turtlebrowser/get-conan@main
         with:
-          version: 1.54.0
+          version: 2.0.9
 
       - name: Make build folder and install Conan dependencies
         run: |
           mkdir build
-          conan install . -s build_type=Release --install-folder=build
+          conan profile detect --force
+          conan install . --output-folder=build --build=missing -s build_type=Release
 
       - name: Generate projects
         run: |
@@ -61,39 +62,21 @@ jobs:
       - name: Move assets to distribution folder
         run: |
           mkdir dist
-          mv build/bin/BMEdit.exe dist
-          mv build/bin/d3dcompiler_47.dll dist
-          mv build/bin/opengl32sw.dll dist
-          mv build/bin/Qt6Core.dll dist
-          mv build/bin/Qt6Gui.dll dist
-          mv build/bin/Qt6OpenGL.dll dist
-          mv build/bin/Qt6OpenGLWidgets.dll dist
-          mv build/bin/Qt6Svg.dll dist
-          mv build/bin/Qt6Widgets.dll dist
-          mv build/bin/Qt63DCore.dll dist
-          mv build/bin/Qt63DRender.dll dist
-          mv build/bin/Qt63DInput.dll dist
-          mv build/bin/Qt63DAnimation.dll dist
-          mv build/bin/Qt63DExtras.dll dist
-          mv build/bin/Qt6Network.dll dist
-          mv build/bin/Qt6Concurrent.dll dist
-          mv build/bin/zip.dll dist
-          mv build/bin/translations dist/translations
-          mv build/bin/styles dist/styles
-          mv build/bin/platforms dist/platforms
-          mv build/bin/renderers dist/renderers
-          mv build/bin/sceneparsers dist/sceneparsers
-          mv build/bin/networkinformation dist/networkinformation
-          mv build/bin/tls dist/tls
-          mv build/bin/geometryloaders dist/geometryloaders
-          mv build/bin/imageformats dist/imageformats
-          mv build/bin/iconengines dist/iconengines
+          mv build/Release/BMEdit.exe dist
+          mv build/Release/*.dll dist
+          mv build/Release/styles dist/styles
+          mv build/Release/platforms dist/platforms
+          mv build/Release/networkinformation dist/networkinformation
+          mv build/Release/tls dist/tls
+          mv build/Release/imageformats dist/imageformats
+          mv build/Release/iconengines dist/iconengines
           mv Assets/g1 dist/g1
+          mv Assets/scripts dist/scripts
           mv Assets/TypesRegistry.json dist
           mv README.md dist
 
       - name: Upload build artifacts - BMEdit
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "BMEdit"
           path: dist

.gitignore

@@ -3,4 +3,5 @@ cmake-build-*
 BMEdit/Editor/UI/UI/*.autosave
 ThirdParty/zlib/zconf.h.included
 Test
-venv
+venv
+Notes.txt

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "ThirdParty/fmt"]
 	path = ThirdParty/fmt
 	url = https://github.com/fmtlib/fmt
+[submodule "ThirdParty/glm"]
+	path = ThirdParty/glm
+	url = https://github.com/g-truc/glm

Assets/TypesRegistry.json

@@ -115,5 +115,6 @@
         "0x200458": "ZHFlowLnkObj",
         "0x20045C": "ZMardiGrassHFlow",
         "0x20045F": "ZHFlowM11"
-    }
+    },
+    "script_incs": "scripts"
 }

Assets/g1/CCheckInside.json

@@ -3,10 +3,10 @@
     "parent": "ZEventBase",
     "kind": "TypeKind.COMPLEX",
     "properties": [
-        { "name": "property_2C", "typename": "ZGEOMREF", "offset": 44 },
-        { "name": "property_30", "typename": "ZGEOMREF", ",offset": 48 },
-        { "name": "property_34", "typename": "ZMsg", "offset": 52 },
-        { "name": "property_36", "typename": "ZMsg", "offset": 54 },
+        { "name": "rTarget", "typename": "ZGEOMREF", "offset": 44 },
+        { "name": "rObserverActor", "typename": "ZGEOMREF", ",offset": 48 },
+        { "name": "OnEnterMSG", "typename": "ZMsg", "offset": 52 },
+        { "name": "OnLeaveMSG", "typename": "ZMsg", "offset": 54 },
         { "name": "property_38", "typename": "PRPOpCode.Bool", "offset": 56 },
         { "name": "property_39", "typename": "PRPOpCode.Bool", "offset": 57 },
         { "name": "property_3A", "typename": "PRPOpCode.Bool", "offset": 58 },

Assets/g1/ECollisionMask.json

@@ -0,0 +1,15 @@
+{
+  "typename": "ECollisionMask",
+  "kind": "TypeKind.ENUM",
+  "enum": {
+    "COLIMASK_All" : 1,
+    "COLIMASK_Background": 2,
+    "COLIMASK_Shot": 4,
+    "COLIMASK_WaterGlass": 8,
+    "COLIMASK_NoWalk": 16,
+    "COLIMASK_Sight": 32,
+    "COLIMASK_Hero": 64,
+    "COLIMASK_Camera": 128,
+    "COLIMASK_NPC": 256
+  }
+}

Assets/g1/PostMissionPF.json

@@ -0,0 +1,7 @@
+{
+  "typename": "PostMissionPF",
+  "parent": "ZEventBase",
+  "kind": "TypeKind.COMPLEX",
+  "properties": [
+  ]
+}

Assets/g1/ZAction.json

@@ -3,7 +3,7 @@
     "parent": "ZEventBase",
     "kind": "TypeKind.COMPLEX",
     "properties": [
-        { "name": "ActionName", "typename": "PRPOpCode.String" },
+        { "name": "ActionName", "typename": "ZLocalizedString" },
         { "name": "IsVisible", "typename": "PRPOpCode.Bool" },
         { "name": "ActionType", "typename": "ZAction.EActionType", "offset": 44 },
         { "name": "MessageID", "typename": "ZMsg", "offset": 48 },

Assets/g1/ZGEOMREF.json

@@ -1,5 +1,6 @@
 {
     "typename": "ZGEOMREF",
     "kind": "TypeKind.ALIAS",
-    "alias": "PRPOpCode.String"
+    "alias": "PRPOpCode.String",
+    "editor": "SelectGeomTool"
 }

Assets/g1/ZGuardQuarterController.json

@@ -3,6 +3,6 @@
     "parent": "ZEventBase",
     "kind": "TypeKind.COMPLEX",
     "properties": [
-        { "name": "property_DC", "typename": "ZGEOMREF", "offset": 220 }
+        { "name": "rWeaponStorage", "typename": "ZGEOMREF", "offset": 220 }
     ]
 }

Assets/g1/ZHM3Actor.json

@@ -8,7 +8,7 @@
     "parent": "ZActor",
     "properties": [
         {
-            "name": "property_900",
+            "name": "rDisguise",
             "offset": 2304,
             "typename": "ZGEOMREF"
         },

Assets/g1/ZHM3ItemTemplateWeapon.json

@@ -28,7 +28,7 @@
             "typename": "ZHM3ItemTemplateWeapon.EHM3WeaponScope"
         },
         {
-            "name": "property_178",
+            "name": "rReloadAnim",
             "offset": 372,
             "typename": "PRPOpCode.String"
         },
@@ -38,12 +38,12 @@
             "typename": "PRPOpCode.String"
         },
         {
-            "name": "property_180",
+            "name": "rHoldAnim",
             "offset": 380,
             "typename": "PRPOpCode.String"
         },
         {
-            "name": "property_184",
+            "name": "rRecoilAnim",
             "offset": 384,
             "typename": "PRPOpCode.String"
         },

Assets/g1/ZHM3LevelControlM13.json

@@ -16,7 +16,7 @@
         { "name": "rJournalistActor", "typename": "ZGEOMREF",  "offset": 1540 },
         { "name": "property_608", "typename": "ZGEOMREF",  "offset": 1544 },
         { "name": "rPriestActor", "typename": "ZGEOMREF",  "offset": 1548 },
-        { "name": "property_610", "typename": "ZGEOMREF",  "offset": 1552 },
-        { "name": "property_614", "typename": "ZGEOMREF",  "offset": 1556 }
+        { "name": "rHitmanDieCutSequence", "typename": "ZGEOMREF",  "offset": 1552 },
+        { "name": "rMoviePlayer", "typename": "ZGEOMREF",  "offset": 1556 }
     ]
 }

Assets/g1/ZItem.json

@@ -8,7 +8,7 @@
     "parent": "ZGROUP",
     "properties": [
         {
-            "name": "property_4C",
+            "name": "rItemTemplate",
             "offset": 76,
             "typename": "ZGEOMREF"
         },

Assets/g1/ZItemTemplateWeapon.json

@@ -23,7 +23,7 @@
             "typename": "ZItemTemplateWeapon.WEAPONTYPE"
         },
         {
-            "name": "property_A4",
+            "name": "rAmmoTemplate",
             "offset": 164,
             "typename": "ZREFTAB32"
         },
@@ -78,12 +78,12 @@
             "typename": "PRPOpCode.Bool"
         },
         {
-            "name": "property_E0",
+            "name": "rModelStates",
             "offset": 224,
             "typename": "ZREFTAB32"
         },
         {
-            "name": "property_FC",
+            "name": "rFlash",
             "offset": 252,
             "typename": "ZGEOMREF"
         },

Assets/g1/ZLocalizedString.json

@@ -0,0 +1,6 @@
+{
+  "typename": "ZLocalizedString",
+  "kind": "TypeKind.ALIAS",
+  "alias": "PRPOpCode.String",
+  "editor": "SelectLocalizationKey"
+}

Assets/g1/ZROOM.json

@@ -8,12 +8,14 @@
     "parent": "ZTreeGroup",
     "properties": [
         {
-            "name": "property_6C",
+            "name": "iNeighboursCount",
+            "__comment__": "I'm not sure about that. 6C and 84 sometimes same",
             "offset": 108,
             "typename": "PRPOpCode.Int32"
         },
         {
-            "name": "property_84",
+            "name": "iExitsCount",
+            "__comment__": "I'm not sure about that. 6C and 84 sometimes same",
             "offset": 132,
             "typename": "PRPOpCode.Int8"
         },

Assets/g1/ZScriptC.ScriptID.json

@@ -0,0 +1,6 @@
+{
+  "typename": "ZScriptC.ScriptID",
+  "kind": "TypeKind.ALIAS",
+  "alias": "PRPOpCode.String",
+  "editor": "SelectGameScript"
+}

Assets/g1/ZScriptC.json

@@ -4,6 +4,6 @@
     "kind": "TypeKind.COMPLEX",
     "skip_unexposed_properties": true,
     "properties": [
-        { "name": "ScriptName",  "typename": "PRPOpCode.String" }
+        { "name": "ScriptName",  "typename": "ZScriptC.ScriptID", "__note": "DO NOT MODIFY THIS NAME!!!" }
     ]
 }