summaryrefslogtreecommitdiff
path: root/src/camera.c
diff options
context:
space:
mode:
authoromniscient <17525998+omnisci3nce@users.noreply.github.com>2024-03-14 22:11:43 +1100
committeromniscient <17525998+omnisci3nce@users.noreply.github.com>2024-03-14 22:11:43 +1100
commit253c90f7ceabff956260b40b69ec7ca55f91e710 (patch)
tree49e45764acab57368b4914bcb0fd77b6b1a1c862 /src/camera.c
parent2af96e3bc19fac5a3dc27f0eedff1b95ef1d473b (diff)
parent70308798adbaa376da97c9c0739d437fe76b8b36 (diff)
Merge branch 'master' of github.com:omnisci3nce/celeritas-core
Diffstat (limited to 'src/camera.c')
-rw-r--r--src/camera.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/camera.c b/src/camera.c
index c2b864d..8ec1251 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -2,10 +2,16 @@
#include "maths.h"
-void camera_view_projection(camera *c, f32 screen_height, f32 screen_width, mat4 *out_view_proj) {
- mat4 proj = mat4_perspective(c->fov * 3.14 / 180.0, screen_width / screen_height, 0.1, 100.0);
+camera camera_create(vec3 pos, vec3 front, vec3 up, f32 fov) {
+ camera c = { .position = pos, .front = front, .up = up, .fov = fov };
+ return c;
+}
+
+void camera_view_projection(camera *c, f32 screen_height, f32 screen_width, mat4 *out_view,
+ mat4 *out_proj) {
+ mat4 proj = mat4_perspective(c->fov, screen_width / screen_height, 0.1, 100.0);
vec3 camera_direction = vec3_add(c->position, c->front);
mat4 view = mat4_look_at(c->position, camera_direction, c->up);
- mat4 out_mat = mat4_mult(view, proj);
- *out_view_proj = out_mat;
+ *out_view = view;
+ *out_proj = proj;
} \ No newline at end of file