Code formatting and linting

Author: Kaweees

.justfile

@@ -32,7 +32,7 @@ web *build_type='Release':
   @mkdir -p build
   @if [ -n "${EM_CACHE-}" ]; then mkdir -p "$EM_CACHE" && mkdir -p "$EM_CACHE/tmp"; fi
   @echo "Configuring the build system..."
-  @cd build && emcmake cmake -S .. -B . -DCMAKE_BUILD_TYPE={{build_type}} -DBUILD_WASM=1
+  @cd build && emcmake cmake -S .. -B . -DCMAKE_BUILD_TYPE={{build_type}}
   @echo "Building the project..."
   @cd build && cmake --build . -j$(nproc)
   @mkdir -p public/assets/

CMakeLists.txt

@@ -28,10 +28,18 @@ target_include_directories(
 include(CheckLanguage)
 include(FetchContent)
 
-if(BUILD_WASM)
-  # Ensure we're using Emscripten compiler
-  if(NOT DEFINED EMSCRIPTEN)
-    message(FATAL_ERROR "BUILD_WASM requires using Emscripten CMake toolchain")
+if(EMSCRIPTEN)
+  if(APPLE)
+    # Tell CMake we are *not* building for macOS and strip any inherited flags.
+    set(CMAKE_OSX_ARCHITECTURES
+        ""
+        CACHE STRING "" FORCE)
+    set(CMAKE_OSX_SYSROOT
+        ""
+        CACHE PATH "" FORCE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET
+        ""
+        CACHE STRING "" FORCE)
   endif()
   add_compile_definitions("__EMSCRIPTEN__")
 
@@ -53,7 +61,7 @@ if(BUILD_WASM)
     "-sASSERTIONS=1")
 
   # Set output extension
-  set(CMAKE_EXECUTABLE_SUFFIX .js)
+  set(CMAKE_EXECUTABLE_SUFFIX ".js")
 else()
   # Metal Support (macOS/iOS)
   if(APPLE)
@@ -137,7 +145,7 @@ if(BUILD_EXAMPLES)
 endif()
 
 # Tests
