From 00653e446d6b1310fa89d3aace70800f9fef4122 Mon Sep 17 00:00:00 2001
From: hgn <hgodden00@gmail.com>
Date: Mon, 20 Nov 2023 14:25:31 +0000
Subject: [PATCH] chaos pt 3

---
 blender_export.py         |   6 +-
 ent_miniworld.c           | 153 +++++++++++++++++++++++++++++++-------
 ent_miniworld.h           |   4 +
 entity.h                  |   3 +-
 input.h                   |   8 ++
 maps_src/dev_hub/main.mdl | Bin 226408 -> 211064 bytes
 menu.h                    |   3 +-
 models_src/rs_icons.mdl   | Bin 40752 -> 41400 bytes
 player.c                  |   1 -
 player_replay.c           |   3 +
 respawn.c                 |   2 +
 shaders/scene_override.fs |   2 +-
 shaders/scene_override.h  |   2 +-
 skaterift.c               |  22 +-----
 skaterift.h               |   2 +-
 world.c                   |   2 +-
 world_entity.c            |   7 +-
 world_gate.c              |   4 -
 world_gate.h              |   2 +-
 world_render.c            |  23 ++----
 world_render.h            |   3 +-
 world_routes.c            |   3 +-
 22 files changed, 172 insertions(+), 83 deletions(-)

diff --git a/blender_export.py b/blender_export.py
index 36ca368..4b7cf7f 100644
--- a/blender_export.py
+++ b/blender_export.py
@@ -528,7 +528,7 @@ class ent_cubemap(Structure):#{
 class ent_miniworld(Structure):#{
    _fields_ = [("transform",mdl_transform),
                ("pstr_world",c_uint32),
-               ("purpose",c_int32),
+               ("camera",c_uint32),
                ("proxy",c_uint32)]
 
    sr_functions = { 0: 'zone', 1: 'leave' }
@@ -1972,6 +1972,7 @@ 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 )
+            miniworld.camera = sr_entity_id( obj_data.camera )
             sr_ent_push( miniworld )
          #}
          elif ent_type == 'ent_prop':#{
@@ -2624,6 +2625,9 @@ class SR_OBJECT_ENT_MINIWORLD(bpy.types.PropertyGroup):
    proxy: bpy.props.PointerProperty( \
                type=bpy.types.Object, name='proxy', \
                poll=lambda self,obj: sr_filter_ent_type(obj,['ent_prop']))
+   camera: bpy.props.PointerProperty( \
+           type=bpy.types.Object, name="Camera", \
+           poll=lambda self,obj: sr_filter_ent_type(obj,['ent_camera']))
 #}
 
 class SR_UL_ROUTE_NODE_LIST(bpy.types.UIList):
diff --git a/ent_miniworld.c b/ent_miniworld.c
index 08e7093..802bd8b 100644
--- a/ent_miniworld.c
+++ b/ent_miniworld.c
@@ -2,6 +2,8 @@
 #include "ent_miniworld.h"
 #include "world_render.h"
 #include "input.h"
