Simplify some render code.

Author: Flone-dnb

src/engine_lib/include/game/camera.h

@@ -56,11 +56,9 @@ float camera_get_far_clip(te_camera* camera);
 // Position of the top-left corner of the viewport rectangle in XY and size in ZW (in range [0; 1]).
 void camera_get_viewport(te_camera* camera, vec4 out);
 
-// Returns camara's view matrix.
-void camera_get_view_mat(te_camera* camera, mat4 out);
-
-// Returns camera's projection matrix.
-void camera_get_proj_mat(te_camera* camera, mat4 out);
+// Returns camera's view projection matrix.
+// Do not free/destroy returned pointer, valid while the camera exists.
+mat4* camera_get_view_proj_mat(te_camera* camera);
 
 // Returns NULL if the camera is not spawned in a world.
 struct te_world* camera_get_world(te_camera* camera);

src/engine_lib/src/debug_console.c

@@ -284,13 +284,12 @@ prv_debug_console_draw(float delta_time_sec) {
         prv_debug_console_draw_stat(screen_pos, "FPS: %u (limit: %u)", stats->fps, fps_limit);
 
         // RAM.
+        const char* ram_fmt = "RAM used (MB): %u (%u/%u)";
 #if defined(ENGINE_ASAN_ENABLED)
-        prv_debug_console_draw_stat(screen_pos, "RAM used (MB): %zu (%zu/%zu) (ASan enabled)",
-                                    stats->process_mem, stats->total_used_mem, stats->total_mem);
-#else
-        prv_debug_console_draw_stat(screen_pos, "RAM used (MB): %zu (%zu/%zu)", stats->process_mem,
-                                    stats->total_used_mem, stats->total_mem);
+        ram_fmt = "RAM used (MB): %u (%u/%u) (ASan enabled)";
 #endif
+        prv_debug_console_draw_stat(screen_pos, ram_fmt, stats->process_mem, stats->total_used_mem,
+                                    stats->total_mem);
 
         // Rendered model count.
         prv_debug_console_draw_stat(screen_pos, "rendered model count: %u", stats->rendered_model_count);

src/engine_lib/src/game/camera.c

@@ -19,6 +19,9 @@ struct te_camera {
     // Projection matrix. May be outdated, see @ref is_proj_mat_outdated.
     mat4 proj_mat;
 
+    // @ref view_mat and @ref proj_mat multiplied. May be outdated.
+    mat4 view_proj_mat;
+
     // Position of the top-left corner of the viewport rectangle in XY and size in ZW (in range [0; 1]).
     vec4 viewport;
 
@@ -222,41 +225,36 @@ prv_camera_recalc_frustum(te_camera* camera) {
                                            (float)camera->render_width / (float)camera->render_height);
 }
 
-void
-camera_get_view_mat(te_camera* camera, mat4 out) {
-    if (camera->is_view_mat_outdated) {
-        vec3 forward;
-        vec3 up;
-        camera_get_forward(camera, forward);
-        camera_get_up(camera, up);
-
-        glm_look_rh(camera->location, forward, up, camera->view_mat);
-        prv_camera_recalc_frustum(camera);
+mat4*
+camera_get_view_proj_mat(te_camera* camera) {
+    if (camera->is_view_mat_outdated || camera->is_proj_mat_outdated) {
+        if (camera->is_view_mat_outdated) {
+            vec3 forward;
+            vec3 up;
+            camera_get_forward(camera, forward);
+            camera_get_up(camera, up);
 
-        camera->is_view_mat_outdated = false;
-    }
+            glm_look_rh(camera->location, forward, up, camera->view_mat);
+            camera->is_view_mat_outdated = false;
+        }
 
-    glm_mat4_copy(camera->view_mat, out);
-}
-
-void
-camera_get_proj_mat(te_camera* camera, mat4 out) {
 #if defined(DEBUG)
-    if (camera->render_width == 0 || camera->render_height == 0) {
-        show_error_and_abort("expected render target width/height to be set at this point");
-    }
+        if (camera->render_width == 0 || camera->render_height == 0) {
+            show_error_and_abort("expected render target width/height to be set at this point");
+        }
 #endif
+        if (camera->is_proj_mat_outdated) {
+            glm_perspective_rh_no(glm_rad(camera->vertical_fov),
+                                  (float)camera->render_width / (float)camera->render_height,
+                                  camera->near_clip, camera->far_clip, camera->proj_mat);
+            camera->is_proj_mat_outdated = false;
+        }
 
-    if (camera->is_proj_mat_outdated) {
-        glm_perspective_rh_no(glm_rad(camera->vertical_fov),
-                              (float)camera->render_width / (float)camera->render_height, camera->near_clip,
-                              camera->far_clip, camera->proj_mat);
         prv_camera_recalc_frustum(camera);
-
-        camera->is_proj_mat_outdated = false;
+        glm_mat4_mul(camera->proj_mat, camera->view_mat, camera->view_proj_mat);
     }
 
-    glm_mat4_copy(camera->proj_mat, out);
+    return &camera->view_proj_mat;
 }
 
 struct te_world*
@@ -272,28 +270,26 @@ camera_get_frustum(te_camera* camera) {
     }
 #endif
 
-    const bool was_outdated = camera->is_view_mat_outdated || camera->is_proj_mat_outdated;
+    if (camera->is_view_mat_outdated || camera->is_proj_mat_outdated) {
+        if (camera->is_view_mat_outdated) {
+            vec3 forward;
+            vec3 up;
+            camera_get_forward(camera, forward);
+            camera_get_up(camera, up);
 
-    if (camera->is_view_mat_outdated) {
-        vec3 forward;
-        vec3 up;
-        camera_get_forward(camera, forward);
-        camera_get_up(camera, up);
+            glm_look_rh(camera->location, forward, up, camera->view_mat);
 
-        glm_look_rh(camera->location, forward, up, camera->view_mat);
+            camera->is_view_mat_outdated = false;
+        }
 
-        camera->is_view_mat_outdated = false;
-    }
-
-    if (camera->is_proj_mat_outdated) {
-        glm_perspective_rh_no(glm_rad(camera->vertical_fov),
-                              (float)camera->render_width / (float)camera->render_height, camera->near_clip,
-                              camera->far_clip, camera->proj_mat);
+        if (camera->is_proj_mat_outdated) {
+            glm_perspective_rh_no(glm_rad(camera->vertical_fov),
+                                  (float)camera->render_width / (float)camera->render_height,
+                                  camera->near_clip, camera->far_clip, camera->proj_mat);
 
-        camera->is_proj_mat_outdated = false;
-    }
+            camera->is_proj_mat_outdated = false;
+        }
 
-    if (was_outdated) {
         prv_camera_recalc_frustum(camera);
     }
 

src/engine_lib/src/render/model_renderer.c

@@ -280,13 +280,13 @@ model_renderer_get_render_data_tmp(te_model_renderer* renderer, unsigned int han
 }
 
 void
-model_renderer_draw(te_model_renderer* renderer, ivec4 gl_viewport, mat4 view_proj_mat,
+model_renderer_draw(te_model_renderer* renderer, ivec4* gl_viewport, mat4* view_proj_mat,
                     te_frustum_shape* camera_frustum) {
 #if defined(ENGINE_DEBUG_TOOLS)
     te_debug_stats* debug_stats = prv_debug_console_get_stats();
 #endif
 
-    glViewport(gl_viewport[0], gl_viewport[1], gl_viewport[2], gl_viewport[3]);
+    glViewport((*gl_viewport)[0], (*gl_viewport)[1], (*gl_viewport)[2], (*gl_viewport)[3]);
 
     unsigned int render_data_idx = 0;
 
@@ -295,7 +295,7 @@ model_renderer_draw(te_model_renderer* renderer, ivec4 gl_viewport, mat4 view_pr
 
         glUseProgram(group->prog_id);
 
-        glUniformMatrix4fv(group->uniform_view_proj_mat, 1, GL_FALSE, view_proj_mat[0]);
+        glUniformMatrix4fv(group->uniform_view_proj_mat, 1, GL_FALSE, (*view_proj_mat)[0]);
 
         for (unsigned int unused = 0; unused < group->count; unused++, render_data_idx++) {
             te_model_render_data* data = &renderer->render_data[render_data_idx];

src/engine_lib/src/render/model_renderer.h

@@ -58,5 +58,5 @@ void model_renderer_remove_model(te_model_renderer* renderer, unsigned int handl
 te_model_render_data* model_renderer_get_render_data_tmp(te_model_renderer* renderer, unsigned int handle);
 
 // Draws models to the currently set framebuffer.
-void model_renderer_draw(te_model_renderer* renderer, ivec4 gl_viewport, mat4 view_proj_mat,
+void model_renderer_draw(te_model_renderer* renderer, ivec4* gl_viewport, mat4* view_proj_mat,
                          struct te_frustum_shape* camera_frustum);

src/engine_lib/src/render/renderer.c

@@ -36,20 +36,6 @@ typedef struct te_renderer_frame_stats {
     unsigned int fps;
 } te_renderer_frame_stats;
 
-// Groups info used during the rendering of a world.
-typedef struct te_world_render_info {
-    // Do not free/destroy this pointer.
-    te_world* world;
-
-    struct te_frustum_shape* camera_frustum;
-
-    // View projection matrix of the camera.
-    mat4 view_proj_mat;
-
-    // OpenGL viewport in pixels (left-bottom origin).
-    ivec4 gl_viewport;
-} te_world_render_info;
-
 struct te_renderer {
     // Always valid pointer, window that owns the renderer. This pointer should not be freed.
     struct te_window* window;
@@ -61,15 +47,8 @@ struct te_renderer {
     te_texture_manager* texture_manager;
     te_font_manager* font_manager;
 
-    // Preallocated array to keep active cameras while submitting a new frame.
-    // Size of this array is @ref worlds_render_info_array_size.
-    te_world_render_info* worlds_render_info;
-
     te_renderer_frame_stats frame_stats;
 
-    // Size of the array @ref worlds_render_info.
-    unsigned int worlds_render_info_array_size;
-
     unsigned int fps_limit;
 };
 
@@ -113,10 +92,6 @@ renderer_create(struct te_window* window) {
     renderer->texture_manager = prv_texture_manager_create();
     renderer->font_manager = prv_font_manager_create(renderer);
 
-    renderer->worlds_render_info_array_size = 2;
-    renderer->worlds_render_info =
-        malloc(sizeof(te_world_render_info) * renderer->worlds_render_info_array_size);
-
     renderer->frame_stats.frame_count = 0;
     renderer->frame_stats.time_sec_since_update = 0.0f;
     renderer->frame_stats.fps = 0;
@@ -191,7 +166,6 @@ renderer_destroy(te_renderer* renderer) {
     prv_texture_manager_destroy(renderer->texture_manager);
     prv_shader_manager_destroy(renderer->shader_manager);
     prv_font_manager_destroy(renderer->font_manager);
-    free(renderer->worlds_render_info);
 
     if (!SDL_GL_DestroyContext(renderer->gl_context)) {
         show_error_and_abort(SDL_GetError());
@@ -295,67 +269,40 @@ prv_renderer_draw_frame(te_renderer* renderer, float delta_time_sec) {
     unsigned int window_height = 0;
     window_get_size(renderer->window, &window_width, &window_height);
 
+    // Rendering to window's framebuffer.
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
     // Get worlds.
     te_game_manager* game_manager = window_get_game_manager(renderer->window);
     unsigned int world_count = 0;
     te_world** worlds = game_manager_get_worlds(game_manager, &world_count);
 
-    if (world_count > renderer->worlds_render_info_array_size) {
-        // Expand the array.
-        te_world_render_info* new_worlds = malloc(sizeof(te_world_render_info) * world_count);
-        free(renderer->worlds_render_info);
-        renderer->worlds_render_info = new_worlds;
-        renderer->worlds_render_info_array_size = world_count;
-    }
-
-    // Get active cameras.
-    unsigned int active_world_count = 0;
     for (unsigned int i = 0; i < world_count; i++) {
         te_camera* camera = world_get_active_camera(worlds[i]);
         if (camera == NULL) {
             continue;
         }
 
+        te_model_renderer* model_renderer = world_get_model_renderer(worlds[i]);
+
         // Set aspect ratio to the camera.
         vec4 viewport;
         camera_get_viewport(camera, viewport);
         const unsigned int viewport_width = (unsigned int)((float)window_width * viewport[2]);
         const unsigned int viewport_height = (unsigned int)((float)window_height * viewport[3]);
         prv_camera_set_render_target_size(camera, viewport_width, viewport_height);
 
-        // Save info.
-        te_world_render_info* info = &renderer->worlds_render_info[active_world_count];
-
-        info->world = worlds[i];
-
-        mat4 view_mat;
-        mat4 proj_mat;
-        camera_get_view_mat(camera, view_mat);
-        camera_get_proj_mat(camera, proj_mat);
-        glm_mat4_mul(proj_mat, view_mat, info->view_proj_mat);
-
-        info->gl_viewport[0] = (int)((float)window_width * viewport[0]);
-        info->gl_viewport[1] = (int)((float)window_height * (1.0f - fmin(1.0f, viewport[1] + viewport[3])));
-        info->gl_viewport[2] = (int)viewport_width;
-        info->gl_viewport[3] = (int)viewport_height;
-
-        info->camera_frustum = camera_get_frustum(camera);
-
-        active_world_count += 1;
-    }
-
-    // Rendering to window's framebuffer.
-    glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        mat4* view_proj_mat = camera_get_view_proj_mat(camera);
 
-    if (active_world_count > 0) {
-        // Draw models.
-        for (unsigned int world_idx = 0; world_idx < active_world_count; world_idx++) {
-            te_world_render_info* info = &renderer->worlds_render_info[world_idx];
-            te_model_renderer* model_renderer = world_get_model_renderer(info->world);
+        ivec4 gl_viewport;
+        gl_viewport[0] = (int)((float)window_width * viewport[0]);
+        gl_viewport[1] = (int)((float)window_height * (1.0f - fmin(1.0f, viewport[1] + viewport[3])));
+        gl_viewport[2] = (int)viewport_width;
+        gl_viewport[3] = (int)viewport_height;
 
-            model_renderer_draw(model_renderer, info->gl_viewport, info->view_proj_mat, info->camera_frustum);
-        }
+        struct te_frustum_shape* camera_frustum = camera_get_frustum(camera);
+        model_renderer_draw(model_renderer, &gl_viewport, view_proj_mat, camera_frustum);
     }
 
 #if defined(ENGINE_DEBUG_TOOLS)