Tileset en couleur en utilisant la palette EGA64 de Fcalva

Le CMakeLists.txt est fonctionnel et on peut choisir entre le tileset 2b et celui EGA64, j'ai testé les deux sur CG donc ça devrait être bon !

CMakeLists.txt

@@ -12,8 +12,8 @@ find_package(Gint 2.9 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1bit or 2bits
-set(COLORMODE 2b)
+set(COLORMODE_fx 2b)
-
+set(COLORMODE_cg EGA64)
 
 fxconv_declare_converters(assets/converters.py)
 
@@ -48,10 +48,17 @@ set(ASSETS
 )
 
 set(ASSETS_cg
-  assets-cg/tileset2b_CG.png
   assets-cg/demo_player.png
 )
 
+set(ASSETS_cg_2b
+  assets-cg/levels/tileset2b_CG.png
+)
+
+set(ASSETS_cg_EGA64
+  assets-cg/levels/tilesetEGA64_CG.png
+)
+
 set(ASSETS_fx
   assets-fx/demo_player.png
   # ...
@@ -67,20 +74,33 @@ set(ASSETS_fx_2b
   # ...
 )
 
-fxconv_declare_assets(${ASSETS} ${ASSETS_fx}  ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} WITH_METADATA)
+fxconv_declare_assets(${ASSETS} ${ASSETS_fx}  ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} ${ASSETS_cg_2b} ${ASSETS_cg_EGA64} WITH_METADATA)
 
-add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE}} )
+if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
+  add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_fx}} )
+elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
+  add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_cg}} )
+endif()
 
-
+# fx colormode
-if("${COLORMODE}" STREQUAL 1b)
+if("${COLORMODE_fx}" STREQUAL 1b)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT)
 endif()
 
 
-if("${COLORMODE}" STREQUAL 2b)
+if("${COLORMODE_fx}" STREQUAL 2b)
   target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR2BIT)
 endif()
 
+# cg colormode
+if("${COLORMODE_cg}" STREQUAL 2b)
+  target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR2BIT)
+endif()
+
+
+if("${COLORMODE_cg}" STREQUAL EGA64)
+  target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOREGA)
+endif()
 
 target_link_options(myaddin PRIVATE -Wl,-Map=Build_Addin.map -Wl,--print-memory-usage)
 target_link_libraries(myaddin LibProf::LibProf Gint::Gint)
@@ -88,12 +108,12 @@ target_link_libraries(myaddin LibProf::LibProf Gint::Gint)
 
 if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
 
-  if("${COLORMODE}" STREQUAL 1b)
+  if("${COLORMODE_fx}" STREQUAL 1b)
     generate_g1a(TARGET myaddin OUTPUT "PrjPC1b.g1a"
       NAME "Col RPG NB" ICON assets-fx/icon1.png)
   endif()
 
-    if("${COLORMODE}" STREQUAL 2b)
+  if("${COLORMODE_fx}" STREQUAL 2b)
     generate_g1a(TARGET myaddin OUTPUT "PrjPC2b.g1a"
       NAME "Col RPG Grey" ICON assets-fx/icon2.png)
   endif()
@@ -101,7 +121,14 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
 
 elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
 
-  generate_g3a(TARGET myaddin OUTPUT "PRJPC_CG.g3a"
+  if("${COLORMODE_cg}" STREQUAL 2b)
-    NAME "Col_RPG_CG" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+    generate_g3a(TARGET myaddin OUTPUT "PrjPC2b.g3a"
+      NAME "Col RPG Grey" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+  endif()
+
+  if("${COLORMODE_cg}" STREQUAL EGA64)
+    generate_g3a(TARGET myaddin OUTPUT "PrjPCega.g3a"
+      NAME "Col RPG EGA" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+  endif()
 
 endif()

assets-cg/fxconv-metadata.txt

@@ -1,7 +1,3 @@
-tileset2b_CG.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
 demo_player.png:
   type: bopti-image
   name: demo_player_img

assets-cg/levels/fxconv-metadata.txt

@@ -0,0 +1,8 @@
+tileset2b_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
+
+tilesetEGA64_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
+

assets-fx/fxconv-metadata.txt

@@ -1,12 +1,3 @@
-tileset1b.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
-  
-tileset2b.png:
-  type: bopti-image
-  name: img_tilesetnpp
-
 demo_player.png:
   type: bopti-image
   name: demo_player_img