some gate improvements

[carveJwlIkooP6JGAAIwe30JlM.git] / world_routes.c

diff --git a/world_routes.c b/world_routes.c
index 8567cdb7cc580513f120737f6bb78d5a3bf8cf75..44d055b1686409fa68015036d5993f194ce29028 100644 (file)
--- a/world_routes.c
+++ b/world_routes.c
@@ -6,6 +6,7 @@
 #define ROUTES_C
 
 #include <time.h>
+#include "entity.h"
 #include "world_routes.h"
 #include "world_gate.h"
 #include "world_load.h"
@@ -132,7 +133,7 @@ VG_STATIC void world_routes_activate_entry_gate( world_instance *world,
    world_static.last_use = world_static.time;
 
    /* disable all routes and leave the world */
-   if( rg->type == k_gate_type_nonlocel ){
+   if( rg->flags & k_ent_gate_nonlocal ){
       for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
          ent_route *route = mdl_arritm( &world->ent_route, i );
          route->active_checkpoint = 0xffff;
@@ -250,15 +251,12 @@ void world_routes_pointcloud_spot( world_instance *world,
       v3_sub( point, pcbuf->boundary[0], pos );
       v3_mul( pos, inv_ext, pos );
 
-      for( u32 i=0; i<3; i++ ){
-         vert->pos[i] = (pos[i]-0.5f) * 32767.0f;
-      }
-
       float dist = 1.0f-(v3_length(jitter));
 
-      for( u32 i=0; i<4; i++ ){
-         vert->colour[i] = colour[i] * 255.0f * dist*dist;
-      }
+      v4f final_colour;
+      v4_muls( colour, dist*dist, final_colour );
+
+      pointcloud_packvert( vert, pos, final_colour );
    }
 }
 
@@ -302,14 +300,7 @@ void world_routes_pointcloud_tower( world_instance *world,
       v3_sub( point, pcbuf->boundary[0], point );
       v3_mul( point, inv_ext, point );
 
-      /* TODO....... */
-      for( u32 i=0; i<3; i++ ){
-         vert->pos[i] = (point[i]-0.5f) * 32767.0f;
-      }
-
-      for( u32 i=0; i<4; i++ ){
-         vert->colour[i] = colour[i] * 255.0f;
-      }
+      pointcloud_packvert( vert, point, colour );
    }
 }
 
@@ -662,10 +653,6 @@ VG_STATIC f64 world_routes_scatter_surface_points( world_instance *world,
          v3_sub( pt, pcbuf->boundary[0], pos );
          v3_mul( pos, inv_ext, pos );
 
-         for( u32 i=0; i<3; i++ ){
-            vert->pos[i] = (pos[i]-0.5f) * 32767.0f;
-         }
-
          static v4f colours[] = {
             [k_surface_prop_concrete] = { 0.13, 0.15, 0.17, 1.0 },
             [k_surface_prop_grass]    = { 0.07, 0.1, 0.14, 1.0 },
@@ -675,16 +662,13 @@ VG_STATIC f64 world_routes_scatter_surface_points( world_instance *world,
          };
 
          v4f col = {0.0f,0.0f,0.0f,0.0f};
-         if( surf->info.surface_prop < vg_list_size(colours) ){
+         if( surf->info.surface_prop < vg_list_size(colours) )
             v4_copy( colours[surf->info.surface_prop], col );
-         }
 
          f32 brightness = v3_dot(vn,light_dir)*0.5f+0.5f;
          v3_muls( col, brightness, col );
 
-         for( u32 j=0; j<4; j++ ){
-            vert->colour[j] = col[j] * 255.0f;
-         }
+         pointcloud_packvert( vert, pos, col );
       }
    }
 
@@ -753,13 +737,7 @@ VG_STATIC void world_routes_surface_grid( world_instance *world,
                   v3_sub( hit, pcbuf->boundary[0], co );
                   v3_mul( co, inv_ext, co );
 
-                  for( u32 i=0; i<3; i++ ){
-                     vert->pos[i] = (co[i]-0.5f) * 32767.0f;
-                  }
-
-                  for( u32 i=0; i<4; i++ ){
-                     vert->colour[i] = colour[i] * 255.0f;
-                  }
+                  pointcloud_packvert( vert, co, colour );
                }
             }
          }
@@ -934,7 +912,8 @@ VG_STATIC void world_gen_routes_ent_init(void)
             }
          }
 
-         if( gate->type == k_gate_type_teleport ){
+         if( (gate->flags & k_ent_gate_linked) &
+            !(gate->flags & k_ent_gate_nonlocal) ){
             gate = mdl_arritm(&world->ent_gate, gate->target );
 
             for( u32 k=0; k<4; k++ ){