X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=ent_challenge.c;h=73476c718bd6baaad23dcdc5d230fa6d6efc8765;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=5f22eaaedf9f724b495a9069cc61896a807c4674;hpb=7eba38b8178c82040618a518634d8ff4813e2ff2;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/ent_challenge.c b/ent_challenge.c
index 5f22eaa..73476c7 100644
--- a/ent_challenge.c
+++ b/ent_challenge.c
@@ -1,48 +1,33 @@
 #ifndef ENT_CHALLENGE_C
 #define ENT_CHALLENGE_C
 
-#include "world.h"
-#include "world_load.h"
 #include "entity.h"
-
-VG_STATIC void ent_challenge_pass( world_instance *world, 
-                                   ent_challenge *challenge ){
-   if( challenge->id_next ){
-      world->challenge_timer += challenge->filter;
-
-      u32 index = mdl_entity_id_id( challenge->id_next );
-      ent_challenge *next = mdl_arritm( &world->ent_challenge, index );
-      world->challenge_target = next;
-
-      vg_info( "pass challenge point\n" );
-   }
-   else {
-      vg_success( "NYU Film school graduate SUCKAH\n" );
-      world->challenge_target = NULL;
-      world->challenge_timer = 0.0f;
-   }
-}
+#include "input.h"
+#include "gui.h"
+#include "audio.h"
 
 VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
    u32 index = mdl_entity_id_id( call->id );
    ent_challenge *challenge = mdl_arritm( &world->ent_challenge, index );
 
-   if( call->function == 0 ){
-      if( world->challenge_target ){
-         if( world->challenge_target == challenge ){
-            ent_challenge_pass( world, challenge );
-         }
-         else {
-            vg_error( "womp womp\n" );
-            world->challenge_target = NULL;
-            world->challenge_timer = 0.0f;
-         }
+   if( call->function == 0 ){ /* unlock() */
+      if( !challenge->status ){
+         vg_info( "challenge( '%s' )\n", 
+                  mdl_pstr( &world->meta, challenge->pstr_alias) );
+         ent_call call;
+         call.data = NULL;
+         call.function = challenge->target_event;
+         call.id = challenge->target;
+         entity_call( world, &call );
       }
+      challenge->status = 1;
    }
-   else if( call->function == 1 ){
-      vg_info( "begin the challenge\n" );
-      world->challenge_timer = 0.0f;
-      ent_challenge_pass( world, challenge );
+   else if( call->function == 1 ){  /* view() */
+      if( (localplayer.subsystem == k_player_subsystem_walk) &&
+          (world_static.challenge_target == NULL) ){
+         world_static.challenge_target = NULL;
+         world_entity_focus( call->id );
+      }
    }
    else {
       vg_print_backtrace();
@@ -50,4 +35,64 @@ VG_STATIC void ent_challenge_call( world_instance *world, ent_call *call ){
    }
 }
 
+VG_STATIC void ent_challenge_preupdate( ent_challenge *challenge ){
+   world_instance *world = world_current_instance();
+
+   if( mdl_entity_id_type( challenge->camera ) == k_ent_camera ){
+      u32 index = mdl_entity_id_id( challenge->camera );
+      ent_camera *cam = mdl_arritm( &world->ent_camera, index );
+
+      /* TODO COMPRESSION */
+      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 {
+      /* TODO COMPRESSION */
+      v3_copy( localplayer.cam.pos, world_static.focus_cam.pos );
+      v3_copy( localplayer.cam.angles, world_static.focus_cam.angles );
+      world_static.focus_cam.fov = localplayer.cam.fov;
+      world_static.focus_cam.nearz = localplayer.cam.nearz;
+      world_static.focus_cam.farz = localplayer.cam.farz;
+   }
+
+   gui_helper_action( button_display_string( k_srbind_maccept ), "start" );
+   gui_helper_action( button_display_string( k_srbind_mback ), "exit" );
+
+   if( mdl_entity_id_type( challenge->first ) == k_ent_objective ){
+      if( button_down( k_srbind_maccept ) ){
+         u32 index = mdl_entity_id_id( challenge->first );
+         world_static.challenge_target = mdl_arritm( &world->ent_objective, 
+                                                     index );
+         world_static.challenge_timer = 0.0f;
+         world_entity_unfocus();
+
+         u32 next = challenge->first;
+         while( mdl_entity_id_type(next) == k_ent_objective ){
+            u32 index = mdl_entity_id_id( next );
+            ent_objective *objective = mdl_arritm(&world->ent_objective,index);
+            objective->flags &= ~k_ent_objective_passed;
+            next = objective->id_next;
+            v3_fill( objective->transform.s, 1.0f );
+         }
+         audio_oneshot( &audio_challenge[5], 1.0f, 0.0f );
+         return;
+      }
+   }
+
+   if( button_down( k_srbind_mback ) ){
+      world_static.challenge_target = NULL;
+      world_entity_unfocus();
+      audio_oneshot( &audio_challenge[4], 1.0f, 0.0f );
+      return;
+   }
+}
+
+VG_STATIC void ent_challenge_render( ent_challenge *challenge ){
+   
+}
+
 #endif /* ENT_CHALLENGE_C */