X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_render.c;h=3693a28920108f5978b1080b323a131a4fa19682;hb=7eba38b8178c82040618a518634d8ff4813e2ff2;hp=c332aced5431851cb0b0bf17e14e5c962e6a1547;hpb=73adac381b2c72f08293416a960942dc40db3c7f;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_render.c b/world_render.c
index c332ace..3693a28 100644
--- a/world_render.c
+++ b/world_render.c
@@ -154,18 +154,59 @@ struct world_pass{
    void (*fn_set_uPvmPrev)( m4x4f pvm );
 };
 
-VG_STATIC void world_render_if( world_instance *world, struct world_pass *pass )
-{
+VG_STATIC
+void world_render_traffic( world_instance *world, u32 material_id,
+                           struct world_pass *pass ){
+   if( !mdl_arrcount( &world->ent_traffic ) ) return;
+
+   /* HACK: use the first material for every traffic entity */
+   ent_traffic *first = mdl_arritm( &world->ent_traffic, 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_traffic ); j++ ){
+      ent_traffic *traffic = mdl_arritm( &world->ent_traffic, j );
+      
+      for( u32 k=0; k<traffic->submesh_count; k++ ){
+         sm = mdl_arritm( &world->meta.submeshs, 
+                           traffic->submesh_start+k );
+
+         m4x3f mmdl;
+         q_m3x3( traffic->transform.q, mmdl );
+         v3_copy( traffic->transform.co, mmdl[3] );
+
+         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 );
+      }
+   }
+}
+
+VG_STATIC 
+void world_render_pass( world_instance *world, struct world_pass *pass ){
    for( int i=0; i<world->surface_count; i++ ){
       struct world_surface *mat = &world->surfaces[i];
 
       if( mat->info.shader == pass->shader ){
          mdl_submesh *sm;
 
-         if( pass->geo_type == k_world_geo_type_solid )
+         if( pass->geo_type == k_world_geo_type_solid ){
             sm = &mat->sm_geo;
-         else
+         }
+         else{
+            world_render_traffic( world, i, pass );
             sm = &mat->sm_no_collide;
+         }
 
          if( !sm->indice_count )
             continue;
@@ -177,27 +218,6 @@ VG_STATIC void world_render_if( world_instance *world, struct world_pass *pass )
 
          pass->fn_bind_textures( world, mat );
          mdl_draw_submesh( sm );
-
-         for( u32 j=0; j<mdl_arrcount( &world->ent_traffic ); j++ ){
-            ent_traffic *traffic = mdl_arritm( &world->ent_traffic, j );
-            
-            for( u32 k=0; k<traffic->submesh_count; k++ ){
-               sm = mdl_arritm( &world->meta.submeshs, 
-                                 traffic->submesh_start+k );
-
-               q_m3x3( traffic->transform.q, mmdl );
-               v3_copy( traffic->transform.co, mmdl[3] );
-
-               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 );
-            }
-         }
       }
    }
 }
@@ -207,12 +227,12 @@ void world_render_both_stages( world_instance *world, struct world_pass *pass )
 {
    mesh_bind( &world->mesh_geo );
    pass->geo_type = k_world_geo_type_solid;
-   world_render_if( world, pass );
+   world_render_pass( world, pass );
 
    glDisable( GL_CULL_FACE );
    mesh_bind( &world->mesh_no_collide );
    pass->geo_type = k_world_geo_type_nonsolid;
-   world_render_if( world, pass );
+   world_render_pass( world, pass );
    glEnable( GL_CULL_FACE );
 }
 
@@ -319,8 +339,39 @@ VG_STATIC void render_world_alphatest( world_instance *world, camera *cam )
    glEnable(GL_CULL_FACE);
 }
 
+VG_STATIC
+void world_render_challenges( world_instance *world, struct world_pass *pass ){
+   if( !world ) return;
+
+   glDisable( GL_CULL_FACE );
+   mesh_bind( &world->mesh_no_collide );
+
+   u32 last_material = 0;
+
+   for( u32 i=0; i<mdl_arrcount(&world->ent_challenge); i++ ){
+      ent_challenge *challenge = mdl_arritm(&world->ent_challenge,i);
+      
+      m4x3f mmdl;
+      mdl_transform_m4x3( &challenge->transform, mmdl );
+      shader_scene_fxglow_uMdl( mmdl );
+
+      for( u32 j=0; j<challenge->submesh_count; j++ ){
+         mdl_submesh *sm = mdl_arritm( &world->meta.submeshs, 
+                                       challenge->submesh_start + j );
+
+         if( sm->material_id != last_material ){
+            last_material = sm->material_id;
+
+            pass->fn_bind_textures( world, &world->surfaces[sm->material_id] );
+         }
+
+         mdl_draw_submesh( sm );
+      }
+   }
+}
+
 VG_STATIC void render_world_fxglow( world_instance *world, camera *cam ){
-   glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
+   //glDrawBuffers( 1, (GLenum[]){ GL_COLOR_ATTACHMENT0 } );
 
    shader_scene_fxglow_use();
    shader_scene_fxglow_uTexMain(1);
@@ -346,9 +397,10 @@ VG_STATIC void render_world_fxglow( world_instance *world, camera *cam ){
    };
 
    world_render_both_stages( world, &pass );
+   world_render_challenges( world, &pass );
 
    glEnable(GL_CULL_FACE);
-   glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } );
+   //glDrawBuffers( 2, (GLenum[]){ GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1 } );
 }
 
 VG_STATIC void bindpoint_terrain( world_instance *world,