X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=camera.h;h=7d720f7ca0f18214cb2735af044dbb72cd7f323b;hb=5bfb36032928ba9f8d12e72961af68bfab9ea648;hp=6fcd2fc161e24b42be6701e73971fb8642fb5e9e;hpb=a99e5f5d5c16a3e865796a96ad648e3c570d32ac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/camera.h b/camera.h index 6fcd2fc..7d720f7 100644 --- a/camera.h +++ b/camera.h @@ -1,12 +1,10 @@ #ifndef CAMERA_H #define CAMERA_H -#include "common.h" +#include "skaterift.h" typedef struct camera camera; - -struct camera -{ +struct camera{ /* Input */ v3f angles; v3f pos; @@ -16,16 +14,14 @@ struct camera m4x3f transform, transform_inverse; - struct camera_mtx - { + struct camera_mtx{ m4x4f p, v, pv; } mtx, mtx_prev; -} -VG_STATIC main_camera, gate_camera; +}; VG_STATIC void camera_lerp_angles( v3f a, v3f b, float t, v3f d ) {