-if(NOT BUILD_WASM AND BUILD_TESTS)
+if(NOT EMSCRIPTEN AND BUILD_TESTS)
   # Fetch GoogleTest
   FetchContent_Declare(
     googletest

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-if(BUILD_WASM)
+if(EMSCRIPTEN)
   add_subdirectory(web)
 else()
   add_subdirectory(bunny)

examples/web/src/web.cpp

@@ -1,6 +1,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <iostream>
+#include <cmath>
 #include <kiwigl/kiwigl.hpp>
 
 #ifdef __EMSCRIPTEN__
@@ -37,10 +38,12 @@ void runMainLoop(void* display) {
 //------------------------------------------------------------------------------------
 int main(int argc, char** argv) {
   // Initialization of display
-  kiwigl::Display* display = new kiwigl::Display("KiwiGL WebAssembly Demo");
+  kiwigl::Display* display =
+      new kiwigl::Display("KiwiGL WebAssembly Demo", false, kiwigl::Vector3D(0, 0, -0.25),
+                          kiwigl::Vector3D(M_PI, M_PI, 0), kiwigl::Vector3D(0.005, 0.005, 0.005));
 
   // Load the Stanford bunny mesh
-  display->loadMesh("./assets/cube.mesh");
+  display->loadMesh("./assets/bunny.mesh");
 
 #ifdef __EMSCRIPTEN__
   emscripten_set_main_loop_arg(runMainLoop, (void*)display, 0, true);

include/kiwigl/geometry/mesh.hpp

@@ -2,6 +2,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -32,25 +33,85 @@ class Mesh {
       std::ifstream file(filename, std::ios::binary);
       if (file.is_open()) {
         std::string line;
-        while (std::getline(file, line) && !file.eof()) {
-          if (line.find("v ") != std::string::npos) {
-            // Parse the vertex
-            Vector3D vertex;
-            if (sscanf(line.c_str(), "v %lf %lf %lf", &vertex.x, &vertex.y, &vertex.z) == 3) { addVertex(vertex); }
-          } else if (line.find("vt ") != std::string::npos) {
+        while (std::getline(file, line)) {
+          if (line.rfind("vt ", 0) == 0) {
             // Parse the texture coordinate
             Texture2D texture;
             if (sscanf(line.c_str(), "vt %lf %lf", &texture.u, &texture.v) == 2) { addTexture(texture); }
-          } else if (line.find("f ") != std::string::npos) {
-            // Parse the face
-            int v1, v2, v3, t1, t2, t3, n1, n2, n3;
-            if (sscanf(line.c_str(), "f %d/%d/%d %d/%d/%d %d/%d/%d", &v1, &t1, &n1, &v2, &t2, &n2, &v3, &t3, &n3) ==
-                9) {
-              addFace(v1, v2, v3, textures[t1 - 1], textures[t2 - 1], textures[t3 - 1], WHITE);
+          } else if (line.rfind("v ", 0) == 0) {
+            // Parse the vertex
+            Vector3D vertex;
+            if (sscanf(line.c_str(), "v %lf %lf %lf", &vertex.x, &vertex.y, &vertex.z) == 3) { addVertex(vertex); }
+          } else if (line.rfind("f ", 0) == 0) {
+            std::stringstream ss(line.substr(2));
+            std::string token;
+            std::vector<int> v_indices, t_indices, n_indices;
+
+            while (ss >> token) {
+              int v = 0, t = 0, n = 0;
+              if (sscanf(token.c_str(), "%d/%d/%d", &v, &t, &n) == 3) {
+                v_indices.push_back(v);
+                t_indices.push_back(t);
+                n_indices.push_back(n);
+              } else if (sscanf(token.c_str(), "%d//%d", &v, &n) == 2) {
+                v_indices.push_back(v);
+                n_indices.push_back(n);
+              } else if (sscanf(token.c_str(), "%d/%d", &v, &t) == 2) {
+                v_indices.push_back(v);
+                t_indices.push_back(t);
+              } else if (sscanf(token.c_str(), "%d", &v) == 1) {
+                v_indices.push_back(v);
+              }
+            }
+
+            // Triangulate polygon faces
+            if (v_indices.size() >= 3) {
+              for (size_t i = 1; i < v_indices.size() - 1; ++i) {
+                Texture2D tex[3];
+                if (t_indices.size() == v_indices.size()) {
+                  auto get_abs_idx = [](int idx, size_t s) -> size_t {
+                    if (idx > 0) return idx - 1;
+                    if (idx < 0) return s + idx;
+                    return (size_t)-1; // Invalid index
+                  };
+
+                  size_t t0 = get_abs_idx(t_indices[0], textures.size());
+                  size_t ti = get_abs_idx(t_indices[i], textures.size());
+                  size_t ti1 = get_abs_idx(t_indices[i + 1], textures.size());
+
+                  if (t0 < textures.size() && ti < textures.size() && ti1 < textures.size()) {
+                    tex[0] = textures[t0];
+                    tex[1] = textures[ti];
+                    tex[2] = textures[ti1];
+                  }
+                }
+
+                addFace(v_indices[0], v_indices[i], v_indices[i + 1], tex[0], tex[1], tex[2], WHITE);
+              }
             }
           }
         }
         file.close();
+
+        // Center the mesh to its origin
+        if (!vertices.empty()) {
+          Vector3D center(0, 0, 0);
+          for (const auto& v : vertices) {
+            center.x += v.x;
+            center.y += v.y;
+            center.z += v.z;
+          }
+          center.x /= vertices.size();
+          center.y /= vertices.size();
+          center.z /= vertices.size();
+
+          for (auto& v : vertices) {
+            v.x -= center.x;
+            v.y -= center.y;
+            v.z -= center.z;
+          }
+        }
+
         return true;
       } else {
         std::cerr << "Failed to open mesh file: " << filename << std::endl;

include/kiwigl/graphics/display.hpp

@@ -188,8 +188,7 @@ class Display {
     // Method to update the display
     void update() {
 #ifndef BENCHMARK_MODE
-      while (!SDL_TICKS_PASSED(SDL_GetTicks(), prevTime + FRAME_TIME))
-        ;
+      while (!SDL_TICKS_PASSED(SDL_GetTicks(), prevTime + FRAME_TIME));
       prevTime = SDL_GetTicks();
 #endif