Update model shader names & more

8 files changed, 35 insertions, 19 deletions

diff --git a/include/files.h b/include/files.h
index 153b78f..94ec43c 100644
--- a/include/files.h
+++ b/include/files.h
@@ -43,12 +43,12 @@ extern unsigned char *file_data_music_theme_it_start;
 extern unsigned char *file_data_music_theme_it_end;
 extern unsigned int   file_data_music_theme_it_size;
 
-extern unsigned char *file_obj_vert_slang_spv_start;
-extern unsigned char *file_obj_vert_slang_spv_end;
-extern unsigned int   file_obj_vert_slang_spv_size;
+extern unsigned char *file_model_vert_slang_spv_start;
+extern unsigned char *file_model_vert_slang_spv_end;
+extern unsigned int   file_model_vert_slang_spv_size;
 
-extern unsigned char *file_obj_frag_slang_spv_start;
-extern unsigned char *file_obj_frag_slang_spv_end;
-extern unsigned int   file_obj_frag_slang_spv_size;
+extern unsigned char *file_model_frag_slang_spv_start;
+extern unsigned char *file_model_frag_slang_spv_end;
+extern unsigned int   file_model_frag_slang_spv_size;
 
 #endif // TA_FILES_H
\ No newline at end of file
diff --git a/include/teapot_data.h b/include/models/teapot_data.h
index 4e2c26b..4e2c26b 100644
--- a/include/teapot_data.h
+++ b/include/models/teapot_data.h
diff --git a/shaders/obj.frag.slang b/shaders/model.frag.slang
index 33596e3..4684db0 100644
--- a/shaders/obj.frag.slang
+++ b/shaders/model.frag.slang
@@ -44,4 +44,4 @@ FSOutput main(FSInput input) {
     FSOutput output;
     output.out_color = float4(shade, shade, shade, 1.0);
     return output;
-}
+}
\ No newline at end of file
diff --git a/shaders/obj.vert.slang b/shaders/model.vert.slang
index 8ab3cc6..380ff37 100644
--- a/shaders/obj.vert.slang
+++ b/shaders/model.vert.slang
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-struct ObjUniforms {
+struct model_uniforms {
     float4x4 mvp;
     float4x4 model;
     float3   camera_position;
@@ -24,11 +24,11 @@ struct ObjUniforms {
 };
 
 [[vk::binding(0, 1)]]
-ConstantBuffer<ObjUniforms> uniforms : register(b0, space1);
+ConstantBuffer<model_uniforms> uniforms : register(b0, space1);
 
 struct VSInput {
     float3 position : POSITION0;
-    float3 normal : NORMAL0;
+    float3 normal   : NORMAL0;
 };
 
 struct VSOutput {
@@ -46,4 +46,4 @@ VSOutput main(VSInput input) {
     output.world_position  = world_position.xyz;
     output.camera_position = uniforms.camera_position;
     return output;
-}
+}
\ No newline at end of file
diff --git a/src/model.c b/src/model.c
index 7902f7a..be72817 100644
--- a/src/model.c
+++ b/src/model.c
@@ -209,8 +209,8 @@ bool ta_model_init(ta_model *model, SDL_GPUDevice *device, const float positions
         return false;
     }
     model->vertex_count = (Uint32)model->mesh.vertex_count;
-    SDL_GPUShader *vertex_shader = ta_model_shader(device, file_obj_vert_slang_spv_start, file_obj_vert_slang_spv_size, SDL_GPU_SHADERSTAGE_VERTEX);
-    SDL_GPUShader *fragment_shader = ta_model_shader(device, file_obj_frag_slang_spv_start, file_obj_frag_slang_spv_size, SDL_GPU_SHADERSTAGE_FRAGMENT);
+    SDL_GPUShader *vertex_shader = ta_model_shader(device, file_model_vert_slang_spv_start, file_model_vert_slang_spv_size, SDL_GPU_SHADERSTAGE_VERTEX);
+    SDL_GPUShader *fragment_shader = ta_model_shader(device, file_model_frag_slang_spv_start, file_model_frag_slang_spv_size, SDL_GPU_SHADERSTAGE_FRAGMENT);
     SDL_GPUVertexBufferDescription vertex_buffer = {.slot = 0, .pitch = sizeof(ta_model_vertex), .input_rate = SDL_GPU_VERTEXINPUTRATE_VERTEX};
     SDL_GPUVertexAttribute attributes[2] = {
         {
diff --git a/src/models/teapot_data.c b/src/models/teapot_data.c
index 4dba3e9..f4a42af 100644
--- a/src/models/teapot_data.c
+++ b/src/models/teapot_data.c
@@ -1,8 +1,24 @@
-/* Generated by tools/obj_to_c.py - do not edit by hand. */
+/*
+ * Tuxánci 2 - A first person shooter
+ * Copyright (C) 2025-2026  Connor Thomson
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
-#include "teapot_data.h"
+#include "models/teapot_data.h"
 
-const float ta_teapot_positions[][3] = {
+const float ta_teapot_positions[][TA_TEAPOT_DIMENSION] = {
     {0.000000f, 2.250000f, 1.500000f},
     {0.021538f, 2.250000f, 1.500000f},
     {0.000000f, 2.254234f, 1.497984f},
@@ -220573,4 +220589,4 @@ const unsigned int ta_teapot_faces[][3] = {
 };
 
 const size_t ta_teapot_position_count = sizeof(ta_teapot_positions) / sizeof(ta_teapot_positions[0]);
-const size_t ta_teapot_face_count = sizeof(ta_teapot_faces) / sizeof(ta_teapot_faces[0]);
+const size_t ta_teapot_face_count = sizeof(ta_teapot_faces) / sizeof(ta_teapot_faces[0]);
\ No newline at end of file
diff --git a/src/teapot.c b/src/teapot.c
index c7973ef..916406f 100644
--- a/src/teapot.c
+++ b/src/teapot.c
@@ -19,7 +19,7 @@
 #include "gpu.h"
 #include "model.h"
 #include "teapot.h"
-#include "teapot_data.h"
+#include "models/teapot_data.h"
 #include "window.h"
 
 static ta_model ta_teapot_model;
diff --git a/src/teapot_data.c b/src/teapot_data.c
index 2c80ec7..a9b9cec 100644
--- a/src/teapot_data.c
+++ b/src/teapot_data.c
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "teapot_data.h"
+#include "models/teapot_data.h"
 
 const float teapot_positions[][TA_TEAPOT_DIMENSION] = {
     {0.000000f, 2.250000f, 1.500000f},