+#include "gui.h"
+#include "menu.h"
 
 static void ent_miniworld_call( world_instance *world, ent_call *call ){
    ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld, 
@@ -13,6 +15,7 @@ static void ent_miniworld_call( world_instance *world, ent_call *call ){
       const char *uid = mdl_pstr( &world->meta, miniworld->pstr_world );
       skaterift_load_world_command( 1, (const char *[]){ uid } );
 
+      mdl_transform_m4x3( &miniworld->transform, global_miniworld.mmdl );
       global_miniworld.active = miniworld;
    }
    else if( call->function == 1 ){
@@ -26,6 +29,28 @@ static void ent_miniworld_call( world_instance *world, ent_call *call ){
    }
 }
 
+static void miniworld_icon( camera *cam, enum gui_icon icon, v3f pos ){
+   m4x3f mmdl;
+   v3_copy( cam->transform[2], mmdl[2] );
+   mmdl[2][1] = 0.0f;
+   v3_normalize( mmdl[2] );
+   v3_copy( (v3f){0,1,0}, mmdl[1] );
+   v3_cross( mmdl[1], mmdl[2], mmdl[0] );
+   m4x3_mulv( global_miniworld.mmdl, pos, mmdl[3] );
+
+   shader_model_font_uMdl( mmdl );
+   shader_model_font_uOffset( (v4f){0,0,0,20} );
+
+   m4x4f m4mdl;
+   m4x3_expand( mmdl, m4mdl );
+   m4x4_mul( cam->mtx_prev.pv, m4mdl, m4mdl );
+   shader_model_font_uPvmPrev( m4mdl );
+
+   mdl_submesh *sm = gui.icons[ icon ];
+   if( sm )
+      mdl_draw_submesh( sm );
+}
+
 static void ent_miniworld_render( world_instance *host_world, camera *cam ){
    if( host_world != &world_static.instances[k_world_purpose_hub] )
       return;
@@ -54,44 +79,118 @@ static void ent_miniworld_render( world_instance *host_world, camera *cam ){
    if( !rendering )
       return;
 
-   m4x3f mmdl;
-   mdl_transform_m4x3( &miniworld->transform, mmdl );
-   render_world_override( dest_world, host_world, mmdl, cam );
-   render_world_routes( dest_world, host_world, mmdl, cam, 0, 1 );
-}
+   render_world_override( dest_world, host_world, global_miniworld.mmdl, cam,
+                          global_miniworld.dest_spawn );
+   render_world_routes( dest_world, host_world, 
+                        global_miniworld.mmdl, cam, 0, 1 );
 
-static void ent_miniworld_preupdate(void){
-   if( world_static.active_instance == k_world_purpose_client ){
-      if( button_down(k_srbind_mleft) ){
-         global_miniworld.transition = -1;
-         global_miniworld.t = 1.0f;
-
-         global_miniworld.cam = skaterift.cam;
-         m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
-         world_switch_instance(0);
+   /* icons
+    * ---------------------*/
+   font3d_bind( &gui.font, k_font_shader_default, 0, NULL, cam );
+   mesh_bind( &gui.icons_mesh );
+
+   glActiveTexture( GL_TEXTURE0 );
+   glBindTexture( GL_TEXTURE_2D, gui.icons_texture );
+   shader_model_font_uTexMain( 0 );
+   shader_model_font_uColour( (v4f){1,1,1,1} );
+
+   for( u32 i=0; i<mdl_arrcount(&dest_world->ent_challenge); i++ ){
+      ent_challenge *challenge = mdl_arritm( &dest_world->ent_challenge, i );
+
+      enum gui_icon icon = k_gui_icon_exclaim;
+      if( challenge->status )
+         icon = k_gui_icon_tick;
+
+      miniworld_icon( cam, icon, challenge->transform.co );
+   }
+
+   for( u32 i=0; i<mdl_arrcount(&dest_world->ent_skateshop); i++ ){
+      ent_skateshop *shop = mdl_arritm( &dest_world->ent_skateshop, i );
+      if( shop->type == k_skateshop_type_boardshop ){
+         miniworld_icon( cam, k_gui_icon_board, shop->transform.co );
       }
+      else if( shop->type == k_skateshop_type_worldshop ){
+         miniworld_icon( cam, k_gui_icon_world, shop->transform.co );
+      }
+   }
+
+   for( u32 i=0; i<mdl_arrcount(&dest_world->ent_route); i++ ){
+      ent_route *route = mdl_arritm( &dest_world->ent_route, i );
+
+      v4f colour;
+      v4_copy( route->colour, colour );
+      v3_muls( colour, 1.6666f, colour );
+      shader_model_font_uColour( colour );
+      miniworld_icon( cam, k_gui_icon_rift_run, route->board_transform[3] );
    }
+}
+
+static void ent_miniworld_preupdate(void){
+   world_instance *hub = world_current_instance(),
+                  *dest = &world_static.instances[k_world_purpose_client];
 
    ent_miniworld *miniworld = global_miniworld.active;
-   if( !miniworld )
+
+   if( (localplayer.subsystem != k_player_subsystem_walk) ||
+       (global_miniworld.transition) ||
+       (world_static.active_instance != k_world_purpose_hub) ||
+       (!miniworld) ||
+       (dest->status != k_world_status_loaded) ){
+      
+      if( global_miniworld.mode ){
+         global_miniworld.mode = 0;
+         menu.disable_open = 0;
+         srinput.state = k_input_state_resume;
+      }
       return;
+   }
 
-   world_instance *world = world_current_instance();
+   if( button_down( k_srbind_miniworld_resume ) ){
+      global_miniworld.mode = 0;
+      global_miniworld.transition = 1;
+      global_miniworld.t = 0.0f;
+      global_miniworld.cam = skaterift.cam;
+   
+      if( global_miniworld.dest_spawn ){
+         v3_copy( global_miniworld.dest_spawn->transform.co, 
+                  dest->player_co );
+      }
 
-   if( global_miniworld.transition ){
+      world_switch_instance(1);
+      global_miniworld.dest_spawn = NULL;
+      srinput.state = k_input_state_resume;
+      menu.disable_open = 0;
    }
    else {
-      int rendering = 1;
-      if( world_static.instances[k_world_purpose_client].status 
-            == k_world_status_loaded ){
-         if( button_down( k_srbind_mright ) ){
-            global_miniworld.transition = 1;
-            global_miniworld.t = 0.0f;
-            global_miniworld.cam = skaterift.cam;
-
-            mdl_transform_m4x3( &miniworld->transform, global_miniworld.mmdl );
-            world_switch_instance(1);
+      if( global_miniworld.mode == 1 ){
+         if( button_down(k_srbind_mback) ){
+            global_miniworld.mode = 0;
+            global_miniworld.dest_spawn = NULL;
+            menu.disable_open = 0;
+            srinput.state = k_input_state_resume;
+         }
+         else {
+            m4x3f mmdl_inv;
+            m4x3_invert_full( global_miniworld.mmdl, mmdl_inv );
+            v3f lco;
+            m4x3_mulv( mmdl_inv, localplayer.rb.co, lco );
+            global_miniworld.dest_spawn = world_find_closest_spawn( dest, lco );
+         }
+      }
+      else {
+         if( button_down( k_srbind_miniworld_teleport ) ){
+            global_miniworld.mode = 1;
+            menu.disable_open = 1;
          }
       }
    }
 }
+
+static void ent_miniworld_goback(void){
+   global_miniworld.transition = -1;
+   global_miniworld.t = 1.0f;
+
+   global_miniworld.cam = skaterift.cam;
+   m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
+   world_switch_instance(0);
+}
diff --git a/ent_miniworld.h b/ent_miniworld.h
index 2be6141..73d0c46 100644
--- a/ent_miniworld.h
+++ b/ent_miniworld.h
@@ -6,14 +6,18 @@
 struct {
    ent_miniworld *active;
    int transition;
+   int mode;
    f32 t;
 
    m4x3f mmdl;
    camera cam;
+
+   ent_spawn *dest_spawn;
 }
 static global_miniworld;
 
 static void ent_miniworld_call( world_instance *world, ent_call *call );
 static void ent_miniworld_render( world_instance *host_world, camera *cam );
+static void ent_miniworld_goback(void);
 
 #endif /* ENT_MINIWORLD_H */
diff --git a/entity.h b/entity.h
index 7cfce58..612ad61 100644
--- a/entity.h
+++ b/entity.h
@@ -504,8 +504,7 @@ struct ent_call{
 struct ent_miniworld {
    mdl_transform transform;
    u32 pstr_world;
-
-   i32 purpose_DELTED;
+   u32 camera;
    u32 proxy;
 };
 
diff --git a/input.h b/input.h
index fc8f7c9..e66bdc6 100644
--- a/input.h
+++ b/input.h
@@ -34,6 +34,10 @@ enum sr_bind{
    k_srbind_home,
    k_srbind_lobby,
    k_srbind_chat,
+   
+   k_srbind_miniworld_teleport,
+   k_srbind_miniworld_resume,
+
    k_srbind_max,
 };
 
@@ -97,6 +101,10 @@ static vg_input_op *input_button_list[] = {
 [k_srbind_sit]   = INPUT_BASIC( SDLK_z, SDL_CONTROLLER_BUTTON_B ),
 [k_srbind_lobby] = INPUT_BASIC( SDLK_TAB, SDL_CONTROLLER_BUTTON_DPAD_LEFT ),
 [k_srbind_chat ] = (vg_input_op[]){ vg_keyboard, SDLK_y, vg_end },
+
+[k_srbind_miniworld_resume]  = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_A ),
+[k_srbind_miniworld_teleport]= INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_X ),
+
 [k_srbind_max]=NULL
 };
 
diff --git a/maps_src/dev_hub/main.mdl b/maps_src/dev_hub/main.mdl
index 44881ec7bc8479d5396fa4b862340299f7b9df14..4798e481c3e9ff36daebffea9e7a389c7a62ba69 100644
GIT binary patch
delta 14849
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
F{|`fQmT&+7

delta 20616
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

diff --git a/menu.h b/menu.h
index 8da5026..8691f08 100644
--- a/menu.h
+++ b/menu.h
@@ -11,6 +11,7 @@
 #include "workshop.h"
 #include "respawn.h"
 #include "gui.h"
+#include "ent_miniworld.h"
 
 #define MENU_STACK_SIZE 8
 
@@ -247,7 +248,7 @@ static void menu_trigger_item( ent_menuitem *item ){
 
       else if( MDL_CONST_PSTREQ( &menu.model, q, "reset" ) ){
          menu_close();
-         respawn_begin_chooser();
+         ent_miniworld_goback();
       }
 
       else if( MDL_CONST_PSTREQ( &menu.model, q, "credits" ) ){
diff --git a/models_src/rs_icons.mdl b/models_src/rs_icons.mdl
index 296df3fba5fff966fb1fec659814053447f61f41..5cb97695e4025b83bba41015131cd84fe3f57625 100644
GIT binary patch
delta 4653
zcmdUydr(tX9>){7LWtZTT;3QUIgmt~3J6XqnnSG>w4*?(T|nh2BDk$Q<)t8uZACjO
z@N=#1u2y!fZ!0nB>S|ld(1%^C1?%c|+cGe?qwQ1_%c}U?-@Vrxt~%5GyP3Je@B2C5
z-#NeYx*;7OyBzCsQ5M;hQ<cgVuqXpU8ygjhiEau7qfjVbFL*7dczHqb;w32XW7=jf
zSNglSD(4s>$0ZUvT*qexicJbn{HytS$A|S@C!c?Dn|sI2z#pd#-j1Z4HXvGwZM@G1
zAKu45*F$!n;JuF59Phn6e)rUGH4|u0!J=KfcOpJ@7zDxuhIsJkXM7IAtEgIB6^a^c
z&xR&cDl9V*)owV%kcebd1L!=7PY=>Tvt6hs<7nTmf97nMHjo@cVVG%QudZ<u3gg_q
ziaiUhV+i}>B?VnypK@3vok(~OKM|1(AsNzp(!!*-qC}!|BkWI^;eu!SOD(Z8z>0*Q
zGVc*d6Os*HfdX0Ter<9g*pRF%^$|uFNxxgz>MIA@k2AZjTKGb-ZpDf<w;~ma#>6)g
zj#^?pmnS~N56`8~xlN(R`NiWGjA#GP|3XV>!ms$FpBf<JV0*%^6a?4Y{FrAsH3gNs
zSq$Pa;P()Uq+lxsdi96}PD#OS435USQ81|<1sN*SZ*KDT64jDaj}I!wQvI^wgn95o
zy3ylir<$4s#by{i%0Ka>69r{K^=bx7BL($(hLMfC=t%=mMa>9u#6f!oVOK<Y(oiSq
zLGs*nmWDftGLx`D%^Di)Br%!9L&`c0S(!#>HK$<%Drv;i@DVDhx6^Pn)5u;aP*M%{
zq$t%mVnMfnup<Eq>gOa@BwOz(g&IXq6O#Q=uGHJ<vB}7Z(tGy3&@ampiT6Un#`n9@
zAj}fUbR@6cVW_W@lr1D`iCkr1$3lZzN<n!R<;Bm&&=B;ae1LM&XKvJAl#>=2SV>yD
z6pmoXTSQpNFOpUyRr}qA)fGu6lA%p18i<{UWJpHV8C)D3=(0w$L}EqazsW<`6Ol9_
zu`f^ywTZ+gBL~j++MA(YmL(GJY!Xs?$%VS%=-TQM$1|#|IR2VXxxUWQa=ru}X8LKQ
z{Sn)tJX;@fBA=nECsMLsUT@jIrvz4K`*BkH@Ov*fZp5|6K76<uE@o?kcXDoYEau60
zqEFga)8?f?Z?-=tHFw;Ob0oc7%U1%=<!FQ7{M21IAu^t5d$8WpHy3D*KPxqF$%%Bl
z39UJVUADqQI2<DB%psga7Wfc{_|9sCTRGa0RKr+d`(-@Q)&91H8(t0%bNpDTec^;i
zhXbs+#Ccsr(v(X$>9}s$<Ky`Lh<6-6+oQQ!&Tq?o%XplvoL|n>2Cw~6Ashf1Ph8#c
zw&g7w4CeZ?QuDEIeH}|-dLCh!Q!c_zi=<3Oj++A<m!Ta=<L8WU`$f`|M>vTbviUl^
z|F}cg1owPx@cmESXatre<B5IWU6_{E3z~d?R%#wwpu(e<mrvN*E)_Lkf=F8P@yI+P
zuwLzG*<ccm%o}(9HLc+861bM`7b3lU<n0rJzMEDXSO}YD`f(Evo9OY<tf_hKYh(D`
z5LRramOJ!KG(GkNzl@y!ntYN6Bx%_*@xk<O=s!QDF?tP5Pa^DlVT3xIqzp-0f}FG`
z5%s}hFWP~gy%so|WKc){!<QZw<pY$J|8~k91qL=aRU-_2H#fmv13d+V3sR4xHuP7L
z`Oz<a-ficLe<xYXZC~ambSvjyAn&Vtn%_#+vI%RnLeE<*^P}g2ZWdub9?;XH*t1Bi
zNR-2J(lm>xrL1NPyg$pJmQqmmqLln78ww2`lk9ga{M54GP@$1~rtPkUUz>Ml&ag|X
zUOijOE(y7B;n(AnTRM9ecrPVm#~jlLg(!zZ;p^Fv9+w9_1-%gN&o;7!-JU|>AEfJT
zgV4T|u(9_>gmL;R=XLCdo~3x-3hoJgDxP1^Q8jYO#$RRkA}u>o%?dq5-Ho?(K}-?e
zRS^5$`2CWOagbL;)Rx6}ggUo{z{Vm27kn&~+Oa%c<P^JZP9m1x2wxOwIoEmK!sg5Q
zE#&{1Z>E2L!f!0rvNJeFI2xWMA0NpCYcb)zoDxij-~H><$*+{hB(2^qT-@q8S}yoP
zIQ``bz6W`_yY4A|agLT%*J|hx`mYrC#zca0E@7#k554XrF-W|l<s=Wuw>QSq|Dq>7
zvp2>Ftw`8S;X*wk=|s}EPfmvB5_NUHm^FSGgr*qO2Ofk8DJWA=t_~9YC>u}?e(6PT
z;1FKCSr6SQj9OpF3AG|hNzu2ZGU}U+PSSv;=v2m|?<b{T+6tCbqsM8^OBiD_ypF1P
zjYd#^hV7_SpD2VS`2(Cmb$6RWnD#-qpK4Uk>=d0vaWE;(z%JM-cDgby-L?<%(uk%i
zS+plarQ6)Ppe;?$4n#{i>9$hnOe1WoNgScE{-=)PFqDR0&>KzkOvk>d*B3&l)u8@p
zQWX74lqo3h<Tz!6)!=a;&`W4-hC^1PI<840sEv&<xZJ?DmHE<db|0R~--de7l@Qir
zPmqjQkv#5cDk02E9tH}{WhUq@VVJ8?MnSZdGE9G4gxC;W%CIBu#M#qHm|jX)t|UxG
z%AO+VVfgWdzOR=unqOv4a3&l*0xo5G&HO}@98G>2<(KK1=Wdw!Ud+tNlM^W%!+=y`
zaHY)5zP&5L*}(^(D<{k>c$UK65)+h`GhEi8XPwRGDj4A_cx}0s<MXAJs*3o=A-u86
zwG3Y(pWIf#aQvu}CouIb{GM%ufC}w6egHX#OXcBWW&Eh&Wej`j!Z@eH4(%1>3DQ$R
zH02w-oSv{r;8Lk)cYYs9BTgI_wr?E7RO0_cIYt@DL(=<-Nk&?c<o<qwjC3OT@tm9t
zA^C2=AoJ)}5O%eSIEezRNWAXqWuytoyRv!|U_&CWM*;mv{$d@iSpnWvgqb}#m_mG&
znMv#k#UCpe9ElDSgA3>IG@L?Gqw=S48w1sSU;MFBZDy_*I0_jUl<)G!y~f~Rm=A?n
zD^1W*%`hL9j}t|BCByPwX`Oxtx*EdrNu$JCL&OnkY95WSx5mu!bxEES=*KL+oKfOk
zOT?1nYo(HF&5x~0GPKv?e<p4b&a7nULGo$ScqeHDWgTJt9{9^h43hKfd}SoBjxc}P
zhcj-jGjsB$#hb&0Gx|lH_OVXtU<f-IS~og{0nn`^%saKX#_?4q=&NJciZP=*H~>v6
ziI<~xwAQ-KJK>i~9d|WzbjOx#4i}F8<&|1C+G=)II3K)M5w@^cPNuIS41d<3XqB1a
z&9HTqnSKAnGtR6Zpa-*BY@?^|2T;}%h9_XEH#58$GV0A5`6<3O0&Vqrrg^O%uQr;D
zi}7`I1%r^AM3~!e?)NK1HDtn~O@Z)2Lm=$L=TU6$Zs-p1JA*Ihv-o_C4<GY?yY1Vz
Gfa-tC(t)l3

delta 3228
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
Kf^}=N*Z%=|Y2o_-

diff --git a/player.c b/player.c
index 3084828..860e048 100644
--- a/player.c
+++ b/player.c
@@ -200,7 +200,6 @@ static void player__im_gui(void){
                                        [k_skaterift_replay]    = "replay",
                                        [k_skaterift_ent_focus] = "ent_focus",
                                        [k_skaterift_default]   = "default",
-                                       [k_skaterift_respawning]= "respawning",
                      } [skaterift.activity] );
    player__debugtext( 1, "time_rate: %.4f", skaterift.time_rate );
 
diff --git a/player_replay.c b/player_replay.c
index 6a59e25..befbf0f 100644
--- a/player_replay.c
+++ b/player_replay.c
@@ -505,6 +505,9 @@ static void skaterift_replay_update_helpers(void){
 }
 
 static void skaterift_replay_post_render(void){
+   if( world_static.active_instance != k_world_purpose_client )
+      return;
+
    /* capture the current resume frame at the very last point */
    if( button_down( k_srbind_reset ) ){
       if( skaterift.activity == k_skaterift_default ){
diff --git a/respawn.c b/respawn.c
index f7be930..0e1dc67 100644
--- a/respawn.c
+++ b/respawn.c
@@ -1,6 +1,7 @@
 #ifndef RESPAWN_C
 #define RESPAWN_C
 
+#if 0
 #include "respawn.h"
 #include "skaterift.h"
 #include "world.h"
@@ -263,5 +264,6 @@ static void respawn_chooser_shader_uniforms(void){
    shader_scene_override_uSpawnPos( uSpawnPos );
 }
 #endif
+#endif
 
 #endif /* RESPAWN_C */
diff --git a/shaders/scene_override.fs b/shaders/scene_override.fs
index f7dff2b..60bf90d 100644
--- a/shaders/scene_override.fs
+++ b/shaders/scene_override.fs
@@ -31,7 +31,7 @@ void main(){
 
    compute_motion_vectors();
 
-   vec3 vfrag = vec3(0.7);
+   vec3 vfrag = vec3(0.898,0.811,0.716);
    vec3 qnorm = aNorm.xyz;
 
    qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);
diff --git a/shaders/scene_override.h b/shaders/scene_override.h
index d0c7ab9..d9f7be0 100644
--- a/shaders/scene_override.h
+++ b/shaders/scene_override.h
@@ -482,7 +482,7 @@ static struct vg_shader _shader_scene_override = {
 "\n"
 "   compute_motion_vectors();\n"
 "\n"
-"   vec3 vfrag = vec3(0.7);\n"
+"   vec3 vfrag = vec3(0.898,0.811,0.716);\n"
 "   vec3 qnorm = aNorm.xyz;\n"
 "\n"
 "   qnorm = normalize(floor(aNorm.xyz*4.0)*0.25);\n"
diff --git a/skaterift.c b/skaterift.c
index 254c80d..c020532 100644
--- a/skaterift.c
+++ b/skaterift.c
@@ -324,8 +324,7 @@ static void vg_pre_update(void){
 
    /* time rate */
    f32 target = 1;
-   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu|
-                             k_skaterift_respawning) ) {
+   if( skaterift.activity & (k_skaterift_replay|k_skaterift_menu) ){
       target = 0;
    }
 
@@ -341,7 +340,6 @@ static void vg_pre_update(void){
 
    world_update( world_current_instance(), localplayer.rb.co );
    audio_ambient_sprites_update( world_current_instance(), localplayer.rb.co );
-   respawn_chooser_pre_update();
 }
 
 static void vg_fixed_update(void){
@@ -545,12 +543,6 @@ static void skaterift_composite_maincamera(void){
       }
    }
 
-   if( skaterift.activity == k_skaterift_respawning ){
-      camera_copy( &respawn_chooser.cam, &skaterift.cam );
-      skaterift.cam.nearz = 4.0f;
-      skaterift.cam.farz  = 3100.0f;
-   }
-
    camera_update_transform( &skaterift.cam );
    camera_update_view( &skaterift.cam );
    camera_update_projection( &skaterift.cam );
@@ -652,16 +644,8 @@ static void vg_gui(void){
    render_view_framebuffer_ui();
    remote_player_network_imgui( vg.pv );
 
-
-   if( skaterift.activity == k_skaterift_respawning ){
-      remote_players_imgui_world( world_current_instance(), vg.pv, 
-                                  2000.0f, 0 );
-      remote_players_imgui_lobby();
-   }
-   else {
-      remote_players_chat_imgui(); /* TODO: conditional */
-      remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
-   }
+   remote_players_chat_imgui(); /* TODO: conditional */
+   remote_players_imgui_world( world_current_instance(), vg.pv, 100.0f, 1 );
 }
 
 
diff --git a/skaterift.h b/skaterift.h
index 6664637..4cfc874 100644
--- a/skaterift.h
+++ b/skaterift.h
@@ -51,7 +51,7 @@ struct{
       k_skaterift_replay     = 0x01,
       k_skaterift_ent_focus  = 0x02,
       k_skaterift_menu       = 0x04,
-      k_skaterift_respawning = 0x08
+      k_skaterift_respawning_DELETED = 0x08,
    }
    activity;
 
diff --git a/world.c b/world.c
index 4f8cda2..22c3c2c 100644
--- a/world.c
+++ b/world.c
@@ -27,7 +27,7 @@ static void world_init(void)
 }
 
 static void world_switch_instance( u32 index ){
-   assert( localplayer.subsystem == k_player_subsystem_walk );
+   localplayer.subsystem = k_player_subsystem_walk;
 
    if( index >= vg_list_size(world_static.instances) ){
       vg_error( "Instance ID out of range (%u)\n", index );
diff --git a/world_entity.c b/world_entity.c
index d34ed6e..c5c2fc7 100644
--- a/world_entity.c
+++ b/world_entity.c
@@ -92,10 +92,9 @@ static void world_entity_focus_render(void){
       ent_skateshop *skateshop = mdl_arritm( &world->ent_skateshop, index );
       skateshop_render( skateshop );
    }
-   else if( type == k_ent_challenge ){
-   }
-   else if( type == k_ent_route ){
-   }
+   else if( type == k_ent_challenge ){}
+   else if( type == k_ent_route ){}
+   else if( type == k_ent_miniworld ){}
    else {
       vg_fatal_error( "Programming error\n" );
    }
diff --git a/world_gate.c b/world_gate.c
index bc21e95..accdc06 100644
--- a/world_gate.c
+++ b/world_gate.c
@@ -65,10 +65,6 @@ static void world_gates_init(void)
       world_gates.sm_marker[i] = *sm;
    }
 
-   mdl_mesh *icosphere = mdl_find_mesh( &mgate, "rs_icosphere" );
-   world_gates.sm_icosphere = 
-      *((mdl_submesh *)mdl_arritm( &mgate.submeshs, icosphere->submesh_start ));
-
    mdl_async_load_glmesh( &mgate, &world_gates.mesh );
    mdl_close( &mgate );
 }
diff --git a/world_gate.h b/world_gate.h
index a8decac..2201f76 100644
--- a/world_gate.h
+++ b/world_gate.h
@@ -11,7 +11,7 @@
 
 struct world_gates{
    glmesh mesh;
-   mdl_submesh sm_surface, sm_marker[4], sm_icosphere;
+   mdl_submesh sm_surface, sm_marker[4];
    camera cam;
 
    v3f userportal_co;
diff --git a/world_render.c b/world_render.c
index b63d8a7..8d7e546 100644
--- a/world_render.c
+++ b/world_render.c
@@ -798,11 +798,7 @@ static void world_prerender( world_instance *world ){
    state->g_debug_indices = k_debug_light_indices;
    state->g_light_preview = k_light_preview;
    state->g_debug_complexity = k_debug_light_complexity;
-
-   if( skaterift.activity == k_skaterift_respawning )
-      state->g_time_of_day = 0.1f;
-   else
-      state->g_time_of_day = vg_fractf( world->time );
+   state->g_time_of_day = vg_fractf( world->time );
 
    state->g_day_phase   = cosf( state->g_time_of_day * VG_PIf * 2.0f );
    state->g_sunset_phase= cosf( state->g_time_of_day * VG_PIf * 4.0f + VG_PIf );
@@ -963,7 +959,8 @@ static void render_world_override_pass( world_instance *world,
 static void render_world_override( world_instance *world,
                                    world_instance *lighting_source,
                                    m4x3f mmdl,
-                                   camera *cam ){
+                                   camera *cam,
+                                   ent_spawn *dest_spawn ){
    struct world_pass pass = {
       .cam = cam,
       .fn_bind_textures = bindpoint_override,
@@ -974,9 +971,6 @@ static void render_world_override( world_instance *world,
    };
 
    shader_scene_override_use();
-#if 0
-   respawn_chooser_shader_uniforms();
-#endif
    shader_scene_override_uTexGarbage(0);
    shader_scene_override_uTexMain(1);
    shader_scene_override_uPv( pass.cam->mtx.pv );
@@ -1003,13 +997,10 @@ static void render_world_override( world_instance *world,
 
    v3_copy( world->player_co, uPlayerPos );
    
-   m4x3f mmdl_inv;
-   m4x3_invert_full( mmdl, mmdl_inv );
-   v3f localized;
-   m4x3_mulv( mmdl_inv, localplayer.rb.co, localized );
-   ent_spawn *spawn = world_find_closest_spawn( world, localized );
-   if( spawn )
-      v3_copy( spawn->transform.co, uSpawnPos );
+   if( dest_spawn && (v3_dist2(dest_spawn->transform.co,uPlayerPos) > 0.1f) )
+      v3_copy( dest_spawn->transform.co, uSpawnPos );
+   else
+      v3_add( uPlayerPos, (v3f){0,-1,0}, uSpawnPos );
 
    uPlayerPos[3] = v3_dist(uPlayerPos,uSpawnPos);
    uSpawnPos[3] = 1.0f/uPlayerPos[3];
diff --git a/world_render.h b/world_render.h
index 3837068..b02116e 100644
--- a/world_render.h
+++ b/world_render.h
@@ -83,7 +83,8 @@ static void bind_terrain_noise(void);
 static void render_world_override( world_instance *world,
                                    world_instance *lighting_source,
                                    m4x3f mmdl,
-                                   camera *cam );
+                                   camera *cam,
+                                   ent_spawn *dest_spawn );
 
 #define WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( WORLD, SHADER )            \
    world_link_lighting_ub( WORLD, _shader_##SHADER.id );                \
diff --git a/world_routes.c b/world_routes.c
index d710e5e..5f6d283 100644
--- a/world_routes.c
+++ b/world_routes.c
@@ -612,8 +612,7 @@ static void world_routes_update( world_instance *world ){
    for( u32 i=0; i<mdl_arrcount(&world->ent_route); i++ ){
       ent_route *route = mdl_arritm( &world->ent_route, i );
       
-      int target = (route->active_checkpoint == 0xffff? 0: 1) || 
-                    skaterift.activity == k_skaterift_respawning;
+      int target = route->active_checkpoint == 0xffff? 0: 1;
       route->factive = vg_lerpf( route->factive, target, 
                                  0.6f*vg.time_frame_delta );
    }
-- 
2.25.1