Remove sokol_color; use uint8 RGBA vs. 4 floats

edge-classic · Dec 13, 2024 · 4592e6f · 4592e6f
1 parent 0da858e
commit 4592e6f
Show file tree

Hide file tree

Showing 40 changed files with 671 additions and 1,786 deletions.
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -17,7 +17,6 @@ add_subdirectory(m4p)
 add_subdirectory(miniz)
 add_subdirectory(pl_mpeg)
 add_subdirectory(prns)
-add_subdirectory(sokol)
 add_subdirectory(stb)
 add_subdirectory(tracy)
 add_subdirectory(xxHash)
diff --git a/libraries/sokol/CMakeLists.txt b/libraries/sokol/CMakeLists.txt
diff --git a/libraries/sokol/sokol_color.cc b/libraries/sokol/sokol_color.cc
diff --git a/libraries/sokol/sokol_color.h b/libraries/sokol/sokol_color.h
diff --git a/source_files/ddf/CMakeLists.txt b/source_files/ddf/CMakeLists.txt
@@ -28,7 +28,7 @@ add_library(
   ddf_weapon.cc
 )
 
-target_link_libraries(edge_ddf PRIVATE almostequals edge_epi HandmadeMath sokol_color stb)
+target_link_libraries(edge_ddf PRIVATE almostequals edge_epi HandmadeMath stb)
 
 target_include_directories(edge_ddf PRIVATE ../edge)
 

diff --git a/source_files/ddf/ddf_game.cc b/source_files/ddf/ddf_game.cc
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "ddf_local.h"
-#include "sokol_color.h"
 
 GameDefinitionContainer gamedefs;
 
@@ -773,7 +772,7 @@ void GameDefinition::Default()
     special_music_ = 0;
     lighting_      = kLightingModelDoomish;
     description_.clear();
-    default_damage_flash_ = SG_RED_RGBA32;
+    default_damage_flash_ = kRGBARed;
 }
 
 // --> game definition container class

diff --git a/source_files/ddf/ddf_image.cc b/source_files/ddf/ddf_image.cc
@@ -25,7 +25,6 @@
 
 #include "ddf_local.h"
 #include "epi_filesystem.h"
-#include "sokol_color.h"
 
 static ImageDefinition *dynamic_image;
 
@@ -378,7 +377,7 @@ void ImageDefinition::Default()
     info_.clear();
 
     type_   = kImageDataColor;
-    colour_ = SG_BLACK_RGBA32;
+    colour_ = kRGBABlack;
     format_ = kLumpImageFormatStandard;
 
     special_  = kImageSpecialNone;

diff --git a/source_files/ddf/ddf_line.cc b/source_files/ddf/ddf_line.cc
@@ -37,7 +37,6 @@
 #include "AlmostEquals.h"
 #include "ddf_local.h"
 #include "epi_str_util.h"
-#include "sokol_color.h"
 
 // -KM- 1999/01/29 Improved scrolling.
 // Scrolling
@@ -1658,7 +1657,7 @@ void LineType::Default(void)
     sector_effect_  = kSectorEffectTypeNone;
     portal_effect_  = kPortalEffectTypeNone;
     slope_type_     = kSlopeTypeNONE;
-    fx_color_       = SG_BLACK_RGBA32;
+    fx_color_       = kRGBABlack;
 
     // lobo 2022
     effectobject_ = nullptr;

diff --git a/source_files/ddf/ddf_main.cc b/source_files/ddf/ddf_main.cc
@@ -32,7 +32,6 @@
 #include "epi_str_compare.h"
 #include "epi_str_util.h"
 #include "p_action.h"
-#include "sokol_color.h"
 #include "stb_sprintf.h"
 
 void ReadRADScript(const std::string &_data, const std::string &source);
