X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=camera.h;h=7bd14e64e6c0eefd4db4d71d6d79cbb4fe8d2558;hb=76315944e5a98838163e0aba8601ed3522f0724d;hp=f028f825e67ef227119af309e365c2b49f494776;hpb=aed3995840d5472275b7bf143efed7c4f9daa358;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/camera.h b/camera.h
index f028f82..7bd14e6 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;
@@ -23,29 +21,41 @@ struct camera
    }
    mtx,
    mtx_prev;
-}
-static main_camera, gate_camera;
+};
 
-VG_STATIC void camera_lerp_angles( v3f a, v3f b, float t, v3f d )
-{
+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 )
-{
+/* lerp position, fov, and angles */
+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 );
+   camera_lerp_angles( a->angles, b->angles, t, d->angles );
    d->fov = vg_lerpf( a->fov, b->fov, t );
 }
 
+static void camera_copy( camera *a, camera *d ){
+   v3_copy( a->pos, d->pos );
+   v3_copy( a->angles, d->angles );
+   d->fov = a->fov;
+}
+
+static void m4x3_transform_camera( m4x3f m, camera *cam ){
+   m4x3_mulv( m, cam->pos, cam->pos );
+
+   v3f v0;
+   v3_angles_vector( cam->angles, v0 );
+   m3x3_mulv( m, v0, v0 );
+   v3_normalize( v0 );
+   v3_angles( v0, cam->angles );
+}
+
 /*
  * 1) [angles, pos] -> transform 
  */
-VG_STATIC void camera_update_transform( camera *cam )
+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] );
@@ -59,7 +69,7 @@ VG_STATIC void camera_update_transform( camera *cam )
 /*
  * 2) [transform] -> transform_inverse, view matrix
  */
-VG_STATIC void camera_update_view( camera *cam )
+static void camera_update_view( camera *cam )
 {
    m4x4_copy( cam->mtx.v,  cam->mtx_prev.v );
    m4x3_invert_affine( cam->transform, cam->transform_inverse );
@@ -69,7 +79,7 @@ VG_STATIC void camera_update_view( camera *cam )
 /*
  * 3) [fov,nearz,farz] -> projection matrix
  */
-VG_STATIC void camera_update_projection( camera *cam )
+static void camera_update_projection( camera *cam )
 {
    m4x4_copy( cam->mtx.p,  cam->mtx_prev.p );
    m4x4_projection( cam->mtx.p, cam->fov,
@@ -80,7 +90,7 @@ VG_STATIC void camera_update_projection( camera *cam )
 /*
  * 4) [projection matrix, view matrix] -> previous pv, new pv 
  */
-VG_STATIC void camera_finalize( camera *cam )
+static void camera_finalize( camera *cam )
 {
    m4x4_copy( cam->mtx.pv, cam->mtx_prev.pv );
    m4x4_mul( cam->mtx.p, cam->mtx.v, cam->mtx.pv );
@@ -89,7 +99,7 @@ VG_STATIC void camera_finalize( camera *cam )
 /* 
  * http://www.terathon.com/lengyel/Lengyel-Oblique.pdf 
  */
-VG_STATIC void m4x4_clip_projection( m4x4f mat, v4f plane )
+static void m4x4_clip_projection( m4x4f mat, v4f plane )
 {
    v4f c = 
    {
@@ -110,7 +120,7 @@ VG_STATIC void m4x4_clip_projection( m4x4f mat, v4f plane )
 /*
  * Undoes the above operation
  */
-VG_STATIC void m4x4_reset_clipping( m4x4f mat, float ffar, float fnear )
+static void m4x4_reset_clipping( m4x4f mat, float ffar, float fnear )
 {
    mat[0][2] = 0.0f; 
    mat[1][2] = 0.0f;