From a618f7c8d4e8df65d9d2542d9032c32973e42981 Mon Sep 17 00:00:00 2001 From: Connor Thomson Date: Thu, 10 Sep 2026 19:16:42 -0700 Subject: Switch away from Wavefront & more --- include/files.h | 4 ---- include/model.h | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/obj.h | 39 ------------------------------------- include/obj_model.h | 41 -------------------------------------- include/teapot_data.h | 32 ++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 84 deletions(-) create mode 100644 include/model.h delete mode 100644 include/obj.h delete mode 100644 include/obj_model.h create mode 100644 include/teapot_data.h (limited to 'include') diff --git a/include/files.h b/include/files.h index bc5cfb7..2f982d1 100644 --- a/include/files.h +++ b/include/files.h @@ -44,10 +44,6 @@ 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_data_models_teapot_obj_start; -extern unsigned char *file_data_models_teapot_obj_end; -extern unsigned int file_data_models_teapot_obj_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; diff --git a/include/model.h b/include/model.h new file mode 100644 index 0000000..5d19307 --- /dev/null +++ b/include/model.h @@ -0,0 +1,54 @@ +/* + * Tuxánci 2 - A first person shooter + * Copyright (C) 2007-2011 Tuxánci Development Team + * 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_MODEL_H +#define TA_MODEL_H + +#include +#include +#include "ta_sdl.h" + +typedef struct ta_model_vertex { + float position[3]; + float normal[3]; +} ta_model_vertex; + +typedef struct ta_model_mesh { + ta_model_vertex *vertices; + size_t vertex_count; +} ta_model_mesh; + +typedef struct ta_model { + SDL_GPUGraphicsPipeline *pipeline; + SDL_GPUBuffer *vertex_buffer; + ta_model_mesh mesh; + Uint32 vertex_count; + bool uploaded; + float position[3]; + float rotation[3]; +} ta_model; + +bool ta_model_build(const float positions[][3], size_t position_count, const unsigned int faces[][3], size_t face_count, ta_model_mesh *mesh); +void ta_model_free(ta_model_mesh *mesh); +bool ta_model_init(ta_model *model, SDL_GPUDevice *device, const float positions[][3], size_t position_count, const unsigned int faces[][3], size_t face_count, SDL_GPUTextureFormat color_format, SDL_GPUTextureFormat depth_format, SDL_GPUSampleCount sample_count); +void ta_model_upload(ta_model *model, SDL_GPUCommandBuffer *command_buffer, SDL_GPUDevice *device); +void ta_model_render(const ta_model *model, SDL_GPUCommandBuffer *command_buffer, SDL_GPURenderPass *render_pass, int window_width, int window_height); +void ta_model_destroy(ta_model *model, SDL_GPUDevice *device); + +#endif // TA_MODEL_H \ No newline at end of file diff --git a/include/obj.h b/include/obj.h deleted file mode 100644 index 190b459..0000000 --- a/include/obj.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Tuxánci 2 - A first person shooter - * Copyright (C) 2007-2011 Tuxánci Development Team - * 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_OBJ_H -#define TA_OBJ_H - -#include -#include - -typedef struct ta_obj_vertex { - float position[3]; - float normal[3]; -} ta_obj_vertex; - -typedef struct ta_obj_mesh { - ta_obj_vertex *vertices; - size_t vertex_count; -} ta_obj_mesh; - -bool ta_obj_parse(const unsigned char *data, size_t size, ta_obj_mesh *mesh); -void ta_obj_free(ta_obj_mesh *mesh); - -#endif // TA_OBJ_H \ No newline at end of file diff --git a/include/obj_model.h b/include/obj_model.h deleted file mode 100644 index 6f01ecf..0000000 --- a/include/obj_model.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Tuxánci 2 - A first person shooter - * Copyright (C) 2007-2011 Tuxánci Development Team - * 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_OBJ_MODEL_H -#define TA_OBJ_MODEL_H - -#include "obj.h" -#include "ta_sdl.h" - -typedef struct ta_obj_model { - SDL_GPUGraphicsPipeline *pipeline; - SDL_GPUBuffer *vertex_buffer; - ta_obj_mesh mesh; - Uint32 vertex_count; - bool uploaded; - float position[3]; - float rotation[3]; -} ta_obj_model; - -bool ta_obj_model_init(ta_obj_model *model, SDL_GPUDevice *device, const unsigned char *data, size_t size, SDL_GPUTextureFormat color_format, SDL_GPUTextureFormat depth_format, SDL_GPUSampleCount sample_count); -void ta_obj_model_upload(ta_obj_model *model, SDL_GPUCommandBuffer *command_buffer, SDL_GPUDevice *device); -void ta_obj_model_render(const ta_obj_model *model, SDL_GPUCommandBuffer *command_buffer, SDL_GPURenderPass *render_pass, int window_width, int window_height); -void ta_obj_model_destroy(ta_obj_model *model, SDL_GPUDevice *device); - -#endif // TA_OBJ_MODEL_H \ No newline at end of file diff --git a/include/teapot_data.h b/include/teapot_data.h new file mode 100644 index 0000000..dfa4130 --- /dev/null +++ b/include/teapot_data.h @@ -0,0 +1,32 @@ +/* + * Tuxánci 2 - A first person shooter + * Copyright (C) 2007-2011 Tuxánci Development Team + * 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 -- cgit v1.2.3