@@ -1949,7 +1948,7 @@ void DynamicLightDefinition::Default()
 {
     type_   = kDynamicLightTypeNone;
     radius_ = 32;
-    colour_ = SG_WHITE_RGBA32;
+    colour_ = kRGBAWhite;
     height_ = 0.5f;
     leaky_  = false;
     shape_  = "DLIGHT_EXP";

diff --git a/source_files/edge/CMakeLists.txt b/source_files/edge/CMakeLists.txt
@@ -152,7 +152,6 @@ set (EDGE_LINK_LIBRARIES
   miniz
   pl_mpeg
   prns
-  sokol_color
   stb
   xxhash
 )

diff --git a/source_files/edge/am_map.cc b/source_files/edge/am_map.cc
@@ -50,7 +50,6 @@
 #include "r_draw.h"
 #include "r_gldefs.h"
 #include "r_modes.h"
-#include "sokol_color.h"
 
 EDGE_DEFINE_CONSOLE_VARIABLE(automap_debug_bsp, "0", kConsoleVariableFlagNone)
 EDGE_DEFINE_CONSOLE_VARIABLE(automap_debug_collisions, "0", kConsoleVariableFlagNone)
@@ -654,7 +653,7 @@ std::string Aux2StringReplaceAll(std::string str, const std::string &from, const
 }
 
 // Lobo 2023: draw some key info in the middle of a line
-static void DrawKeyOnLine(AutomapLine *ml, int theKey, RGBAColor rgb = SG_WHITE_RGBA32)
+static void DrawKeyOnLine(AutomapLine *ml, int theKey, RGBAColor rgb = kRGBAWhite)
 {
     if (hide_lines)
         return;
@@ -887,12 +886,12 @@ static void AutomapWalkSeg(Seg *seg)
                 {
                     if (line->special->keys_ & kDoorKeyStrictlyAllKeys)
                     {
-                        DrawMLineDoor(&l, SG_PURPLE_RGBA32); // purple
+                        DrawMLineDoor(&l, kRGBAPurple); // purple
                         DrawKeyOnLine(&l, kDoorKeyStrictlyAllKeys);
                     }
                     else if (line->special->keys_ & kDoorKeyBlueCard || line->special->keys_ & kDoorKeyBlueSkull)
                     {
-                        DrawMLineDoor(&l, SG_BLUE_RGBA32); // blue
+                        DrawMLineDoor(&l, kRGBABlue); // blue
                         if (line->special->keys_ & (kDoorKeyBlueSkull | kDoorKeyBlueCard))
                         {
                             DrawKeyOnLine(&l, kDoorKeyBlueCard);
@@ -905,7 +904,7 @@ static void AutomapWalkSeg(Seg *seg)
                     }
                     else if (line->special->keys_ & kDoorKeyYellowCard || line->special->keys_ & kDoorKeyYellowSkull)
                     {
-                        DrawMLineDoor(&l, SG_YELLOW_RGBA32); // yellow
+                        DrawMLineDoor(&l, kRGBAYellow); // yellow
                         if (line->special->keys_ & (kDoorKeyYellowSkull | kDoorKeyYellowCard))
                         {
                             DrawKeyOnLine(&l, kDoorKeyYellowCard);
@@ -918,7 +917,7 @@ static void AutomapWalkSeg(Seg *seg)
                     }
                     else if (line->special->keys_ & kDoorKeyRedCard || line->special->keys_ & kDoorKeyRedSkull)
                     {
-                        DrawMLineDoor(&l, SG_RED_RGBA32); // red
+                        DrawMLineDoor(&l, kRGBARed); // red
                         if (line->special->keys_ & (kDoorKeyRedSkull | kDoorKeyRedCard))
                         {
                             DrawKeyOnLine(&l, kDoorKeyRedCard);
@@ -931,7 +930,7 @@ static void AutomapWalkSeg(Seg *seg)
                     }
                     else if (line->special->keys_ & kDoorKeyGreenCard || line->special->keys_ & kDoorKeyGreenSkull)
                     {
-                        DrawMLineDoor(&l, SG_GREEN_RGBA32); // green
+                        DrawMLineDoor(&l, kRGBAGreen); // green
                         if (line->special->keys_ & (kDoorKeyGreenSkull | kDoorKeyGreenCard))
                         {
                             DrawKeyOnLine(&l, kDoorKeyGreenCard);
@@ -944,7 +943,7 @@ static void AutomapWalkSeg(Seg *seg)
                     }
                     else
                     {
-                        DrawMLineDoor(&l, SG_PURPLE_RGBA32); // purple
+                        DrawMLineDoor(&l, kRGBAPurple); // purple
                     }
                     return;
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,7 +152,6 @@ set (EDGE_LINK_LIBRARIES @@
       miniz
       pl_mpeg
       prns
-      sokol_color
       stb
       xxhash
     )
@@ Expand Down @@