minor changes to be on track with vg revision

diff --git a/camera.h b/camera.h
index 7bd14e64e6c0eefd4db4d71d6d79cbb4fe8d2558..fdbc00c44fafbc4d75697970dc1bb4f8ba124bfe 100644 (file)
--- a/camera.h
+++ b/camera.h
@@ -96,36 +96,4 @@ static void camera_finalize( camera *cam )
    m4x4_mul( cam->mtx.p, cam->mtx.v, cam->mtx.pv );
 }
 
-/* 
- * http://www.terathon.com/lengyel/Lengyel-Oblique.pdf 
- */
-static void m4x4_clip_projection( m4x4f mat, v4f plane )
-{
-   v4f c = 
-   {
-      (vg_signf(plane[0]) + mat[2][0]) / mat[0][0],
-      (vg_signf(plane[1]) + mat[2][1]) / mat[1][1],
-      -1.0f,
-      (1.0f + mat[2][2]) / mat[3][2]
-   };
-
-   v4_muls( plane, 2.0f / v4_dot(plane,c), c );
-
-   mat[0][2] = c[0];
-   mat[1][2] = c[1];
-   mat[2][2] = c[2] + 1.0f;
-   mat[3][2] = c[3];
-}
-
-/*
- * Undoes the above operation
- */
-static void m4x4_reset_clipping( m4x4f mat, float ffar, float fnear )
-{
-   mat[0][2] = 0.0f; 
-   mat[1][2] = 0.0f; 
-   mat[2][2] = -(ffar + fnear) / (ffar - fnear); 
-   mat[3][2] = -2.0f * ffar * fnear / (ffar - fnear); 
-}
-
 #endif /* CAMERA_H */

diff --git a/player_skate.c b/player_skate.c
index cbf43ec36fc57837463f29be2d6ffd43195248f3..1aba17a7646535b9c6c01a78759dd5085b771985 100644 (file)
--- a/player_skate.c
+++ b/player_skate.c
@@ -2542,9 +2542,7 @@ begin_collision:;
    l = rb_manifold_apply_filtered( cman, l );
 
    manifold_len += l;
-
-   if( vg_lines.draw )
-      vg_line_capsule( mtx, capsule.r, capsule.h, VG__WHITE );
+   vg_line_capsule( mtx, capsule.r, capsule.h, VG__WHITE );
 
    /* add limits */
    if( state->activity >= k_skate_activity_grind_any ){

diff --git a/world_audio.c b/world_audio.c
index 0ecb6eb5d0c03443ff8ceeccc3cf778c0690d9c3..826e20a4ce708a80fc33a15050b21d79ec268e4f 100644 (file)
--- a/world_audio.c
+++ b/world_audio.c
@@ -116,7 +116,7 @@ static void world_audio_sample_distances( v3f co, int *index, float *value )
 
    distances[si] = dist;
 
-   if( vg_audio.debug_ui && vg_lines.draw ){
+   if( vg_audio.debug_ui && vg_lines.enabled ){
       for( int i=0; i<14; i++ ){
          if( distances[i] != 200.0f ){
             u32 colours[] = { VG__RED, VG__BLUE, VG__GREEN,