X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=camera.h;h=7d720f7ca0f18214cb2735af044dbb72cd7f323b;hb=ca35eceae3abfcfb9ba266d6ea8e664bc06b0a3e;hp=596409937ceb3cf2f532c7d22f2c999533bd9fa7;hpb=f7db507815e2822d971031c30f25e02b45e9c914;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/camera.h b/camera.h
index 5964099..7d720f7 100644
--- a/camera.h
+++ b/camera.h
@@ -1,14 +1,12 @@
 #ifndef CAMERA_H
 #define CAMERA_H
 
-#include "common.h"
+#include "skaterift.h"
 
 typedef struct camera camera;
-
-struct camera
-{
+struct camera{
    /* Input */
-   v2f angles;
+   v3f angles;
    v3f pos;
    float fov, nearz, farz;
 
@@ -16,16 +14,30 @@ struct camera
    m4x3f transform,
          transform_inverse;
 
-   struct camera_mtx
-   {
+   struct camera_mtx{
       m4x4f p,
             v,
             pv;
    }
    mtx,
    mtx_prev;
+};
+
+VG_STATIC void camera_lerp_angles( v3f a, v3f b, float t, v3f d )
+{
+   d[0] = vg_alerpf( a[0], b[0], t );
+   d[1] = vg_lerpf(  a[1], b[1], t );
+   d[2] = vg_lerpf(  a[2], b[2], t );
+}
+
+VG_STATIC void camera_lerp( camera *a, camera *b, float t, camera *d )
+{
+   v3_lerp( a->pos, b->pos, t, d->pos );
+   d->angles[0] = vg_alerpf( a->angles[0], b->angles[0], t );
+   d->angles[1] = vg_lerpf( a->angles[1], b->angles[1], t );
+   d->angles[2] = vg_lerpf( a->angles[2], b->angles[2], t );
+   d->fov = vg_lerpf( a->fov, b->fov, t );
 }
-VG_STATIC main_camera;
 
 /*
  * 1) [angles, pos] -> transform 
@@ -33,7 +45,7 @@ VG_STATIC main_camera;
 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 );