Compression, timer changes etc.

This commit is contained in:
Heath Mitchell 2022-07-14 18:09:38 +01:00
parent f8656a9af8
commit a27ca32657
44 changed files with 595 additions and 189 deletions

View File

@ -7,10 +7,12 @@ project(MarioKart)
set(SOURCES
src/3d.c
src/buttons.c
src/data.c
src/debugHud.c
src/images.c
src/main.c
src/maths.c
src/miniz.c
src/particles.c
src/physics.c
src/sprites.c

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

View File

@ -81,12 +81,12 @@ clean: CMakeFiles/mariokart.dir/clean
CMakeFiles/mariokart.dir/all:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/depend
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13 "Built target mariokart"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 "Built target mariokart"
.PHONY : CMakeFiles/mariokart.dir/all
# Build rule for subdir invocation for target.
CMakeFiles/mariokart.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/heath/mk-gint/build-em/CMakeFiles 13
$(CMAKE_COMMAND) -E cmake_progress_start /home/heath/mk-gint/build-em/CMakeFiles 15
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/mariokart.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/heath/mk-gint/build-em/CMakeFiles 0
.PHONY : CMakeFiles/mariokart.dir/rule

View File

@ -10,10 +10,12 @@ set(CMAKE_DEPENDS_LANGUAGES
set(CMAKE_DEPENDS_DEPENDENCY_FILES
"/home/heath/mk-gint/src/3d.c" "CMakeFiles/mariokart.dir/src/3d.c.o" "gcc" "CMakeFiles/mariokart.dir/src/3d.c.o.d"
"/home/heath/mk-gint/src/buttons.c" "CMakeFiles/mariokart.dir/src/buttons.c.o" "gcc" "CMakeFiles/mariokart.dir/src/buttons.c.o.d"
"/home/heath/mk-gint/src/data.c" "CMakeFiles/mariokart.dir/src/data.c.o" "gcc" "CMakeFiles/mariokart.dir/src/data.c.o.d"
"/home/heath/mk-gint/src/debugHud.c" "CMakeFiles/mariokart.dir/src/debugHud.c.o" "gcc" "CMakeFiles/mariokart.dir/src/debugHud.c.o.d"
"/home/heath/mk-gint/src/images.c" "CMakeFiles/mariokart.dir/src/images.c.o" "gcc" "CMakeFiles/mariokart.dir/src/images.c.o.d"
"/home/heath/mk-gint/src/main.c" "CMakeFiles/mariokart.dir/src/main.c.o" "gcc" "CMakeFiles/mariokart.dir/src/main.c.o.d"
"/home/heath/mk-gint/src/maths.c" "CMakeFiles/mariokart.dir/src/maths.c.o" "gcc" "CMakeFiles/mariokart.dir/src/maths.c.o.d"
"/home/heath/mk-gint/src/miniz.c" "CMakeFiles/mariokart.dir/src/miniz.c.o" "gcc" "CMakeFiles/mariokart.dir/src/miniz.c.o.d"
"/home/heath/mk-gint/src/particles.c" "CMakeFiles/mariokart.dir/src/particles.c.o" "gcc" "CMakeFiles/mariokart.dir/src/particles.c.o.d"
"/home/heath/mk-gint/src/physics.c" "CMakeFiles/mariokart.dir/src/physics.c.o" "gcc" "CMakeFiles/mariokart.dir/src/physics.c.o.d"
"/home/heath/mk-gint/src/platforms/emscripten.c" "CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o" "gcc" "CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o.d"

View File

@ -97,10 +97,24 @@ CMakeFiles/mariokart.dir/src/buttons.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mariokart.dir/src/buttons.c.s"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/heath/mk-gint/src/buttons.c -o CMakeFiles/mariokart.dir/src/buttons.c.s
CMakeFiles/mariokart.dir/src/data.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/data.c.o: ../src/data.c
CMakeFiles/mariokart.dir/src/data.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/mariokart.dir/src/data.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/data.c.o -MF CMakeFiles/mariokart.dir/src/data.c.o.d -o CMakeFiles/mariokart.dir/src/data.c.o -c /home/heath/mk-gint/src/data.c
CMakeFiles/mariokart.dir/src/data.c.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/mariokart.dir/src/data.c.i"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/heath/mk-gint/src/data.c > CMakeFiles/mariokart.dir/src/data.c.i
CMakeFiles/mariokart.dir/src/data.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mariokart.dir/src/data.c.s"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/heath/mk-gint/src/data.c -o CMakeFiles/mariokart.dir/src/data.c.s
CMakeFiles/mariokart.dir/src/debugHud.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/debugHud.c.o: ../src/debugHud.c
CMakeFiles/mariokart.dir/src/debugHud.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/mariokart.dir/src/debugHud.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object CMakeFiles/mariokart.dir/src/debugHud.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/debugHud.c.o -MF CMakeFiles/mariokart.dir/src/debugHud.c.o.d -o CMakeFiles/mariokart.dir/src/debugHud.c.o -c /home/heath/mk-gint/src/debugHud.c
CMakeFiles/mariokart.dir/src/debugHud.c.i: cmake_force
@ -114,7 +128,7 @@ CMakeFiles/mariokart.dir/src/debugHud.c.s: cmake_force
CMakeFiles/mariokart.dir/src/images.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/images.c.o: ../src/images.c
CMakeFiles/mariokart.dir/src/images.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building C object CMakeFiles/mariokart.dir/src/images.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building C object CMakeFiles/mariokart.dir/src/images.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/images.c.o -MF CMakeFiles/mariokart.dir/src/images.c.o.d -o CMakeFiles/mariokart.dir/src/images.c.o -c /home/heath/mk-gint/src/images.c
CMakeFiles/mariokart.dir/src/images.c.i: cmake_force
@ -128,7 +142,7 @@ CMakeFiles/mariokart.dir/src/images.c.s: cmake_force
CMakeFiles/mariokart.dir/src/main.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/main.c.o: ../src/main.c
CMakeFiles/mariokart.dir/src/main.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building C object CMakeFiles/mariokart.dir/src/main.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building C object CMakeFiles/mariokart.dir/src/main.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/main.c.o -MF CMakeFiles/mariokart.dir/src/main.c.o.d -o CMakeFiles/mariokart.dir/src/main.c.o -c /home/heath/mk-gint/src/main.c
CMakeFiles/mariokart.dir/src/main.c.i: cmake_force
@ -142,7 +156,7 @@ CMakeFiles/mariokart.dir/src/main.c.s: cmake_force
CMakeFiles/mariokart.dir/src/maths.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/maths.c.o: ../src/maths.c
CMakeFiles/mariokart.dir/src/maths.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building C object CMakeFiles/mariokart.dir/src/maths.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building C object CMakeFiles/mariokart.dir/src/maths.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/maths.c.o -MF CMakeFiles/mariokart.dir/src/maths.c.o.d -o CMakeFiles/mariokart.dir/src/maths.c.o -c /home/heath/mk-gint/src/maths.c
CMakeFiles/mariokart.dir/src/maths.c.i: cmake_force
@ -153,10 +167,24 @@ CMakeFiles/mariokart.dir/src/maths.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mariokart.dir/src/maths.c.s"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/heath/mk-gint/src/maths.c -o CMakeFiles/mariokart.dir/src/maths.c.s
CMakeFiles/mariokart.dir/src/miniz.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/miniz.c.o: ../src/miniz.c
CMakeFiles/mariokart.dir/src/miniz.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building C object CMakeFiles/mariokart.dir/src/miniz.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/miniz.c.o -MF CMakeFiles/mariokart.dir/src/miniz.c.o.d -o CMakeFiles/mariokart.dir/src/miniz.c.o -c /home/heath/mk-gint/src/miniz.c
CMakeFiles/mariokart.dir/src/miniz.c.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/mariokart.dir/src/miniz.c.i"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/heath/mk-gint/src/miniz.c > CMakeFiles/mariokart.dir/src/miniz.c.i
CMakeFiles/mariokart.dir/src/miniz.c.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/mariokart.dir/src/miniz.c.s"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/heath/mk-gint/src/miniz.c -o CMakeFiles/mariokart.dir/src/miniz.c.s
CMakeFiles/mariokart.dir/src/particles.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/particles.c.o: ../src/particles.c
CMakeFiles/mariokart.dir/src/particles.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building C object CMakeFiles/mariokart.dir/src/particles.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building C object CMakeFiles/mariokart.dir/src/particles.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/particles.c.o -MF CMakeFiles/mariokart.dir/src/particles.c.o.d -o CMakeFiles/mariokart.dir/src/particles.c.o -c /home/heath/mk-gint/src/particles.c
CMakeFiles/mariokart.dir/src/particles.c.i: cmake_force
@ -170,7 +198,7 @@ CMakeFiles/mariokart.dir/src/particles.c.s: cmake_force
CMakeFiles/mariokart.dir/src/physics.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/physics.c.o: ../src/physics.c
CMakeFiles/mariokart.dir/src/physics.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building C object CMakeFiles/mariokart.dir/src/physics.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building C object CMakeFiles/mariokart.dir/src/physics.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/physics.c.o -MF CMakeFiles/mariokart.dir/src/physics.c.o.d -o CMakeFiles/mariokart.dir/src/physics.c.o -c /home/heath/mk-gint/src/physics.c
CMakeFiles/mariokart.dir/src/physics.c.i: cmake_force
@ -184,7 +212,7 @@ CMakeFiles/mariokart.dir/src/physics.c.s: cmake_force
CMakeFiles/mariokart.dir/src/sprites.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/sprites.c.o: ../src/sprites.c
CMakeFiles/mariokart.dir/src/sprites.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building C object CMakeFiles/mariokart.dir/src/sprites.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building C object CMakeFiles/mariokart.dir/src/sprites.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/sprites.c.o -MF CMakeFiles/mariokart.dir/src/sprites.c.o.d -o CMakeFiles/mariokart.dir/src/sprites.c.o -c /home/heath/mk-gint/src/sprites.c
CMakeFiles/mariokart.dir/src/sprites.c.i: cmake_force
@ -198,7 +226,7 @@ CMakeFiles/mariokart.dir/src/sprites.c.s: cmake_force
CMakeFiles/mariokart.dir/src/state.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/state.c.o: ../src/state.c
CMakeFiles/mariokart.dir/src/state.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building C object CMakeFiles/mariokart.dir/src/state.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building C object CMakeFiles/mariokart.dir/src/state.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/state.c.o -MF CMakeFiles/mariokart.dir/src/state.c.o.d -o CMakeFiles/mariokart.dir/src/state.c.o -c /home/heath/mk-gint/src/state.c
CMakeFiles/mariokart.dir/src/state.c.i: cmake_force
@ -212,7 +240,7 @@ CMakeFiles/mariokart.dir/src/state.c.s: cmake_force
CMakeFiles/mariokart.dir/src/tilemap.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/tilemap.c.o: ../src/tilemap.c
CMakeFiles/mariokart.dir/src/tilemap.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building C object CMakeFiles/mariokart.dir/src/tilemap.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Building C object CMakeFiles/mariokart.dir/src/tilemap.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/tilemap.c.o -MF CMakeFiles/mariokart.dir/src/tilemap.c.o.d -o CMakeFiles/mariokart.dir/src/tilemap.c.o -c /home/heath/mk-gint/src/tilemap.c
CMakeFiles/mariokart.dir/src/tilemap.c.i: cmake_force
@ -226,7 +254,7 @@ CMakeFiles/mariokart.dir/src/tilemap.c.s: cmake_force
CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o: CMakeFiles/mariokart.dir/flags.make
CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o: ../src/platforms/emscripten.c
CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o: CMakeFiles/mariokart.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building C object CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_14) "Building C object CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o"
/usr/lib/emscripten/emcc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o -MF CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o.d -o CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o -c /home/heath/mk-gint/src/platforms/emscripten.c
CMakeFiles/mariokart.dir/src/platforms/emscripten.c.i: cmake_force
@ -241,10 +269,12 @@ CMakeFiles/mariokart.dir/src/platforms/emscripten.c.s: cmake_force
mariokart_OBJECTS = \
"CMakeFiles/mariokart.dir/src/3d.c.o" \
"CMakeFiles/mariokart.dir/src/buttons.c.o" \
"CMakeFiles/mariokart.dir/src/data.c.o" \
"CMakeFiles/mariokart.dir/src/debugHud.c.o" \
"CMakeFiles/mariokart.dir/src/images.c.o" \
"CMakeFiles/mariokart.dir/src/main.c.o" \
"CMakeFiles/mariokart.dir/src/maths.c.o" \
"CMakeFiles/mariokart.dir/src/miniz.c.o" \
"CMakeFiles/mariokart.dir/src/particles.c.o" \
"CMakeFiles/mariokart.dir/src/physics.c.o" \
"CMakeFiles/mariokart.dir/src/sprites.c.o" \
@ -257,10 +287,12 @@ mariokart_EXTERNAL_OBJECTS =
mariokart.html: CMakeFiles/mariokart.dir/src/3d.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/buttons.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/data.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/debugHud.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/images.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/main.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/maths.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/miniz.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/particles.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/physics.c.o
mariokart.html: CMakeFiles/mariokart.dir/src/sprites.c.o
@ -270,7 +302,7 @@ mariokart.html: CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o
mariokart.html: CMakeFiles/mariokart.dir/build.make
mariokart.html: CMakeFiles/mariokart.dir/objects1.rsp
mariokart.html: CMakeFiles/mariokart.dir/link.txt
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Linking C executable mariokart.html"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/heath/mk-gint/build-em/CMakeFiles --progress-num=$(CMAKE_PROGRESS_15) "Linking C executable mariokart.html"
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/mariokart.dir/link.txt --verbose=$(VERBOSE)
# Rule to build all files generated by this target.

View File

@ -3,6 +3,8 @@ file(REMOVE_RECURSE
"CMakeFiles/mariokart.dir/src/3d.c.o.d"
"CMakeFiles/mariokart.dir/src/buttons.c.o"
"CMakeFiles/mariokart.dir/src/buttons.c.o.d"
"CMakeFiles/mariokart.dir/src/data.c.o"
"CMakeFiles/mariokart.dir/src/data.c.o.d"
"CMakeFiles/mariokart.dir/src/debugHud.c.o"
"CMakeFiles/mariokart.dir/src/debugHud.c.o.d"
"CMakeFiles/mariokart.dir/src/images.c.o"
@ -11,6 +13,8 @@ file(REMOVE_RECURSE
"CMakeFiles/mariokart.dir/src/main.c.o.d"
"CMakeFiles/mariokart.dir/src/maths.c.o"
"CMakeFiles/mariokart.dir/src/maths.c.o.d"
"CMakeFiles/mariokart.dir/src/miniz.c.o"
"CMakeFiles/mariokart.dir/src/miniz.c.o.d"
"CMakeFiles/mariokart.dir/src/particles.c.o"
"CMakeFiles/mariokart.dir/src/particles.c.o.d"
"CMakeFiles/mariokart.dir/src/physics.c.o"

View File

@ -20,6 +20,28 @@ CMakeFiles/mariokart.dir/src/buttons.c.o
/home/heath/mk-gint/src/platforms/emscripten.h
/home/heath/mk-gint/src/main.h
CMakeFiles/mariokart.dir/src/data.c.o
/home/heath/mk-gint/src/data.c
/home/heath/mk-gint/src/data.h
/home/heath/mk-gint/src/miniz.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stddef.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h
/home/heath/.emscripten_cache/sysroot/include/assert.h
/home/heath/.emscripten_cache/sysroot/include/features.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h
/home/heath/.emscripten_cache/sysroot/include/stdint.h
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h
/home/heath/.emscripten_cache/sysroot/include/compat/stdlib.h
/home/heath/.emscripten_cache/sysroot/include/stdlib.h
/home/heath/.emscripten_cache/sysroot/include/alloca.h
/home/heath/.emscripten_cache/sysroot/include/compat/string.h
/home/heath/.emscripten_cache/sysroot/include/string.h
/home/heath/.emscripten_cache/sysroot/include/strings.h
/home/heath/.emscripten_cache/sysroot/include/stdio.h
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h
/home/heath/mk-gint/data-headers/compressedTrack.h
CMakeFiles/mariokart.dir/src/debugHud.c.o
/home/heath/mk-gint/src/debugHud.c
/home/heath/mk-gint/src/debugHud.h
@ -58,6 +80,7 @@ CMakeFiles/mariokart.dir/src/main.c.o
/home/heath/mk-gint/src/sprites.h
/home/heath/mk-gint/src/debugHud.h
/home/heath/mk-gint/src/particles.h
/home/heath/mk-gint/src/data.h
/home/heath/mk-gint/data-headers/images.h
/home/heath/mk-gint/src/platforms/gint.h
/home/heath/.emscripten_cache/sysroot/include/stdio.h
@ -75,6 +98,26 @@ CMakeFiles/mariokart.dir/src/maths.c.o
/home/heath/mk-gint/src/maths.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h
CMakeFiles/mariokart.dir/src/miniz.c.o
/home/heath/mk-gint/src/miniz.c
/home/heath/mk-gint/src/miniz.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stddef.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h
/home/heath/.emscripten_cache/sysroot/include/assert.h
/home/heath/.emscripten_cache/sysroot/include/features.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h
/home/heath/.emscripten_cache/sysroot/include/stdint.h
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h
/home/heath/.emscripten_cache/sysroot/include/compat/stdlib.h
/home/heath/.emscripten_cache/sysroot/include/stdlib.h
/home/heath/.emscripten_cache/sysroot/include/alloca.h
/home/heath/.emscripten_cache/sysroot/include/compat/string.h
/home/heath/.emscripten_cache/sysroot/include/string.h
/home/heath/.emscripten_cache/sysroot/include/strings.h
/home/heath/.emscripten_cache/sysroot/include/stdio.h
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h
CMakeFiles/mariokart.dir/src/particles.c.o
/home/heath/mk-gint/src/particles.c
/home/heath/mk-gint/src/particles.h
@ -141,5 +184,6 @@ CMakeFiles/mariokart.dir/src/tilemap.c.o
/home/heath/mk-gint/src/tilemap.h
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h
/home/heath/mk-gint/src/main.h
/home/heath/mk-gint/src/data.h
/home/heath/mk-gint/data-headers/track.h

View File

@ -18,6 +18,27 @@ CMakeFiles/mariokart.dir/src/buttons.c.o: ../src/buttons.c \
../src/platforms/emscripten.h \
../src/main.h
CMakeFiles/mariokart.dir/src/data.c.o: ../src/data.c \
../src/data.h \
../src/miniz.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stddef.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h \
/home/heath/.emscripten_cache/sysroot/include/assert.h \
/home/heath/.emscripten_cache/sysroot/include/features.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h \
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/compat/stdlib.h \
/home/heath/.emscripten_cache/sysroot/include/stdlib.h \
/home/heath/.emscripten_cache/sysroot/include/alloca.h \
/home/heath/.emscripten_cache/sysroot/include/compat/string.h \
/home/heath/.emscripten_cache/sysroot/include/string.h \
/home/heath/.emscripten_cache/sysroot/include/strings.h \
/home/heath/.emscripten_cache/sysroot/include/stdio.h \
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h \
../data-headers/compressedTrack.h
CMakeFiles/mariokart.dir/src/debugHud.c.o: ../src/debugHud.c \
../src/debugHud.h \
/home/heath/.emscripten_cache/sysroot/include/stdio.h \
@ -53,6 +74,7 @@ CMakeFiles/mariokart.dir/src/main.c.o: ../src/main.c \
../src/sprites.h \
../src/debugHud.h \
../src/particles.h \
../src/data.h \
../data-headers/images.h \
../src/platforms/gint.h \
/home/heath/.emscripten_cache/sysroot/include/stdio.h \
@ -69,6 +91,25 @@ CMakeFiles/mariokart.dir/src/maths.c.o: ../src/maths.c \
../src/maths.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h
CMakeFiles/mariokart.dir/src/miniz.c.o: ../src/miniz.c \
../src/miniz.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stddef.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h \
/home/heath/.emscripten_cache/sysroot/include/assert.h \
/home/heath/.emscripten_cache/sysroot/include/features.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h \
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h \
/home/heath/.emscripten_cache/sysroot/include/compat/stdlib.h \
/home/heath/.emscripten_cache/sysroot/include/stdlib.h \
/home/heath/.emscripten_cache/sysroot/include/alloca.h \
/home/heath/.emscripten_cache/sysroot/include/compat/string.h \
/home/heath/.emscripten_cache/sysroot/include/string.h \
/home/heath/.emscripten_cache/sysroot/include/strings.h \
/home/heath/.emscripten_cache/sysroot/include/stdio.h \
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h
CMakeFiles/mariokart.dir/src/particles.c.o: ../src/particles.c \
../src/particles.h \
../src/sprites.h \
@ -129,115 +170,140 @@ CMakeFiles/mariokart.dir/src/tilemap.c.o: ../src/tilemap.c \
../src/tilemap.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h \
../src/main.h \
../src/data.h \
../data-headers/track.h
../data-headers/track.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/html5_webgl.h:
/home/heath/.emscripten_cache/sysroot/include/sched.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/version.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_js.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_types.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_macros.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_asm.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/emscripten.h:
../src/platforms/emscripten.c:
../src/physics.c:
/home/heath/.emscripten_cache/sysroot/include/emscripten/console.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/html5.h:
../src/particles.c:
../src/tilemap.c:
../src/state.c:
../src/maths.c:
../src/platforms/gint.h:
../data-headers/images.h:
../src/sprites.c:
../src/sprites.h:
../data-headers/generated_lut.h:
../src/maths.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/console.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/eventloop.h:
../src/buttons.h:
/home/heath/.emscripten_cache/sysroot/include/time.h:
../src/main.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten.h:
../src/buttons.c:
/home/heath/.emscripten_cache/sysroot/include/strings.h:
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h:
../src/particles.h:
../src/platforms/emscripten.h:
../src/3d.h:
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h:
/home/heath/.emscripten_cache/sysroot/include/compat/time.h:
../src/tilemap.h:
../src/3d.c:
/home/heath/.emscripten_cache/sysroot/include/time.h:
../src/platform.h:
/home/heath/.emscripten_cache/sysroot/include/string.h:
/home/heath/.emscripten_cache/sysroot/include/stdio.h:
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h:
../src/platform.h:
../src/particles.h:
/home/heath/.emscripten_cache/sysroot/include/stdint.h:
/home/heath/.emscripten_cache/sysroot/include/alloca.h:
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h:
../src/debugHud.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/wget.h:
/home/heath/.emscripten_cache/sysroot/include/features.h:
/opt/emscripten-llvm/lib/clang/15.0.0/include/stddef.h:
/home/heath/.emscripten_cache/sysroot/include/compat/string.h:
../src/images.c:
../src/debugHud.c:
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/wget.h:
../src/debugHud.h:
/home/heath/.emscripten_cache/sysroot/include/bits/alltypes.h:
/home/heath/.emscripten_cache/sysroot/include/stdint.h:
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h:
/home/heath/.emscripten_cache/sysroot/include/features.h:
../src/miniz.h:
../src/state.h:
../src/tilemap.c:
../src/3d.c:
/home/heath/.emscripten_cache/sysroot/include/pthread.h:
../src/tilemap.h:
/home/heath/.emscripten_cache/sysroot/include/compat/time.h:
/opt/emscripten-llvm/lib/clang/15.0.0/include/__stddef_max_align_t.h:
../src/data.h:
../src/3d.h:
../src/platforms/emscripten.h:
../src/buttons.c:
/home/heath/.emscripten_cache/sysroot/include/stdlib.h:
/home/heath/.emscripten_cache/sysroot/include/bits/stdint.h:
../src/main.h:
../src/data.c:
../src/buttons.h:
../src/maths.h:
../data-headers/generated_lut.h:
/home/heath/.emscripten_cache/sysroot/include/assert.h:
/home/heath/.emscripten_cache/sysroot/include/wasi/api.h:
../data-headers/compressedTrack.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten.h:
../data-headers/images.c:
/home/heath/.emscripten_cache/sysroot/include/pthread.h:
../src/physics.h:
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdint.h:
../src/main.c:
../src/sprites.h:
../data-headers/images.h:
../src/platforms/gint.h:
../src/maths.c:
/home/heath/.emscripten_cache/sysroot/include/compat/stdlib.h:
../src/miniz.c:
../src/particles.c:
/home/heath/.emscripten_cache/sysroot/include/emscripten/html5.h:
../src/physics.c:
../src/platforms/emscripten.c:
/home/heath/.emscripten_cache/sysroot/include/emscripten/emscripten.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_asm.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_macros.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_types.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/html5_webgl.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/em_js.h:
/home/heath/.emscripten_cache/sysroot/include/emscripten/version.h:
/home/heath/.emscripten_cache/sysroot/include/sched.h:

View File

@ -1 +1 @@
CMakeFiles/mariokart.dir/src/3d.c.o CMakeFiles/mariokart.dir/src/buttons.c.o CMakeFiles/mariokart.dir/src/debugHud.c.o CMakeFiles/mariokart.dir/src/images.c.o CMakeFiles/mariokart.dir/src/main.c.o CMakeFiles/mariokart.dir/src/maths.c.o CMakeFiles/mariokart.dir/src/particles.c.o CMakeFiles/mariokart.dir/src/physics.c.o CMakeFiles/mariokart.dir/src/sprites.c.o CMakeFiles/mariokart.dir/src/state.c.o CMakeFiles/mariokart.dir/src/tilemap.c.o CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o
CMakeFiles/mariokart.dir/src/3d.c.o CMakeFiles/mariokart.dir/src/buttons.c.o CMakeFiles/mariokart.dir/src/data.c.o CMakeFiles/mariokart.dir/src/debugHud.c.o CMakeFiles/mariokart.dir/src/images.c.o CMakeFiles/mariokart.dir/src/main.c.o CMakeFiles/mariokart.dir/src/maths.c.o CMakeFiles/mariokart.dir/src/miniz.c.o CMakeFiles/mariokart.dir/src/particles.c.o CMakeFiles/mariokart.dir/src/physics.c.o CMakeFiles/mariokart.dir/src/sprites.c.o CMakeFiles/mariokart.dir/src/state.c.o CMakeFiles/mariokart.dir/src/tilemap.c.o CMakeFiles/mariokart.dir/src/platforms/emscripten.c.o

View File

@ -11,4 +11,6 @@ CMAKE_PROGRESS_10 = 10
CMAKE_PROGRESS_11 = 11
CMAKE_PROGRESS_12 = 12
CMAKE_PROGRESS_13 = 13
CMAKE_PROGRESS_14 = 14
CMAKE_PROGRESS_15 = 15

View File

@ -8,7 +8,7 @@ CMakeFiles/mariokart.dir/src/main.c.o: /home/heath/mk-gint/src/main.c \
/home/heath/mk-gint/src/./tilemap.h \
/home/heath/mk-gint/src/./sprites.h \
/home/heath/mk-gint/src/./debugHud.h \
/home/heath/mk-gint/src/./particles.h \
/home/heath/mk-gint/src/./particles.h /home/heath/mk-gint/src/./data.h \
/home/heath/mk-gint/src/../data-headers/images.h \
/home/heath/mk-gint/src/platforms/gint.h \
/home/heath/.emscripten_cache/sysroot/include/stdio.h \

View File

@ -1,5 +1,5 @@
CMakeFiles/mariokart.dir/src/tilemap.c.o: \
/home/heath/mk-gint/src/tilemap.c /home/heath/mk-gint/src/./tilemap.h \
/opt/emscripten-llvm/lib/clang/15.0.0/include/stdbool.h \
/home/heath/mk-gint/src/./main.h \
/home/heath/mk-gint/src/./main.h /home/heath/mk-gint/src/./data.h \
/home/heath/mk-gint/src/../data-headers/track.h

View File

@ -1 +1 @@
13
15

View File

@ -177,6 +177,30 @@ src/buttons.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/buttons.c.s
.PHONY : src/buttons.c.s
src/data.o: src/data.c.o
.PHONY : src/data.o
# target to build an object file
src/data.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/data.c.o
.PHONY : src/data.c.o
src/data.i: src/data.c.i
.PHONY : src/data.i
# target to preprocess a source file
src/data.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/data.c.i
.PHONY : src/data.c.i
src/data.s: src/data.c.s
.PHONY : src/data.s
# target to generate assembly for a file
src/data.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/data.c.s
.PHONY : src/data.c.s
src/debugHud.o: src/debugHud.c.o
.PHONY : src/debugHud.o
@ -273,6 +297,30 @@ src/maths.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/maths.c.s
.PHONY : src/maths.c.s
src/miniz.o: src/miniz.c.o
.PHONY : src/miniz.o
# target to build an object file
src/miniz.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/miniz.c.o
.PHONY : src/miniz.c.o
src/miniz.i: src/miniz.c.i
.PHONY : src/miniz.i
# target to preprocess a source file
src/miniz.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/miniz.c.i
.PHONY : src/miniz.c.i
src/miniz.s: src/miniz.c.s
.PHONY : src/miniz.s
# target to generate assembly for a file
src/miniz.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/mariokart.dir/build.make CMakeFiles/mariokart.dir/src/miniz.c.s
.PHONY : src/miniz.c.s
src/particles.o: src/particles.c.o
.PHONY : src/particles.o
@ -432,6 +480,9 @@ help:
@echo "... src/buttons.o"
@echo "... src/buttons.i"
@echo "... src/buttons.s"
@echo "... src/data.o"
@echo "... src/data.i"
@echo "... src/data.s"
@echo "... src/debugHud.o"
@echo "... src/debugHud.i"
@echo "... src/debugHud.s"
@ -444,6 +495,9 @@ help:
@echo "... src/maths.o"
@echo "... src/maths.i"
@echo "... src/maths.s"
@echo "... src/miniz.o"
@echo "... src/miniz.i"
@echo "... src/miniz.s"
@echo "... src/particles.o"
@echo "... src/particles.i"
@echo "... src/particles.s"

View File

@ -1692,8 +1692,8 @@ var tempI64;
// === Body ===
var ASM_CONSTS = {
529604: () => { window.canvasContext = Module['canvas'].getContext('2d'); window.canvasImageData = canvasContext.getImageData(0, 0, 396, 224); },
529735: ($0) => { let data = Module.HEAPU8.slice($0, $0 + 396 * 224 * 4); canvasImageData.data.set(data); canvasContext.putImageData(canvasImageData, 0, 0); }
490692: () => { window.canvasContext = Module['canvas'].getContext('2d'); window.canvasImageData = canvasContext.getImageData(0, 0, 396, 224); },
490823: ($0) => { let data = Module.HEAPU8.slice($0, $0 + 396 * 224 * 4); canvasImageData.data.set(data); canvasContext.putImageData(canvasImageData, 0, 0); }
};
function getTimeMS() { return Date.now() - 1657104690407; }
function logInit() { console.log("platformInit"); }
@ -1842,6 +1842,10 @@ function logInit() { console.log("platformInit"); }
return demangleAll(js);
}
function ___assert_fail(condition, filename, line, func) {
abort('Assertion failed: ' + UTF8ToString(condition) + ', at: ' + [filename ? UTF8ToString(filename) : 'unknown filename', line, func ? UTF8ToString(func) : 'unknown function']);
}
var readAsmConstArgsArray = [];
function readAsmConstArgs(sigPtr, buf) {
// Nobody should have mutated _readAsmConstArgsArray underneath us to be something else than an array.
@ -2861,6 +2865,53 @@ function logInit() { console.log("platformInit"); }
var browserIterationFunc = getWasmTableEntry(func);
setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop);
}
var printCharBuffers = [null,[],[]];
function printChar(stream, curr) {
var buffer = printCharBuffers[stream];
assert(buffer);
if (curr === 0 || curr === 10) {
(stream === 1 ? out : err)(UTF8ArrayToString(buffer, 0));
buffer.length = 0;
} else {
buffer.push(curr);
}
}
function flush_NO_FILESYSTEM() {
// flush anything remaining in the buffers during shutdown
_fflush(0);
if (printCharBuffers[1].length) printChar(1, 10);
if (printCharBuffers[2].length) printChar(2, 10);
}
var SYSCALLS = {varargs:undefined,get:function() {
assert(SYSCALLS.varargs != undefined);
SYSCALLS.varargs += 4;
var ret = HEAP32[(((SYSCALLS.varargs)-(4))>>2)];
return ret;
},getStr:function(ptr) {
var ret = UTF8ToString(ptr);
return ret;
}};
function _fd_write(fd, iov, iovcnt, pnum) {
// hack to support printf in SYSCALLS_REQUIRE_FILESYSTEM=0
var num = 0;
for (var i = 0; i < iovcnt; i++) {
var ptr = HEAPU32[((iov)>>2)];
var len = HEAPU32[(((iov)+(4))>>2)];
iov += 8;
for (var j = 0; j < len; j++) {
printChar(fd, HEAPU8[ptr+j]);
}
num += len;
}
HEAPU32[((pnum)>>2)] = num;
return 0;
}
function _setTempRet0(val) {
setTempRet0(val);
}
Module["requestFullscreen"] = function Module_requestFullscreen(lockPointer, resizeCanvas) { Browser.requestFullscreen(lockPointer, resizeCanvas) };
Module["requestFullScreen"] = function Module_requestFullScreen() { Browser.requestFullScreen() };
Module["requestAnimationFrame"] = function Module_requestAnimationFrame(func) { Browser.requestAnimationFrame(func) };
@ -2905,6 +2956,7 @@ function checkIncomingModuleAPI() {
ignoredModuleProp('fetchSettings');
}
var asmLibraryArg = {
"__assert_fail": ___assert_fail,
"emscripten_asm_const_int": _emscripten_asm_const_int,
"emscripten_memcpy_big": _emscripten_memcpy_big,
"emscripten_resize_heap": _emscripten_resize_heap,
@ -2912,13 +2964,18 @@ var asmLibraryArg = {
"emscripten_set_keydown_callback_on_thread": _emscripten_set_keydown_callback_on_thread,
"emscripten_set_keyup_callback_on_thread": _emscripten_set_keyup_callback_on_thread,
"emscripten_set_main_loop": _emscripten_set_main_loop,
"fd_write": _fd_write,
"getTimeMS": getTimeMS,
"logInit": logInit
"logInit": logInit,
"setTempRet0": _setTempRet0
};
var asm = createWasm();
/** @type {function(...*):?} */
var ___wasm_call_ctors = Module["___wasm_call_ctors"] = createExportWrapper("__wasm_call_ctors");
/** @type {function(...*):?} */
var _malloc = Module["_malloc"] = createExportWrapper("malloc");
/** @type {function(...*):?} */
var _main = Module["_main"] = createExportWrapper("main");
@ -2928,9 +2985,6 @@ var ___errno_location = Module["___errno_location"] = createExportWrapper("__err
/** @type {function(...*):?} */
var _fflush = Module["_fflush"] = createExportWrapper("fflush");
/** @type {function(...*):?} */
var _malloc = Module["_malloc"] = createExportWrapper("malloc");
/** @type {function(...*):?} */
var _emscripten_stack_init = Module["_emscripten_stack_init"] = function() {
return (_emscripten_stack_init = Module["_emscripten_stack_init"] = Module["asm"]["emscripten_stack_init"]).apply(null, arguments);
@ -2960,6 +3014,9 @@ var stackRestore = Module["stackRestore"] = createExportWrapper("stackRestore");
/** @type {function(...*):?} */
var stackAlloc = Module["stackAlloc"] = createExportWrapper("stackAlloc");
/** @type {function(...*):?} */
var dynCall_jiji = Module["dynCall_jiji"] = createExportWrapper("dynCall_jiji");
@ -3324,7 +3381,7 @@ function checkUnflushedContent() {
has = true;
}
try { // it doesn't matter if it fails
_fflush(0);
flush_NO_FILESYSTEM();
} catch(e) {}
out = oldOut;
err = oldErr;

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -37,7 +37,6 @@ extern const unsigned short img_boost_2[1524];
extern const unsigned short img_boost_3[2304];
extern const unsigned short img_boost_4[2748];
extern const unsigned short* imgs_boost[5];
extern const unsigned short img_fire[244];
extern const unsigned short img_font_0[114];
extern const unsigned short img_font_1[59];
extern const unsigned short img_font_2[114];
@ -55,3 +54,17 @@ extern const unsigned short img_countdown_1[2864];
extern const unsigned short img_countdown_2[3588];
extern const unsigned short img_countdown_3[3709];
extern const unsigned short* imgs_countdown[4];
extern const unsigned short img_fire_0[244];
extern const unsigned short img_fire_1[244];
extern const unsigned short img_fire_2[244];
extern const unsigned short* imgs_fire[3];
extern const unsigned short img_smallboost_0[160];
extern const unsigned short img_smallboost_1[1028];
extern const unsigned short img_smallboost_2[814];
extern const unsigned short img_smallboost_3[1524];
extern const unsigned short img_smallboost_4[2636];
extern const unsigned short* imgs_smallboost[5];
extern const unsigned short img_lap_0[1108];
extern const unsigned short img_lap_1[1108];
extern const unsigned short img_lap_2[1108];
extern const unsigned short* imgs_lap[3];

View File

@ -257,7 +257,7 @@ const unsigned short tileData[256][256] = {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
};
const unsigned char trackData[256*256] = {
/* const unsigned char trackData[256*256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -514,7 +514,7 @@ const unsigned char trackData[256*256] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
}; */
#define trackImageWidth 256 * 8
#define trackImageHeight 256 * 8

View File

@ -25,6 +25,10 @@ def toData(path):
# Crop the image to the box.
img = img.crop(box)
# Reduce palette
img = img.convert("P", palette=Image.ADAPTIVE, colors=256)
img = img.convert("RGBA")
# Add the height and width to the header.
outData.append(img.size[0])
outData.append(img.size[1])

View File

@ -14,7 +14,8 @@ sizes = {
"int": 4,
"long": 8,
"float": 4,
"double": 8
"double": 8,
"ParticleType": 12
}
aliases = {
@ -39,30 +40,62 @@ for directory in includedDirectories:
# Read each file and get the size of each array.
arrays = []
for file in files:
if file.endswith("miniz.c") or file.endswith("miniz.h"):
continue
with open(file, "r") as f:
content = f.read()
# The first group is the name and type of the array, the rest are the dimensions.
for match in regex.finditer(content):
nameAndType = match.group(1)
name = nameAndType.split(" ")[-1]
typeName = " ".join(nameAndType.split(" ")[:-1])
typeSize = sizes[typeName.split("unsigned ")[-1]]
try:
name = nameAndType.split(" ")[-1]
typeName = " ".join(nameAndType.split(" ")[:-1])
typeSize = sizes[typeName.split("unsigned ")[-1]]
dimensions = [match.group(i) for i in range(2, len(match.groups()) + 1)]
# Filter out the None values.
dimensions = [dimension for dimension in dimensions if dimension is not None]
# Resolve the aliases.
for alias in aliases:
if alias in dimensions:
dimensions[dimensions.index(alias)] = aliases[alias]
# Multiply the dimensions together.
size = typeSize
for dimension in dimensions:
size *= int(dimension)
arrays.append((name, size))
dimensions = [match.group(i) for i in range(2, len(match.groups()) + 1)]
# Filter out the None values.
dimensions = [dimension for dimension in dimensions if dimension is not None]
# Resolve the aliases.
for alias in aliases:
if alias in dimensions:
dimensions[dimensions.index(alias)] = aliases[alias]
# Multiply the dimensions together.
size = typeSize
for dimension in dimensions:
size *= int(dimension)
arrays.append((name, size))
except Exception as e:
print(f"Array: {nameAndType}")
print(f"Error: {e}")
print(f"File: {file}")
# Merge img_name_0, img_name_1, ... into img_name.
for i in range(len(arrays)):
name = arrays[i][0]
# If it ends with _0, _1, ... _10 etc. remove the number.
if name.split("_")[-1].isnumeric():
name = "_".join(name.split("_")[:-1])
arrays[i] = (name, arrays[i][1])
# Now merge the arrays with the same name.
# First, sort the arrays alphabetically.
arrays.sort(key=lambda x: x[0])
# Then, merge the arrays with the same name.
mergedArrays = []
for i in range(len(arrays)):
if i == 0:
mergedArrays.append(arrays[i])
else:
if arrays[i][0] == mergedArrays[-1][0]:
mergedArrays[-1] = (mergedArrays[-1][0], mergedArrays[-1][1] + arrays[i][1])
else:
mergedArrays.append(arrays[i])
arrays = mergedArrays
# Sort the arrays by size - biggest to smallest.
arrays.sort(key=lambda x: x[1], reverse=True)
# Print the arrays with human-readable sizes in KB.
for array in arrays:
print(f"{array[0]}: {array[1] / 1024:.2f} KB")

View File

@ -9,6 +9,7 @@
#include "./buttons.h"
#include "./debugHud.h"
#include "./particles.h"
#include "./data.h"
#include "../data-headers/images.h"
#include "platforms/gint.h"
@ -178,6 +179,7 @@ void main_loop() {
// Main game loop
scanButtons();
bool didFinishLap = false;
if (state.totalFrameCount > 180) {
if (buttons.save) {
savedState = state;
@ -214,9 +216,9 @@ void main_loop() {
} */
}
if (state.driftCharge > 60) {
state.driftCharge = 60;
}
// if (state.driftCharge > 60) {
// state.driftCharge = 60;
// }
/* if (state.driftCharge > 0) {
// Draw a 4px red bar at the top of the screen
@ -231,8 +233,16 @@ void main_loop() {
if (!buttons.hop) {
if (state.drifting && state.driftCharge >= 60) {
state.boostTime = 30;
addParticle(1, LCD_WIDTH_PX / 2 - 28, LCD_HEIGHT_PX - 70, 0, 0);
if (state.driftCharge > 360) {
state.boostTime = 100;
addParticle(2, LCD_WIDTH_PX / 2 - 28, LCD_HEIGHT_PX - 70, 0, 0);
} else if (state.driftCharge >= 180) {
state.boostTime = 50;
addParticle(1, LCD_WIDTH_PX / 2 - 28, LCD_HEIGHT_PX - 70, 0, 0);
} else {
state.boostTime = 20;
addParticle(3, LCD_WIDTH_PX / 2 - 28, LCD_HEIGHT_PX - 70, 0, 0);
}
}
state.drifting = false;
}
@ -340,12 +350,28 @@ void main_loop() {
setPixel(x * 2 + 1, y, thing);
}
} */
if (newTile == 254 && currentTile != 254) {
state.lapCount++;
didFinishLap = true;
#ifdef __EMSCRIPTEN__
printf("Lap %d\n", state.lapCount);
#endif
}
}
draw3D();
if (state.driftCharge >= 60) {
// Draw fire effect on the wheels
int fireStage;
if (state.driftCharge > 360) {
fireStage = 2;
} else if (state.driftCharge >= 180) {
fireStage = 1;
} else {
fireStage = 0;
}
int sign = state.kartSteerAnim < 0 ? -1 : 1;
sign *= -1;
int x = LCD_WIDTH_PX / 2 - (44 * sign) - 8;
@ -361,11 +387,11 @@ void main_loop() {
x += (state.totalFrameCount / 2) % 3 * sign;
y += (state.totalFrameCount / 2) % 2;
if (sign == 1) {
draw(img_fire, x, y);
draw(img_fire, x + (state.totalFrameCount / 2) % 2 * 3, y + 5);
draw(imgs_fire[fireStage], x, y);
draw(imgs_fire[fireStage], x + (state.totalFrameCount / 2) % 2 * 3, y + 5);
} else {
draw_flipped(img_fire, x, y);
draw_flipped(img_fire, x - (state.totalFrameCount / 2) % 2 * 3, y + 5);
draw_flipped(imgs_fire[fireStage], x, y);
draw_flipped(imgs_fire[fireStage], x - (state.totalFrameCount / 2) % 2 * 3, y + 5);
}
}
@ -440,7 +466,8 @@ void main_loop() {
// CopySpriteMaskedFlipped(mksprites[-state.kartSteerAnim / 4], (LCD_WIDTH_PX / 2) - 36, 128, 72, 80, 0x4fe0);
draw_flipped(imgs_kart[animNo], (LCD_WIDTH_PX / 2) - (96 / 2), horizon + 4 + (jitter % 2) - (hopAnim[state.hopStage] * 3));
if (newAnimNo != animNo) {
draw_flipped(imgs_kart[newAnimNo], (LCD_WIDTH_PX / 2) - (96 / 2), horizon + 4 + (jitter % 2) - (hopAnim[state.hopStage] * 3));
// printf("kartSteerAnim: %d,\n", state.kartSteerAnim);
draw_flipped(imgs_kart[newAnimNo], (LCD_WIDTH_PX / 2) - (96 / 2) - (state.kartSteerAnim == -20 ? 1 : 0), horizon + 4 + (jitter % 2) - (hopAnim[state.hopStage] * 3));
}
}
@ -481,11 +508,32 @@ void main_loop() {
}
// Calculate the total time in mm:ss:xx format
int timerFrames = state.totalFrameCount - 180;
if (timerFrames >= 0) {
int minutes = timerFrames / 60 / 60;
int seconds = (timerFrames / 60) % 60;
int milliseconds = ((timerFrames % 60) * 16667) / 1000;
static int timerFrames;
static int freezeForFrames = 0;
static int freezeTime;
if (state.lapCount <= 3) {
timerFrames = state.totalFrameCount - 180;
}
int newTimerFrames = timerFrames;
static int lastLapTime = 0;
if (didFinishLap && state.lapCount > 1) {
freezeForFrames = 150;
freezeTime = (state.totalFrameCount - 180) - lastLapTime;
lastLapTime = (state.totalFrameCount - 180);
}
if (freezeForFrames > 0) {
freezeForFrames--;
newTimerFrames = freezeTime;
}
if (newTimerFrames >= 0 && (freezeForFrames == 0 || (freezeForFrames / 10) % 2 == 0)) {
int minutes = newTimerFrames / 60 / 60;
int seconds = (newTimerFrames / 60) % 60;
int milliseconds = ((newTimerFrames % 60) * 16667) / 1000;
if (milliseconds >= 1000) {
milliseconds = 999;
}
@ -493,10 +541,14 @@ void main_loop() {
sprintf(timeStr, "%02d:%02d:%02d", minutes, seconds, milliseconds / 10);
// Draw text
draw_time(timeStr, LCD_WIDTH_PX - 90, 8);
// Lap count
int lap = MIN(MAX(state.lapCount, 1), 3);
draw(imgs_lap[lap - 1], 8, 8);
}
// Update timer on screen
displayUpdate(8, 20);
displayUpdate(8, 24);
// Update track on screen
displayUpdate(horizon + 2, LCD_HEIGHT_PX);
@ -508,11 +560,19 @@ void main_loop() {
// draw_loop_x(img_bush, 0, 0, angle * 2, LCD_WIDTH_PX);
// Bdisp_PutDisp_DD();
// #ifdef __EMSCRIPTEN__
// if (state.totalFrameCount % 30 == 0) {
// printf("kartX: %d, kartY: %d\n", kartX, kartY);
// printf("Tile: %d\n", getTileType(kartX / scale, kartY / scale));
// }
// #endif
state.totalFrameCount += 1;
}
int main() {
platformInit();
initData();
fillSky(0, LCD_HEIGHT_PX);

View File

@ -13,13 +13,27 @@ ParticleType types[] = {
.animDelay = 4,
.animFrames = imgs_smoke
},
// Boost fire
// Boost fire (small)
{
.maxAge = 20,
.animLength = 5,
.animDelay = 4,
.animFrames = imgs_boost
},
// Boost fire (large)
{
.maxAge = 40,
.animLength = 5,
.animDelay = 4,
.animFrames = imgs_boost
},
// Small boost fire
{
.maxAge = 10,
.animLength = 5,
.animDelay = 2,
.animFrames = imgs_smallboost
},
};
ParticleState particles[MAX_PARTICLES];
@ -44,7 +58,7 @@ void tickParticles() {
particle->x += particle->xVel;
particle->y += particle->yVel;
// Draw the particle
int frame = (particle->age / types[particle->type].animLength) % types[particle->type].animLength;
int frame = (particle->age / types[particle->type].animDelay) % types[particle->type].animLength;
draw(types[particle->type].animFrames[frame], particle->x, particle->y);
}
}

View File

@ -72,10 +72,11 @@ void updateWithControls(Kart *kart, ButtonState controls) {
double change = isTurningLeft ? -1 : isTurningRight ? 1 : 0;
if (state.drifting) {
if (state.driftDir == -1) {
change += 0.7;
change += 1.2;
} else {
change -= 0.7;
change -= 1.2;
}
change *= 1.7 / 2.2;
}
change *= direction * turnSpeed;
kart->angularVelocity += change;

View File

@ -19,7 +19,11 @@ typedef struct {
int hopStage;
bool drifting;
int driftDir;
int driftCharge;
int boostTime;
int lapCount;
if (state.totalFrameCoun
int totalFrameCount;
} State;
*/
@ -27,17 +31,23 @@ typedef struct {
State state;
void initState() {
state.player.x = 3565.0 / 12;
state.player.y = 2600.0 / 12;
state.player.xVelocity = 0;
state.player.yVelocity = 0;
state.player.power = 0;
state.player.angle = 0;
state.player.angularVelocity = 0;
state.hopStage = 0;
state.drifting = false;
state.driftDir = 0;
state.driftCharge = 0;
state.boostTime = -1;
state.totalFrameCount = 0;
state = (State) {
.player = (Kart) {
.x = 3565.0 / 12,
.y = 2600.0 / 12,
.xVelocity = 0,
.yVelocity = 0,
.power = 0,
.angle = 0,
.angularVelocity = 0,
},
.kartSteerAnim = 0,
.hopStage = 0,
.drifting = false,
.driftDir = 0,
.driftCharge = 0,
.boostTime = -1,
.totalFrameCount = 0,
.lapCount = 0,
};
}

View File

@ -14,6 +14,7 @@ typedef struct {
int driftDir;
int driftCharge;
int boostTime;
int lapCount;
int totalFrameCount;
} State;

View File

@ -1,7 +0,0 @@
// Calculate the total time in mm:ss:xx format
int minutes = state.totalFrameCount / 60 / 60;
int seconds = (state.totalFrameCount / 60) % 60;
int milliseconds = ((state.totalFrameCount % 60) * 16667) / 1000;
if (milliseconds >= 1000) {
milliseconds = 999
}

View File

@ -1,6 +1,7 @@
#include "./tilemap.h"
#include "./main.h"
#include "./data.h"
#include "../data-headers/track.h"