projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render routes in mini-world
[carveJwlIkooP6JGAAIwe30JlM.git]
/
camera.h
diff --git
a/camera.h
b/camera.h
index c1744d86f23f556deaad3f4e7c2bfc55a8f122ea..7bd14e64e6c0eefd4db4d71d6d79cbb4fe8d2558 100644
(file)
--- a/
camera.h
+++ b/
camera.h
@@
-29,11
+29,10
@@
static void camera_lerp_angles( v3f a, v3f b, float t, v3f d ){
d[2] = vg_lerpf( a[2], b[2], t );
}
d[2] = vg_lerpf( a[2], b[2], t );
}
+/* 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 );
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 );
}
d->fov = vg_lerpf( a->fov, b->fov, t );
}
@@
-43,6
+42,16
@@
static void camera_copy( camera *a, camera *d ){
d->fov = a->fov;
}
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
*/
/*
* 1) [angles, pos] -> transform
*/