From 9a82ce0083437a4f9f58108b2c23b957d2249ad8 Mon Sep 17 00:00:00 2001
From: 3gg <3gg@shellblade.net>
Date: Fri, 27 Jun 2025 09:28:19 -0700
Subject: Tidy

---
 game/src/game.c           |  5 -----
 game/src/plugins/viewer.c | 46 +++++++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'game/src')

diff --git a/game/src/game.c b/game/src/game.c
index dc2248b..51f5cbe 100644
--- a/game/src/game.c
+++ b/game/src/game.c
@@ -14,14 +14,9 @@
 #include <gfx/core.h>
 #include <gfx/gfx.h>
 #include <gfx/renderer.h>
-#include <gfx/scene/camera.h>
-#include <gfx/scene/node.h>
-#include <gfx/scene/object.h>
-#include <gfx/scene/scene.h>
 
 #include <error.h>
 #include <log/log.h>
-#include <math/camera.h>
 #include <plugin.h>
 
 #include <assert.h>
diff --git a/game/src/plugins/viewer.c b/game/src/plugins/viewer.c
index 5fc4be7..23b9ffb 100644
--- a/game/src/plugins/viewer.c
+++ b/game/src/plugins/viewer.c
@@ -12,15 +12,28 @@
 
 #include <stdlib.h>
 
+// Skybox.
+static const char* skybox[6] = {
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_east.bmp",
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_west.bmp",
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_up.bmp",
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_down.bmp",
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_south.bmp",
+    "/home/jeanne/Nextcloud/assets/textures/skybox/clouds1/clouds1_north.bmp",
+};
+
 // Paths to various scene files.
-static const char* BOX     = "/assets/models/box.gltf";
-static const char* SUZANNE = "/assets/models/suzanne.gltf";
-static const char* SPONZA =
-    "/assets/glTF-Sample-Models/2.0/Sponza/glTF/Sponza.gltf";
+static const char* BOX = "/home/jeanne/Nextcloud/assets/models/box.gltf";
+static const char* SUZANNE =
+    "/home/jeanne/Nextcloud/assets/models/suzanne.gltf";
+static const char* SPONZA = "/home/jeanne/Nextcloud/assets/glTF-Sample-Models/"
+                            "2.0/Sponza/glTF/Sponza.gltf";
 static const char* FLIGHT_HELMET =
-    "/assets/glTF-Sample-Models/2.0/FlightHelmet/glTF/FlightHelmet.gltf";
+    "/home/jeanne/Nextcloud/assets/glTF-Sample-Models/2.0/FlightHelmet/glTF/"
+    "FlightHelmet.gltf";
 static const char* DAMAGED_HELMET =
-    "/assets/glTF-Sample-Models/2.0/DamagedHelmet/glTF/DamagedHelmet.gltf";
+    "/home/jeanne/Nextcloud/assets/glTF-Sample-Models/2.0/DamagedHelmet/glTF/"
+    "DamagedHelmet.gltf";
 static const char* GIRL =
     "/home/jeanne/Nextcloud/assets/models/girl/girl-with-ground.gltf";
 static const char* BOXES =
@@ -67,12 +80,9 @@ static const Texture* load_environment_map(Gfx* gfx) {
                .filtering              = NearestFiltering,
                .mipmaps                = false,
                .data.cubemap.filepaths = {
-                                          mstring_make("/assets/skybox/clouds1/clouds1_east.bmp"),
-                                          mstring_make("/assets/skybox/clouds1/clouds1_west.bmp"),
-                                          mstring_make("/assets/skybox/clouds1/clouds1_up.bmp"),
-                                          mstring_make("/assets/skybox/clouds1/clouds1_down.bmp"),
-                                          mstring_make("/assets/skybox/clouds1/clouds1_south.bmp"),
-                                          mstring_make("/assets/skybox/clouds1/clouds1_north.bmp")}
+                                          mstring_make(skybox[0]), mstring_make(skybox[1]),
+                                          mstring_make(skybox[2]), mstring_make(skybox[3]),
+                                          mstring_make(skybox[4]), mstring_make(skybox[5])}
   });
 }
 
@@ -109,9 +119,8 @@ static Model* load_scene(Game* game, State* state, const char* scene_filepath) {
   }
 
   Model* model = gfx_load_model(
-      game->gfx,
-      &(LoadModelCmd){
-          .origin = AssetFromFile, .filepath = mstring_make(scene_filepath)});
+      game->gfx, &(LoadModelCmd){.origin   = AssetFromFile,
+                                 .filepath = mstring_make(scene_filepath)});
   if (!model) {
     return 0;
   }
@@ -341,10 +350,9 @@ void render(const Game* game, const State* state) {
   assert(renderer);
 
   gfx_render_scene(
-      renderer, &(RenderSceneParams){
-                    .mode   = RenderDefault,
-                    .scene  = state->scene,
-                    .camera = state->camera});
+      renderer, &(RenderSceneParams){.mode   = RenderDefault,
+                                     .scene  = state->scene,
+                                     .camera = state->camera});
 
   if (RenderBoundingBoxes) {
     render_bounding_boxes(game, state);
-- 
cgit v1.2.3