X-Git-Url: https://harrygodden.com/git/?p=csRadar.git;a=blobdiff_plain;f=vmf.h;h=ec9573aaa8c21feeebca6fe9716e1f976290d742;hp=ea91d17ed7e78e59cb180c2f88eca79aea522266;hb=1d2752b69b6285d5eb6436728c6cf84228a9ccde;hpb=2b5ab41c3193d52eba04269f236d30a71aa0dd9d

diff --git a/vmf.h b/vmf.h
index ea91d17..ec9573a 100644
--- a/vmf.h
+++ b/vmf.h
@@ -101,27 +101,20 @@ void solidgen_ctx_free( vmf_solid *ctx )
 }
 
 // Compute bounds of solid gen ctx
-void solidgen_bounds( vmf_solid *ctx, u32 start, u32 end, v3f min, v3f max )
+void solidgen_bounds( vmf_solid *ctx, boxf box )
 {
 	v3f mine = { INFINITY, INFINITY, INFINITY };
 	v3f maxe = {-INFINITY,-INFINITY,-INFINITY };
 
-	for( int i = start; i < end; i ++ )
+	for( int i = 0; i < csr_sb_count( ctx->verts ); i ++ )
 	{
 		vmf_vert *vert = ctx->verts + i;
-		float *co = vert->co;
-		
-		mine[0] = fminf( mine[0], co[0] );
-		mine[1] = fminf( mine[1], co[1] );
-		mine[2] = fminf( mine[2], co[2] );
-		
-		maxe[0] = fmaxf( maxe[0], co[0] );
-		maxe[1] = fmaxf( maxe[1], co[1] );
-		maxe[2] = fmaxf( maxe[2], co[2] );
+		v3_minv( mine, vert->co, mine );
+		v3_maxv( maxe, vert->co, maxe );
 	}
 	
-	v3_copy( mine, min );
-	v3_copy( maxe, max );
+	v3_copy( mine, box[0] );
+	v3_copy( maxe, box[1] );
 }
 
 struct
@@ -732,6 +725,12 @@ vmf_map *vmf_init( const char *path, int load_models )
 	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 );