diff options
| author | Connor Thomson <blumatrikz@gmail.com> | 2026-09-09 19:56:12 -0700 |
|---|---|---|
| committer | Connor Thomson <blumatrikz@gmail.com> | 2026-09-09 19:56:12 -0700 |
| commit | f7ab7a861f70bd67ef26685f29ed5e5b8b6bef17 (patch) | |
| tree | 14c2e654a2e87b6d3435f6e31946ce98416860fa | |
| parent | 96ec0ce08c9d97717ee4dd892a4eb6a25154ee09 (diff) | |
Add camera subsystem
| -rw-r--r-- | include/camera.h | 34 | ||||
| -rw-r--r-- | src/camera.c | 37 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/obj_model.c | 4 |
4 files changed, 75 insertions, 2 deletions
diff --git a/include/camera.h b/include/camera.h new file mode 100644 index 0000000..beb819e --- /dev/null +++ b/include/camera.h @@ -0,0 +1,34 @@ +/* + * 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 <https://www.gnu.org/licenses/>. + */ + +#ifndef TA_CAMERA_H +#define TA_CAMERA_H + +typedef struct ta_camera { + float x; + float y; + float z; +} ta_camera; + +extern ta_camera ta_camera_current; + +void ta_camera_init(void); +void ta_camera_get_view_matrix(float *matrix); + +#endif // TA_CAMERA_H
\ No newline at end of file diff --git a/src/camera.c b/src/camera.c new file mode 100644 index 0000000..ffb63cb --- /dev/null +++ b/src/camera.c @@ -0,0 +1,37 @@ +/* + * 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 <https://www.gnu.org/licenses/>. + */ + +#include "camera.h" +#include "ta_sdl.h" + +ta_camera ta_camera_current; + +void ta_camera_init(void) { + ta_camera_current = (ta_camera){ 0.0f, 0.0f, 5.0f }; +} + +void ta_camera_get_view_matrix(float *matrix) { + for (int index = 0; index < 16; index++) { + matrix[index] = index % 5 == 0 ? 1.0f : 0.0f; + } + + matrix[12] = -ta_camera_current.x; + matrix[13] = -ta_camera_current.y; + matrix[14] = -ta_camera_current.z; +}
\ No newline at end of file @@ -35,9 +35,11 @@ #include "color.h" #include "teapot.h" #include "mouse.h" +#include "camera.h" static void ta_main_init(void) { ta_color_init(); + ta_camera_init(); ta_window_init(); ta_exit_key_init(); ta_sdl_ttf_init(); diff --git a/src/obj_model.c b/src/obj_model.c index 44cf8aa..ffbfcf3 100644 --- a/src/obj_model.c +++ b/src/obj_model.c @@ -20,6 +20,7 @@ #include <math.h> #include <string.h> #include "obj_model.h" +#include "camera.h" #include "ta_sdl.h" #include "files.h" @@ -156,8 +157,7 @@ void ta_obj_model_render(const ta_obj_model *model, SDL_GPUCommandBuffer *comman uniforms.model[14] = model->position[2]; float aspect = (float)window_width / (float)window_height; float focal_length = 1.0f / tanf(22.5f * 0.01745329252f); - ta_obj_identity(view); - view[14] = -5.0f; + ta_camera_get_view_matrix(view); projection[0] = focal_length / aspect; projection[5] = focal_length; projection[10] = -101.0f / 99.0f; |