From 1a7f4a35e88698bdb45c90f646f1645589d5511c Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Sun, 19 Nov 2023 04:40:33 +0000
Subject: [PATCH] proxy models

---
 blender_export.py                  |  79 +++++++++++++++++++----------
 ent_miniworld.c                    |  26 ++++++++++
 entity.h                           |  12 ++++-
 maps_src/dev_hub/main.mdl          | Bin 194664 -> 227944 bytes
 shaders/model_board_view.h         |  14 +++--
 shaders/model_character_view.h     |  14 +++--
 shaders/model_entity.h             |  14 +++--
 shaders/model_sky.h                |  14 +++--
 shaders/model_sky_space.h          |  14 +++--
 shaders/scene_cubemapped.h         |  14 +++--
 shaders/scene_depth.h              |  14 +++--
 shaders/scene_font.h               |  14 +++--
 shaders/scene_fxglow.h             |  14 +++--
 shaders/scene_override.h           |  16 +++---
 shaders/scene_position.h           |  14 +++--
 shaders/scene_route.h              |  14 +++--
 shaders/scene_scoretext.h          |  14 +++--
 shaders/scene_standard.h           |  14 +++--
 shaders/scene_standard_alphatest.h |  14 +++--
 shaders/scene_terrain.h            |  14 +++--
 shaders/scene_vertex_blend.h       |  14 +++--
 shaders/scene_water.h              |  14 +++--
 shaders/scene_water_fast.h         |  14 +++--
 world.h                            |   3 +-
 world_entity.c                     |  11 ++++
 world_gen.c                        |  11 ++++
 world_load.c                       |   1 +
 world_render.c                     |  40 +++++++++++++++
 world_volumes.c                    |   6 +++
 29 files changed, 332 insertions(+), 125 deletions(-)

diff --git a/blender_export.py b/blender_export.py
index b4a501d..36ca368 100644
--- a/blender_export.py
+++ b/blender_export.py
@@ -40,7 +40,8 @@ sr_entity_list = [
    ('ent_objective',    'Objective',      '', 18 ),
    ('ent_challenge',    'Challenge',      '', 19 ),
    ('ent_relay',        'Relay',          '', 20 ),
-   ('ent_miniworld',    'Mini World',     '', 22 )
+   ('ent_miniworld',    'Mini World',     '', 22 ),
+   ('ent_prop',         'Prop',           '', 23 )
 ]
 
 MDL_VERSION_NR = 104
@@ -283,7 +284,7 @@ class ent_water(Structure):
 class volume_trigger(Structure):
 #{
    _fields_ = [("event",c_uint32),
-               ("blank",c_uint32)]
+               ("event_leave",c_uint32)]
 #}
 
 class volume_particles(Structure):
@@ -527,9 +528,17 @@ class ent_cubemap(Structure):#{
 class ent_miniworld(Structure):#{
    _fields_ = [("transform",mdl_transform),
                ("pstr_world",c_uint32),
-               ("purpose",c_int32)]
+               ("purpose",c_int32),
+               ("proxy",c_uint32)]
 
-   sr_functions = { 0: 'zone' }
+   sr_functions = { 0: 'zone', 1: 'leave' }
+#}
+
+class ent_prop(Structure):#{
+   _fields_ = [("transform",mdl_transform),
+               ("submesh_start",c_uint32),
+               ("submesh_count",c_uint32),
+               ("flags",c_uint32)]
 #}
 
 def obj_ent_type( obj ):
@@ -1665,6 +1674,7 @@ def sr_compile( collection ):
          # entity ignore mesh list
          #
          if ent_type == 'ent_traffic': continue
+         if ent_type == 'ent_prop': continue
          if ent_type == 'ent_font': continue
          if ent_type == 'ent_font_variant': continue
          if ent_type == 'ent_menuitem': continue
@@ -1841,6 +1851,7 @@ def sr_compile( collection ):
             if obj_data.target:#{
                volume.target = sr_entity_id( obj_data.target )
                volume._anon.trigger.event = obj_data.target_event
+               volume._anon.trigger.event_leave = obj_data.target_event_leave
             #}
 
             sr_ent_push(volume)
@@ -1960,8 +1971,17 @@ def sr_compile( collection ):
 
             compile_obj_transform( obj, miniworld.transform )
             miniworld.pstr_world = sr_compile_string( obj_data.world )
+            miniworld.proxy = sr_entity_id( obj_data.proxy )
             sr_ent_push( miniworld )
          #}
+         elif ent_type == 'ent_prop':#{
+            prop = ent_prop()
+            compile_obj_transform( obj, prop.transform )
+            prop.submesh_start, prop.submesh_count, _ = \
+                  sr_compile_mesh_internal( obj )
+            prop.flags = 0
+            sr_ent_push( prop )
+         #}
       #}
    #}
 
@@ -2601,6 +2621,9 @@ class SR_OBJECT_ENT_ROUTE_ENTRY(bpy.types.PropertyGroup):
 class SR_OBJECT_ENT_MINIWORLD(bpy.types.PropertyGroup):
 #{
    world: bpy.props.StringProperty( name='world UID' )
+   proxy: bpy.props.PointerProperty( \
+               type=bpy.types.Object, name='proxy', \
+               poll=lambda self,obj: sr_filter_ent_type(obj,['ent_prop']))
 #}
 
 class SR_UL_ROUTE_NODE_LIST(bpy.types.UIList):
@@ -2950,40 +2973,44 @@ class SR_OBJECT_ENT_VOLUME(bpy.types.PropertyGroup):#{
    target: bpy.props.PointerProperty( \
            type=bpy.types.Object, name="Target", \
            poll=lambda self,obj: sr_filter_ent_type(obj,SR_TRIGGERABLE))
-   target_event: bpy.props.IntProperty( name="Event/Method" )
+   target_event: bpy.props.IntProperty( name="Enter Ev" )
+   target_event_leave: bpy.props.IntProperty( name="Leave Ev" )
 
    @staticmethod
-   def inspect_target( layout, data, propname ):#{
+   def inspect_target( layout, data, propname, evs = ['_event'] ):#{
       box = layout.box()
       box.prop( data[0], propname )
 
