revision 2

[carveJwlIkooP6JGAAIwe30JlM.git] / world_map.c

diff --git a/world_map.c b/world_map.c
index c7f6ec82ce4dbb249abf9937c06b75f57f4ec2e4..bc2ab5c9bd9092d82b59d036bd0741c7e82c7a8a 100644 (file)
--- a/world_map.c
+++ b/world_map.c
@@ -1,14 +1,13 @@
-#ifndef RESPAWN_C
-#define RESPAWN_C
-
-#include "world_map.h"
 #include "skaterift.h"
+#include "world_map.h"
 #include "world.h"
 #include "input.h"
 #include "gui.h"
 #include "menu.h"
 #include "scene.h"
 
+struct world_map world_map;
+
 static void world_map_get_dir( v3f dir ){
    /* idk */
    dir[0] = -sqrtf(0.5f);
@@ -40,8 +39,8 @@ static void respawn_world_to_plane_pos( v3f pos, v2f plane_pos ){
    plane_pos[1] = co[2];
 }
 
-static void respawn_map_draw_icon( camera *cam, 
-                                      enum gui_icon icon, v3f pos ){
+static void respawn_map_draw_icon( vg_camera *cam, 
+                                   enum gui_icon icon, v3f pos ){
    v4f v;
    v3_copy( pos, v );
    v[3] = 1.0f;
@@ -51,7 +50,8 @@ static void respawn_map_draw_icon( camera *cam,
    gui_draw_icon( icon, (v2f){ v[0]*0.5f+0.5f,v[1]*0.5f+0.5f }, 1.0f );
 }
 
-static void world_map_pre_update(void){
+void world_map_pre_update(void)
+{
    if( skaterift.activity != k_skaterift_world_map ) return;
 
    if( button_down( k_srbind_mback ) ){
@@ -91,7 +91,7 @@ static void world_map_pre_update(void){
    v2_maxv( (v2f){ bbx[0][0], bbx[0][2] }, pos, pos );
 
    /* update camera */
-   camera *cam = &world_map.cam;
+   vg_camera *cam = &world_map.cam;
    v3f dir;
    world_map_get_dir(dir);
 
@@ -109,10 +109,10 @@ static void world_map_pre_update(void){
    cam->nearz = 10.0f;
    cam->fov = 40.0f;
 
-   camera_update_transform( cam );
-   camera_update_view( cam );
-   camera_update_projection( cam );
-   camera_finalize( cam );
+   vg_camera_update_transform( cam );
+   vg_camera_update_view( cam );
+   vg_camera_update_projection( cam );
+   vg_camera_finalize( cam );
 
    /* pick spawn */
    world_map.spawn = NULL;
@@ -187,7 +187,8 @@ static void world_map_pre_update(void){
    }
 }
 
-static void world_map_enter(void){
+void world_map_enter(void)
+{
    skaterift.activity = k_skaterift_world_map;
    world_map.world_id = world_static.active_instance;
 
@@ -210,5 +211,3 @@ static void world_map_enter(void){
    if( gui_new_helper( input_button_list[k_srbind_mback], &text ) )
       vg_strcat( &text, "exit" );
 }
-
-#endif /* RESPAWN_C */