Engine, Editor: use shared __my_setcolor() function

The split implementations are result of old refactor, where the editor and engine used difference color shifts and conversions. It looks like that is not necessary now.
adventuregamestudio · Aug 11, 2024 · 482ced6 · 482ced6
1 parent 0a4573a
commit 482ced6
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 113 deletions.
diff --git a/Common/util/wgt2allg.cpp b/Common/util/wgt2allg.cpp
@@ -16,6 +16,37 @@
 
 using namespace AGS::Common;
 
+  void __my_setcolor(int *ctset, int newcol, int wantColDep)
+  {
+    if (wantColDep == 8)
+    {
+      ctset[0] = newcol;
+    }
+    else if ((newcol >= 32) && (wantColDep > 16))
+    {
+      // true-color
+      ctset[0] = makeacol32(getr16(newcol), getg16(newcol), getb16(newcol), 255);
+    }
+    else if (newcol >= 32)
+    {
+      // If it's 15-bit, convert the color
+      if (wantColDep == 15)
+        ctset[0] = (newcol & 0x001f) | ((newcol >> 1) & 0x7fe0);
+      else
+        ctset[0] = newcol;
+    } 
+    else
+    {
+      // indexed color, use palette
+      ctset[0] = makecol_depth(wantColDep, col_lookups[newcol] >> 16,
+                               (col_lookups[newcol] >> 8) & 0x000ff, col_lookups[newcol] & 0x000ff);
+
+      // in case it's used on an alpha-channel sprite, make sure it's visible
+      if (wantColDep > 16)
+        ctset[0] |= 0xff000000;
+    }
+  }
+
   void wsetrgb(int coll, int r, int g, int b, RGB * pall)
   {
     pall[coll].r = r;

diff --git a/Editor/AGS.Native/NativeDLL.vcxproj b/Editor/AGS.Native/NativeDLL.vcxproj
@@ -331,7 +331,6 @@ copy "$(TargetPath)" "$(SolutionDir)..\Editor\References\x64"</Command>
     <ClCompile Include="..\Native\acgui_agsnative.cpp" />
     <ClCompile Include="..\Native\ac\actiontype.cpp" />
     <ClCompile Include="..\Native\ac\scriptmodule.cpp" />
-    <ClCompile Include="..\Native\color_native.cpp" />
     <ClCompile Include="..\scintilla\lexers\LexCPP.cxx" />
     <ClCompile Include="..\scintilla\lexlib\Accessor.cxx" />
     <ClCompile Include="..\scintilla\lexlib\CharacterCategory.cxx" />

diff --git a/Editor/AGS.Native/NativeDLL.vcxproj.filters b/Editor/AGS.Native/NativeDLL.vcxproj.filters
@@ -52,9 +52,6 @@
     <ClCompile Include="agsnative.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Native\color_native.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="NativeMethods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/Editor/Native/color_native.cpp b/Editor/Native/color_native.cpp
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -312,7 +312,6 @@ target_sources(engine
     gfx/ali3dsw.h
     gfx/blender.cpp
     gfx/blender.h
-    gfx/color_engine.cpp
     gfx/ddb.h
     gfx/gfx_util.cpp
     gfx/gfx_util.h

diff --git a/Engine/gfx/color_engine.cpp b/Engine/gfx/color_engine.cpp
diff --git a/Solutions/Engine.App/Engine.App.vcxproj b/Solutions/Engine.App/Engine.App.vcxproj
@@ -593,7 +593,6 @@
     <ClCompile Include="..\..\Engine\gfx\ali3dogl.cpp" />
     <ClCompile Include="..\..\Engine\gfx\ali3dsw.cpp" />
     <ClCompile Include="..\..\Engine\gfx\blender.cpp" />
-    <ClCompile Include="..\..\Engine\gfx\color_engine.cpp" />
     <ClCompile Include="..\..\Engine\gfx\gfxdriverbase.cpp" />
     <ClCompile Include="..\..\Engine\gfx\gfxdriverfactory.cpp" />
     <ClCompile Include="..\..\Engine\gfx\gfxfilter_aad3d.cpp" />

diff --git a/Solutions/Engine.App/Engine.App.vcxproj.filters b/Solutions/Engine.App/Engine.App.vcxproj.filters
@@ -516,9 +516,6 @@
     <ClCompile Include="..\..\Engine\gfx\blender.cpp">
       <Filter>Source Files\gfx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Engine\gfx\color_engine.cpp">
-      <Filter>Source Files\gfx</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Engine\gfx\gfx_util.cpp">
       <Filter>Source Files\gfx</Filter>
     </ClCompile>