Début convertisseur + ajout timestamps

.gitignore

@@ -16,6 +16,7 @@
 __pycache__/
 
 # Common IDE files
+*.kate-swp
 *.sublime-project
 *.sublime-workspace
 .vscode

CMakeLists.txt

@@ -1,3 +1,4 @@
+#Fcalva 14/02/2024
 # Configure with [fxsdk build-fx] or [fxsdk build-cg], which provide the
 # toolchain file and module path of the fxSDK
 
@@ -34,6 +35,7 @@ set(SOURCES
   src/inputs.c
   src/ui.c
   src/sdl_image.c
+  maps/convert/converted.c
 )
 
 set(ASSETS
@@ -47,20 +49,6 @@ set(ASSETS
 )
 if("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50)
 
-#fxconv_declare_converters(assets-cg/map/converters.py)
-
-#Les lignes suivantes proviennent de https://gitea.planet-casio.com/Slyvtt/Collab_RPG
-#add_custom_command(
-#  COMMENT "Convert Tiled TMX map to usable JSON file"
-#	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-cg/map/
-#
-#  OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/map/Shooterlevel0.json"
-# if several levels/maps are created, just copy the previous line and change the .json name with the new level/map
-#  DEPENDS 	assets-cg/map/converters.py
-#		assets-cg/map/0.tmx
-#)
-
 fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA)
 
 set(CFLAGS -Wall -Wextra -Ofast -pipe -flto)

build.sh

@@ -1,18 +1,24 @@
-#Script to do the build for you. Not meant to be more then an automation tool for devs.
+#Fcalva 14/02/2024
+#Script to do the build for you.
+#Is now meant to be used since it runs the converter script for you
 
-if test $1 "linux"; then
-  mkdir "./build"
-  cd "./build"
+python3 ./maps/convert/convert.py
+
+if test $1 = "linux"; then
+  mkdir "./build-linux"
+  cd "./build-linux"
   cmake ..
   make
   mv "./RaycasterGame" "../RaycasterGame.amd64";
-elif test $1 "win"; then
+elif test $1 = "cg"; then
+  fxsdk build-cg;
+elif test $1 = "win"; then
   #todo
   echo "not done yet !";
-elif test $1 "ems"; then
-  mkdir "./build"
-  cd "./build"
+elif test $1 = "ems"; then
+  mkdir "./build-ems"
+  cd "./build-ems"
   cmake ..
   emmake make
-  emcc [-Ox] RaycaserGame.o -o RaycaserGame.js
+  emcc [-Ox] RaycasterGame.o -o RaycasterGame.js
 fi

converted.c

@@ -0,0 +1 @@
+#include "../../src/fixed.h"

maps/convert/convert.py

@@ -0,0 +1,21 @@
+#Fcalva 14/02/2023
+
+import os
+import os.path
+
+print("convert.py : Converting maps to C object...")
+
+try:
+  convert = open("./converted.c", mode="x+t", buffering=1, encoding="utf-8", newline="\n")
+  convert.write('#include "../../src/fixed.h"\n')
+except:
+  convert = open("./converted.c", mode="r+t", buffering=1, encoding="utf-8", newline="\n")
+
+folder = os.listdir(path="..")
+
+for i in range(0, len(folder)):
+  flen = len(folder[i])-1
+  if folder[i][flen-2] == "." and folder[i][flen-1] == "r" and folder[i][flen] == "c":
+    continue
+  else:
+    folder.pop(i)

maps/convert/converted.c

@@ -0,0 +1 @@
+#include "../../src/fixed.h"

src/config.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #ifndef config__h
 #define config__h
 

src/fixed.h

@@ -3,7 +3,7 @@
 // ---
 //
 // Fcalva : vient de https://gitea.planet-casio.com/Slyvtt/OutRun
-//
+// Fcalva 14/02/2024
 #pragma once
 #include <stdint.h>
 

src/includes.h

@@ -1,3 +1,4 @@
+//Fcalva 14/02/2024
 // Tout les #include extérieurs au projet
 
 #ifndef includes__h

src/inputs.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "inputs.h"

src/inputs.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"

src/main.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #ifdef FX9860G
 #error "Ce code n'est pas pour FX, enlevez ce message a vos riques et périls"
 #endif

src/map.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"
@@ -49,9 +51,9 @@ ShooterMap ShooterLevel0 = {0,0,0,0,0,0,
                                {1,255,2,2,2,2,2,2,2,2,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,2,0,0,0,2,0,0,2,255,255,255,255,255,2,2,0,2,2,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,2,0,0,0,0,0,0,0,255,255,255,255,255,2,0,0,0,2,255,255,255,255,255,255,255,255,255,255,255,2},
-                               {2,255,2,0,0,0,2,0,0,2,255,255,0,0,0,0,0,2,255,255,255,255,255,255,255,255,255,255,255,255,255,2},
+                               {2,255,2,0,0,0,2,0,0,2,255,255,255,255,255,2,0,0,0,2,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,2,0,0,0,2,2,2,2,0,255,255,255,255,2,0,0,0,2,255,255,255,255,255,255,255,255,255,255,255,2},
-                               {2,255,2,0,0,0,2,0,0,0,255,255,255,255,255,2,2,0,2,2,255,255,255,255,255,255,255,255,255,255,255,2},
+                               {2,255,2,0,0,0,2,0,0,0,255,255,255,255,255,2,2,2,2,2,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,2,2,2,2,2,0,0,2,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,2},
                                {2,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,2},

src/map.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"

src/moteur.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "moteur.h"
@@ -194,7 +196,7 @@ void dstripe(image_t *stripe, image_t *vram, int x, int linePos, int lineHeight,
 
   if(linePos < ymin || linePos+lineHeight > ymax){
     texSampleY = f2int(fdiv(fix(linePos - ymin), texScale));
-    //texSample = f2int(fdiv(fix(linePos + lineHeight - ymax), texScale));
+    texSample = f2int(fdiv(fix(linePos + lineHeight - ymax), texScale));
   }
 
   image_sub(stripe, 0, texSampleY, 2, texSample, &stripe1);

src/moteur.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"

src/player.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 

src/player.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #ifndef player_h

src/sdl_image.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #ifdef SDL2

src/sdl_image.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #ifdef SDL2
 
 #ifndef sdl__h

src/sprites.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"

src/sprites.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #ifndef sprites_h

src/types.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #ifndef types_h

src/ui.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "ui.h"

src/ui.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #ifndef ui__h
 #define ui__h
 

src/utils.c

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #include "types.h"

src/utils.h

@@ -1,3 +1,5 @@
+//Fcalva 14/02/2024
+
 #include "includes.h"
 
 #ifndef utils__h