Update Shadow's master branch

merged Shadow's PR - Brand New B&W Tileset
Merge pull request '1-bit tileset' (#10 ) from Shadow/Collab_RPG:master into master
2023-07-08 17:24:17 +02:00 · 2023-07-08 13:16:49 +02:00 · 2023-07-08 12:57:23 +02:00 · 2023-07-07 19:26:14 +02:00 · 2023-07-07 18:32:08 +02:00 · 2023-07-07 18:22:39 +02:00
29 changed files with 317 additions and 248 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,3 +12,5 @@ __pycache__/
 *.sublime-project
 *.sublime-workspace
 .vscode
+
+*.json
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,28 +5,30 @@ cmake_minimum_required(VERSION 3.15)
 project(MyAddin)

 include(GenerateG1A)
+include(GenerateG3A)
+
 include(Fxconv)
 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 1b)


-fxconv_declare_converters(assets-fx/converters.py)
+fxconv_declare_converters(assets/converters.py)

 add_custom_command(
  COMMENT "Convert Tiled TMX map to usable JSON file"
 	COMMAND tiled --export-tileset json tilesetnpp.tsx tilesetnpp.json
 	COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json'
-	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-fx/levels/  
+	WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets/  

-  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-fx/levels/level0.json"
+  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets/level0.json"
 # if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
-  DEPENDS 	assets-fx/converters.py
-		assets-fx/levels/tileset.png 
-		assets-fx/levels/tilesetnpp.tsx
-		assets-fx/levels/level0.tmx
+  DEPENDS 	assets/converters.py
+		assets/tileset.png 
+		assets/tilesetnpp.tsx
+		assets/level0.tmx
 # if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
  )

@ -39,10 +41,16 @@ set(SOURCES
 )
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
+  assets/level0.json
+  assets/demo_player.png
  # ...
 )
+
+set(ASSETS_cg
+  assets-cg/tileset2b_CG.png
+)
+
 set(ASSETS_fx
-  assets-fx/levels/level0.json
  # ...
 )

@ -56,10 +64,11 @@ set(ASSETS_fx_2b
  # ...
 )

-fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_fx_1b} ${ASSETS_fx_2b} WITH_METADATA)
+fxconv_declare_assets(${ASSETS} ${ASSETS_fx}  ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} WITH_METADATA)

 add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE}} )

+
 if("${COLORMODE}" STREQUAL 1b)
  target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT)
 endif()
@ -75,6 +84,7 @@ target_link_libraries(myaddin LibProf::LibProf Gint::Gint)


 if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
+
  if("${COLORMODE}" STREQUAL 1b)
  generate_g1a(TARGET myaddin OUTPUT "PrjPC1b.g1a"
    NAME "Col RPG NB" ICON assets-fx/icon1.png)
@ -84,4 +94,11 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G)
  generate_g1a(TARGET myaddin OUTPUT "PrjPC2b.g1a"
    NAME "Col RPG Grey" ICON assets-fx/icon2.png)
  endif()
-endif()
+
+
+elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
+
+  generate_g3a(TARGET myaddin OUTPUT "PRJPC_CG.g3a"
+    NAME "Col_RPG_CG" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png)
+
+endif()
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,9 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to https://unlicense.org
--- a/assets-cg/fxconv-metadata.txt
+++ b/assets-cg/fxconv-metadata.txt
@ -0,0 +1,5 @@
+ 
+tileset2b_CG.png:
+  type: bopti-image
+  name: img_tilesetnpp
+
--- a/assets-cg/icon-sel.png
+++ b/assets-cg/icon-sel.png
--- a/assets-cg/icon-uns.png
+++ b/assets-cg/icon-uns.png
--- a/assets-cg/tileset2b_CG.png
+++ b/assets-cg/tileset2b_CG.png
--- a/assets-fx/fxconv-metadata.txt
+++ b/assets-fx/fxconv-metadata.txt
@ -1,3 +0,0 @@
-example.png:
-  type: bopti-image
-  name: img_example
--- a/assets-fx/levels/fxconv-metadata.txt
+++ b/assets-fx/levels/fxconv-metadata.txt
@ -1,7 +1,3 @@
-*.json:
-  custom-type: map
-  name_regex: (.*)\.json map_\1
-  
 tileset1b.png:
  type: bopti-image
  name: img_tilesetnpp