-      row = box.row()
-      row.prop( data[0], propname + '_event')
-
-      target = getattr( data[0], propname )
-      if target:#{
-         tipo = target.SR_data.ent_type
-         cls = globals()[ tipo ]
-
-         table = getattr( cls, 'sr_functions', None )
-         if table:#{
-            index = getattr( data[0], propname+'_event')
-            if index in table:
-               row.label( text=table[index] )
-            else:
-               row.label( text="undefined function" )
+      for evname in evs:#{
+         row = box.row()
+         row.prop( data[0], propname + evname )
+
+         target = getattr( data[0], propname )
+         if target:#{
+            tipo = target.SR_data.ent_type
+            cls = globals()[ tipo ]
+
+            table = getattr( cls, 'sr_functions', None )
+            if table:#{
+               index = getattr( data[0], propname + evname )
+               if index in table:
+                  row.label( text=table[index] )
+               else:
+                  row.label( text="undefined function" )
+            #}
+         #}
+         else:#{
+            row.label( text="..." )
+            row.enabled=False
          #}
-      #}
-      else:#{
-         row.label( text="..." )
-         row.enabled=False
       #}
    #}
 
    @staticmethod
    def sr_inspector( layout, data ):#{
       layout.prop( data[0], 'subtype' )
-      SR_OBJECT_ENT_VOLUME.inspect_target( layout, data, 'target' )
+      SR_OBJECT_ENT_VOLUME.inspect_target( layout, data, 'target', \
+            ['_event','_event_leave'] )
    #}
 #}
 
diff --git a/ent_miniworld.c b/ent_miniworld.c
index bc59d47..54ce8ae 100644
--- a/ent_miniworld.c
+++ b/ent_miniworld.c
@@ -14,6 +14,19 @@ static void ent_miniworld_call( world_instance *world, ent_call *call ){
 
       global_miniworld.active_id = call->id;
    }
