From 0f09a7b2bd4d26e9fb192725a2108983cd105534 Mon Sep 17 00:00:00 2001
From: En Yi <en.yi@tutanota.com>
Date: Sat, 4 May 2024 20:40:15 +0800
Subject: [PATCH] Remove obsolete render function field

---
 engine/engine.c       | 4 +---
 engine/engine.h       | 5 +----
 scenes/editor_scene.c | 2 +-
 scenes/game_scene.c   | 2 +-
 scenes/menu_scene.c   | 2 +-
 water_test.c          | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/engine/engine.c b/engine/engine.c
index 9f90ce7..745ba69 100644
--- a/engine/engine.c
+++ b/engine/engine.c
@@ -145,8 +145,7 @@ void update_sfx_list(GameEngine_t* engine)
     engine->sfx_list.played_sfx = 0;
 }
 
-//void init_scene(Scene_t* scene, SceneType_t scene_type, system_func_t render_func, action_func_t action_func)
-void init_scene(Scene_t* scene, render_func_t render_func, action_func_t action_func)
+void init_scene(Scene_t* scene, action_func_t action_func)
 {
     sc_map_init_64(&scene->action_map, 32, 0);
     sc_array_init(&scene->systems);
@@ -154,7 +153,6 @@ void init_scene(Scene_t* scene, render_func_t render_func, action_func_t action_
     init_particle_system(&scene->part_sys);
 
     //scene->scene_type = scene_type;
-    scene->render_function = render_func;
     scene->layers.n_layers = 0;
     scene->bg_colour = WHITE;
 
diff --git a/engine/engine.h b/engine/engine.h
index 39cf674..c2174f3 100644
--- a/engine/engine.h
+++ b/engine/engine.h
@@ -61,8 +61,6 @@ struct Scene {
     struct sc_array_systems systems;
     SceneRenderLayers_t layers;
     Color bg_colour;
-    // TODO: Render function is obsolete and should be treated like a system
-    render_func_t render_function;
     action_func_t action_function;
     EntityManager_t ent_manager;
     float delta_time;
@@ -90,8 +88,7 @@ extern void update_scene(Scene_t* scene, float delta_time);
 extern void render_scene(Scene_t* scene);
 extern void do_action(Scene_t* scene, ActionType_t action, bool pressed);
 
-//void init_scene(Scene_t* scene, SceneType_t scene_type, system_func_t render_func, action_func_t action_func);
-void init_scene(Scene_t* scene, render_func_t render_func, action_func_t action_func);
+void init_scene(Scene_t* scene, action_func_t action_func);
 bool add_scene_layer(Scene_t* scene, int width, int height, Rectangle render_area);
 void free_scene(Scene_t* scene);
 
diff --git a/scenes/editor_scene.c b/scenes/editor_scene.c
index 5b67c3f..3440013 100644
--- a/scenes/editor_scene.c
+++ b/scenes/editor_scene.c
@@ -979,7 +979,7 @@ static void level_do_action(Scene_t* scene, ActionType_t action, bool pressed)
 
 void init_sandbox_scene(LevelScene_t* scene)
 {
-    init_scene(&scene->scene, &level_scene_render_func, &level_do_action);
+    init_scene(&scene->scene, &level_do_action);
     init_entity_tag_map(&scene->scene.ent_manager, PLAYER_ENT_TAG, 4);
     init_entity_tag_map(&scene->scene.ent_manager, BOULDER_ENT_TAG, MAX_COMP_POOL_SIZE);
     init_entity_tag_map(&scene->scene.ent_manager, LEVEL_END_TAG, 16);
diff --git a/scenes/game_scene.c b/scenes/game_scene.c
index 1f720e0..e78498a 100644
--- a/scenes/game_scene.c
+++ b/scenes/game_scene.c
@@ -348,7 +348,7 @@ static void render_regular_game_scene(Scene_t* scene)
 
 void init_game_scene(LevelScene_t* scene)
 {
-    init_scene(&scene->scene, &level_scene_render_func, &level_do_action);
+    init_scene(&scene->scene, &level_do_action);
     init_entity_tag_map(&scene->scene.ent_manager, PLAYER_ENT_TAG, 4);
     init_entity_tag_map(&scene->scene.ent_manager, BOULDER_ENT_TAG, MAX_COMP_POOL_SIZE);
     init_entity_tag_map(&scene->scene.ent_manager, LEVEL_END_TAG, 16);
diff --git a/scenes/menu_scene.c b/scenes/menu_scene.c
index 5398d8d..ccecfd4 100644
--- a/scenes/menu_scene.c
+++ b/scenes/menu_scene.c
@@ -132,7 +132,7 @@ static void gui_loop(Scene_t* scene)
 
 void init_menu_scene(MenuScene_t* scene)
 {
-    init_scene(&scene->scene, &menu_scene_render_func, &menu_do_action);
+    init_scene(&scene->scene, &menu_do_action);
 
     sc_array_add(&scene->scene.systems, &gui_loop);
     sc_array_add(&scene->scene.systems, &menu_scene_render_func);
diff --git a/water_test.c b/water_test.c
index 43ecdcb..31637dd 100644
--- a/water_test.c
+++ b/water_test.c
@@ -400,7 +400,7 @@ int main(void)
 
     LevelScene_t scene;
     scene.scene.engine = &engine;
-    init_scene(&scene.scene, &level_scene_render_func, &level_do_action);
+    init_scene(&scene.scene, &level_do_action);
     init_entity_tag_map(&scene.scene.ent_manager, PLAYER_ENT_TAG, 4);
     init_entity_tag_map(&scene.scene.ent_manager, DYNMEM_ENT_TAG, 16);
     init_level_scene_data(