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 --- include/files.h | 12 +++++------ include/models/teapot_data.h | 31 ++++++++++++++++++++++++++++ include/teapot_data.h | 31 ---------------------------- shaders/model.frag.slang | 47 ++++++++++++++++++++++++++++++++++++++++++ shaders/model.vert.slang | 49 ++++++++++++++++++++++++++++++++++++++++++++ shaders/obj.frag.slang | 47 ------------------------------------------ shaders/obj.vert.slang | 49 -------------------------------------------- src/model.c | 4 ++-- src/models/teapot_data.c | 24 ++++++++++++++++++---- src/teapot.c | 2 +- src/teapot_data.c | 2 +- 11 files changed, 157 insertions(+), 141 deletions(-) create mode 100644 include/models/teapot_data.h delete mode 100644 include/teapot_data.h create mode 100644 shaders/model.frag.slang create mode 100644 shaders/model.vert.slang delete mode 100644 shaders/obj.frag.slang delete mode 100644 shaders/obj.vert.slang 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/models/teapot_data.h b/include/models/teapot_data.h new file mode 100644 index 0000000..4e2c26b --- /dev/null +++ b/include/models/teapot_data.h @@ -0,0 +1,31 @@ +/* + * 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 . + */ + +#ifndef TA_TEAPOT_DATA_H +#define TA_TEAPOT_DATA_H + +#include + +#define TA_TEAPOT_DIMENSION 3 + +extern const float ta_teapot_positions[][TA_TEAPOT_DIMENSION]; +extern const unsigned int ta_teapot_faces[][TA_TEAPOT_DIMENSION]; +extern const size_t ta_teapot_position_count; +extern const size_t ta_teapot_face_count; + +#endif // TA_TEAPOT_DATA_H diff --git a/include/teapot_data.h b/include/teapot_data.h deleted file mode 100644 index 4e2c26b..0000000 --- a/include/teapot_data.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 . - */ - -#ifndef TA_TEAPOT_DATA_H -#define TA_TEAPOT_DATA_H - -#include - -#define TA_TEAPOT_DIMENSION 3 - -extern const float ta_teapot_positions[][TA_TEAPOT_DIMENSION]; -extern const unsigned int ta_teapot_faces[][TA_TEAPOT_DIMENSION]; -extern const size_t ta_teapot_position_count; -extern const size_t ta_teapot_face_count; - -#endif // TA_TEAPOT_DATA_H diff --git a/shaders/model.frag.slang b/shaders/model.frag.slang new file mode 100644 index 0000000..4684db0 --- /dev/null +++ b/shaders/model.frag.slang @@ -0,0 +1,47 @@ +/* + * 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 . + */ + +struct FSInput { + float3 normal : TEXCOORD0; + float3 world_position : TEXCOORD1; + float3 camera_position : TEXCOORD2; +}; + +struct FSOutput { + float4 out_color : SV_Target0; +}; + +static const float ambient_strength = 0.22; +static const float diffuse_strength = 0.78; +static const float specular_strength = 0.6; +static const float shininess = 32.0; + +FSOutput main(FSInput input) { + float3 light_direction = normalize(float3(-0.45, 0.75, 0.55)); + float3 normal = normalize(input.normal); + float3 view_direction = normalize(input.camera_position - input.world_position); + float3 halfway_direction = normalize(light_direction + view_direction); + + float diffuse = max(dot(normal, light_direction), 0.0); + float specular = diffuse > 0.0 ? pow(max(dot(normal, halfway_direction), 0.0), shininess) : 0.0; + + float shade = saturate(ambient_strength + diffuse * diffuse_strength + specular * specular_strength); + FSOutput output; + output.out_color = float4(shade, shade, shade, 1.0); + return output; +} \ No newline at end of file diff --git a/shaders/model.vert.slang b/shaders/model.vert.slang new file mode 100644 index 0000000..380ff37 --- /dev/null +++ b/shaders/model.vert.slang @@ -0,0 +1,49 @@ +/* + * 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 . + */ + +struct model_uniforms { + float4x4 mvp; + float4x4 model; + float3 camera_position; + float padding; +}; + +[[vk::binding(0, 1)]] +ConstantBuffer uniforms : register(b0, space1); + +struct VSInput { + float3 position : POSITION0; + float3 normal : NORMAL0; +}; + +struct VSOutput { + float4 position : SV_Position; + float3 normal : TEXCOORD0; + float3 world_position : TEXCOORD1; + float3 camera_position : TEXCOORD2; +}; + +VSOutput main(VSInput input) { + VSOutput output; + float4 world_position = mul(uniforms.model, float4(input.position, 1.0)); + output.position = mul(uniforms.mvp, float4(input.position, 1.0)); + output.normal = normalize(mul((float3x3)uniforms.model, input.normal)); + output.world_position = world_position.xyz; + output.camera_position = uniforms.camera_position; + return output; +} \ No newline at end of file diff --git a/shaders/obj.frag.slang b/shaders/obj.frag.slang deleted file mode 100644 index 33596e3..0000000 --- a/shaders/obj.frag.slang +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 . - */ - -struct FSInput { - float3 normal : TEXCOORD0; - float3 world_position : TEXCOORD1; - float3 camera_position : TEXCOORD2; -}; - -struct FSOutput { - float4 out_color : SV_Target0; -}; - -static const float ambient_strength = 0.22; -static const float diffuse_strength = 0.78; -static const float specular_strength = 0.6; -static const float shininess = 32.0; - -FSOutput main(FSInput input) { - float3 light_direction = normalize(float3(-0.45, 0.75, 0.55)); - float3 normal = normalize(input.normal); - float3 view_direction = normalize(input.camera_position - input.world_position); - float3 halfway_direction = normalize(light_direction + view_direction); - - float diffuse = max(dot(normal, light_direction), 0.0); - float specular = diffuse > 0.0 ? pow(max(dot(normal, halfway_direction), 0.0), shininess) : 0.0; - - float shade = saturate(ambient_strength + diffuse * diffuse_strength + specular * specular_strength); - FSOutput output; - output.out_color = float4(shade, shade, shade, 1.0); - return output; -} diff --git a/shaders/obj.vert.slang b/shaders/obj.vert.slang deleted file mode 100644 index 8ab3cc6..0000000 --- a/shaders/obj.vert.slang +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 . - */ - -struct ObjUniforms { - float4x4 mvp; - float4x4 model; - float3 camera_position; - float padding; -}; - -[[vk::binding(0, 1)]] -ConstantBuffer uniforms : register(b0, space1); - -struct VSInput { - float3 position : POSITION0; - float3 normal : NORMAL0; -}; - -struct VSOutput { - float4 position : SV_Position; - float3 normal : TEXCOORD0; - float3 world_position : TEXCOORD1; - float3 camera_position : TEXCOORD2; -}; - -VSOutput main(VSInput input) { - VSOutput output; - float4 world_position = mul(uniforms.model, float4(input.position, 1.0)); - output.position = mul(uniforms.mvp, float4(input.position, 1.0)); - output.normal = normalize(mul((float3x3)uniforms.model, input.normal)); - output.world_position = world_position.xyz; - output.camera_position = uniforms.camera_position; - return output; -} 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