(50c0271)

[carveJwlIkooP6JGAAIwe30JlM.git] / world_gate.c

diff --git a/world_gate.c b/world_gate.c
index 1631e05dc535b65ea19b925e65962e03271c7743..2a236d4391c0d8d7f67d8bcc94bcbad42151a787 100644 (file)
--- a/world_gate.c
+++ b/world_gate.c
@@ -13,41 +13,42 @@
 #include "model.h"
 #include "entity.h"
 #include "render.h"
-#include "camera.h"
 
 #include "world_water.h"
 #include "player_remote.h"
 #include "shaders/model_gate_unlinked.h"
+#include <string.h>
+
+struct world_gates world_gates;
 
 /*
  * Update the transform matrices for gate
  */
-static void gate_transform_update( ent_gate *gate ){
-   if( gate->flags & k_ent_gate_flip ){
+void gate_transform_update( ent_gate *gate )
+{
+   if( gate->flags & k_ent_gate_flip )
+   {
       v4f qflip;
       q_axis_angle( qflip, (v3f){0.0f,1.0f,0.0f}, VG_PIf );
       q_mul( gate->q[1], qflip, gate->q[1] );
+      q_normalize( gate->q[1] );
    }
 
    m4x3f to_local, recv_to_world;
 
    q_m3x3( gate->q[0], gate->to_world );
    v3_copy( gate->co[0], gate->to_world[3] );
-   
    m4x3_invert_affine( gate->to_world, to_local );
 
    q_m3x3( gate->q[1], recv_to_world );
    v3_copy( gate->co[1], recv_to_world[3] );
+
    m4x3_mul( recv_to_world, to_local, gate->transport );
 }
 
-static void world_gates_init(void)
+void world_gates_init(void)
 {
    vg_info( "world_gates_init\n" );
-
-   shader_model_gate_register();
-   shader_model_gate_unlinked_register();
-
    vg_linear_clear( vg_mem.scratch );
 
    mdl_context mgate;
@@ -71,7 +72,8 @@ static void world_gates_init(void)
    mdl_close( &mgate );
 }
 
-static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
+void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl )
+{
    m4x3_copy( gate->to_world, mmdl );
    
    if( !(gate->flags & k_ent_gate_custom_mesh) ){
@@ -80,7 +82,8 @@ static void ent_gate_get_mdl_mtx( ent_gate *gate, m4x3f mmdl ){
    }
 }
 
-static void render_gate_mesh( world_instance *world, ent_gate *gate ){
+static void render_gate_mesh( world_instance *world, ent_gate *gate )
+{
    if( gate->flags & k_ent_gate_custom_mesh ){
       mesh_bind( &world->mesh_no_collide );
       for( u32 i=0; i<gate->submesh_count; i++ ){
@@ -98,8 +101,9 @@ static void render_gate_mesh( world_instance *world, ent_gate *gate ){
 /*
  * Render the view through a gate
  */
-static int render_gate( world_instance *world, world_instance *world_inside,
-                           ent_gate *gate, camera *cam ){
+int render_gate( world_instance *world, world_instance *world_inside,
+                 ent_gate *gate, vg_camera *cam )
+{
    v3f viewdir, gatedir;
    m3x3_mulv( cam->transform, (v3f){0.0f,0.0f,-1.0f}, viewdir );
    q_mulv( gate->q[0], (v3f){0.0f,0.0f,-1.0f}, gatedir );
@@ -139,8 +143,8 @@ static int render_gate( world_instance *world, world_instance *world_inside,
    world_gates.cam.farz  = 2000.0f;
 
    m4x3_mul( gate->transport, cam->transform, world_gates.cam.transform );
-   camera_update_view( &world_gates.cam );
-   camera_update_projection( &world_gates.cam );
+   vg_camera_update_view( &world_gates.cam );
+   vg_camera_update_projection( &world_gates.cam );
 
    /* Add special clipping plane to projection */
    v4f surface;
@@ -154,7 +158,7 @@ static int render_gate( world_instance *world, world_instance *world_inside,
       m4x4_clip_projection( world_gates.cam.mtx.p, surface );
 
    /* Ready to draw with new camrea */
-   camera_finalize( &world_gates.cam );
+   vg_camera_finalize( &world_gates.cam );
 
    vg_line_point( world_gates.cam.transform[3], 0.3f, 0xff00ff00 );
 
@@ -184,8 +188,9 @@ static int render_gate( world_instance *world, world_instance *world_inside,
    return 1;
 }
 
-static void render_gate_unlinked( world_instance *world,
-                                  ent_gate *gate, camera *cam ){
+void render_gate_unlinked( world_instance *world, 
+                           ent_gate *gate, vg_camera *cam )
+{
    m4x3f mmdl; m4x4f m4mdl;
    ent_gate_get_mdl_mtx( gate, mmdl );
    m4x3_expand( mmdl, m4mdl );
@@ -252,7 +257,8 @@ static int gate_intersect_plane( ent_gate *gate,
 /*
  * Intersect specific gate
  */
-static int gate_intersect( ent_gate *gate, v3f pos, v3f last ){
+int gate_intersect( ent_gate *gate, v3f pos, v3f last )
+{
    v2f xy;
 
    if( gate_intersect_plane( gate, pos, last, xy ) ){
@@ -268,7 +274,8 @@ static int gate_intersect( ent_gate *gate, v3f pos, v3f last ){
 /* 
  * Intersect all gates in the world
  */
-static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){
+u32 world_intersect_gates( world_instance *world, v3f pos, v3f last )
+{
    for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
       ent_gate *gate = mdl_arritm( &world->ent_gate, i );
 
@@ -288,16 +295,19 @@ static u32 world_intersect_gates( world_instance *world, v3f pos, v3f last ){
    return 0;
 }
 
-static void ent_gate_call( world_instance *world, ent_call *call ){
+entity_call_result ent_gate_call( world_instance *world, ent_call *call )
+{
    u32 index = mdl_entity_id_id( call->id );
    ent_gate *gate = mdl_arritm( &world->ent_gate, index );
 
-   if( call->function == 0 ){ /* unlock() */
+   if( call->function == 0 ) /* unlock() */
+   { 
       gate->flags &= ~k_ent_gate_locked;
+      return k_entity_call_result_OK;
    }
-   else {
-      vg_print_backtrace();
-      vg_error( "Unhandled function id: %u\n", call->function );
+   else 
+   {
+      return k_entity_call_result_unhandled;
    }
 }
 
@@ -305,24 +315,32 @@ static void ent_gate_call( world_instance *world, ent_call *call ){
 /* 
  * detatches any nonlocal gates 
  */
-static void world_unlink_nonlocal( world_instance *world ){
-   for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
+void world_unlink_nonlocal( world_instance *world )
+{
+   for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ )
+   {
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
 
-      if( gate->flags & k_ent_gate_nonlocal ){
+      if( gate->flags & k_ent_gate_nonlocal )
+      {
          gate->flags &= ~k_ent_gate_linked;
       }
    }
 }
 
-/* 
- * attatches nonlocal gates, to be called from main thread ONLY! 
+/*
+ * This has to be synchronous because main thread looks at gate data for 
+ * rendering, and we modify gates that the main thread has ownership of.
  */
-static void world_link_nonlocal_async( void *payload, u32 size ){
+void world_link_gates_async( void *payload, u32 size )
+{
+   VG_ASSERT( vg_thread_purpose() == k_thread_purpose_main );
+
    world_instance *world = payload;
    u32 world_id = world - world_static.instances;
 
-   for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ ){
+   for( u32 j=0; j<mdl_arrcount(&world->ent_gate); j ++ )
+   {
       ent_gate *gate = mdl_arritm( &world->ent_gate, j );
       gate_transform_update( gate );