glider orphan / entity normals with scale

diff --git a/player.c b/player.c
index f52c8bdeb7b16c687a676f678f98eaf6bf93249a..8b095cd7d9e5d1f6865d5c41abefc7a6f0bcf709 100644 (file)
--- a/player.c
+++ b/player.c
@@ -112,6 +112,9 @@ static void player__pre_update(void){
 static void player__update(void){
    if( player_subsystems[ localplayer.subsystem ]->update )
       player_subsystems[ localplayer.subsystem ]->update();
+
+   if( localplayer.glider_orphan )
+      glider_physics();
 }
 
 static void player__post_update(void)
@@ -284,6 +287,8 @@ static void player__reset(void){
 
    localplayer.immobile = 0;
    localplayer.gate_waiting = NULL;
+   localplayer.have_glider = 0;
+   localplayer.glider_orphan = 0;
 
    v3_copy( localplayer.rb.co, localplayer.cam_control.tpv_lpf );
    player__clean_refs();

diff --git a/player.h b/player.h
index 97c8292353555b6757de1b1e3c79e5ad975a28e4..ad152270328d8f2d633885ee105bd95a098565ea 100644 (file)
--- a/player.h
+++ b/player.h
@@ -88,7 +88,7 @@ struct {
    rigidbody rb;
    v3f angles;
 
-   bool have_glider;
+   bool have_glider, glider_orphan;
 
    /*
     * Camera management

diff --git a/player_glide.c b/player_glide.c
index d67d8ecd61ca291f859b82880d4fee141b0a16d0..1b21191f85999785deed8d3d28ec6d88dde2d0f9 100644 (file)
--- a/player_glide.c
+++ b/player_glide.c
@@ -22,12 +22,13 @@ static i32 k_glide_pause = 0;
 static void player_glide_pre_update(void){
    if( button_down(k_srbind_use) ){
       localplayer.subsystem = k_player_subsystem_skate;
+      localplayer.glider_orphan = 1;
 
       player_skate.state.activity = k_skate_activity_air;
       player_skate.state.activity_prev = k_skate_activity_air;
 
       q_mulv( localplayer.rb.q, (v3f){0.0f,1.0f,0.0f}, player_skate.state.cog );
-      v3_add( player_skate.state.cog, localplayer.rb.co, player_skate.state.cog );
+      v3_add( player_skate.state.cog, localplayer.rb.co, player_skate.state.cog);
       v3_copy( localplayer.rb.v, player_skate.state.cog_v );
 
       player__begin_holdout( (v3f){0.0f,0.0f,0.0f} );
@@ -80,7 +81,10 @@ static void calculate_drag( v3f vl, f32 cd, v3f out_force ){
    v3_muls( vl, -cd*v2, out_force );
 }
 
-static void player_glide_update(void){
+/*
+ * Returns true if the bottom sphere is hit 
+ */
+static bool glider_physics(void){
    rigidbody *rb = &player_glide.rb;
 
    v2f steer;
@@ -120,7 +124,7 @@ static void player_glide_update(void){
 
    if( player_glide.ticker ){
       player_glide.ticker --;
-      return;
+      return 0;
    }
    player_glide.ticker += k_glide_pause;
 
@@ -136,12 +140,15 @@ static void player_glide_update(void){
    m3x3_mulv( rb->to_world, Fw, Fw );
    v3_muladds( rb->w, Fw, k_rb_delta, rb->w );
 
+
    /* 
     * collisions & constraints
     */
    world_instance *world = world_current_instance();
    rb_solver_reset();
 
+   bool bottom_hit = 0;
+
    rigidbody _null = {0};
    _null.inv_mass = 0.0f;
    m3x3_zero( _null.iI );
@@ -173,6 +180,9 @@ static void player_glide_update(void){
             l = rb_sphere__scene( mmdl, player_glide.parts[i].r,
                                   NULL, world->geo_bh, buf,
                                   k_material_flag_ghosts );
+
+            if( l ) 
+               bottom_hit = 1;
          }
 
          for( u32 j=0; j<l; j ++ ){
@@ -187,9 +197,18 @@ static void player_glide_update(void){
    rb_presolve_contacts( rb_contact_buffer, rb_contact_count );
    for( u32 i=0; i<10; i ++ )
       rb_solve_contacts( rb_contact_buffer, rb_contact_count );
-
+   
    rb_iter( rb );
    rb_update_matrices( rb );
+
+   return bottom_hit;
+}
+
+static void player_glide_update(void){
+   if( glider_physics() ){
+      player__dead_transition( k_player_die_type_generic );
+      localplayer.glider_orphan = 1;
+   }
 }
 
 static void player_glide_post_update(void){
@@ -361,50 +380,56 @@ static void player_glide_transition(void){
 static void player_glide_render( camera *cam, world_instance *world,
                                  player_pose *pose ){
    if( !((localplayer.subsystem == k_player_subsystem_glide) ||
-          localplayer.have_glider) )
+          localplayer.have_glider ||
+          localplayer.glider_orphan) )
       return;
 
-   f32 t;
-   if( localplayer.subsystem == k_player_subsystem_glide )
-      t = 1.0f;
-   else
-      t = 0.0f;
-
-   vg_slewf( &player_glide.t, t, vg.time_frame_delta * 4.0f );
-
    shader_model_entity_use();
    shader_model_entity_uTexMain( 0 );
    shader_model_entity_uCamera( cam->transform[3] );
    shader_model_entity_uPv( cam->mtx.pv );
    WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( world, model_entity );
 
-   mdl_keyframe kf_backpack,
-                kf_res;
+   mdl_keyframe kf_res;
+   if( localplayer.glider_orphan ){
+      rb_extrapolate( &player_glide.rb, kf_res.co, kf_res.q );
+      v3_fill( kf_res.s, 1.0f );
+   }
+   else {
+      f32 t;
+      if( localplayer.subsystem == k_player_subsystem_glide )
+         t = 1.0f;
+      else
+         t = 0.0f;
 
+      vg_slewf( &player_glide.t, t, vg.time_frame_delta * 4.0f );
 
-   struct skeleton *sk = &localplayer.skeleton;
-   m4x3_mulv( localplayer.final_mtx[localplayer.id_chest ],
-         sk->bones[localplayer.id_chest].co, 
-         kf_backpack.co );
+      mdl_keyframe kf_backpack;
 
-   v4f qyaw, qpitch, qchest, q;
-   q_axis_angle( qyaw,   (v3f){0,1,0}, VG_TAUf*0.25f );
-   q_axis_angle( qpitch, (v3f){1,0,0}, VG_TAUf*0.25f );
-   m3x3_q( localplayer.final_mtx[ localplayer.id_chest ], qchest );
+      struct skeleton *sk = &localplayer.skeleton;
+      m4x3_mulv( localplayer.final_mtx[localplayer.id_chest ],
+            sk->bones[localplayer.id_chest].co, 
+            kf_backpack.co );
 
-   q_mul( qyaw, qpitch, q );
-   q_mul( qchest, q, kf_backpack.q );
-   q_normalize( kf_backpack.q );
+      v4f qyaw, qpitch, qchest, q;
+      q_axis_angle( qyaw,   (v3f){0,1,0}, VG_TAUf*0.25f );
+      q_axis_angle( qpitch, (v3f){1,0,0}, VG_TAUf*0.25f );
+      m3x3_q( localplayer.final_mtx[ localplayer.id_chest ], qchest );
 
-   v3_fill( kf_backpack.s, 0.2f );
+      q_mul( qyaw, qpitch, q );
+      q_mul( qchest, q, kf_backpack.q );
+      q_normalize( kf_backpack.q );
 
-   v3_copy( pose->root_co, kf_res.co );
-   v4_copy( pose->root_q, kf_res.q );
-   v3_fill( kf_res.s, 1.0f );
+      v3_fill( kf_backpack.s, 0.2f );
 
-   keyframe_lerp( &kf_backpack, &kf_res, vg_smoothstepf( player_glide.t ),
-                  &kf_res );
-   
+      v3_copy( pose->root_co, kf_res.co );
+      v4_copy( pose->root_q, kf_res.q );
+      v3_fill( kf_res.s, 1.0f );
+
+      keyframe_lerp( &kf_backpack, &kf_res, vg_smoothstepf( player_glide.t ),
+                     &kf_res );
+   }
+      
    m4x3f mmdl;
    q_m3x3( kf_res.q, mmdl );
    m3x3_scale( mmdl, kf_res.s );

diff --git a/player_glide.h b/player_glide.h
index e6af01db34e607114aa5761c9039ff851d3fcc81..777112bd51694e9e65ce31b7407f57543afae982 100644 (file)
--- a/player_glide.h
+++ b/player_glide.h
@@ -72,6 +72,7 @@ static void player_glide_post_animate(void);
 static void player_glide_im_gui(void);
 static void player_glide_bind(void);
 static void player_glide_transition(void);
+static bool glider_physics(void);
 
 struct player_subsystem_interface static player_subsystem_glide = {
    .pre_update = player_glide_pre_update,

diff --git a/shaders/model.vs b/shaders/model.vs
index 350a821944bcdf68e824db0af10795c64eecad3f..a23529d839dc7582b9248bb43fe989a287b5591d 100644 (file)
--- a/shaders/model.vs
+++ b/shaders/model.vs
@@ -29,6 +29,6 @@ void main()
    aWorldCo = world_pos0;
    aColour = a_colour;
    aUv = a_uv;
-   aNorm = mat3(uMdl) * a_norm;
+   aNorm = normalize( mat3(uMdl) * a_norm );
    aCo = a_co;
 }

diff --git a/shaders/model_board_view.h b/shaders/model_board_view.h
index a50e9d586e9fb3e71ad7168dd693d882eca51df5..abbc42f1da28b27af31b9c7c65486479e91b7b0e 100644 (file)
--- a/shaders/model_board_view.h
+++ b/shaders/model_board_view.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_board_view = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_entity.h b/shaders/model_entity.h
index 8b842aee6958e137d847e84d88843a5432a8cba3..a9700388f0e4783c2d9eed4dec3be0423bbb3621 100644 (file)
--- a/shaders/model_entity.h
+++ b/shaders/model_entity.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_entity = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_gate.h b/shaders/model_gate.h
index 31329abb360c00b1bc97621f47263aa79ace7606..1bc558fd5e0be8bba07fe2603a89a7b4f63a6658 100644 (file)
--- a/shaders/model_gate.h
+++ b/shaders/model_gate.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_gate = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_gate_unlinked.h b/shaders/model_gate_unlinked.h
index 1fda296a7a51e05b7300403adb13c0269be401da..449322aa95a2368792442e9ed59582dd8a6861d5 100644 (file)
--- a/shaders/model_gate_unlinked.h
+++ b/shaders/model_gate_unlinked.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_gate_unlinked = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_menu.h b/shaders/model_menu.h
index 1d17aa06cae4a10352768d32e89f691012b36d94..0ee6ad39f0aca1044922ebf3f6b28a79991cb35b 100644 (file)
--- a/shaders/model_menu.h
+++ b/shaders/model_menu.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_menu = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_sky.h b/shaders/model_sky.h
index f8f88d3d1a19ef6e9c205c6006b3d943b56807bc..88612b2bb7ac06a48729f3abd551d95d6175653f 100644 (file)
--- a/shaders/model_sky.h
+++ b/shaders/model_sky.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_sky = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/shaders/model_sky_space.h b/shaders/model_sky_space.h
index 83095509f465aec8ae190b6966ef5fb4230d03a1..c96f2c4bb19531453a7f51ebec84f5018ef97124 100644 (file)
--- a/shaders/model_sky_space.h
+++ b/shaders/model_sky_space.h
@@ -58,7 +58,7 @@ static struct vg_shader _shader_model_sky_space = {
 "   aWorldCo = world_pos0;\n"
 "   aColour = a_colour;\n"
 "   aUv = a_uv;\n"
-"   aNorm = mat3(uMdl) * a_norm;\n"
+"   aNorm = normalize( mat3(uMdl) * a_norm );\n"
 "   aCo = a_co;\n"
 "}\n"
 ""},

diff --git a/testing.c b/testing.c
index c057c9fa0514d67847d12899318628e0297a498d..37ef42eea55364b3134eec935d200f4d21255f08 100644 (file)
--- a/testing.c
+++ b/testing.c
@@ -24,6 +24,7 @@ static void testing_update(void){
 
    if( vg_getkey( SDLK_8 ) ){
       localplayer.have_glider = 1;
+      localplayer.have_glider = 0;
    }
 
    vg_line_boxf_transformed( baller.rb.to_world, baller.box, VG__RED );