1 files changed, 35 insertions, 6 deletions

diff --git a/src/main.c b/src/main.c
index e0b54c1..1f900bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,6 +9,8 @@
 #include <swgfx.h>
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_timer.h>
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -25,7 +27,9 @@ static constexpr int     WindowWidth  = 640;
 static constexpr int     WindowHeight = 480;
 static constexpr sgVec2i WindowDims   = (sgVec2i){.x = WindowWidth, .y = WindowHeight};
 
-static const R Fovy = (R)(90 * TO_RAD);
+static constexpr R Fovy = (R)(90 * TO_RAD);
+static constexpr R Near = 0.1f;
+static constexpr R Far  = 1000.0f;
 
 #define DEBUG_EVENT_LOOP 1
 
@@ -65,6 +69,7 @@ typedef struct State {
   void*            gfx_mem;
   swgfx*           gfx;
   Model*           model;
+  sgTexture_t      texture;
   Camera           camera;
   CameraController camera_controller;
   Uint64           last_tick;
@@ -146,7 +151,8 @@ static void RenderIndexedModel(swgfx* gfx, const IndexedModel* model) {
   assert(model);
   const sgTriIdx*  tris   = (const sgTriIdx*)(model->data + model->offsetTris);
   const sgVec3* positions = (const sgVec3*)  (model->data + model->offsetPositions);
-  sgTrianglesIndexedNonUniform(gfx, model->numTris, tris, positions);
+  const sgVec2* texcoords = (const sgVec2*)(model->data + model->offsetTexcoords);
+  sgTrianglesIndexedNonUniform(gfx, model->numTris, tris, positions, texcoords);
 }
 
 static void RenderModel(swgfx* gfx, const Model* model) {
@@ -164,7 +170,11 @@ static void RenderTriangle2d(swgfx* gfx) {
   const sgVec2 p0  = (sgVec2){20, 20};
   const sgVec2 p1  = (sgVec2){80, 20};
   const sgVec2 p2  = (sgVec2){50, 50};
-  const sgTri2 tri = (sgTri2){p0, p1, p2};
+  const sgVec2 uv  = (sgVec2){0,0}; // Not used.
+  const sgTri2 tri = (sgTri2){
+    (sgVert2){p0, uv},
+    (sgVert2){p1, uv},
+    (sgVert2){p2, uv}};
   sgTriangles2(gfx, 1, &tri);
 }
 
@@ -215,6 +225,7 @@ static bool Render(State* state) {
   sgModelId(state->gfx);
   sgView(state->gfx, SgVec3FromMathVec3(cam->spatial.p), SgVec3FromMathVec3(cam->spatial.f));
   sgPerspective(state->gfx, cam->fovy, cam->aspect, cam->near, cam->far);
+  sgTexture(state->gfx, &state->texture);
   RenderModel(state->gfx, state->model);
   /*sgIdx indices[3] = {0, 1, 2};
   sgVec3 positions[3] = {
@@ -273,17 +284,30 @@ static bool Initialize(State* state) {
     return false;
   }
 
-  const char* model_path = "/home/jeanne/blender/box.mdl";
+  const char* model_path = "/home/jeanne/blender/box_textured.mdl";
   if (!(state->model = read_file(model_path))) {
     fprintf(stderr, "Failed to load model: [%s]\n", model_path);
     return false;
   }
+  if (state->model->material.diffuseTexture[0] != 0) {
+    // TODO: When doing lighting, need to gamma-correct here.
+    sgTexture_t texture = {0};
+    int channels = 0;
+    constexpr int desired_channels = 4;
+    texture.pixels = (sgPixel*)stbi_load(state->model->material.diffuseTexture, &texture.width, &texture.height, &channels, desired_channels);
+    if (!texture.pixels) {
+      fprintf(stderr, "Failed to read texture: [%s]\n", state->model->material.diffuseTexture);
+      return false;
+    }
+    assert(channels == desired_channels);
+    state->texture = texture;
+  }
 
   Camera* camera    = &state->camera;
   camera->fovy      = Fovy;
   camera->aspect    = Aspect;
-  camera->near      = 0.1f;
-  camera->far       = 1000.f;
+  camera->near      = Near;
+  camera->far       = Far;
   camera->spatial   = spatial3_make();
   camera->spatial.p = vec3_make(0, 1, 10);
 
@@ -300,6 +324,11 @@ static bool Initialize(State* state) {
 static void Shutdown(State* state) {
   assert(state);
 
+  if (state->texture.pixels) {
+    free(state->texture.pixels);
+    state->texture = (sgTexture_t){0};
+  }
+
   if (state->model) {
     free(state->model);
     state->model = nullptr;