revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 67f78b5df9829e4b66e7405cb1015e8cac3765cb..c6ebe715b0441ac3a94245f69124d92b80f0a854 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -1,6 +1,4 @@
-#ifndef GUI_H
-#define GUI_H
-
+#pragma once
 #include "font.h"
 #include "input.h"
 #include "player.h"
@@ -87,7 +85,7 @@ static void gui_draw(void){
          (v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f) )
       gui_helper_clear();
 
-   camera ortho;
+   vg_camera ortho;
 
    float fl = 0.0f,
          fr = vg.window_x,
@@ -103,9 +101,9 @@ static void gui_draw(void){
    ortho.mtx.p[3][1] = (ft + fb) * -tb;
    ortho.mtx.p[3][3] = 1.0f;
    m4x3_identity( ortho.transform );
-   camera_update_view( &ortho );
+   vg_camera_update_view( &ortho );
    m4x4_mul( ortho.mtx.p, ortho.mtx.v, ortho.mtx.pv );   /* HACK */
-   camera_finalize( &ortho );
+   vg_camera_finalize( &ortho );
 
 
    /* icons */
@@ -349,5 +347,3 @@ static void gui_init(void){
    mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh, NULL );
    mdl_close( &gui.model_icons );
 }
-
-#endif /* GUI_H */