#include "respawn.h"
#include "ent_miniworld.h"
#include "player_remote.h"
+#include "ent_skateshop.h"
static int ccmd_set_time( int argc, const char *argv[] ){
world_instance *world = world_current_instance();
shader_scene_standard_register();
shader_scene_standard_alphatest_register();
+ shader_scene_foliage_register();
shader_scene_override_register();
shader_scene_cubemapped_register();
shader_scene_fxglow_register();
mdl_context msky;
mdl_open( &msky, "models/rs_skydome.mdl", vg_mem.scratch );
mdl_load_metadata_block( &msky, vg_mem.scratch );
- mdl_async_load_glmesh( &msky, &world_render.skydome );
+ mdl_async_load_glmesh( &msky, &world_render.skydome, NULL );
mdl_close( &msky );
vg_info( "Loading default world textures\n" );
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 );
if( prop->flags & 0x1 ) continue;
for( u32 k=0; k<prop->submesh_count; k++ ){
- sm = mdl_arritm( &world->meta.submeshs, prop->submesh_start+k );
+ mdl_submesh *sm =
+ mdl_arritm( &world->meta.submeshs, prop->submesh_start+k );
+
+ if( sm->material_id != material_id ) continue;
m4x3f mmdl;
mdl_transform_m4x3( &prop->transform, mmdl );
glEnable( GL_CULL_FACE );
}
+static GLuint world_get_texture( world_instance *world, u32 id ){
+ if( id & 0x80000000 )
+ return skaterift.rt_textures[id & ~0x80000000];
+ else
+ return world->textures[ id ];
+}
+
static void bindpoint_diffuse_texture1( world_instance *world,
- struct world_surface *mat )
-
-{
+ struct world_surface *mat ){
glActiveTexture( GL_TEXTURE1 );
- glBindTexture( GL_TEXTURE_2D, world->textures[ mat->info.tex_diffuse ] );
+ glBindTexture( GL_TEXTURE_2D,
+ world_get_texture(world,mat->info.tex_diffuse) );
}
static void bindpoint_diffuse1_and_cubemap10( world_instance *world,
struct world_surface *mat ){
glActiveTexture( GL_TEXTURE1 );
- glBindTexture( GL_TEXTURE_2D, world->textures[ mat->info.tex_diffuse ] );
+ glBindTexture( GL_TEXTURE_2D,
+ world_get_texture(world,mat->info.tex_diffuse) );
u32 cubemap_id = mat->info.tex_none0,
cubemap_index = 0;
glEnable(GL_CULL_FACE);
}
-static
-void world_render_challenges( world_instance *world, struct world_pass *pass,
- v3f pos ){
+static void render_world_foliage( world_instance *world, camera *cam ){
+ shader_scene_foliage_use();
+ shader_scene_foliage_uTexGarbage(0);
+ shader_scene_foliage_uTexMain(1);
+ shader_scene_foliage_uPv( cam->mtx.pv );
+ shader_scene_foliage_uTime( vg.time );
+
+ WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( world, scene_foliage );
+ bind_terrain_noise();
+
+ shader_scene_foliage_uCamera( cam->transform[3] );
+ glDisable(GL_CULL_FACE);
+ struct world_pass pass = {
+ .shader = k_shader_foliage,
+ .cam = cam,
+ .fn_bind_textures = bindpoint_diffuse_texture1,
+ .fn_set_mdl = shader_scene_foliage_uMdl,
+ .fn_set_uPvmPrev = shader_scene_foliage_uPvmPrev,
+ };
+ world_render_both_stages( world, &pass );
+ glEnable(GL_CULL_FACE);
+}
+
+static void world_render_challenges( world_instance *world,
+ struct world_pass *pass, v3f pos ){
if( !world ) return;
if( skaterift.activity == k_skaterift_replay ) return;
if( world != world_current_instance() ) return;
}
}
-static void render_world_fxglow( world_instance *world, camera *cam ){
+static void render_world_fxglow( world_instance *host_world,
+ world_instance *world, camera *cam,
+ m4x3f world_mmdl,
+ int generic, int challenges, int regions ){
shader_scene_fxglow_use();
shader_scene_fxglow_uUvOffset( (v2f){ 0.0f, 0.0f } );
shader_scene_fxglow_uTexMain(1);
shader_scene_fxglow_uPv( cam->mtx.pv );
- world_link_lighting_ub( world, _shader_scene_fxglow.id );
- world_bind_position_texture( world, _shader_scene_fxglow.id,
+ world_link_lighting_ub( host_world, _shader_scene_fxglow.id );
+ world_bind_position_texture( host_world, _shader_scene_fxglow.id,
_uniform_scene_fxglow_g_world_depth, 2 );
- world_bind_light_array( world, _shader_scene_fxglow.id,
+ world_bind_light_array( host_world, _shader_scene_fxglow.id,
_uniform_scene_fxglow_uLightsArray, 3 );
- world_bind_light_index( world, _shader_scene_fxglow.id,
+ world_bind_light_index( host_world, _shader_scene_fxglow.id,
_uniform_scene_fxglow_uLightsIndex, 4 );
shader_scene_fxglow_uCamera( cam->transform[3] );
.fn_set_uPvmPrev = shader_scene_fxglow_uPvmPrev,
};
- world_render_both_stages( world, &pass );
- world_render_challenges( world, &pass, cam->pos );
+ if( generic )
+ world_render_both_stages( world, &pass );
+
+ if( regions ){
+ mesh_bind( &world->mesh_no_collide );
+
+ u32 last_material = 0;
+ for( u32 i=0; i<mdl_arrcount(&world->ent_region); i ++ ){
+ shader_scene_fxglow_uUvOffset( (v2f){ 0.0f, 0.0f } );
+ ent_region *region = mdl_arritm( &world->ent_region, i );
+
+ f32 offset = 0.0f;
+ if( region->flags & k_ent_route_flag_achieve_gold )
+ offset = 2.0f;
+ else if( region->flags & k_ent_route_flag_achieve_silver )
+ offset = 1.0f;
+
+ shader_scene_fxglow_uUvOffset( (v2f){ (8.0f/256.0f)*offset, 0.0f } );
+
+ m4x3f mmdl;
+ mdl_transform_m4x3( ®ion->transform, mmdl );
+ m4x3_mul( world_mmdl, mmdl, mmdl );
+ shader_scene_fxglow_uMdl( mmdl );
+
+ for( u32 j=0; j<region->submesh_count; j++ ){
+ mdl_submesh *sm = mdl_arritm( &world->meta.submeshs,
+ region->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 );
+ }
+ }
+ }
+
+ if( challenges )
+ world_render_challenges( world, &pass, cam->pos );
glEnable(GL_CULL_FACE);
}
struct world_surface *mat )
{
glActiveTexture( GL_TEXTURE1 );
- glBindTexture( GL_TEXTURE_2D, world->textures[ mat->info.tex_diffuse ] );
+ glBindTexture( GL_TEXTURE_2D,
+ world_get_texture(world,mat->info.tex_diffuse) );
shader_scene_terrain_uSandColour( mat->info.colour );
shader_scene_terrain_uBlendOffset( mat->info.colour1 );
}
else{
glActiveTexture( GL_TEXTURE1 );
- glBindTexture( GL_TEXTURE_2D, world->textures[ mat->info.tex_diffuse ] );
+ glBindTexture( GL_TEXTURE_2D,
+ world_get_texture(world,mat->info.tex_diffuse) );
shader_scene_override_uAlphatest(1);
}
}
for( u32 i=0; i<mdl_arrcount(&world->ent_gate); i++ ){
ent_gate *gi = mdl_arritm( &world->ent_gate, i );
- if( !(gi->flags & k_ent_gate_linked) )
- continue;
+
+ if( !(gi->flags & k_ent_gate_nonlocal) )
+ if( !(gi->flags & k_ent_gate_linked) )
+ continue;
float dist = v3_dist2( gi->co[0], cam->transform[3] );
}
if( gate->flags & k_ent_gate_nonlocal ){
- if( world_static.load_state != k_world_loader_none ){
+ if( !(gate->flags & k_ent_gate_linked) ||
+ (world_static.load_state != k_world_loader_none) ){
world->rendering_gate = NULL;
+ render_gate_unlinked( world, gate, cam );
return;
}
world->time = 0.834;
}
+ if( world->info.flags & 0x1 ){
+ world->time = world->info.timezone;
+ }
+
struct ub_world_lighting *state = &world->ub_lighting;
state->g_time = world->time;
render_world_vb( world, cam );
render_world_alphatest( world, cam );
+ render_world_foliage( world, cam );
render_terrain( world, cam );
if( !viewing_from_gate ){
GL_COLOR_ATTACHMENT1 } );
}
- render_world_fxglow( world, cam );
+ render_world_fxglow( world, world, cam, NULL, 1, 1, 0 );
}
if( with_water ){
world_instance *lighting_source,
m4x3f mmdl,
camera *cam,
- ent_spawn *dest_spawn, f32 iso_amt ){
+ ent_spawn *dest_spawn, v4f map_info ){
struct world_pass pass = {
.cam = cam,
.fn_bind_textures = bindpoint_override,
shader_scene_override_uTexGarbage(0);
shader_scene_override_uTexMain(1);
shader_scene_override_uPv( pass.cam->mtx.pv );
- shader_scene_override_uIsoAmt( iso_amt );
+ shader_scene_override_uMapInfo( map_info );
WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( lighting_source, scene_override );
bind_terrain_noise();
pass.geo_type = k_world_geo_type_nonsolid;
render_world_override_pass( world, &pass, mmdl, mnormal, mpvm_prev );
glEnable( GL_CULL_FACE );
+
+ render_world_fxglow( world, world, cam, mmdl, 0, 0, 1 );
}
static void render_cubemap_side( world_instance *world, ent_cubemap *cm,
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff