Remove renderer from camera_view_port

diff --git a/src/game/level.c b/src/game/level.c
index adaafa196454638a9d97b01d84cfdf30936c90e8..d5e9c70fa37b461b8a11e33a6c00fee170bba059 100644 (file)
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -111,7 +111,7 @@ int level_render(const level_t *level, SDL_Renderer *renderer)
         return -1;
     }
 
-    const rect_t view_port = camera_view_port(level->camera, renderer);
+    const rect_t view_port = camera_view_port(level->camera);
 
     background_move_to(level->background, vec(view_port.x + view_port.w * 0.5f,
                                               view_port.y + view_port.h * 0.5f));

diff --git a/src/game/level/background.c b/src/game/level/background.c
index 70608836c011449e7387a6d8116e4aa24a99e550..ba2be0ef6d47db29fcc84e1d87c059c228034841 100644 (file)
--- a/src/game/level/background.c
+++ b/src/game/level/background.c
@@ -56,7 +56,7 @@ int background_render(const background_t *background,
     assert(renderer);
     assert(camera);
 
-    rect_t view_port = camera_view_port(camera, renderer);
+    rect_t view_port = camera_view_port(camera);
 
     int min_x = 0, min_y = 0;
     chunk_of_point(vec(view_port.x, view_port.y), &min_x, &min_y);

diff --git a/src/game/level/camera.c b/src/game/level/camera.c
index e21c63cee400e0aa8fddd35feb616d8c8dbd2798..bb8256746b66b710f4196b84c668dee43d6cab47 100644 (file)
--- a/src/game/level/camera.c
+++ b/src/game/level/camera.c
@@ -225,14 +225,12 @@ int camera_is_point_visible(const camera_t *camera, point_t p)
         camera_point(camera, &view_port, p));
 }
 
-rect_t camera_view_port(const camera_t *camera,
-                        SDL_Renderer *renderer)
+rect_t camera_view_port(const camera_t *camera)
 {
     assert(camera);
-    assert(renderer);
 
     SDL_Rect view_port;
-    SDL_RenderGetViewport(renderer, &view_port);
+    SDL_RenderGetViewport(camera->renderer, &view_port);
 
     const vec_t s = effective_scale(&view_port);
     const float w = (float) view_port.w * s.x;

diff --git a/src/game/level/camera.h b/src/game/level/camera.h
index 9a5414f3cd5b239606ae30a106b33db06819e0ad..8e5106192b1b7351fdcfc6377b66fb251d7ae0e8 100644 (file)
--- a/src/game/level/camera.h
+++ b/src/game/level/camera.h
@@ -39,7 +39,6 @@ void camera_toggle_blackwhite_mode(camera_t *camera);
 
 int camera_is_point_visible(const camera_t *camera, point_t p);
 
-rect_t camera_view_port(const camera_t *camera,
-                        SDL_Renderer *render);
+rect_t camera_view_port(const camera_t *camera);
 
 #endif  // CAMERA_H_