u32 hash;
mdl_mesh_t mdl;
+
+ int need_load;
}
*models;
{
ESolidResult flag = k_ESolidResult_valid;
+ double planes[ SOLID_MAX_SIDES*4 ];
vmf_face faces[ SOLID_MAX_SIDES ];
- int is_displacement = 0;
+ int is_displacement = solid_has_displacement( node );
int num_planes = 0;
- // TODO: What is this for again? surely it should be the other way around... i think...
- if( solid_has_displacement( node ) )
- {
- printf( "solid_has_displacement\n" );
- num_planes = vmf_api.bisectors;
-
- // Add dummy stuff for globals
- // ???
- for( int k = 0; k < vmf_api.bisectors; k ++ )
- {
- vmf_face *dummy = faces + k;
- dummy->indices = NULL;
- dummy->dispinfo = NULL;
- dummy->material = NULL;
- }
-
- is_displacement = 1;
- }
-
int it = 0;
vdf_node *pSide;
while( (pSide = vdf_next(node, "side", &it)) )
if( num_planes >= SOLID_MAX_SIDES )
{
flag = k_ESolidResult_maxsides;
- fprintf( stderr, "Solid over maxsides limit (%i)\n", SOLID_MAX_SIDES );
+ log_error( "Solid over maxsides limit (%i)\n", SOLID_MAX_SIDES );
break;
}
kv_double_array( pSide, "plane", 9, points );
- tri_to_plane( points+6, points+3, points+0, vmf_api.planes + num_planes * 4 );
+ tri_to_plane( points+6, points+3, points+0, planes + num_planes * 4 );
num_planes ++;
}
if( (faces[ i[0] ].blacklisted && faces[ i[1] ].blacklisted && faces[ i[2] ].blacklisted) )
continue;
- if( !plane_intersect( vmf_api.planes+i[0]*4, vmf_api.planes+i[1]*4, vmf_api.planes+i[2]*4, p ) )
+ if( !plane_intersect( planes+i[0]*4, planes+i[1]*4, planes+i[2]*4, p ) )
continue;
// Check for illegal verts (eg: got clipped by bisectors)
int valid = 1;
for( int m = 0; m < num_planes; m ++ )
{
- if( plane_polarity( vmf_api.planes+m*4, p ) > 1e-6f )
+ if( plane_polarity( planes+m*4, p ) > 1e-6f )
{
valid = 0;
break;
face_add_indice( faces + i[k], c );
v3d_v3f( p, ctx->verts[ c ].co );
- v3d_v3f( vmf_api.planes+i[k]*4, ctx->verts[ c ].nrm );
+ v3d_v3f( planes+i[k]*4, ctx->verts[ c ].nrm );
csr_sb_inc( ctx->verts, 1 );
}
}
// Sort each faces and trianglulalate them
- for( int k = vmf_api.bisectors; k < num_planes; k ++ )
+ for( int k = 0; k < num_planes; k ++ )
{
vmf_face *face = faces + k;
if( csr_sb_count( face->indices ) < 3 )
{
- if( !vmf_api.bisectors )
- {
- flag = k_ESolidResult_degenerate;
- fprintf( stderr, "Skipping degenerate face\n" );
- }
+ flag = k_ESolidResult_degenerate;
+ log_error( "Skipping degenerate face\n" );
continue;
}
// Sort only if there is no displacements, or if this side is
if( !is_displacement || ( is_displacement && face->dispinfo ) )
{
- sort_coplanar( vmf_api.planes+k*4, ctx->verts, face->indices, csr_sb_count( face->indices ) );
+ sort_coplanar( planes+k*4, ctx->verts, face->indices, csr_sb_count( face->indices ) );
}
if( is_displacement )
{
if( csr_sb_count( face->indices ) != 4 )
{
- // Mute error if we have global planes cause they
- // are of course gonna fuck things up here
- if( !vmf_api.bisectors )
- {
- flag = k_ESolidResult_degenerate;
- fprintf( stderr, "Skipping degenerate displacement\n" );
- }
+ flag = k_ESolidResult_degenerate;
+ log_error( "Skipping degenerate displacement\n" );
continue;
}
}
}
- // Get corners of displacement
- float *SW = ctx->verts[ face->indices[ sw ] ].co;
- float *NW = ctx->verts[ face->indices[ (sw+1) % 4] ].co;
- float *NE = ctx->verts[ face->indices[ (sw+2) % 4] ].co;
- float *SE = ctx->verts[ face->indices[ (sw+3) % 4] ].co;
-
// Can be either 5, 9, 17
numpoints = pow( 2, kv_get_int( dispinfo, "power", 2 ) ) + 1;
u32 reqverts = numpoints*numpoints;
ctx->verts = csr_sb_reserve( ctx->verts, reqverts, sizeof( vmf_vert ) );
ctx->indices = csr_sb_reserve( ctx->indices, reqidx, sizeof( u32 ) );
+
+ // Get corners of displacement
+ float *SW = ctx->verts[ face->indices[ sw ] ].co;
+ float *NW = ctx->verts[ face->indices[ (sw+1) % 4] ].co;
+ float *NE = ctx->verts[ face->indices[ (sw+2) % 4] ].co;
+ float *SE = ctx->verts[ face->indices[ (sw+3) % 4] ].co;
float normals[ 17*3 ];
float distances[ 17 ];
map->models = csr_sb_reserve( map->models, 1, sizeof( struct vmf_model ));
struct vmf_model *entry = &map->models[ csr_sb_count( map->models ) ];
+ entry->need_load = 0;
+ mdl_error( &entry->mdl ); // (just setting arrays to 0)
+
entry->str = csr_malloc( strlen( model_path ) +1 );
strcpy( entry->str, model_path );
entry->hash = djb2( (const unsigned char *)model_path );
}
// Load all models
-void vmf_load_models( vmf_map *map )
+void vmf_index_models( vmf_map *map )
{
- printf( "Loading all models\n" );
+ log_info( "Indexing all models\n" );
- // Error model. TODO: Maybe don't have this be junk data.
+ // Error model == blank
map->models = csr_sb_reserve( map->models, 1, sizeof( struct vmf_model ));
csr_sb_use( map->models );
mdl_error( &map->models[0].mdl );
vmf_populate_models( map->cache[i].root, map );
}
- printf( "Indexed (%u) models\n", csr_sb_count( map->models )-1 );
-
+ log_info( "Indexed (%u) models\n", csr_sb_count( map->models )-1 );
+}
+
+void vmf_load_models( vmf_map *map )
+{
u32 num_success = 0;
+ u32 num_reqs = 0;
- // Load model data
- // TODO: Make nice loading bar
for( int i = 1; i < csr_sb_count( map->models ); i ++ )
{
struct vmf_model *mdl = &map->models[i];
- if( mdl_from_find_files( mdl->str, &mdl->mdl ) )
+ if( mdl->need_load )
{
- num_success ++;
- }
- else
- {
- fprintf( stderr, "Failed to load model: %s\n", mdl->str );
+ num_reqs ++;
+
+ if( mdl_from_find_files( mdl->str, &mdl->mdl ) )
+ {
+ num_success ++;
+ }
+ else
+ {
+ log_warn( "Failed to load model: %s\n", mdl->str );
+ }
}
}
- printf( "Done (%u of %u loaded)\n", num_success, csr_sb_count( map->models )-1 );
+ log_info( "Done (%u of %u loaded)\n", num_success, num_reqs );
}
u32 vmf_init_subvmf( vmf_map *map, const char *subvmf );
{
if( !strcmp( map->cache[i].name, subvmf ) )
{
- return i+1;
+ if( map->cache[i].root )
+ return i+1;
+ else
+ return 0;
}
}
}
- printf( "Loading subvmf: %s\n", subvmf );
-
id = csr_sb_count( map->cache );
map->cache = csr_sb_reserve( map->cache, 1, sizeof( struct vmf_instance ));
struct vmf_instance *inst = &map->cache[ id ];
+ csr_sb_use( map->cache );
+ inst->hash = hash;
+ inst->name = csr_malloc( strlen( subvmf )+1 );
+ strcpy( inst->name, subvmf );
+
if( (inst->root = vdf_open_file( subvmf )) )
- {
- csr_sb_use( map->cache );
-
- inst->hash = hash;
- inst->name = csr_malloc( strlen( subvmf )+1 );
- strcpy( inst->name, subvmf );
-
+ {
// Recursive load other instances
- vmf_load_all_instances( map, inst->root );
-
+ vmf_load_all_instances( map, inst->root );
return id+1;
}
else
{
- fprintf( stderr, "Failed to load instance file\n" );
+ log_error( "Failed to load instance file: %s\n", subvmf );
return 0;
}
}
-vmf_map *vmf_init( const char *path, int load_models )
+vmf_map *vmf_init( const char *path )
{
vmf_map *map = csr_calloc( sizeof( vmf_map ) );
map->root = vdf_open_file( path );
+ if( !map->root )
+ {
+ free( map );
+ return NULL;
+ }
+
// Prepare instances
vmf_load_all_instances( map, map->root );
// Other resources
- if( load_models )
- {
- vmf_load_models( map );
- }
-
+ vmf_index_models( map );
return map;
}
{
for( int i = 0; i < csr_sb_count( map->cache ); i ++ )
{
- vdf_free_r( map->cache[i].root );
+ if( map->cache[i].root )
+ vdf_free_r( map->cache[i].root );
+
free( map->cache[i].name );
}
free( map );
}
-void solidgen_to_obj( vmf_solid *ctx, const char *path )
-{
- FILE *fp = fopen( path, "w" );
-
- if( fp )
- {
- fprintf( fp, "o vmf_export\n" );
-
- vmf_vert *vert;
-
- // Write vertex block
- for( int i = 0; i < csr_sb_count( ctx->verts ); i ++ )
- {
- vert = &ctx->verts[i];
- fprintf( fp, "v %f %f %f\n", vert->co[0], vert->co[1], vert->co[2] );
- }
-
- // Write normals block
- for( int i = 0; i < csr_sb_count( ctx->verts ); i ++ )
- {
- vert = &ctx->verts[i];
- fprintf( fp, "vn %f %f %f\n", vert->nrm[0], vert->nrm[1], vert->nrm[2] );
- }
-
- fprintf( fp, "s off\n" );
-
- // Indices
- for( int i = 0; i < csr_sb_count( ctx->indices )/3; i ++ )
- {
- u32 * base = ctx->indices + i*3;
- fprintf( fp, "f %u//%u %u//%u %u//%u\n",
- base[2]+1, base[2]+1,
- base[1]+1, base[1]+1,
- base[0]+1, base[0]+1
- );
- }
-
- fclose( fp );
- }
- else
- {
- fprintf( stderr, "Could not open %s for writing\n", path );
- }
-}
-
void vmf_entity_transform( vdf_node *ent, m4x3f mat )
{
v3f angles = {0.f,0.f,0.f};
projects / csRadar.git / blobdiff