diff options
| -rw-r--r-- | src/camera.c | 14 | ||||
| -rw-r--r-- | src/camera.h | 2 |
2 files changed, 11 insertions, 5 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 diff --git a/src/camera.h b/src/camera.h index 226f80e..df91712 100644 --- a/src/camera.h +++ b/src/camera.h @@ -23,4 +23,4 @@ typedef struct camera { camera camera_create(vec3 pos, vec3 front, vec3 up, f32 fov); /** @brief get a 4x4 transform matrix for the view and perspective projection */ -void camera_view_projection(camera *c, f32 screen_height, f32 screen_width, mat4 *out_view_proj);
\ No newline at end of file +void camera_view_projection(camera *c, f32 screen_height, f32 screen_width,mat4 *out_view, mat4 *out_proj);
\ No newline at end of file |