projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
its a menu, fuck off
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_gen.h
diff --git
a/world_gen.h
b/world_gen.h
index 3e7cdb90addbca4605f31b993f8aabfcf674002d..c274eace18e621cc15b3b7ed81915e644781a56c 100644
(file)
--- a/
world_gen.h
+++ b/
world_gen.h
@@
-548,10
+548,7
@@
VG_STATIC int reset_player( int argc, char const *argv[] );
VG_STATIC void world_post_process( world_instance *world )
{
world_compute_light_indices( world );
VG_STATIC void world_post_process( world_instance *world )
{
world_compute_light_indices( world );
-
- vg_async_item *call = vg_async_alloc(0);
- call->payload = world;
- vg_async_dispatch( call, async_world_postprocess_render );
+ vg_async_call( async_world_postprocess_render, world, 0 );
}
VG_STATIC void world_process_resources( world_instance *world )
}
VG_STATIC void world_process_resources( world_instance *world )
@@
-823,6
+820,7
@@
VG_STATIC void world_load( u32 index, const char *path )
mdl_load_mesh_block( meta, world->heap );
mdl_load_array( meta, &world->ent_gate, "ent_gate", heap );
mdl_load_mesh_block( meta, world->heap );
mdl_load_array( meta, &world->ent_gate, "ent_gate", heap );
+ mdl_load_array( meta, &world->ent_camera, "ent_camera", heap );
mdl_load_array( meta, &world->ent_spawn, "ent_spawn", heap );
mdl_load_array( meta, &world->ent_light, "ent_light", heap );
mdl_load_array( meta, &world->ent_route_node,"ent_route_node", heap );
mdl_load_array( meta, &world->ent_spawn, "ent_spawn", heap );
mdl_load_array( meta, &world->ent_light, "ent_light", heap );
mdl_load_array( meta, &world->ent_route_node,"ent_route_node", heap );
@@
-834,6
+832,9
@@
VG_STATIC void world_load( u32 index, const char *path )
mdl_load_array( meta, &world->ent_audio, "ent_audio", heap );
mdl_load_array( meta, &world->ent_volume, "ent_volume", heap );
mdl_load_array( meta, &world->ent_traffic, "ent_traffic", heap );
mdl_load_array( meta, &world->ent_audio, "ent_audio", heap );
mdl_load_array( meta, &world->ent_volume, "ent_volume", heap );
mdl_load_array( meta, &world->ent_traffic, "ent_traffic", heap );
+ mdl_load_array( meta, &world->ent_marker, "ent_marker", heap );
+ mdl_load_array( meta, &world->ent_skateshop, "ent_skateshop", heap );
+ mdl_load_array( meta, &world->ent_swspreview,"ent_swspreview", heap );
/* process resources from pack */
world_process_resources( world );
/* process resources from pack */
world_process_resources( world );