graphics changes

[carveJwlIkooP6JGAAIwe30JlM.git] / world_load.c

diff --git a/world_load.c b/world_load.c
index 6055d887acbe96ed7b7a5d68b53a2fc52765a2b3..c275c7aee5b3c5fbe1d31c56baebee793da8f987 100644 (file)
--- a/world_load.c
+++ b/world_load.c
@@ -10,6 +10,7 @@
 #include "vg/vg_msg.h"
 #include "network.h"
 #include "player_remote.h"
+#include "vg/vg_loader.h"
 
 /* 
  * load the .mdl file located in path as a world instance
@@ -69,6 +70,8 @@ static void world_instance_load_mdl( u32 instance_id, const char *path ){
    MDL_LOAD_ARRAY( meta, &world->ent_miniworld, ent_miniworld,  heap );
    MDL_LOAD_ARRAY( meta, &world->ent_prop,      ent_prop,       heap );
    MDL_LOAD_ARRAY( meta, &world->ent_region,    ent_region,     heap );
+   MDL_LOAD_ARRAY( meta, &world->ent_glider,    ent_glider,     heap );
+   MDL_LOAD_ARRAY( meta, &world->ent_npc,       ent_npc,        heap );
 
    mdl_array_ptr infos;
    MDL_LOAD_ARRAY( meta, &infos, ent_worldinfo, vg_mem.scratch );
@@ -172,7 +175,8 @@ static void skaterift_world_load_done( void *payload, u32 size ){
    if( data->purpose != k_world_purpose_hub ){
       vg_msg player_frame = sav;
       if( vg_msg_seekframe( &player_frame, "player" ) ){
-         vg_msg_getkvv3f( &player_frame, "position", world->player_co, NULL );
+         vg_msg_getkvvecf( &player_frame, "position", k_vg_msg_v3f, 
+                           world->player_co, NULL );
       }
    }
 
@@ -181,15 +185,11 @@ static void skaterift_world_load_done( void *payload, u32 size ){
    world_static.load_state = k_world_loader_none;
 }
 
-struct world_load_args {
-   enum world_purpose purpose;
-   addon_reg *reg;
-};
-
 /*
  * Does a complete world switch using the remaining free slots
  */
-static void skaterift_world_load_thread( void *_args ){
+void skaterift_world_load_thread( void *_args )
+{
    struct world_load_args args = *((struct world_load_args *)_args);
 
    addon_reg *reg = args.reg;
@@ -203,7 +203,6 @@ static void skaterift_world_load_thread( void *_args ){
    vg_str path;
    vg_strnull( &path, path_buf, 4096 );
 
-   assert( reg );
    addon_get_content_folder( reg, &path, 1 );
 
    vg_str folder = path;
@@ -278,7 +277,8 @@ static void skaterift_world_load_thread( void *_args ){
 
 /* holding pattern before we can start loading the new world, since we might be
  * waiting for audio to stop */
-static void skaterift_change_client_world_preupdate(void){
+void skaterift_change_client_world_preupdate(void)
+{
    for( u32 i=1; i<k_world_max; i++ ){
       world_instance *inst = &world_static.instances[i];
       
@@ -309,7 +309,8 @@ static void skaterift_change_client_world_preupdate(void){
 }
 
 /* places all loaded worlds into unloading state */
-static void skaterift_change_world_start( addon_reg *reg ){
+void skaterift_change_world_start( addon_reg *reg )
+{
    if( world_static.active_instance != 0 )
       vg_error( "Cannot change worlds while in non-root world\n" );
    else{
@@ -344,7 +345,7 @@ static void skaterift_change_world_start( addon_reg *reg ){
 }
 
 /* console command for the above function */
-static int skaterift_load_world_command( int argc, const char *argv[] )
+int skaterift_load_world_command( int argc, const char *argv[] )
 {
    if( !vg_loader_availible() ) 
    {
@@ -389,7 +390,8 @@ static int skaterift_load_world_command( int argc, const char *argv[] )
  *  1. to see if all audios owned by the world have been stopped
  *  2. that this is the least significant world
  */
-static int world_freeable( world_instance *world ){
+int world_freeable( world_instance *world )
+{
    if( world->status != k_world_status_unloading ) return 0;
    u8 world_id = (world - world_static.instances) + 1;
 
@@ -418,7 +420,8 @@ static int world_freeable( world_instance *world ){
 /*
  * Free all resources for world instance
  */
-static void world_free( world_instance *world ){
+void world_free( world_instance *world )
+{
    vg_info( "Free world @%p\n", world );
 
    /* free meshes */
@@ -457,7 +460,8 @@ static void world_free( world_instance *world ){
  * reset the world structure without deallocating persistent buffers 
  * TODO: Make this a memset(0), and have persistent items live in a static loc
  */
-static void world_init_blank( world_instance *world ){
+void world_init_blank( world_instance *world )
+{
    memset( &world->meta, 0, sizeof(mdl_context) );
 
    world->textures = NULL;
@@ -487,12 +491,23 @@ static void world_init_blank( world_instance *world ){
    state->g_shadow_length = 9.50f;
    state->g_shadow_spread = 0.65f;
 
+#if 0
+   /* 2023 style */
    v3_copy( (v3f){0.37f, 0.54f, 0.97f}, state->g_daysky_colour );
    v3_copy( (v3f){0.03f, 0.05f, 0.20f}, state->g_nightsky_colour );
    v3_copy( (v3f){1.00f, 0.32f, 0.01f}, state->g_sunset_colour );
    v3_copy( (v3f){0.13f, 0.17f, 0.35f}, state->g_ambient_colour );
    v3_copy( (v3f){0.25f, 0.17f, 0.51f}, state->g_sunset_ambient );
    v3_copy( (v3f){1.10f, 0.89f, 0.35f}, state->g_sun_colour );
+#else
+   /* 2024 style */
+   v3_copy( (v3f){0.308f, 0.543f, 0.904f}, state->g_daysky_colour );
+   v3_copy( (v3f){0.030f, 0.050f, 0.200f}, state->g_nightsky_colour );
+   v3_copy( (v3f){1.000f, 0.320f, 0.010f}, state->g_sunset_colour );
+   v3_copy( (v3f){0.130f, 0.170f, 0.350f}, state->g_ambient_colour );
+   v3_copy( (v3f){0.25f, 0.17f, 0.51f}, state->g_sunset_ambient );
+   v3_copy( (v3f){1.000f, 0.809f, 0.318f}, state->g_sun_colour );
+#endif
 }
 
 #endif /* WORLD_LOAD_C */