summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/pong.c8
-rw-r--r--src/plugins/viewer.c14
2 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/pong.c b/src/plugins/pong.c
index f8d455d..03eac9e 100644
--- a/src/plugins/pong.c
+++ b/src/plugins/pong.c
@@ -168,7 +168,7 @@ void update(Game* game, State* state, double t, double dt) {
168 collide_ball(old_ball_position, &state->enemy, &state->ball); 168 collide_ball(old_ball_position, &state->enemy, &state->ball);
169} 169}
170 170
171static void draw_player(ImmRenderer* imm, const Player* player) { 171static void draw_player(Imm* imm, const Player* player) {
172 assert(imm); 172 assert(imm);
173 assert(player); 173 assert(player);
174 174
@@ -181,7 +181,7 @@ static void draw_player(ImmRenderer* imm, const Player* player) {
181 gfx_imm_draw_aabb2(imm, box); 181 gfx_imm_draw_aabb2(imm, box);
182} 182}
183 183
184static void draw_ball(ImmRenderer* imm, const Ball* ball) { 184static void draw_ball(Imm* imm, const Ball* ball) {
185 assert(imm); 185 assert(imm);
186 assert(ball); 186 assert(ball);
187 187
@@ -197,8 +197,8 @@ void render(const Game* game, const State* state) {
197 assert(game); 197 assert(game);
198 assert(state); 198 assert(state);
199 199
200 LLR* llr = gfx_get_llr(game->gfx); 200 LLR* llr = gfx_get_llr(game->gfx);
201 ImmRenderer* imm = gfx_get_imm_renderer(game->gfx); 201 Imm* imm = gfx_get_imm(game->gfx);
202 202
203 gfx_llr_set_projection_matrix(llr, &state->projection); 203 gfx_llr_set_projection_matrix(llr, &state->projection);
204 gfx_llr_load_identity(llr); 204 gfx_llr_load_identity(llr);
diff --git a/src/plugins/viewer.c b/src/plugins/viewer.c
index 2702980..16c6634 100644
--- a/src/plugins/viewer.c
+++ b/src/plugins/viewer.c
@@ -46,9 +46,9 @@ static const char* GIRL =
46static const char* BOXES = 46static const char* BOXES =
47 "/home/jeanne/Nextcloud/assets/models/boxes/boxes.gltf"; 47 "/home/jeanne/Nextcloud/assets/models/boxes/boxes.gltf";
48 48
49#define DEFAULT_SCENE_FILE GIRL 49#define DEFAULT_SCENE_FILE SPONZA
50 50
51static const bool RenderBoundingBoxes = true; 51static const bool RenderBoundingBoxes = false;
52static const R DefaultCameraSpeed = (R)6.0; 52static const R DefaultCameraSpeed = (R)6.0;
53static const R DefaultMouseSensitivity = (R)(10 * TO_RAD); 53static const R DefaultMouseSensitivity = (R)(10 * TO_RAD);
54static const vec3 DefaultCameraPosition = (vec3){0, 2, 5}; 54static const vec3 DefaultCameraPosition = (vec3){0, 2, 5};
@@ -276,8 +276,8 @@ void update(Game* game, State* state, double t, double dt) {
276 276
277/// Render the bounding boxes of all scene objects. 277/// Render the bounding boxes of all scene objects.
278static void render_bounding_boxes_rec( 278static void render_bounding_boxes_rec(
279 LLR* llr, ImmRenderer* imm, const Anima* anima, 279 LLR* llr, Imm* imm, const Anima* anima, const mat4* parent_model_matrix,
280 const mat4* parent_model_matrix, const SceneNode* node) { 280 const SceneNode* node) {
281 assert(llr); 281 assert(llr);
282 assert(imm); 282 assert(imm);
283 assert(node); 283 assert(node);
@@ -331,9 +331,9 @@ static void render_bounding_boxes(const Game* game, const State* state) {
331 assert(game); 331 assert(game);
332 assert(state); 332 assert(state);
333 333
334 GfxCore* gfxcore = gfx_get_core(game->gfx); 334 GfxCore* gfxcore = gfx_get_core(game->gfx);
335 LLR* llr = gfx_get_llr(game->gfx); 335 LLR* llr = gfx_get_llr(game->gfx);
336 ImmRenderer* imm = gfx_get_imm_renderer(game->gfx); 336 Imm* imm = gfx_get_imm(game->gfx);
337 assert(gfxcore); 337 assert(gfxcore);
338 assert(llr); 338 assert(llr);
339 assert(imm); 339 assert(imm);