X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=camera.h;h=f028f825e67ef227119af309e365c2b49f494776;hb=bae39f2ca5100c49fdc23b91c2f2e10a181bba5c;hp=77fc0893f4e885e6766e001617b23b2bab33bcb6;hpb=e3bf80ff27b675f5e7f87dcebd16fab6fe08df7a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/camera.h b/camera.h index 77fc089..f028f82 100644 --- a/camera.h +++ b/camera.h @@ -16,8 +16,7 @@ struct camera m4x3f transform, transform_inverse; - struct camera_mtx - { + struct camera_mtx{ m4x4f p, v, pv; @@ -25,7 +24,7 @@ struct camera mtx, mtx_prev; } -VG_STATIC main_camera; +static main_camera, gate_camera; VG_STATIC void camera_lerp_angles( v3f a, v3f b, float t, v3f d ) { @@ -49,7 +48,7 @@ VG_STATIC void camera_lerp( camera *a, camera *b, float t, camera *d ) VG_STATIC void camera_update_transform( camera *cam ) { v4f qyaw, qpitch, qcam; - q_axis_angle( qyaw, (v3f){ 0.0f, 1.0f, 0.0f }, -cam->angles[0] ); + q_axis_angle( qyaw, (v3f){ 0.0f, 1.0f, 0.0f }, -cam->angles[0] ); q_axis_angle( qpitch, (v3f){ 1.0f, 0.0f, 0.0f }, -cam->angles[1] ); q_mul( qyaw, qpitch, qcam );