@ -9,4 +5,4 @@ tileset1b.png:
  
 tileset2b.png:
  type: bopti-image
-  name: img_tilesetnpp
+  name: img_tilesetnpp
--- a/assets-fx/levels/level0.json
+++ b/assets-fx/levels/level0.json
@ -1,44 +0,0 @@
-{ "compressionlevel":-1,
- "height":24,
- "infinite":false,
- "layers":[
-        {
-         "data":[257, 297, 298, 299, 300, 257, 386, 297, 298, 299, 300, 2, 2, 2, 2, 2, 257, 2, 2, 225, 226, 227, 228, 201, 202, 203, 204, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 253, 205, 229, 205, 229, 280, 179, 180, 179, 156, 156, 156, 158, 157, 179, 180, 253, 2, 2, 249, 250, 251, 252, 225, 226, 227, 228, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 301, 125, 126, 127, 128, 2, 385, 303, 350, 351, 303, 2, 2, 2, 350, 351, 301, 2, 2, 273, 274, 275, 276, 249, 250, 251, 252, 201, 202, 203, 204, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 325, 149, 150, 151, 152, 2, 2, 327, 374, 375, 327, 2, 184, 185, 374, 375, 325, 2, 279, 297, 298, 299, 300, 273, 274, 275, 276, 225, 226, 227, 228, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 257, 2, 2, 385, 2, 2, 385, 2, 265, 266, 2, 2, 208, 209, 352, 353, 257, 2, 302, 2, 130, 129, 166, 297, 298, 299, 300, 249, 250, 251, 252, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 281, 176, 2, 2, 278, 2, 2, 385, 289, 290, 2, 2, 232, 233, 376, 377, 281, 2, 326, 2, 154, 153, 190, 201, 202, 203, 204, 273, 274, 275, 276, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 201, 202, 203, 204, 302, 385, 2, 2, 265, 266, 2, 385, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 166, 225, 226, 227, 228, 297, 298, 299, 300, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 225, 226, 227, 228, 326, 2, 385, 2, 265, 266, 2, 2, 2, 2, 214, 215, 2, 2, 2, 2, 2, 2, 190, 249, 250, 251, 252, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 249, 250, 251, 252, 201, 202, 203, 204, 289, 290, 2, 258, 259, 260, 238, 239, 260, 260, 261, 262, 262, 263, 264, 273, 274, 275, 276, 2, 93, 94, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 273, 274, 275, 276, 225, 226, 227, 228, 265, 266, 2, 282, 283, 284, 285, 285, 285, 285, 285, 285, 286, 287, 288, 297, 298, 299, 300, 2, 117, 118, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 297, 298, 299, 300, 249, 250, 251, 252, 290, 2, 2, 306, 307, 308, 309, 308, 309, 308, 309, 310, 310, 311, 312, 131, 2, 339, 340, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 202, 203, 204, 386, 273, 274, 275, 276, 2, 2, 2, 330, 331, 332, 333, 332, 333, 332, 333, 334, 334, 335, 336, 132, 2, 363, 364, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 226, 227, 228, 386, 297, 298, 299, 300, 2, 290, 2, 162, 163, 164, 165, 162, 163, 164, 165, 162, 163, 164, 165, 132, 2, 201, 202, 203, 204, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 250, 251, 252, 2, 2, 2, 2, 2, 2, 2, 2, 86, 87, 88, 89, 186, 187, 188, 189, 86, 87, 88, 89, 132, 2, 225, 226, 227, 228, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 274, 275, 276, 2, 270, 271, 271, 271, 272, 2, 2, 110, 111, 112, 113, 210, 211, 212, 213, 110, 111, 112, 113, 133, 2, 249, 250, 251, 252, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 298, 299, 300, 2, 294, 1, 1, 1, 296, 2, 2, 136, 137, 0, 0, 234, 290, 265, 237, 2, 2, 339, 340, 2, 2, 273, 274, 275, 276, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 202, 203, 204, 2, 294, 1, 1, 1, 296, 2, 2, 160, 161, 265, 266, 266, 265, 266, 2, 2, 2, 363, 364, 2, 2, 297, 298, 299, 300, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 226, 227, 228, 2, 318, 319, 319, 319, 320, 2, 2, 2, 2, 289, 290, 265, 266, 290, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 250, 251, 252, 2, 2, 2, 2, 2, 2, 385, 386, 2, 2, 265, 265, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 274, 275, 276, 201, 202, 203, 204, 257, 2, 2, 2, 257, 2, 265, 265, 2, 257, 2, 2, 2, 257, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 298, 299, 300, 225, 226, 227, 228, 253, 205, 229, 205, 253, 2, 290, 265, 2, 253, 205, 229, 205, 253, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 386, 249, 250, 251, 252, 345, 346, 347, 348, 277, 2, 265, 266, 2, 301, 386, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 202, 203, 204, 273, 274, 275, 276, 369, 370, 371, 372, 301, 2, 289, 290, 2, 325, 387, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 226, 227, 228, 297, 298, 299, 300, 393, 394, 395, 396, 325, 2, 265, 266, 2, 301, 386, 2, 2, 2, 2, 257, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
-         "height":24,
-         "id":1,
-         "name":"Background",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":48,
-         "x":0,
-         "y":0
-        }, 
-        {
-         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-         "height":24,
-         "id":2,
-         "name":"Foreground",
-         "opacity":1,
-         "type":"tilelayer",
-         "visible":true,
-         "width":48,
-         "x":0,
-         "y":0
-        }],
- "nextlayerid":3,
- "nextobjectid":1,
- "orientation":"orthogonal",
- "renderorder":"right-down",
- "tiledversion":"1.8.0",
- "tileheight":8,
- "tilesets":[
-        {
-         "firstgid":1,
-         "source":"tilesetnpp.tsx"
-        }],
- "tilewidth":8,
- "type":"map",
- "version":"1.8",
- "width":48
-}
--- a/assets-fx/levels/tileset1b_bak.png
+++ b/assets-fx/levels/tileset1b_bak.png
--- a/assets-fx/levels/tileset_1b.png
+++ b/assets-fx/levels/tileset_1b.png
--- a/assets-fx/levels/tilesetnpp.json
+++ b/assets-fx/levels/tilesetnpp.json
@ -1,14 +0,0 @@
-{ "columns":24,
- "image":"tileset.png",
- "imageheight":136,
- "imagewidth":192,
- "margin":0,
- "name":"tileset",
- "spacing":0,
- "tilecount":408,
- "tiledversion":"1.8.0",
- "tileheight":8,
- "tilewidth":8,
- "type":"tileset",
- "version":"1.8"
-}
--- a/assets-fx/converters.py
+++ b/assets-fx/converters.py
--- a/assets/demo_player.png
+++ b/assets/demo_player.png
--- a/assets/fxconv-metadata.txt
+++ b/assets/fxconv-metadata.txt
@ -0,0 +1,7 @@
+*.json:
+  custom-type: map
+  name_regex: (.*)\.json map_\1
+
+demo_player.png:
+  type: bopti-image
+  name: demo_player_img
--- a/assets-fx/levels/level0.tmx
+++ b/assets-fx/levels/level0.tmx
--- a/assets-fx/levels/tileset.png
+++ b/assets-fx/levels/tileset.png
--- a/assets-fx/levels/tilesetnpp.tsx
+++ b/assets-fx/levels/tilesetnpp.tsx
--- a/captures/fxlink-image-2023.07.08-13h00-1.png
+++ b/captures/fxlink-image-2023.07.08-13h00-1.png
--- a/captures/fxlink-image-2023.07.08-13h00-2.png
+++ b/captures/fxlink-image-2023.07.08-13h00-2.png
--- a/captures/fxlink-image-2023.07.08-13h01-1.png
+++ b/captures/fxlink-image-2023.07.08-13h01-1.png
--- a/captures/fxlink-image-2023.07.08-13h02-1.png
+++ b/captures/fxlink-image-2023.07.08-13h02-1.png
--- a/src/main.c
+++ b/src/main.c
@ -5,68 +5,64 @@
 #define USB_FEATURE 1

 #if USB_FEATURE==1
-	#include <gint/usb-ff-bulk.h>
-	#include <gint/usb.h>
+    #include <gint/usb-ff-bulk.h>
+    #include <gint/usb.h>
 #endif //USB_FEATURE


-#ifdef COLOR2BIT
-	#include <gint/gray.h>
-#endif //COLOR2BIT
-
-
-
+#if !defined(FXCG50) && defined(COLOR2BIT)
+    #define GRAYMODEOK
+#endif

+#ifdef GRAYMODEOK
+    #include <gint/gray.h>
+#endif //GRAYMODEOK

 #include <stdint.h>
 #include <stdbool.h>

 #include "map.h"
 #include "player.h"
-
-
+#include "mapdata.h"

 /* Player data (defined in "player.h")*/
-struct Player MyPlayer = { 10, 5, 100 };
-
+Player MyPlayer = { 10, 5, 0, 0, 100 };
+Map *map_level = &map_level0;

 /* some global variables */
-bool exittoOS = false;		// set to true when asked for exit
-
-bool screenshot = false;	// set to true when screenshot is required
-bool record = false;		// set to true when 
-
+bool exittoOS = false;        // set to true when asked for exit

+bool screenshot = false;    // set to true when screenshot is required
+bool record = false;        // set to true when

 /* Key management */

 static void get_inputs( void  )
 {
    key_event_t ev;
-    while((ev = pollevent()).type != KEYEV_NONE)
-    {
+    while((ev = pollevent()).type != KEYEV_NONE){

    }

-	/* Key binding for the Player action */
-	/*************************************/
-	
+    /* Key binding for the Player action */
+
+    /*************************************/

    if(keydown(KEY_EXIT)) exittoOS = true;

-	/* Player actions - Prototypes in player.h and implementation in player.c */
+    /* Player actions - Prototypes in player.h and implementation in player.c */
    if(keydown(KEY_LEFT))  PlayerLeft();
-	if(keydown(KEY_RIGHT)) PlayerRight();
-	if(keydown(KEY_UP))	   PlayerUp();
-	if(keydown(KEY_DOWN))  PlayerDown();
-	if(keydown(KEY_SHIFT)) PlayerAction();
+    if(keydown(KEY_RIGHT)) PlayerRight();
+    if(keydown(KEY_UP))    PlayerUp();
+    if(keydown(KEY_DOWN))  PlayerDown();
+    if(keydown(KEY_SHIFT)) PlayerAction();

-	/* if USB is enabled - keybinding for screencapture */
+    /* if USB is enabled - keybinding for screencapture */

 #if USB_FEATURE==1

-	if(keydown(KEY_7))    screenshot = true;
-	if(keydown(KEY_8))    record = !record;
+    if(keydown(KEY_7))    screenshot = true;
+    if(keydown(KEY_8))    record = !record;

 #endif //USB_FEATURE
 }
@ -76,88 +72,99 @@ static void get_inputs( void  )

 #if USB_FEATURE==1

-	void USB_feature( void )
-	{
-		if (screenshot && usb_is_open()) {
-		if (!dgray_enabled())
-			usb_fxlink_screenshot(false);
-		else
-			usb_fxlink_screenshot_gray(false);
-		screenshot = false;
-		}
+    void USB_feature( void )
+    {
+        if (screenshot && usb_is_open()) {

-		if (record && usb_is_open()) {
-		if (!dgray_enabled())
-			usb_fxlink_videocapture(false);
-		else
-			usb_fxlink_videocapture_gray(false);
-		}
-	}
+            #ifdef GRAYMODEOK                       // This is a trick, if GRAYMODEOK is defined then we make the code accessible
+
+                if (dgray_enabled())
+                    usb_fxlink_screenshot_gray(false);
+                else
+
+            #endif
+
+            usb_fxlink_screenshot(false);           // else we just let the usual screeshot function
+            screenshot = false;
+        }
+
+
+        if (record && usb_is_open()) {
+        
+            #ifdef GRAYMODEOK
+
+                if (dgray_enabled())
+                    usb_fxlink_videocapture_gray(false);
+                else
+
+            #endif
+
+            usb_fxlink_videocapture(false);
+        }
+    }

 #endif


-void GameLogic( void )
-{
-
-
+void GameLogic(void) {
+    // to be done
 }


-int main(void)
-{
+int main(void) {

-	#if USB_FEATURE==1
-		usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL};
-		usb_open(interfaces, GINT_CALL_NULL);
-	#endif
+    #if USB_FEATURE==1
+        usb_interface_t const *interfaces[] = {&usb_ff_bulk, NULL};
+        usb_open(interfaces, GINT_CALL_NULL);
+    #endif


-	/* start grayscale engine */
+    /* start grayscale engine */

-	#ifdef COLOR2BIT
-		dgray( DGRAY_ON );
-	#endif
-	
+    #ifdef GRAYMODEOK
+        dgray( DGRAY_ON );
+    #endif

-	do
-	{
-		/* clear screen */
-		dclear(C_WHITE);

-		/* render the map */
-		RenderMap();
+    do
+    {
+        /* clear screen */
+        dclear(C_WHITE);

-		/* start the logic of the game */
-		GameLogic();
+        /* render the map */
+        RenderMap(&MyPlayer, map_level);
+        PlayerDraw();

-		/* Screen blit */
-		dupdate();
+        /* start the logic of the game */
+        GameLogic();

-		/* Screen capture feature if enabled */
-		#if USB_FEATURE==1
-			USB_feature();
-		#endif
+        /* Screen blit */
+        dupdate();

-		/* Management of the inputs */
-		get_inputs();
+        /* Screen capture feature if enabled */
+        #if USB_FEATURE==1
+            USB_feature();
+        #endif

-	}
-	while (exittoOS == false);	// want to exit ?
+        /* Management of the inputs */
+        get_inputs();
+
+    }
+    while (exittoOS == false);    // want to exit ?



-	/* shutdown grayengine*/
-	#ifdef COLOR2BIT
-		dgray( DGRAY_OFF );
-	#endif
+    /* shutdown grayengine*/
+    #ifdef GRAYMODEOK
+        dgray( DGRAY_OFF );
+    #endif


-	/* close USB */
-	#if USB_FEATURE==1
-  		usb_close();
-	#endif
+    /* close USB */
+    #if USB_FEATURE==1
+          usb_close();
+    #endif


-	return 1;
+    return 1;
 }
--- a/src/map.c
+++ b/src/map.c
@ -1,38 +1,89 @@
 #include "map.h"
+
 #include <gint/display.h>

-extern struct Map map_level0;
-
-struct Map *map_level = &map_level0;
-
-void RenderMap( void )
-{
-  /* for all Layer (2 in the current configuration: Background is layer 0 and foreground is layer 1 ) */
-  for (int u = 0; u < map_level->nblayers; u++)
-  {
-    /* for each colum */
-    for (int i = 0; i < map_level->w; i++)
-    {
-      /* and each line */
-      for (int j = 0; j < map_level->h; j++)
-      {
-        /* compute the index */
-        uint16_t index = j * map_level->w + i;
-        
-        /* get the tile index from the map*/
-        int16_t currentTile = map_level->layers[u][index];
-        
-        /* currentTile == -1 means nothing to be draw */
-        if (currentTile != -1)
-        {
-          /* get x and y position in the tileset image */
-          uint16_t xtile = (currentTile % map_level->tileset_size) * 8;
-          uint16_t ytile = (currentTile / map_level->tileset_size) * 8;
-          
-          /* render */
-          dsubimage(i * 8, j * 8, map_level->tileset, xtile, ytile, 8, 8, DIMAGE_NONE );
-        }
-      }
+void RenderMap(Player *player, Map *map_level) {
+    /* for all Layer (2 in the current configuration: Background is layer 0 and
+     * foreground is layer 1 ) */
+    /* x and y will contain the position in the loop. */
+    unsigned char x, y;
+    /* The positions where we start drawing the tiles will be in tx and
+     * ty. */
+    unsigned short int tx, ty;
+    /* mx and my will contain how many pixels will be hidden on x and on
+     * y. */
+    unsigned char mx, my;
+    /* dw and dh contain the amount of tiles that will be drawn on x and on
+     * y. */
+    unsigned char dw = DWIDTH/T_WIDTH+1, dh = DHEIGHT/T_HEIGHT+1;
+    /* mw and mh will contain the height and the width of the map. */
+    unsigned short int mw = map_level->w*T_WIDTH, mh = map_level->h*T_HEIGHT;
+    /* tile contains the tile to draw. */
+    short int tile;
+    /* The position where I start drawing */
+    unsigned short int sx, sy;
+    /* The position of the tile in the tileset. */
+    unsigned short int xtile, ytile;
+    /* The layer we're drawing */
+    unsigned char l;
+    /* Fix sx. */
+    if(player->x<DWIDTH/2){
+        /* If I can't center the player because I'm near the left border of
+         * the map. */
+        player->px = player->x;
+        sx = 0;
+    }else if(player->x+DWIDTH/2>mw){
+        /* If I can't center the player because I'm near the right border of
+         * the map. */
+        sx = mw-DWIDTH;
+        player->px = player->x-sx;
+    }else{
+        /* I can center the player. */
+        player->px = DWIDTH/2;
+        sx = player->x-player->px;
+    }
+    /* Fix sy. */
+    if(player->y<DHEIGHT/2){
+        /* If I can't center the player because I'm near the top border of
+         * the map. */
+        player->py = player->y;
+        sy = 0;
+    }else if(player->y+DHEIGHT/2>mh){
+        /* If I can't center the player because I'm near the bottom border
+         * of the map. */
+        sy = mh-DHEIGHT;
+        player->py = player->y-sy;
+    }else{
+        /* I can center the player. */
+        player->py = DHEIGHT/2;
+        sy = player->y-player->py;
+    }
+    tx = sx/T_WIDTH;
+    ty = sy/T_HEIGHT;
+    mx = sx-tx*T_WIDTH;
+    my = sy-ty*T_HEIGHT;
+    for (l = 0; l < map_level->nblayers; l++){
+        /* Draw a layer of the map on screen. */
+        for(y=0;y<dh;y++){
+            for(x=0;x<dw;x++){
+                /* I get the tile number if his position is inside the map. Then
+                 * I draw it. */
+                if(tx+x>=0 && tx+x < map_level->w &&
+                   ty+y>=0 && ty+y < map_level->h){
+                    tile = map_level->layers[l][(y+ty) * map_level->w + tx+x];
+                    /* tile == -1 means nothing to be drawn */
+                    if(tile >= 0){
+                        /* get x and y position in the tileset image */
+                        xtile = (tile % map_level->tileset_size) * T_WIDTH;
+                        ytile = (tile / map_level->tileset_size) * T_HEIGHT;
+                        /* render */
+                        dsubimage(x*T_WIDTH-mx, y*T_HEIGHT-my,
+                                  map_level->tileset, xtile, ytile, T_WIDTH, T_HEIGHT,
+                                  DIMAGE_NONE);
+                    }
+                }
+            }
+        }
    }
-  }
 }
+
--- a/src/map.h
+++ b/src/map.h
@ -2,25 +2,33 @@
 #define MAP_H


+#ifdef FXCG50
+    #define T_HEIGHT 16
+    #define T_WIDTH  16
+#else
+    #define T_HEIGHT 8
+    #define T_WIDTH  8
+#endif
+
+
 #include <gint/display.h>

+#include "player.h"

-void RenderMap(void);
+typedef struct {

+    /*width, height and the number of layer of the map*/
+    int w, h, nblayers;

-struct Map {
-
-  /*width, height and the number of layer of the map*/
-  int w, h, nblayers;
-
-  /*the tileset to use*/
-  bopti_image_t *tileset;
-  int tileset_size;
-
-  /*list of all the tiles*/
-  short *layers[];
-};
+    /*the tileset to use*/
+    bopti_image_t *tileset;
+    int tileset_size;

+    /*list of all the tiles*/
+    short *layers[];
+} Map;

+void RenderMap(Player *player, Map *map_level);

 #endif
+
--- a/src/mapdata.h
+++ b/src/mapdata.h
@ -0,0 +1,7 @@
+#ifndef MAPDATA_H
+#define MAPDATA_H
+
+extern Map map_level0;
+
+#endif
+
--- a/src/player.c
+++ b/src/player.c
@ -1,30 +1,52 @@
 #include "player.h"
 #include "map.h"
+#include <gint/display.h>

-extern struct player;
-extern struct Map *map_level;

-void PlayerLeft( void )
-{
+#define P_WIDTH 8
+#define P_HEIGHT 8

+
+#ifdef FXCG50
+    #define SPEED   3
+#else
+    #define SPEED   1
+#endif
+
+
+extern Player MyPlayer;
+extern Map *map_level;
+extern bopti_image_t demo_player_img;
+
+
+void PlayerDraw(void) {
+    dimage(MyPlayer.px-P_WIDTH/2, MyPlayer.py-P_HEIGHT/2, &demo_player_img);
 }

-void PlayerRight( void )
-{
-
+void PlayerLeft(void) {
+    if(MyPlayer.x >= SPEED){
+        MyPlayer.x-=SPEED;
+    }
 }

-void PlayerUp( void )
-{
-
+void PlayerRight(void) {
+    if(MyPlayer.x <= map_level->w * T_WIDTH - SPEED){
+        MyPlayer.x+=SPEED;
+    }
 }

-void PlayerDown( void )
-{
-
+void PlayerUp(void) {
+    if(MyPlayer.y >= SPEED){
+        MyPlayer.y-=SPEED;
+    }
 }

-void PlayerAction( void )
-{
+void PlayerDown(void) {
+    if(MyPlayer.y <= map_level->h * T_HEIGHT - SPEED){
+        MyPlayer.y+=SPEED;
+    }
+}

-}
+void PlayerAction(void) {
+
+}
--- a/src/player.h
+++ b/src/player.h
@ -1,27 +1,26 @@
 #ifndef PLAYER_H
 #define PLAYER_H

-#include <stdint.h>
-
-
 /* Struct that define player parameters */
-struct Player
-{
-    uint16_t x, y;
-    uint16_t life;    
-};
+typedef struct {
+    unsigned short int x, y; /* The position of the player */
+    unsigned char px, py; /* The position of the player on screen */
+    unsigned short int life; /* How many lives the player still has between 0
+                              * and 100. */
+} Player;
+
+/* This function should be called after drawing the map ! */
+void PlayerDraw(void);
+
+void PlayerLeft(void);
+
+void PlayerRight(void);
+
+void PlayerUp(void);
+
+void PlayerDown(void);
+
+void PlayerAction(void);


-
-void PlayerLeft( void );
-
-void PlayerRight( void );
-
-void PlayerUp( void );
-
-void PlayerDown( void );
-
-void PlayerAction( void );
-
-
-#endif
+#endif
Author	SHA1	Message	Date
Shadow15510	0050c2ddf8	Update Shadow's master branch	2023-07-08 17:24:17 +02:00
Sylvain PILLOT	60c26b8c22	merged Shadow's PR - Brand New B&W Tileset	2023-07-08 13:16:49 +02:00
Sylvain PILLOT	1bfaf75a78	Merge pull request '1-bit tileset' (#10 ) from Shadow/Collab_RPG:master into master Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/10	2023-07-08 12:57:23 +02:00
Sylvain PILLOT	c87580130d	added speed parameter for player	2023-07-07 19:26:14 +02:00
Sylvain PILLOT	ac9f17bd75	corrected Tileset for CG taht was upscaled with interpolation and was provoking glitches	2023-07-07 18:32:08 +02:00
Sylvain PILLOT	f0417bee16	merged MiBi88's work on map movement and rendering + FCalva's work on adding a target for fxCG50	2023-07-07 18:22:39 +02:00
Sylvain PILLOT	78d45a1e78	Merge pull request 'Better map displaying :)' (#7 ) from mibi88/Collab_RPG-map-displaying:master into master Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/7 This is now merged into master. Thanks Mb88	2023-07-07 17:04:41 +02:00
mibi88	d3f1e55422	The map displaying is now SUPER fast	2023-07-07 14:50:30 +02:00
mibi88	9818d835be	Restructured some stuff, now the map is scrolling :), but some optimizations are needed!	2023-07-07 14:20:13 +02:00