Scripting, updated Findlibopenmpt.cmake, refactoring

deathkiller · Nov 20, 2023 · cffcaa0 · cffcaa0
1 parent b44c75f
commit cffcaa0
Show file tree

Hide file tree

Showing 32 changed files with 1,161 additions and 248 deletions.
diff --git a/Sources/Jazz2.vcxproj b/Sources/Jazz2.vcxproj
@@ -362,6 +362,8 @@
     <ClInclude Include="Jazz2\Scripting\LevelScriptLoader.h" />
     <ClInclude Include="Jazz2\Scripting\RegisterArray.h" />
     <ClInclude Include="Jazz2\Scripting\RegisterDictionary.h" />
+    <ClInclude Include="Jazz2\Scripting\RegisterImGuiBindings.h" />
+    <ClInclude Include="Jazz2\Scripting\RegisterMath.h" />
     <ClInclude Include="Jazz2\Scripting\RegisterRef.h" />
     <ClInclude Include="Jazz2\Scripting\RegisterString.h" />
     <ClInclude Include="Jazz2\Scripting\ScriptActorWrapper.h" />
@@ -727,6 +729,8 @@
     <ClCompile Include="Jazz2\Scripting\LevelScriptLoader.cpp" />
     <ClCompile Include="Jazz2\Scripting\RegisterArray.cpp" />
     <ClCompile Include="Jazz2\Scripting\RegisterDictionary.cpp" />
+    <ClCompile Include="Jazz2\Scripting\RegisterImGuiBindings.cpp" />
+    <ClCompile Include="Jazz2\Scripting\RegisterMath.cpp" />
     <ClCompile Include="Jazz2\Scripting\RegisterRef.cpp" />
     <ClCompile Include="Jazz2\Scripting\RegisterString.cpp" />
     <ClCompile Include="Jazz2\Scripting\ScriptActorWrapper.cpp" />

diff --git a/Sources/Jazz2.vcxproj.filters b/Sources/Jazz2.vcxproj.filters
@@ -1410,6 +1410,12 @@
     <ClInclude Include="nCine\Graphics\IDebugOverlay.h">
       <Filter>Header Files\nCine\Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="Jazz2\Scripting\RegisterImGuiBindings.h">
+      <Filter>Header Files\Jazz2\Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="Jazz2\Scripting\RegisterMath.h">
+      <Filter>Header Files\Jazz2\Scripting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Main.cpp">
@@ -2336,6 +2342,12 @@
     <ClCompile Include="nCine\Graphics\ImGuiDrawing.cpp">
       <Filter>Source Files\nCine\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="Jazz2\Scripting\RegisterImGuiBindings.cpp">
+      <Filter>Source Files\Jazz2\Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="Jazz2\Scripting\RegisterMath.cpp">
+      <Filter>Source Files\Jazz2\Scripting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resources.rc">

diff --git a/Sources/Jazz2/Actors/Lighting/FlickerLight.cpp b/Sources/Jazz2/Actors/Lighting/FlickerLight.cpp
@@ -15,7 +15,7 @@ namespace Jazz2::Actors::Lighting
 		_brightness = details.Params[1] / 255.0f;
 		_radiusNear = (float)*(uint16_t*)&details.Params[2];
 		_radiusFar = (float)*(uint16_t*)&details.Params[4];
-		_phase = 0.6;
+		_phase = 0.6f;
 
 		SetState(ActorState::ForceDisableCollisions, true);
 		SetState(ActorState::CanBeFrozen | ActorState::CollideWithTileset | ActorState::CollideWithOtherActors | ActorState::ApplyGravitation, false);

diff --git a/Sources/Jazz2/Compatibility/JJ2Anims.cpp b/Sources/Jazz2/Compatibility/JJ2Anims.cpp
@@ -385,14 +385,14 @@ namespace Jazz2::Compatibility
 							if (colorIdx == 0) {
 								a = 0;
 							} else if (frame.DrawTransparent) {
-								a = 140 * src.A() / 255;
+								a = 140 * src.A / 255;
 							} else {
-								a = src.A();
+								a = src.A;
 							}
 
-							pixels[(stride * targetY + targetX) * 4] = src.R();
-							pixels[(stride * targetY + targetX) * 4 + 1] = src.G();
-							pixels[(stride * targetY + targetX) * 4 + 2] = src.B();
+							pixels[(stride * targetY + targetX) * 4] = src.R;
+							pixels[(stride * targetY + targetX) * 4 + 1] = src.G;
+							pixels[(stride * targetY + targetX) * 4 + 2] = src.B;
 							pixels[(stride * targetY + targetX) * 4 + 3] = a;
 						} else {
 							uint8_t a;

diff --git a/Sources/Jazz2/ContentResolver.cpp b/Sources/Jazz2/ContentResolver.cpp
@@ -1052,7 +1052,7 @@ namespace Jazz2
 							Color c1 = Color(pixels[((ty + y * 3) * width) + tx + x]);
 							Color c2 = Color(pixels[((ty + y * 3 + 1) * width) + tx + x]);
 							Color c3 = Color(pixels[((ty + y * 3 + 2) * width) + tx + x]);
-							captionTile[y * TileSet::DefaultTileSize + x] = Color((c1.B() + c2.B() + c3.B()) / 3, (c1.G() + c2.G() + c3.G()) / 3, (c1.R() + c2.R() + c3.R()) / 3);
+							captionTile[y * TileSet::DefaultTileSize + x] = Color((c1.B + c2.B + c3.B) / 3, (c1.G + c2.G + c3.G) / 3, (c1.R + c2.R + c3.R) / 3);
 						}
 					}
 				}

diff --git a/Sources/Jazz2/Scripting/LevelScriptLoader.cpp b/Sources/Jazz2/Scripting/LevelScriptLoader.cpp
@@ -1,10 +1,14 @@
 #if defined(WITH_ANGELSCRIPT)
 
 #include "LevelScriptLoader.h"
+#include "RegisterMath.h"
 #include "RegisterRef.h"
 #include "RegisterString.h"
 #include "RegisterArray.h"
 #include "RegisterDictionary.h"
+#if defined(WITH_IMGUI)
+#	include "RegisterImGuiBindings.h"
+#endif
 #include "ScriptActorWrapper.h"
 #include "ScriptPlayerWrapper.h"
 
@@ -362,10 +366,14 @@ namespace Jazz2::Scripting
 
 	void LevelScriptLoader::RegisterBuiltInFunctions(asIScriptEngine* engine)
 	{
+		RegisterMath(engine);
 		RegisterRef(engine);
 		RegisterString(engine);
 		RegisterArray(engine);
 		RegisterDictionary(engine);
+#if defined(WITH_IMGUI)
+		RegisterImGuiBindings(engine);
+#endif
 
 		// Math functions
 		int r;