+   else if( call->function == 1 ){
+
+      if( global_miniworld.active_id == call->id )
+         global_miniworld.active_id = 0;
+      else 
+         vg_warn( "bad call\n" );
+
+      if( miniworld->proxy ){
+         ent_prop *prop = mdl_arritm( &world->ent_prop, 
+                                      mdl_entity_id_id(miniworld->proxy) );
+         prop->flags &= ~0x1;
+      }
+   }
 }
 
 static void ent_miniworld_render( world_instance *host_world ){
@@ -25,7 +38,20 @@ static void ent_miniworld_render( world_instance *host_world ){
    ent_miniworld *miniworld = mdl_arritm( &host_world->ent_miniworld, 
                                           mdl_entity_id_id(entity_id) );
 
+   int rendering = 1;
    if( miniworld->purpose == k_world_purpose_invalid )
+      rendering = 0;
+
+   if( miniworld->proxy ){
+      ent_prop *prop = mdl_arritm( &host_world->ent_prop, 
+                                   mdl_entity_id_id(miniworld->proxy) );
+      if( !rendering )
+         prop->flags &= ~0x1;
+      else
+         prop->flags |= 0x1;
+   }
+
+   if( !rendering )
       return;
 
    world_instance *dest_world = &world_static.instances[miniworld->purpose];
diff --git a/entity.h b/entity.h
index cab16c8..bdb69f8 100644
--- a/entity.h
+++ b/entity.h
@@ -31,6 +31,7 @@ typedef struct ent_challenge ent_challenge;
 typedef struct ent_relay ent_relay;
 typedef struct ent_cubemap ent_cubemap;
 typedef struct ent_miniworld ent_miniworld;
+typedef struct ent_prop ent_prop;
 
 enum entity_alias{
    k_ent_none        = 0,
@@ -72,7 +73,8 @@ static u32 mdl_entity_id( u32 type, u32 index ){
 
 enum entity_function{
    k_ent_function_trigger,
-   k_ent_function_particle_spawn
+   k_ent_function_particle_spawn,
+   k_ent_function_trigger_leave
 };
 
 struct ent_spawn{
@@ -207,7 +209,7 @@ struct volume_particles{
 };
 
 struct volume_trigger{
-   u32 event, blank;
+   u32 event, event_leave;
 };
 
 enum ent_volume_flag {
@@ -504,6 +506,12 @@ struct ent_miniworld {
    u32 pstr_world;
 
    i32 purpose;
+   u32 proxy;
+};
+
+struct ent_prop {
+   mdl_transform transform;
+   u32 submesh_start, submesh_count, flags;
 };
 
 #include "world.h"
diff --git a/maps_src/dev_hub/main.mdl b/maps_src/dev_hub/main.mdl
index 106e213105632022dc9de5da022840c63e07cf74..deae0e2fd6a1888498422b2e5643d600e58ae432 100644
GIT binary patch
delta 25896
zcmcIt30zdw_kY78f*=8-fDX8!sJP@7sLZ=F;J%`%sHwT(5{ertrTAPb$lRYbSZ11v
z`xcg%%$pf7MN`sW`qN6&$_2I5`kPDs(*L<{-W$#vc<}svKEL^Nyq9yn=bm$yci+8t
z&Yeo{*C>4uV4lP<OnsnWAOq0kwDBn!kjkGh58&$<2L5AarO%w4HgT3LV&Xg*#(T9n
z)O(T_!}zTp8P>5H!@z$`JkZqfQ(m7sCOu{5<S|pIMz#;bKv~R7k}N$XBYpPF6e?o2
z`>ftu#{>R7S*O!>z)@rEfl|`aU!P0Mpdk2Mm1Hd-Pi3>FkC~e$N}$~8e59_9Z`0~d
zGwpe^E@a3m>8~6~Va~KEv!^<3GIn1HDaoeKoHku5i)rfT%*oD<Nt+CHnLLdeYwE|Z
z(AB9%A(wsly}H_QIZJfR)c}TpRuHQVZ8&+HWF_o~j!ClV#41f6GcHxOK+`oI8>8;{
zHcCyLJvOD)%WY$sojZ3nyYVbw;>^k8r;eG<q-I*?(|q1~k3Kq6&coos;>pWQ$9g&J
zv%7sxWI`n_WSE5n+DNpv5ecB+oqVb1l)xvk3vCa6X>+ve(V1PUT{^~(^E%9xKuw|m
zyvUnj!bGKoHYi9YLJOrtd-hMj)`9L>2UwauIltL{f6(8ySkLi}<bdYp0ApXPUyU0k
ziuLzrm~(*1gFl)>dMmWJsNML~1Vj2Kg||<pCbE0?C$4;S)jN@b^XhxI(E08c%`;4I
zevEf?G#xJTr;n6bRRATyrvQlN?H&yOTD6q$V)&cZ@*Jd>B!Yyw#D8C{b&YE@D}F-x
zX`an$hz$gP>zGiU_<W$#@#lRkFVT{dzF6eQJ2l+YUms%Ur&KfezzCvfKGn0OH;foY
zmp8e(CAi1vI{6Os-dPC=v+Ex%>a|?3`OhIGk9?_H;^#Sh<UCF7_okX7ep{XJY~iya
zjOTmQHRz!y5?%`pQWV5z)HNhBrscw#skud7g_*{t-KUX<9rIYZ)XFR%Jb$5XM3+%-
z=*{grZhhf$?z0hW<KxMsUo|hn#~BRz@B>W38|&{CDFjf3M7auBpynxVJI4hdW6YoN
zq{}-k_~V9%kjF4UZ{BTn6!RZRd^&K|_+GnWZQljPkXn|Wd~!qtN6QI)8gvx#1ugz)
z!Q;MM>l<Zjv#2v^xgizz3_mU+NURI>0b%&iNM{`{j=ouh`Or&xxt9iPx@qlyEt4?y
z=2-c#NP}1qRX_rMn^aJrS$PWng~$j!t^9$00Y^`;x7b?7ab!@yQY#&3A#yJv0Uuj0
zLSOCQ0}>iFxmSevRz-jF9fu38b9<2GgKEJ*s0Tw<(ohKSSXKx?BShBdYFf@F?M@}b
z7cb|d>qqGIX+6wKiq8}wzQA9UYE5f_1XLkJR@k-pY<ytK0`l+MKk<ivPisB0$onYf
zLu-h9S`Ov|UTh_buW|4zWBAETGTF~z<(t+wxC|fxKevIipn;#26k+~0;PW14bB~8#
z7k<@p1AFYpsic)h5`UpVL}IK*?F9Xrwnd1K$B1HnV8X7mGXvjGIGWoD<N4Tz5g~({
z#hFd_ubOi&k@%M3nS^u==O+T6R=CHHza?P41^9H5FMjzO1^+nko1D69W@gw->9@X*
zCl6+kn(IH}F&^`y8#&A0c<^8X<|hN+YjaS-?(Z{;dKMS6=U1hWy1oPXEa0zv`JDvQ
z)$t1cA>enpUOgc!|3M+f-)t12pB7#%A$L_~QA6uS<LkR7lZD39(DQW-octhQf!f21
z8%_)U>Y;Z`?YH+z*gvsbLUGmxA-i5z5_F~}yy2W5m{$3`s3384)MvXZF#M#3hD5p5
zRg_hG^}_iJ0{?If$t)Sf$2NAhZnuK$BFvxI*f}g0)@+3N0>8b1!8Oe0PY)K>-keId
z4&2M*=EZy%ej)Pk!+hNA1FC;0tSC$;BqFObf3bl<FDobn*^LZ(xnorYr9a#=9-7gY
zcpt50<A;KVJVX=%c%y~LZ!{#}yGKWaB-QjWf0(weXiC&Dw(&0+#Q(K#__@HpoBOqS
z{l~2p{B6K@tX*a@{L)gv$M`k*YgzJS7O8%1AMevNA|yEbTQjpRu@LiPn>t(DKBL%y
z_(oa-*C0>-=b?3L=egvLF_pJ~!qv|R`)Er+5#kH<U9FdErV!wX?}0r{C^$QkG|>IR
z#~LDB?^48P`JAQ(mkEUcCMMTZd2V@Ne5!*Zbq2IH@;#yruGT{W{${g?kleO{DW&!M
zMVKGjJR&4w^<U-(@6Rprn$py|Giw^@GAobo4*cuMZ4!jk-U|L);Qul1vxFXzcM8?;
zK0zIXcbCj2rJs)FFEo$P|6%;t+-Ah)BE%Q?(q;yiLrB2K#yGoS(%^H2U)J3tBo$33
z`|tTf&6*or9w7m(nO?3L;)@D;xe60J`w6w1&L*!s8p!f-G0vALHGu?tbPMNfxv*M2
z2j(YB{ETro65gJ^rogdh0`WV4na=|Loz*!B%;L6%n12ZPbY8gn$q%adC2wW2>E|bt
z8);kl(3Vd8GMi@+=645v(roX9gAZO&@aF<QE6{A775#pZzE6Zueb9W86S<P#2K<w$
z`%TTSI28N~Qu#HPZ&C0uzW=^$#)JV2$e^>E`Pf!Yf0p{5D8l@St(;wR^7>uOxAGY+
z4K9a1Dfrv?e9D_-*b+03D}ecrq=G)$m|2AQFtJ4%#Hp4pW9|<R5C*-UNtR@t=*-78
zb_(besSv;m!nIOT2=Mgs>yAb2veDB?ud!+LS>xn&E8?rZit+MJ3mz|L@2sC^{P})&
z(jmN_4Zl%dtsCT8d?5^7@`_7Uy5vQCtgCpTVBb#k3$u+SeaMjs$BoFA0*`%D!PBLx
z*adW{iZS$6?Akf3xgBfETiS;F`T7V|W7s*2r)yZz0$sx@1hC8#1$24lpL&J8<ll!p
zJ#t>)i(#)pA1K-`3IQxJIe8U}1!@g|mj^@YR3kOwl8G_HUv)2F+SApv>~?;_^mZ>5
zs^Iy&20@&>=2O8aIsuniZ`>uePizvoJHA+T0OBQz3Z74F7^Iiig&0Fu3SDI9_I+R=
z1LJy<pN=0=?KJEh#`AFv4K54rf-bUY()b6q$kBn+T^dN#x&T)P<LPQj>}0xzRS25G
z`<M1UU3_l-YaRRi+gZf(*S<Wwuth$7VPihL;Pvtg9`TKQaYKV^)oaN9&U$S3bi($?
zRjjHpAFqZnA6CPnr_`Z`LEh|xmGel*cpsLp-qhe)S|9<Bm)n>R>ovW+96q*jm2rD>
zj$C@Rp3+k!P^?|t_^v8XvwUgf?k*trzWFqs&xkhY<wcW1kPpi;*|b7{HBNQ7ZhRnQ
zl1;Z(iOV3@LQWyTMJWV$9Tf9Xf8*4jrxJeB5ph-TnzR*yQt(RN2PgzE`Gm;(fYi;0
zgeLvQkrQw6bm=V4nDo7X_^J;yo&dDq@n}79agR{r5lk3Q&f$l(vFg)}75ME@&f!gW
z5emU1>D5M8`JIdXZQrdNL|(d>Z=@Px-KYi@s6AQu*?m#`CkM|9ubU?j|HEFm?V=QQ
z!;Oa&c)U+Rd~u(mmuH`XO$ox_F7rrzA-_N|n<xbEi0b8ysjA@Lx6_5w*%_q8$amv;
zJo*#@nEG7C6#~$3Z9;?B=mf7(Gsx}>pC~r1n2&c)m=Bv=*IvknYb2~aGm1=`e^<Hw
zR|xR%b{BM!$Nkf3d)Nc@rjeD2H?3-2je7#)6&p8&0QLoXc~`Y-ZZ7+K{Tbx5?A=zy
z?gk0ycFQ$$AU+%f!JdRp$8_4AndEDnu!1AQ8g(<$Wwj`v%W8#SJJ^<YXsUu&>I`P@
z9M2$c)c(~-r!CiB4+-d$@3M{f%E{@T&4W!HJdLzozC%##hmb(Ac|&|ban4n;{Ic=4
zpXZWKEE8D8u1+Dqn>1Cy^R<hu!`|eGv8dz-b;{Kl3IX2MsS4P<2xG(Gab(uVcVI7r
zPTv#)?3F@rvAMyuBdh%&ObB2578yG<5QZ&0FtlUop_W1bTQ%1XOCi7-Igh?D?)uLH
z(s93MXL@et+MX%|xG04nyM@8Em#VdiXNSK%f#e>}Rcs+JAMZmkAGRENdCxTE!K-X;
zGBi}ne+hgTY#-%~E)wv#Ak2piuxt1D&CZR+ZUt|V4auysAS6)ibP-?N>AIS)bE~BI
zGq*T$Soc-DVi+g{_<>Os9BLe6OkKs1ZU>u)&z`szqR$=@C^pB4Z{(Xod()Fay4TIV
z^0DyFpVLVbrZ$iFu9%Pax^8^Eya#?WE>r0Aa4h+&c`-aL(BASv0TR$nwq7=j_@aVd
zR`6VXRroe=EP422b5^nOM*_um9rN*aeWE>yHGVOQ@HejWS>2uM#Z@c1Bq;c38?WGZ
zcTP4GZ@6)rP3|{_H0t%Ykq>L>d{F3qT_J!$>}m{!0Bh`>#j?TO=8=o1Ua|6zTRDrO
zJ7I;O2W+Y3af}2!-pl`Hi)7cmo<X*6Vfome&dQZG`>qJ{;rt~;K7YY{z>5z%#Sh(f
zzraxAEi!58FmV<TM-rU{kbn+vS3z!k*K{)VJp=pCD|5)ft&_y(L@z&Z3c*FG`RH+k
zLVzF9ZZkhO#yxnGWX|ZNm;*2$&O!9@ISAsz`Vv{VYMo*nyl*C1lDJX%>>>e=OG12D
z!9X|2M=BfG@2yGM3&@t!ukk*8oXt0|(WxTDFQBHy=A)HE0)C>Ta5(*PQP+|NLe|7&
z64%Si#^>}g=x@}WXI}BPn_!YOH0WuILIZr#%RU8f8!YshltxzH%z@KFRFpzc9R%Xc
z4&EvRF#JSs>G1pZ$T!CGvlft86O1P5fQFs`A-?jY2MH8MMsbhwjKy0Pkl?K0^hnC(
zE8>d<x%y5am?Zg18|vAoZG>jgX~d7)3Y#lb355VxTOq)mcWKo%cG%c)<huDM9-m_&
zzLhp$h};)QkaxWQk9JP+6}U}WnJrXZp*g=Yhi$O<bveS*zZu5;`&#KMc8UiqCGoRR
z(kIV3(2$r?A_L`AR-oxZqGA9SPI0oKDjZ@MPAuM4s|ssCByU}XIt@4j1}bof;sIOc
zL|MLE1vs%*WeUz_q)ew{RXK$5s$D=GLL`<9<x?J4&LfbDU|X4ztU%MM@FG^k$vKr4
zayrDxD3^y7*4W({$$+y~6&Rp+Nk=w7vGk*?04FhJ1xV>f?7M|x7XGQg02GG%SjIbz
zRDuUR`f=e0(1J(>3gC!nz)e9^t_UxdLv{H1)uSLNMOFsJZY6{8mz)e)h4B8qQC!zw
z^=9)g-EH3<?c|7j>>DpYum=s|5dDRJ+<h#l|Gg<GCBXJ>m)4r_jXHUVkuyg&1XqOT
z${AQRbcAW+>c_Ux{{%Sx(=ktI0<j_AI5Jfa`LIJ;@O<hp)2UHE+v2Vmp?vPe4D_t#
zWorUKBfca8pPD?ETZ^W5{f?VHE!<%X-sS7463>AGZlWp`0FS$@*E=mp6vUWpgIE)4
zoPON9tkc{k=Gzd+H2>wNc6U6rUrvEWJ5hyh8QmQ23RU6TT6(f4AXp^;f>tP&e%u|}
z-_KJlzchRR=g^{nYpey2$AtHWRG}S2vCxPVr#sjovHlE$JaSa7;4ETY4Xf!FXrZy!
z5;fuRpxYfe$4En9u55%O5y^hJCc*|33Q`r^o3!DRd8RAi(1tC899r<Z6Q7!B7jriQ
z_t=L7EHws0EX`SnsVUz?P7WTVTJXK+9WxzxI^E{I@LFZ%%k@`2Hme8Kvc*71&S416
zQF90z(1OPmD8qBw42)j9oE-pxJ$)g-N6n$JA8#_Pc=LPP)V?F_TJT~QaL@;|3$!R;
z0|mE#GSUE{IS?qM=1{;NrKVd@{s+xiyBfZ%{h<_jP*8`|6l7yG#Ri7?ImAdKKZrPz
zG46vDS3tsZq%wts=NrTt?C`8*(_&!EmIbz}>wd7!*z=OZ-y=yVhKQwu5V@r0Q0W8C
zlXN`0-ZsK3Op`)#hZy1rjI=G@+D;SxGiJEG;Ex||6YAA=uwBE2RuJMe6+)d{4sp;%
z@*gy%L8re#pB=l>u3`l@{Gw0R+39n<#BkkSp#eAil6u76aN<7O)5d?;1J-{ea5PxT
z3_(+}6M$DZgbh%Is_>pC*N6@s-(V39RDtK1G2cEWg&CjP^8a(x9_>3&_zt43dPDS;
znnQb{3&?i^TG;xYd#DNDyH<d0-tjHAwqM?<01xBey~ci#k4fFPa&33J860bkr`eGZ
zzV#A>aj7|k=XNc4JcibC8Vsa`rrT%ay=i-QNn1zlGc|2*Ls-`d2=7vJC~IiC{W^>Z
z?@7a|#EZ{A9&}m^;2Nwh8N{xI(66%)0;cAWv9sP(3J#Ubf7RiJ7wwnpf)y!aS*k!o
zuiX?x8}40(pZgsH_lhB83m}wC&7ra}!QHWIQ7C;-Hcx25<1zGOWY&@85R3LI#H5vT
z$XS1e!3HW-kV?Q$!HeSkj@BZ15Ycu4BHLv9<+=brmRO-&4I~C$wrjzgi{nkdr~Jy<
z3L31p`@Z&#u@OYZ&4UOzH3JhG++lydcEt8o=oU@*UZa0tcXj&Rw!ko?61=Pa41*2S
zySC374<U9r5NfC9P`?L{Z9&)bZ5R4j?OO0TY2o6`7+v~)8J?@e0Pcb(##DAQgz8O&
zkUcergeLEqgc*-)Gl$%;Yr)el<K(TD76rWIs;~P+utCJ%C5Ze}a|rK*RPfw$S(&D|
z1}X{)JYG-)3}|hg3W0+^tO!(nnMs3A9CH%Ba)th_>X^39xn(=K$j7e5K*NQ%i0`mH
zwjY+}lIFAW*aHxN*aQL*<x09wT-CUp^T``=%WNevBaB)UwoHh!*-xDm4##<$wBW0u
z^8fjCEc*^bGWtS9qwEmp?oo~FgG_%OEw<$}JkM67;Eu;Fqy_(5!E3hPVQN3H&)0tT
zo<C=$A(43y8Yz3^ZUEN+6sp8yhpNWI^N$TgKN={6LS*Gch_F<12-iRh{^p4o@wsPP
zuM*1P>HOnf<Gxomi5HLhT^nr*Ie%FYAVM<*A~n?<8nIJnpRw?7A@uS*P58-uHi+ea
zwZ0$WUev(3w5{x$5bC)ILO#_TYV(&M&_1TOrK-Tw`ZLVW=5TWSa;`1ox6xH8h<IJy
zI;Q`#{9tSCJ>S$La;4D^Vn(0#j!^Bg<J?M9-^I6W?Y>y-hIiU8*993TlEoFvXmeXP
z1<`&vJT?$>cC*n8!Kd>e2-S%$-^Ih*<(TNQ{bR1(PLmde=$6MshgPq7OA{Wq&^t@a
z>@x^r9Rk6u?hZ-yS9U>V3UUFCE{_RaWVY>j&ZGs84=7?+oH#NBf?@NA2XLx=h8K-U
zK^2de;ac#{1q<gqXdE&&O?VGtYHvVntz1L*#}dEIwBYd}lq%lU{$N#c$`xLZ{0hOg
zHz4R%%^`fE(N+T<p99Kxt}+9-1|<`YTi<|)Tmd3;)f~bV(1M3kH%>kXbZAk)ecWvH
z2<tJ3+Fc0IyJ`;M3RH~el)GJg>{hXY5|2+zo*X&Peh)#uArS1V<`C`z5zkejfcsdB
z0lYOcW%#qc5EDEUVuRHj;x_92?Y|Ut65=nmb!bt*TP-bkT>g{s#X>I#5Uvk_!jePf
z&;Rjmw*rN7Q!hSZ(SpYns9ww+vi654;{6a!tky)h2GxtJ#$$)7#B*R3D}*i$v=u|p
zaR&%KR&xlqkQO}N-n-+e{c=r;&v3kc?Q4AoG0J-&R$0v<ytC1QM>{9Zu0;W#T0xAn
z@HNCb>mlY@%^}>PmE*<w!~Jl4jHbZ=ZlTEWJ^~Gzz7N6EY7U_q+ZA}pez`8dHC8A{
z7TjM>WhWYU>{nl{XWa(D*IOY7Tg@T4e2yLjYEi&7cv1YFZ$2%cLEOV3nA^=Ex&F%S
zcO?q4K7(tl1&_D)_FJp0G!#6)19#osBbNcZ{Vr2b$76@I;Kc<9Cw<eocG3|x6(Y(5
zA+lWdz`c+0+fNG~A3~|&%i15TVgnG5&PGFA`Xq=?S91t2(X`<4%Spm>l^Vb^U6&{4
z1V0E^KMH~CY7XJ4S_?jFC|7n=szm`GOa@%cxBd&l+l>(BuI3Ovimeb2>yPKMGEH#}
zDpaThA9&b{9Svdc>mmGIF4KJs;Vz(ft||pwV=V^o>(yJxk57gu`Fx0$S8<3_y!|vN
zF!IbrC$1O8>qov@Kx6GoAm-lb5R8BKCc@8gd4=+LTw^VGTz(#R;S(`rzYc`%t27aV
z&wBGT;PF{<Re16F#|Ea%zsu6t|GySAQgsNQ^=iT6iO3Bv+Ar4ySYc`6P2+yJLEtle
z53ANfcvNe_m$eWV=Fp;m4-U^{?>63p3kN&k;(?k&_}x({-dTU;+pkgu$s%5Ieb}g*
zmEK$U9PTfuIfM_bFkZG_t_$$-IaW|Jfbprdf3@C%+YctV1)+wQUdNnxp07m#*H{Z4
zcR{n|JJ_jkiQ*burcgTMsz1ZvK2}$d)s=_UTJZS%V4G!va0~8Ye8<7147o`6i3mSt
zE`>_)`1D*Wo|C^Yi2Ayub241%cnnuN)EvSsqy>+U=T-2^^M9<6{_!1wUJU687ev$?
z!e2;e!Q&Qk;<?HV;M4G-Lj&0`xL!gpji@<<0~WO4`*Y|E1}zHMz)$-<kL-p^DsRJO
z6*Y%&i&li^+y@;#KCei@9gh#6*B;Jghrv~s25{v?%^`f$3wW+d1^kW2iyBze@?Y#G
zxHFRucV{Yg2%dlZolVsW41*ogg2&%4tVm|r?r`_!Yq*0WIz;Cm_a?;-l~bqyj|Zt1
zJnmx7q5G=fEZpJg)jCPj*JfJq_+3y1-Z}qbg~WqRtn?;O%_cFbqZ+@>wBT`#m3V3X
zckcrHolOI#wvYuEir$8cMHLSs_-R4(m5LU;>#5=3JDV3$0K8{RvCt82Ce48xN@@<_
zL0TDJsz1Zv8ds(u8^i{F{IR)k1}->x!9^!o?%tyKDL{Dj^MC9RQcyL3zcpKR<GMiL
zqSPq3Fs0_unXFm%-v@Dj+eV!zHfd3C^%-=57QEAdv-~SP|F#Z?8&_d)^Ge~6tNnqC
zzcy1<khLMj4r#&T@`s#y#TWwjwzw^DflDsaz0dG>JhDP%cs#dj!Na#~oa<}0JzH4z
zBe?%{4(@@eIW&>mV!8)kI=%c#Gol5LXU2;0oO1h(4Wus}#@2z0WcRn;SN-Z0zmB!w
zu|p!BtHJ<Q_;Twc_9<LQONEPRYAuA{9a``l{-#rl0yeN|MlZGlTx)v+uD7W<gvUe$
z`10rf_?ycL6w19VaRpKmH?l+FdfZH5imF4n0x5}H)e6`lEe7y+!GC@GT6}-FWmf>V
z?J8^``uz8N^s)G5aIZI5Q<VyU$2Hc1fA(y@SpJQWtE5FQFR~JD>-B?Md(<Iu{&9cq
zV}lQv+83X-r7jp@a#x^A?s)v=v=%&SA<neoW{%JsF8#d(m;Y$t^y6*-JER4VTeNb#
zH2>n6F44pqFTmBoOt?bmbf>&SuJ7;R>w7JDJcbl_dH#2=F*dOI-QmU)a0PKDTt!rK
z2sNom3to1JqahSp6!0MWd%;#A25vHXZfv94Ww;9}!OQh$7~IE|D98=K;2QJhpNwPS
zKBNuqMals87R7_K4Btsz0XtNtP=@F2%MAV<y1!%neH=$p<Bt^ZrOTo?%-EY0WW2eg
zA8~hu{zC9B$GU`#D<>yt!M7f{FhSRhPw3WiM4>yrR9U{WJ?F3g**s*`vV<*9Sw|HL
zVsoAPFs9H$SdcI$v)HZ$AJuI^p%>ss&GvM2DDSQ1pXuVq4jvdc;u%NsJC`0&YlJ~7
zdKY;^8N1Vc5;30NzC6lb!N^!1RRb~d4z0Wu8iv)s7^y!%@6&a?ll(cK51oJ+YW8s*
zwBU2ndKJ++2cM~3i1E9jldmf~fq#Gd2mI9){<=T-mOG;PEjwTK1kJo{J9p@K`*Qzy
zdqC>p!O%Qi_TAFdJQ&Z%?T+$SFfQ&=GV&gOo)LCv<4d}@7z_LxX1U)?mvLy2UYG7=
z$!VbT?+L$eE&h}_?Rxq<)bzK#DUW{W-!xBuX`B8$H2qm<nx`rK;qV$jaLtf`p9E)W
zSk4CNLL!178wf;G`cvy6Kzg8BG;h%b>q0t&LpBtMrgebo0vUiJq&!U{f$9O(2Wmj`
zmNB5(pfO|{0nxMxP&80epk`9OnMGGe7sAEBpDlq}0ksBt8K{kvr)gWDc0lx}*E>jg
zn!W-Q3ls;`QOeV_6HsR$x+kWSF3r=FPA>$=1VnAnJfxgx)C_+l03`y^JWaa*bp`4M
zWRmhUrHZsLS|~M6^E9Q-bO-7I)KkjSv=>lsAo^qBeWg52`vLW*ukj?v3=sctrUN1W
zD$pRH!4eIDG+D~il*)$!4Fei3<!SmF&<LQBK%=BQO<xBZ4KxO5tdyteINBrQfl`1b
zNO_u01eydi8R!j~w>awRLM){%b$Z_!@HhSS`{|ZHfEO?avgtrHoofj<=%T~tLv{fW
z)K0t@y$I69G;bMTfPwceWZwp&X%<j6(0f2jY2LC3AeLpdb=4#2n5_x4Qc71rx*Es_
z$j@SItP8bludQnuz8?PG0Q4!)MxaeVpV7P}C<4soLUs!fO}7DU2igI&ljbdE3fT+U
z-9R+m2ecpP0MO?&Z&?(f3vF`{vR?un0?G$E4D^+hr|A)(0w61pK=YQfP;!St$l8Hu
zS_E_y=xd;3Ql6&Afr^1n0G*_HOUFpvJ?=ha{{;F!pa(#I0X>xRG<^j080ZPm-%_5Y
zPl5ge^bgQ8DNobqK=fzhbwD0KG*44cATJ<qplVVcQp?SHx_}5jU{nX9X$>HMpa7tn
zG;ay24~-WLS^7KmGz|gL1JwemP4gBrKsfrd{9!;etqVl|?+p<^krLH|w7x_QAf<9D
zqdb~#2-FBDO3Kr;F;EkrXrQK2o~F%!W=xwr!8s>-&{;C;W@p`@o1Hxt6>v@oV}k0N
zyqIUZcI`U7I=j>971_J8JDpmU-RW|8r_(KhI-T<S-{iRevgneW?9+U<2l%=(+v61R
zxJ*1wH;ARVl1`^zz-8`#SU0z-mAspMIw!mR={4CqvfH1EZ!bE^{VyBW&4G%#k}G4D
z#Gd{jJN9(@7O|&-V@q~spKcLwdL;~lfKx33UaV1HpiR5}R|BgAMl1cm$QD2U4<w#b
A9smFU

delta 8107
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
R6Gv@ysgRv<sj$nh{68?Eru_f_

diff --git a/shaders/model_board_view.h b/shaders/model_board_view.h
index 19e3b2c..2d40352 100644
--- a/shaders/model_board_view.h
+++ b/shaders/model_board_view.h
@@ -205,14 +205,18 @@ static struct vg_shader _shader_model_board_view = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/model_character_view.h b/shaders/model_character_view.h
index 03df443..51e06db 100644
--- a/shaders/model_character_view.h
+++ b/shaders/model_character_view.h
@@ -213,14 +213,18 @@ static struct vg_shader _shader_model_character_view = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/model_entity.h b/shaders/model_entity.h
index 585c897..e7044ed 100644
--- a/shaders/model_entity.h
+++ b/shaders/model_entity.h
@@ -205,14 +205,18 @@ static struct vg_shader _shader_model_entity = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/model_sky.h b/shaders/model_sky.h
index 882e174..0bf6751 100644
--- a/shaders/model_sky.h
+++ b/shaders/model_sky.h
@@ -207,14 +207,18 @@ static struct vg_shader _shader_model_sky = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/model_sky_space.h b/shaders/model_sky_space.h
index 7251196..589175f 100644
--- a/shaders/model_sky_space.h
+++ b/shaders/model_sky_space.h
@@ -207,14 +207,18 @@ static struct vg_shader _shader_model_sky_space = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_cubemapped.h b/shaders/scene_cubemapped.h
index 4c90269..5f8b80a 100644
--- a/shaders/scene_cubemapped.h
+++ b/shaders/scene_cubemapped.h
@@ -207,14 +207,18 @@ static struct vg_shader _shader_scene_cubemapped = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_depth.h b/shaders/scene_depth.h
index 160fd02..ea2fbeb 100644
--- a/shaders/scene_depth.h
+++ b/shaders/scene_depth.h
@@ -206,14 +206,18 @@ static struct vg_shader _shader_scene_depth = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_font.h b/shaders/scene_font.h
index 7eba1b0..2cae292 100644
--- a/shaders/scene_font.h
+++ b/shaders/scene_font.h
@@ -209,14 +209,18 @@ static struct vg_shader _shader_scene_font = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_fxglow.h b/shaders/scene_fxglow.h
index 98bb0e3..f5c14c3 100644
--- a/shaders/scene_fxglow.h
+++ b/shaders/scene_fxglow.h
@@ -204,14 +204,18 @@ static struct vg_shader _shader_scene_fxglow = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_override.h b/shaders/scene_override.h
index fb53671..d0c7ab9 100644
--- a/shaders/scene_override.h
+++ b/shaders/scene_override.h
@@ -210,14 +210,18 @@ static struct vg_shader _shader_scene_override = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
@@ -478,7 +482,7 @@ static struct vg_shader _shader_scene_override = {
 "\n"
 "   compute_motion_vectors();\n"
 "\n"
-"   vec3 vfrag = vec3(0.5);\n"
+"   vec3 vfrag = vec3(0.7);\n"
 "   vec3 qnorm = aNorm.xyz;\n"
 "\n"
 "   qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);\n"
diff --git a/shaders/scene_position.h b/shaders/scene_position.h
index 99fe303..4b0a226 100644
--- a/shaders/scene_position.h
+++ b/shaders/scene_position.h
@@ -206,14 +206,18 @@ static struct vg_shader _shader_scene_position = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_route.h b/shaders/scene_route.h
index ecaf5fe..8e3cc10 100644
--- a/shaders/scene_route.h
+++ b/shaders/scene_route.h
@@ -205,14 +205,18 @@ static struct vg_shader _shader_scene_route = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_scoretext.h b/shaders/scene_scoretext.h
index a2241c8..17d0eba 100644
--- a/shaders/scene_scoretext.h
+++ b/shaders/scene_scoretext.h
@@ -225,14 +225,18 @@ static struct vg_shader _shader_scene_scoretext = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_standard.h b/shaders/scene_standard.h
index 3904980..b5b3298 100644
--- a/shaders/scene_standard.h
+++ b/shaders/scene_standard.h
@@ -205,14 +205,18 @@ static struct vg_shader _shader_scene_standard = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_standard_alphatest.h b/shaders/scene_standard_alphatest.h
index 2240b4b..f548899 100644
--- a/shaders/scene_standard_alphatest.h
+++ b/shaders/scene_standard_alphatest.h
@@ -205,14 +205,18 @@ static struct vg_shader _shader_scene_standard_alphatest = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_terrain.h b/shaders/scene_terrain.h
index faeb11e..5bf992c 100644
--- a/shaders/scene_terrain.h
+++ b/shaders/scene_terrain.h
@@ -206,14 +206,18 @@ static struct vg_shader _shader_scene_terrain = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_vertex_blend.h b/shaders/scene_vertex_blend.h
index 672d154..2cc345b 100644
--- a/shaders/scene_vertex_blend.h
+++ b/shaders/scene_vertex_blend.h
@@ -204,14 +204,18 @@ static struct vg_shader _shader_scene_vertex_blend = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_water.h b/shaders/scene_water.h
index 2ce696c..3a733b3 100644
--- a/shaders/scene_water.h
+++ b/shaders/scene_water.h
@@ -214,14 +214,18 @@ static struct vg_shader _shader_scene_water = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/shaders/scene_water_fast.h b/shaders/scene_water_fast.h
index 3e88f1d..8a1ba5e 100644
--- a/shaders/scene_water_fast.h
+++ b/shaders/scene_water_fast.h
@@ -211,14 +211,18 @@ static struct vg_shader _shader_scene_water_fast = {
 "   vec3 sun_colour  = mix( vec3(1.0), g_sunset_colour.rgb, g_sunset_phase*0.5 );\n"
 "        sun_colour *= sun_shape;\n"
 "\n"
-"\n"
+"   \n"
 "   float star = 0.0;\n"
-"   for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
-"      float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
-"      star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0 / pow(4.0, j));\n"
+"   float star_blend = 10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"\n"
+"   if( star_blend > 0.001 ){\n"
+"      for( float j = 1.0; j <= 4.1; j += 1.0 ){\n"
+"         float m = mix(0.6, 0.9, smoothstep(1.0, 2.0, j));\n"
+"         star += stars( ray_dir, 1.94 * pow( 1.64, j ), m ) * (1.0/pow(4.0, j));\n"
+"      }\n"
 "   }\n"
 "   \n"
-"   vec3 composite   = sky_colour + sun_colour + star*10.0*max(0.0,(1.0-g_day_phase*2.0));\n"
+"   vec3 composite   = sky_colour + sun_colour + star*star_blend;\n"
 "   return composite;\n"
 "}\n"
 "\n"
diff --git a/world.h b/world.h
index 02bb02e..dde9aea 100644
--- a/world.h
+++ b/world.h
@@ -180,7 +180,8 @@ struct world_instance {
                  ent_challenge,
                  ent_relay,
                  ent_cubemap,
-                 ent_miniworld;
+                 ent_miniworld,
+                 ent_prop;
 
    enum skybox {
       k_skybox_default,
diff --git a/world_entity.c b/world_entity.c
index 73caa0b..975c008 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -286,6 +286,17 @@ static void ent_volume_call( world_instance *world, ent_call *call )
          entity_call( world, call );
       }
    }
+   else if( call->function == k_ent_function_trigger_leave ){
+      call->id = volume->target;
+
+      if( volume->flags & k_ent_volume_flag_particles ){
+         assert(0);
+      }
+      else{
+         call->function = volume->trigger.event_leave;
+         entity_call( world, call );
+      }
+   }
 }
 
 static void ent_audio_call( world_instance *world, ent_call *call ){
diff --git a/world_gen.c b/world_gen.c
index 7d3cc81..51d0302 100644
--- a/world_gen.c
+++ b/world_gen.c
@@ -300,6 +300,17 @@ static void world_gen_generate_meshes( world_instance *world ){
       }
    }
 
+   /* unpack prop models */
+   for( u32 i=0; i<mdl_arrcount( &world->ent_prop ); i++ ){
+      ent_prop *prop = mdl_arritm( &world->ent_prop, i );
+
+      for( u32 j=0; j<prop->submesh_count; j ++ ){
+         mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, 
+                                       prop->submesh_start+j );
+         world_unpack_submesh_dynamic( world, &world->scene_no_collide, sm );
+      }
+   }
+
    vg_async_dispatch( call, async_scene_upload );
 }
 
diff --git a/world_load.c b/world_load.c
index 1605325..6378e9b 100644
--- a/world_load.c
+++ b/world_load.c
@@ -68,6 +68,7 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    mdl_load_array( meta, &world->ent_relay,     "ent_relay",      heap );
    mdl_load_array( meta, &world->ent_cubemap,   "ent_cubemap",    heap );
    mdl_load_array( meta, &world->ent_miniworld, "ent_miniworld",  heap );
+   mdl_load_array( meta, &world->ent_prop,      "ent_prop",  heap );
 
    mdl_array_ptr infos;
    mdl_load_array( meta, &infos, "ent_worldinfo", vg_mem.scratch );
diff --git a/world_render.c b/world_render.c
index 1463142..1d2256b 100644
--- a/world_render.c
+++ b/world_render.c
@@ -154,6 +154,45 @@ struct world_pass{
    void (*fn_set_uNormalMtx)( m3x3f mnorm );
 };
 
+/* FIXME: we gotta do something about this crap, maybe batch lists. something..
+ * anything but this. */
+static
+void world_render_props( world_instance *world, u32 material_id,
+                         struct world_pass *pass ){
+   if( !mdl_arrcount( &world->ent_prop ) ) return;
+
+   /* HACK: use the first material for every prop entity */
+   ent_prop *first = mdl_arritm( &world->ent_prop, 0 );
+   if( !first->submesh_count ) return;
+
+   mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, first->submesh_start );
+   if( sm->material_id != material_id ) return;
+
+   struct world_surface *mat = &world->surfaces[ material_id ];
+   pass->fn_bind_textures( world, mat );
+
+   for( u32 j=0; j<mdl_arrcount( &world->ent_prop ); j++ ){
+      ent_prop *prop = mdl_arritm( &world->ent_prop, j );
+      if( prop->flags & 0x1 ) continue;
+      
+      for( u32 k=0; k<prop->submesh_count; k++ ){
+         sm = mdl_arritm( &world->meta.submeshs, prop->submesh_start+k );
+
+         m4x3f mmdl;
+         mdl_transform_m4x3( &prop->transform, mmdl );
+
+         m4x4f m4mdl;
+         m4x3_expand( mmdl, m4mdl );
+         m4x4_mul( pass->cam->mtx_prev.pv, m4mdl, m4mdl );
+
+         pass->fn_set_mdl( mmdl );
+         pass->fn_set_uPvmPrev( m4mdl );
+
+         mdl_draw_submesh( sm );
+      }
+   }
+}
+
 static
 void world_render_traffic( world_instance *world, u32 material_id,
                            struct world_pass *pass ){
@@ -205,6 +244,7 @@ void world_render_pass( world_instance *world, struct world_pass *pass ){
          }
          else{
             world_render_traffic( world, i, pass );
+            world_render_props( world, i, pass );
             sm = &mat->sm_no_collide;
          }
 
diff --git a/world_volumes.c b/world_volumes.c
index dac790e..23b8299 100644
--- a/world_volumes.c
+++ b/world_volumes.c
@@ -23,6 +23,12 @@ static void world_volumes_update( world_instance *world, v3f pos ){
       }
       else{
          /* trigger on exit...... */
+         ent_call basecall;
+         basecall.function = k_ent_function_trigger_leave;
+         basecall.id = mdl_entity_id( k_ent_volume, idx );
+         basecall.data = NULL;
+
+         entity_call( world, &basecall );
       }
    }
    world_static.active_trigger_volume_count = j;
-- 
2.25.1