X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_gen.h;h=63cb1ef98f1e91c38799f1f9d2e78a7a65e81b69;hb=0a33f65eecb5e75cddaefa08d3a5eb1a301d0479;hp=b35c6c25f036a3a4380b1d7a0b24afa47ee2f401;hpb=4fa1c611e0af4c32cdcc891f8c511217a2762d65;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_gen.h b/world_gen.h index b35c6c2..63cb1ef 100644 --- a/world_gen.h +++ b/world_gen.h @@ -126,115 +126,8 @@ VG_STATIC void world_apply_procedural_foliage( world_instance *world, vg_info( "%d foliage models added\n", count ); } -#if 0 -VG_STATIC void world_ents_allocate( world_instance *world ) -{ - vg_info( "Allocating entities\n" ); - - /* --count entites to allocate buffers for them.-- - * --maybe in the future we just store these numbers in the model file...-- - * - * ... 16.03.23: I HOPE YOUR FUCKING HAPPY - * ... 22.03.23: incomprehensible pain - * - * -- use this in world_routes too -- - * - */ - - struct countable - { - enum classtype ct, ct1; - void **to_allocate; - u32 item_size; - int count; - } - entity_counts[] = - { - { - k_classtype_spawn, - k_classtype_none, - (void*)&world->spawns, - sizeof(struct respawn_point) - }, - { - k_classtype_audio, - k_classtype_none, - (void*)&world->audio_things, - sizeof(struct world_audio_thing) - }, - { - k_classtype_world_light, - k_classtype_none, - (void*)&world->lights, - sizeof(struct world_light) - }, - { - k_classtype_nonlocal_gate, - k_classtype_none, - (void*)&world->nonlocal_gates, - sizeof(struct nonlocal_gate) - }, - }; - - for( int i=0; imeta->info.node_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( world->meta, i ); - - for( int j=0; jclasstype == entity_counts[j].ct) || - (pnode->classtype == entity_counts[j].ct1) ) - { - pnode->sub_uid = entity_counts[j].count; - entity_counts[j].count ++; - break; - } - } - } - - for( int i=0; iitem_size*counter->count; - *counter->to_allocate = vg_linear_alloc( world_global.generic_heap, - bufsize ); - memset( *counter->to_allocate, 0, bufsize ); - } - - world->volume_bh = bh_create( world_global.generic_heap, - &bh_system_volumes, - world, - world->volume_count, - 1 ); -} -#endif #if 0 -VG_STATIC void world_pct_spawn( world_instance *world, mdl_node *pnode ) -{ - struct respawn_point *rp = &world->spawns[ world->spawn_count ++ ]; - - v3_copy( pnode->co, rp->co ); - v4_copy( pnode->q, rp->q ); - rp->name = mdl_pstr( world->meta, pnode->pstr_name ); -} - -VG_STATIC void world_pct_water( world_instance *world, mdl_node *pnode ) -{ - if( world->water.enabled ) - { - vg_warn( "Multiple water surfaces in level! ('%s')\n", - mdl_pstr( world->meta, pnode->pstr_name )); - return; - } - - world->water.enabled = 1; - water_set_surface( world, pnode->co[1] ); -} VG_STATIC void world_pct_audio( world_instance *world, mdl_node *pnode ) { @@ -259,20 +152,6 @@ VG_STATIC void world_pct_audio( world_instance *world, mdl_node *pnode ) world->audio_things_count ++; } -VG_STATIC void world_pct_world_light( world_instance *world, mdl_node *pnode ) -{ - struct world_light *light = &world->lights[ world->light_count ++ ]; - light->node = pnode; - light->inf = mdl_get_entdata( world->meta, pnode ); - - q_m3x3( pnode->q, light->inverse_world ); - v3_copy( pnode->co, light->inverse_world[3] ); - m4x3_invert_affine( light->inverse_world, light->inverse_world ); - - light->angle_sin_cos[0] = sinf( light->inf->angle * 0.5f ); - light->angle_sin_cos[1] = cosf( light->inf->angle * 0.5f ); -} - VG_STATIC void world_pct_nonlocal_gate( world_instance *world, mdl_node *pnode ) { struct nonlocal_gate *gate = &world->nonlocal_gates[ @@ -285,38 +164,6 @@ VG_STATIC void world_pct_nonlocal_gate( world_instance *world, mdl_node *pnode ) v2_copy( inf->dims, gate->gate.dims ); } -VG_STATIC void world_entities_process( world_instance *world ) -{ - struct entity_instruction - { - enum classtype ct; - void (*process)( world_instance *world, mdl_node *pnode ); - } - entity_instructions[] = - { - { k_classtype_spawn, world_pct_spawn }, - { k_classtype_water, world_pct_water }, - { k_classtype_audio, world_pct_audio }, - { k_classtype_world_light, world_pct_world_light }, - { k_classtype_nonlocal_gate, world_pct_nonlocal_gate } - }; - - for( int i=0; imeta->info.node_count; i++ ) - { - mdl_node *pnode = mdl_node_from_id( world->meta, i ); - - for( int j=0; jclasstype == instr->ct ) - { - instr->process( world, pnode ); - break; - } - } - } -} VG_STATIC void world_link_nonlocal_gates( int index_a, int index_b ) { vg_info( "Linking non-local gates\n" ); @@ -372,48 +219,6 @@ VG_STATIC void world_link_nonlocal_gates( int index_a, int index_b ) } #endif -#if 0 -VG_STATIC float colour_luminance( v3f v ) -{ - return v3_dot( v, (v3f){0.2126f, 0.7152f, 0.0722f} ); -} - -VG_STATIC float calc_light_influence( world_instance *world, v3f position, - int light ) -{ - struct world_light *world_light = &world->lights[ light ]; - struct classtype_world_light *inf = world_light->inf; - - v3f light_delta; - v3_sub( world_light->node->co, position, light_delta ); - v3_muls( light_delta, 10.0f, light_delta ); - - float quadratic = v3_dot( light_delta, light_delta ), - attenuation = 1.0f/( 1.0f + quadratic ); - - float quadratic_light = attenuation * colour_luminance( inf->colour ); - - if( (inf->type == k_light_type_point) || - (inf->type == k_light_type_point_nighttime_only) ) - { - return quadratic_light; - } - else if( (inf->type == k_light_type_spot) || - (inf->type == k_light_type_spot_nighttime_only) ) - { - v3f dir; - q_mulv( world_light->node->q, (v3f){0.0f,1.0f,0.0f}, dir ); - - float spot_theta = vg_maxf( 0.0f, v3_dot( light_delta, dir ) ), - falloff = spot_theta >= 0.0f? 1.0f: 0.0f; - - return quadratic_light * falloff; - } - else - return 0.0f; -} -#endif - VG_STATIC void world_generate( world_instance *world ) { /* @@ -974,6 +779,18 @@ VG_STATIC void world_entities_init( world_instance *world ) ent_gate *gate = mdl_arritm( &world->ent_gate, j ); gate_transform_update( gate ); } + + /* water */ + for( u32 j=0; jent_water); j++ ){ + ent_water *water = mdl_arritm( &world->ent_water, j ); + if( world->water.enabled ){ + vg_warn( "Multiple water surfaces in level!\n" ); + break; + } + + world->water.enabled = 1; + water_set_surface( world, water->transform.co[1] ); + } } VG_STATIC void world_load( world_instance *world, const char *path ) @@ -1004,6 +821,8 @@ VG_STATIC void world_load( world_instance *world, const char *path ) "ent_checkpoint", world_global.generic_heap ); mdl_load_array( &world->meta, &world->ent_route, "ent_route", world_global.generic_heap ); + mdl_load_array( &world->meta, &world->ent_water, + "ent_water", world_global.generic_heap ); mdl_close( &world->meta );