#ifndef WORLD_H
#define WORLD_H
+#include "vg/vg_loader.h"
+
#include "network.h"
#include "network_msg.h"
#include "scene.h"
#include "terrain.h"
#include "render.h"
#include "rigidbody.h"
-#include "gate.h"
#include "bvh.h"
#include "lighting.h"
#include "model.h"
struct route_gate
{
- teleport_gate gate;
+ struct teleport_gate
+ {
+ v3f co[2];
+ v4f q[2];
+ v2f dims;
+
+ m4x3f to_world, recv_to_world, transport;
+ }
+ gate;
u32 node_id;
glmesh cars;
mdl_submesh car_holden;
- rigidbody mr_ball;
-
/* Load time */
struct instance_cache
*/
#include "world_routes.h"
#include "world_sfd.h"
-#include "world_audio.h"
#include "world_render.h"
#include "world_water.h"
#include "world_gen.h"
+#include "world_gate.h"
/*
* -----------------------------------------------------------------------------
* Events
* -----------------------------------------------------------------------------
*/
-static void world_register(void)
+
+static int world_init(void)
{
shader_terrain_register();
shader_sky_register();
shader_fscolour_register();
shader_alphatest_register();
- world_routes_register();
- world_sfd_register();
- world_water_register();
-}
-
-static void world_free(void)
-{
- /* TODO.. */
-
- world_sfd_free();
-}
+ vg_info( "Loading world resources\n" );
-
-static void world_init(void)
-{
mdl_header *mcars = mdl_load( "models/rs_cars.mdl" );
- mdl_unpack_glmesh( mcars, &world.cars );
mdl_node *nholden = mdl_node_from_name( mcars, "holden" );
world.car_holden = *mdl_node_submesh( mcars, nholden, 0 );
- free(mcars);
-
mdl_header *msky = mdl_load("models/rs_skydome.mdl");
- mdl_unpack_glmesh( msky, &world.skydome );
-
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 );
world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
+
+ /* TODO: cleanup resource acquisition */
+ if( !mcars || !msky )
+ {
+ free( mcars );
+ free( msky );
+ return 0;
+ }
+
+ if( vg_acquire_thread_sync(1) )
+ {
+ if( !mdl_unpack_glmesh( mcars, &world.cars ) )
+ {
+ free( mcars );
+ free( msky );
+ vg_release_thread_sync(1);
+ return 0;
+ }
+
+ if( !mdl_unpack_glmesh( msky, &world.skydome ) )
+ {
+ mesh_free( &world.cars );
+ free( mcars );
+ free( msky );
+ vg_release_thread_sync(1);
+ return 0;
+ }
+
+ vg_release_thread_sync(1);
+ }
+ else
+ {
+ free(mcars);
+ free(msky);
+ return 0;
+ }
+
+ free(mcars);
free(msky);
+ vg_info( "Loading other world systems\n" );
+
+ if( !vg_loader_highwater( (void *)mesh_free, &world.cars ) ) return 0;
+ if( !vg_loader_highwater( (void *)mesh_free, &world.skydome ) ) return 0;
/* Other systems */
- world_render_init();
- world_sfd_init();
- world_audio_init();
+
+ if( !world_render_init() ) return 0;
+ if( !vg_loader_highwater( world_render_free, NULL ) ) return 0;
+
+ if( !world_sfd_init() ) return 0;
+ if( !vg_loader_highwater( world_sfd_free, NULL ) ) return 0;
+
+ if( !world_water_init() ) return 0;
+ if( !vg_loader_highwater( world_water_free, NULL ) ) return 0;
+
+ if( !world_gates_init() ) return 0;
+ if( !vg_loader_highwater( world_gates_free, NULL ) ) return 0;
+
+ if( !world_routes_init() ) return 0;
+ if( !vg_loader_highwater( world_routes_free, NULL ) ) return 0;
+ return 1;
}
static void world_update( v3f pos )