#include "shaders/terrain.h"
#include "shaders/sky.h"
-#include "shaders/planeinf.h"
#include "shaders/standard.h"
#include "shaders/vblend.h"
#include "shaders/gpos.h"
-#include "shaders/fscolour.h"
+#include "shaders/blitcolour.h"
#include "shaders/alphatest.h"
typedef struct teleport_gate teleport_gate;
shader_terrain_register();
shader_sky_register();
- shader_planeinf_register();
shader_gpos_register();
- shader_fscolour_register();
+ shader_blitcolour_register();
shader_alphatest_register();
vg_info( "Loading world resources\n" );
vg_linear_clear( vg_mem.scratch );
mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
- mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
- *nupper = mdl_node_from_name( msky, "dome_upper" );
-
- world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+ mdl_node *nupper = mdl_node_from_name( msky, "dome_complete" );
world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
vg_acquire_thread_sync();
/* Other systems */
vg_info( "Loading other world systems\n" );
- vg_loader_highwater( world_render_init, NULL, NULL );
- vg_loader_highwater( world_sfd_init, NULL, NULL );
- vg_loader_highwater( world_water_init, NULL, NULL );
- vg_loader_highwater( world_gates_init, NULL, NULL );
- vg_loader_highwater( world_routes_init, NULL, NULL );
+ vg_loader_step( world_render_init, NULL );
+ vg_loader_step( world_sfd_init, NULL );
+ vg_loader_step( world_water_init, NULL );
+ vg_loader_step( world_gates_init, NULL );
+ vg_loader_step( world_routes_init, NULL );
/* Allocate dynamic world memory arena */
u32 max_size = 76*1024*1024;
{
world.switching_to_new_world = 0;
world_unload();
- world_load();
+ vg_loader_start( world_load );
+ return;
}
}
-
world.sky_time += world.sky_rate * vg.time_delta;
world.sky_rate = vg_lerp( world.sky_rate, world.sky_target_rate,
vg.time_delta * 5.0 );