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 ------------------------------- 3 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 include/models/teapot_data.h delete mode 100644 include/teapot_data.h (limited to 'include') 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 -- cgit v1.2.3