X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_entity.c;h=eccf2b4f7afed09c36d349b6432e86015d3c63fc;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=3b2837fa09e329a22436ea038c849c8458264637;hpb=22f62f001f21d1b91fefd9fc495c122d9ddf205a;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_entity.c b/world_entity.c
index 3b2837f..eccf2b4 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -10,6 +10,7 @@
 #include "menu.h"
 #include "ent_challenge.h"
 #include "ent_skateshop.h"
+#include "ent_route.h"
 
 static void world_entity_focus( u32 entity_id ){
    localplayer.immobile = 1;
@@ -29,6 +30,27 @@ static void world_entity_unfocus(void){
    srinput.enabled = 0;
 }
 
+static void world_entity_focus_camera( world_instance *world, u32 uid ){
+   if( mdl_entity_id_type( uid ) == k_ent_camera ){
+      u32 index = mdl_entity_id_id( uid );
+      ent_camera *cam = mdl_arritm( &world->ent_camera, index );
+
+      v3f dir = {0.0f,-1.0f,0.0f};
+      mdl_transform_vector( &cam->transform, dir, dir );
+      m3x3_mulv( localplayer.invbasis, dir, dir );
+      player_vector_angles( world_static.focus_cam.angles, dir, 1.0f, 0.0f );
+      v3_copy( cam->transform.co, world_static.focus_cam.pos );
+      world_static.focus_cam.fov = cam->fov;
+   }
+   else {
+      camera_copy( &localplayer.cam, &world_static.focus_cam );
+
+      /* TODO ? */
+      world_static.focus_cam.nearz = localplayer.cam.nearz;
+      world_static.focus_cam.farz = localplayer.cam.farz;
+   }
+}
+
 /* logic preupdate */
 static void world_entity_focus_preupdate(void){
    f32 rate = vg_minf( 1.0f, vg.time_frame_delta * 2.0f );
@@ -43,6 +65,7 @@ static void world_entity_focus_preupdate(void){
        index = mdl_entity_id_id( world_static.focused_entity );
    world_instance *world = world_current_instance();
 
+   /* TODO: Table. */
    if( type == k_ent_skateshop ){
       ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index );
       ent_skateshop_preupdate( skateshop, active );
@@ -51,6 +74,10 @@ static void world_entity_focus_preupdate(void){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
       ent_challenge_preupdate( challenge, active );
    }
+   else if( type == k_ent_route ){
+      ent_route *route = mdl_arritm( &world->ent_route, index );
+      ent_route_preupdate( route, active );
+   }
 }
 
 /* additional renderings like text etc.. */
@@ -67,7 +94,8 @@ static void world_entity_focus_render(void){
       skateshop_render( skateshop );
    }
    else if( type == k_ent_challenge ){
-      
+   }
+   else if( type == k_ent_route ){
    }
    else {
       vg_fatal_error( "Programming error\n" );
@@ -558,7 +586,7 @@ static void world_entity_start( world_instance *world, vg_msg *sav ){
       ent_challenge *challenge = mdl_arritm( &world->ent_challenge, i );
       const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias );
 
-      if( vg_msg_seekkvu32( sav, alias, k_vg_msg_first ) ){
+      if( vg_msg_getkvu32( sav, alias, 0 ) ){
          ent_call call;
          call.data = NULL;
          call.function = 0;