From a113b3569b2d6c621219cf51e0b761f84fd40f29 Mon Sep 17 00:00:00 2001 From: Connor Thomson Date: Fri, 11 Sep 2026 16:26:13 -0700 Subject: Update model shader names & more --- src/model.c | 4 ++-- src/models/teapot_data.c | 24 ++++++++++++++++++++---- src/teapot.c | 2 +- src/teapot_data.c | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) (limited to 'src') 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 . + */ -#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 . */ -#include "teapot_data.h" +#include "models/teapot_data.h" const float teapot_positions[][TA_TEAPOT_DIMENSION] = { {0.000000f, 2.250000f, 1.500000f}, -- cgit v1.2.3