make glider look nice

diff --git a/models_src/glider.mdl b/models_src/glider.mdl
index dc26c942d52e1182061223e36f78fbc9ea65112b..0a2ca3c4401a4c09e351c6ba980e3652e3e32674 100644 (file)
Binary files a/models_src/glider.mdl and b/models_src/glider.mdl differ

diff --git a/particle.c b/particle.c
index e1f6ac85b0f31270b75c0fafb91160aa0c767233..9c1f87e5e044f8674b4995cc4f6ee53367004c60 100644 (file)
--- a/particle.c
+++ b/particle.c
@@ -95,14 +95,11 @@ static void async_particle_init( void *payload, u32 size ){
    VG_CHECK_GL_ERR();
 }
 
-static void particle_alloc( particle_system *sys, u32 max ){
-   static int reg = 1;
-   if( reg ){
-      shader_particle_register();
-      shader_trail_register();
-      reg = 0;
-   }
+static void particle_init(void){
+   shader_particle_register();
+}
 
+static void particle_alloc( particle_system *sys, u32 max ){
    size_t stride = sizeof(particle_vert);
 
    sys->max = max;

diff --git a/player_glide.c b/player_glide.c
index eccf3ab0696690d4c4538f87e0b4e73bef436acb..331565c58f8b58e4eb982ce22afe7ab7df2528d6 100644 (file)
--- a/player_glide.c
+++ b/player_glide.c
@@ -394,7 +394,25 @@ static void player_glide_bind(void){
                                &player_glide.glider_textures[i+1] );
    }
 
+   /* load trail positions */
+   mdl_array_ptr markers;
+   MDL_LOAD_ARRAY( mdl, &markers, ent_marker, vg_mem.scratch );
+
+   for( u32 i=0; i<mdl_arrcount( &markers ); i ++ ){
+      ent_marker *marker = mdl_arritm( &markers, i );
+      v3_copy( marker->transform.co, 
+               player_glide.trail_positions[ player_glide.trail_count ++ ] );
+
+      if( player_glide.trail_count == vg_list_size(trails_glider) )
+         break;
+   }
+
    mdl_close( mdl );
+
+   /* allocate effects */
+   for( u32 i=0; i<vg_list_size(trails_glider); i ++ ){
+      trail_alloc( &trails_glider[i], 200 );
+   }
 }
 
 static void player_glide_transition(void){
@@ -572,4 +590,26 @@ static void player_glide_render( camera *cam, world_instance *world,
    player_glide.remote_animator.s = kf_res.s[0];
 }
 
+static void player_glide_render_effects( camera *cam ){
+   v3f co, temp;
+   v4f q;
+   rb_extrapolate( &player_glide.rb, co, q );
+   q_mulv( q, (v3f){0,-0.5f,0}, temp );
+   v3_add( temp, co, co );
+
+   f32 alpha = vg_maxf( (fabsf(player_glide.info_lift[2])-1.0f), 0.0f ) /18.0f;
+
+   for( u32 i=0; i<player_glide.trail_count; i ++ ){
+      v3f vvert;
+      q_mulv( q, player_glide.trail_positions[i], vvert );
+      v3_add( co, vvert, vvert );
+      
+      trail_system_update( &trails_glider[i], vg.time_delta, vvert,
+                           localplayer.rb.to_world[1], alpha );
+                           
+      trail_system_prerender( &trails_glider[i] );
+      trail_system_render( &trails_glider[i], &skaterift.cam );
+   }
+}
+
 #endif /* PLAYER_GLIDE_C */

diff --git a/player_glide.h b/player_glide.h
index f9e4e975b7474d765a5340739149c3c01841b4ff..fdf34bcabb5f2a80ddb4fa2529ada3a8b1684c24 100644 (file)
--- a/player_glide.h
+++ b/player_glide.h
@@ -2,6 +2,7 @@
 #define PLAYER_GLIDE_H
 
 #include "player.h"
+#include "trail.h"
 
 struct player_glide {
    struct skeleton_anim *anim_glide;
@@ -44,6 +45,9 @@ struct player_glide {
    }
    parts[4];
 
+   u32 trail_count;
+   v3f trail_positions[2];
+
    mdl_context glider;
    GLuint *glider_textures;
    glmesh glider_mesh;
@@ -87,6 +91,19 @@ static player_glide = {
    }
 };
 
+static trail_system trails_glider[] = {
+{
+   .width = 0.035f,
+   .lifetime = 5.0f,
+   .min_dist = 0.5f
+},
+{
+   .width = 0.035f,
+   .lifetime = 5.0f,
+   .min_dist = 0.5f
+},
+};
+
 static void player_glide_pre_update(void);
 static void player_glide_update(void);
 static void player_glide_post_update(void);

diff --git a/player_render.c b/player_render.c
index be6d5f28bdc91d653601d6c28e40140449f9afe0..40c2f9a73b5d5db2c3a828e9970ee93287ea5224 100644 (file)
--- a/player_render.c
+++ b/player_render.c
@@ -595,7 +595,9 @@ static void player__render( camera *cam ){
 
    SDL_AtomicUnlock( &addon_system.sl_cache_using_resources );
 
+   glEnable( GL_CULL_FACE );
    player_glide_render( cam, world, &localplayer.pose );
+   glDisable( GL_CULL_FACE );
 }
 
 static void player_mirror_pose( mdl_keyframe pose[32], 

diff --git a/skaterift.c b/skaterift.c
index ecdad8e54b19cd6aafe69f3184621cfe29dfac0f..eec32d5b1725b38c96bf8423fb73c765f1bb4b1d 100644 (file)
--- a/skaterift.c
+++ b/skaterift.c
@@ -200,7 +200,6 @@ static void skaterift_load_player_content(void){
 
    particle_alloc( &particles_grind, 300 );
    particle_alloc( &particles_env, 200 );
-   trail_alloc( &trails_test, 200 );
 
    player_load_animation_reference( "models/ch_none.mdl" );
    player_model_load( &localplayer.fallback_model, "models/ch_none.mdl" );
@@ -236,6 +235,8 @@ static void vg_load(void){
    vg_loader_step( skateshop_init, NULL );
    vg_loader_step( ent_tornado_init, NULL );
    vg_loader_step( testing_init, NULL );
+   vg_loader_step( trail_init, NULL );
+   vg_loader_step( particle_init, NULL );
   
    vg_loader_step( skaterift_load_player_content, NULL );
 
@@ -516,16 +517,7 @@ static void render_scene(void){
    particle_system_prerender( &particles_env );
    particle_system_render( &particles_env, &skaterift.cam );
 
-   v3f co;
-   v4f q;
-   rb_extrapolate( &localplayer.rb, co, q );
-
-   trail_system_update( &trails_test, vg.time_delta, 
-                        co,
-                        localplayer.rb.to_world[1], 1.0f );
-   trail_system_debug( &trails_test );
-   trail_system_prerender( &trails_test );
-   trail_system_render( &trails_test, &skaterift.cam );
+   player_glide_render_effects( &skaterift.cam );
 
    /* 
     * render transition 

diff --git a/testing.c b/testing.c
index 2e581637e017e040f12b6fda8ec9c3c7e58b7f55..103f62cafeb106fb397ef7475763cc9cd8c0cbd5 100644 (file)
--- a/testing.c
+++ b/testing.c
@@ -14,6 +14,9 @@ static baller = {
 };
 
 static void testing_update(void){
+   if( !vg_console.cheats )
+      return;
+
    if( vg_getkey( SDLK_9 ) ){
       v3_add( localplayer.rb.co, (v3f){0,1,0}, baller.rb.co );
       v3_zero( baller.rb.w );

diff --git a/trail.c b/trail.c
index b492cabc36b7d0580fcc029786b4ead5eb0e804a..3399694923e2fed841efd3069992e084aa4c0b14 100644 (file)
--- a/trail.c
+++ b/trail.c
@@ -170,7 +170,12 @@ static void trail_system_render( trail_system *sys, camera *cam ){
    shader_trail_use();
    shader_trail_uPv( cam->mtx.pv );
    shader_trail_uPvPrev( cam->mtx_prev.pv );
+   shader_trail_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
        glBindVertexArray( sys->vao );
    glDrawArrays( GL_TRIANGLE_STRIP, 0, sys->count*2 );
 }
+
+static void trail_init( void ){
+   shader_trail_register();
+}

diff --git a/trail.h b/trail.h
index dc90fc9438414e45c598a161c3774bd5d56887fd..58bcb933427a229461f480693330e5c60d3a00aa 100644 (file)
--- a/trail.h
+++ b/trail.h
@@ -26,11 +26,6 @@ struct trail_system {
 
    /* render settings */
    f32 width, lifetime, min_dist;
-}
-static trails_test = {
-   .width = 0.25f,
-   .lifetime = 5.0f,
-   .min_dist = 0.5f
 };
 
 static void trail_alloc( trail_system *sys, u32 max );