Merge web build and pc build

also prevent last row to be modified

CMakeLists.txt

@@ -6,6 +6,14 @@ project(${PROJECT_NAME} C)
 set(CMAKE_C_STANDARD 99)
 set(RAYLIB_DIR /usr/local/lib CACHE FILEPATH "directory to Raylib")
 
+if (EMSCRIPTEN)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WEB")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
+set(CMAKE_EXECUTABLE_SUFFIX ".html")
+endif ()
+
 if (${CMAKE_BUILD_TYPE} STREQUAL tile16)
     set_directory_properties(PROPERTIES COMPILE_DEFINITIONS TILE16_SIZE)
 endif()
@@ -29,19 +37,6 @@ target_link_libraries(${PROJECT_NAME}
     ${GAME_LIBS}
 )
 
-add_executable(EntManager_test
-    entManager_test.c
-)
-target_compile_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
-target_include_directories(EntManager_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_link_libraries(EntManager_test
-    ${GAME_LIBS}
-)
-
 add_executable(scene_test
     scene_test.c
 )
@@ -58,6 +53,22 @@ target_link_libraries(scene_test
     ${GAME_LIBS}
 )
 
+
+if (NOT EMSCRIPTEN)
+add_executable(EntManager_test
+    entManager_test.c
+)
+target_compile_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
+target_link_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
+target_include_directories(EntManager_test
+    PRIVATE
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+target_link_libraries(EntManager_test
+    ${GAME_LIBS}
+)
+
+
 add_executable(scene_test_mem
     scene_test.c
 )
@@ -128,4 +139,4 @@ if (BUILD_TESTING)
      find_package(cmocka 1.1.0 REQUIRED)
      add_subdirectory(tests)
 endif()
-
+endif()

CMakeLists_regular.txt

@@ -1,131 +0,0 @@
-set(PROJECT_NAME HATPC_remake)
-set(CMAKE_C_COMPILER clang)
-set(CMAKE_C_FLAGS "-Wall")
-cmake_minimum_required(VERSION 3.22.1)
-project(${PROJECT_NAME} C)
-set(CMAKE_C_STANDARD 99)
-set(RAYLIB_DIR /usr/local/lib CACHE FILEPATH "directory to Raylib")
-
-if (${CMAKE_BUILD_TYPE} STREQUAL tile16)
-    set_directory_properties(PROPERTIES COMPILE_DEFINITIONS TILE16_SIZE)
-endif()
-
-set(GAME_LIBS
-    lib_scenes
-)
-
-
-add_subdirectory(scenes)
-add_executable(${PROJECT_NAME}
-    main.c
-)
-
-target_include_directories(${PROJECT_NAME}
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-
-target_link_libraries(${PROJECT_NAME}
-    ${GAME_LIBS}
-)
-
-add_executable(EntManager_test
-    entManager_test.c
-)
-target_compile_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(EntManager_test PRIVATE -fsanitize=address -gdwarf-4)
-target_include_directories(EntManager_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_link_libraries(EntManager_test
-    ${GAME_LIBS}
-)
-
-add_executable(scene_test
-    scene_test.c
-)
-
-target_include_directories(scene_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-
-target_compile_options(scene_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(scene_test PRIVATE -fsanitize=address -gdwarf-4)
-
-target_link_libraries(scene_test
-    ${GAME_LIBS}
-)
-
-add_executable(scene_test_mem
-    scene_test.c
-)
-target_include_directories(scene_test_mem
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_link_options(scene_test_mem PRIVATE -Xlinker -Map=scene_test.map)
-
-target_link_libraries(scene_test_mem
-    ${GAME_LIBS}
-)
-
-add_executable(water_test
-    water_test.c
-)
-
-target_include_directories(water_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_link_libraries(water_test
-    ${GAME_LIBS}
-)
-target_compile_options(water_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(water_test PRIVATE -fsanitize=address -gdwarf-4)
-
-add_executable(level_load_test
-    level_load_test.c
-)
-target_include_directories(level_load_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_link_libraries(level_load_test
-    ${GAME_LIBS}
-)
-target_compile_options(level_load_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(level_load_test PRIVATE -fsanitize=address -gdwarf-4)
-
-add_executable(menu_test
-    menu_test.c
-)
-target_include_directories(menu_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_compile_options(menu_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(menu_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_libraries(menu_test
-    ${GAME_LIBS}
-)
-
-add_executable(assets_test
-    assets_test.c
-)
-target_include_directories(assets_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_compile_options(assets_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_options(assets_test PRIVATE -fsanitize=address -gdwarf-4)
-target_link_libraries(assets_test
-    ${GAME_LIBS}
-)
-
-if (BUILD_TESTING)
-     find_package(cmocka 1.1.0 REQUIRED)
-     add_subdirectory(tests)
-endif()
-

CMakeLists_web.txt

@@ -1,30 +0,0 @@
-set(PROJECT_NAME HATPC_remake)
-set(CMAKE_C_FLAGS "-Wall")
-cmake_minimum_required(VERSION 3.22.1)
-project(${PROJECT_NAME} C)
-set(CMAKE_C_STANDARD 99)
-set(RAYLIB_DIR /usr/local/lib CACHE FILEPATH "directory to Raylib")
-
-if (EMSCRIPTEN)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_GLFW=3 -s ASSERTIONS=1 -s WASM=1 -s ASYNCIFY")
-set(CMAKE_EXECUTABLE_SUFFIX ".html")
-endif ()
-
-set(GAME_LIBS
-    lib_scenes
-)
-
-add_subdirectory(scenes)
-add_executable(scene_test
-    scene_test.c
-)
-target_include_directories(scene_test
-    PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}
-)
-target_com
-target_link_libraries(scene_test
-    ${GAME_LIBS}
-)

scene_test.c

@@ -54,8 +54,10 @@ int main(void)
     change_scene(&engine, 0);
 
     #if defined(PLATFORM_WEB)
+        puts("Setting emscripten main loop");
         emscripten_set_main_loop(update_loop, 0, 1);
     #else
+        puts("Regular main loop");
         while(true)
         {
 

scenes/CMakeLists.txt

@@ -1,7 +1,3 @@
-if (EMSCRIPTEN)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WEB")
-endif ()
-
 add_subdirectory(engine)
 add_library(lib_scenes STATIC
     assets_loader.c

scenes/constants.h

@@ -4,7 +4,7 @@
 #ifndef TILE16_SIZE
 #define TILE_SIZE 32
 #define DEFAULT_MAP_WIDTH 48
-#define DEFAULT_MAP_HEIGHT 22
+#define DEFAULT_MAP_HEIGHT 32
 #define VIEWABLE_MAP_WIDTH 32
 #define VIEWABLE_MAP_HEIGHT 16
 #else

scenes/editor_scene.c

@@ -493,7 +493,7 @@ static void toggle_block_system(Scene_t* scene)
     {
         Vector2 mouse_pos = GetScreenToWorld2D(raw_mouse_pos, data->cam);
         unsigned int tile_idx = get_tile_idx(mouse_pos.x, mouse_pos.y, &tilemap);
-        if (tile_idx >= MAX_N_TILES) return;
+        if (tile_idx >= (tilemap.n_tiles - tilemap.width)) return;
         if (tile_idx == last_tile_idx) return;
 
         if (IsMouseButtonDown(MOUSE_LEFT_BUTTON))