X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fcommon%2Fl3dslib.c;h=5e340b9da166c4dbef7349ebd9d904f4efe813dc;hb=830125fad042fad35dc029b6eb57c8156ad7e176;hp=0620f9b47f80f8b0f23e9bab408b062065e6796c;hpb=99980506540d9546dad31223a6eadf126ba68121;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/common/l3dslib.c b/tools/quake3/common/l3dslib.c
index 0620f9b4..5e340b9d 100644
--- a/tools/quake3/common/l3dslib.c
+++ b/tools/quake3/common/l3dslib.c
@@ -1,23 +1,23 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 //
 // l3dslib.c: library for loading triangles from an Alias triangle file
@@ -36,43 +36,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TRI_VERTEXL   0x4110
 #define TRI_FACEL1    0x4120
 
-#define MAXVERTS	2000
-#define MAXTRIANGLES	750
+#define MAXVERTS    2000
+#define MAXTRIANGLES    750
 
 typedef struct {
-	int	v[4];
+	int v[4];
 } tri;
 
-float	fverts[MAXVERTS][3];
-tri		tris[MAXTRIANGLES];
+float fverts[MAXVERTS][3];
+tri tris[MAXTRIANGLES];
 
-int	bytesread, level, numtris, totaltris;
-int	vertsfound, trisfound;
+int bytesread, level, numtris, totaltris;
+int vertsfound, trisfound;
 
-triangle_t	*ptri;
+triangle_t  *ptri;
 
 
 // Alias stores triangles as 3 explicit vertices in .tri files, so even though we
 // start out with a vertex pool and vertex indices for triangles, we have to convert
 // to raw, explicit triangles
-void StoreAliasTriangles (void)
-{
-	int		i, j, k;
+void StoreAliasTriangles( void ){
+	int i, j, k;
 
-	if ((totaltris + numtris) > MAXTRIANGLES)
-		Error ("Error: Too many triangles");
+	if ( ( totaltris + numtris ) > MAXTRIANGLES ) {
+		Error( "Error: Too many triangles" );
+	}
 
-	for (i=0; i<numtris ; i++)
+	for ( i = 0; i < numtris ; i++ )
 	{
-		for (j=0 ; j<3 ; j++)
+		for ( j = 0 ; j < 3 ; j++ )
 		{
-			for (k=0 ; k<3 ; k++)
+			for ( k = 0 ; k < 3 ; k++ )
 			{
-				ptri[i+totaltris].verts[j][k] = fverts[tris[i].v[j]][k];
+				ptri[i + totaltris].verts[j][k] = fverts[tris[i].v[j]][k];
 			}
 		}
 	}
-	
+
 	totaltris += numtris;
 	numtris = 0;
 	vertsfound = 0;
@@ -80,165 +80,177 @@ void StoreAliasTriangles (void)
 }
 
 
-int ParseVertexL (FILE *input)
-{
-	int				i, j, startbytesread, numverts;
-	unsigned short	tshort;
+int ParseVertexL( FILE *input ){
+	int i, j, startbytesread, numverts;
+	unsigned short tshort;
 
-	if (vertsfound)
-		Error ("Error: Multiple vertex chunks");
+	if ( vertsfound ) {
+		Error( "Error: Multiple vertex chunks" );
+	}
 
 	vertsfound = 1;
 	startbytesread = bytesread;
 
-	if (feof(input))
-		Error ("Error: unexpected end of file");
+	if ( feof( input ) ) {
+		Error( "Error: unexpected end of file" );
+	}
 
-	fread(&tshort, sizeof(tshort), 1, input);
-	bytesread += sizeof(tshort);
+	fread( &tshort, sizeof( tshort ), 1, input );
+	bytesread += sizeof( tshort );
 	numverts = (int)tshort;
 
-	if (numverts > MAXVERTS)
-		Error ("Error: Too many vertices");
+	if ( numverts > MAXVERTS ) {
+		Error( "Error: Too many vertices" );
+	}
 
-	for (i=0 ; i<numverts ; i++)
+	for ( i = 0 ; i < numverts ; i++ )
 	{
-		for (j=0 ; j<3 ; j++)
+		for ( j = 0 ; j < 3 ; j++ )
 		{
-			if (feof(input))
-				Error ("Error: unexpected end of file");
+			if ( feof( input ) ) {
+				Error( "Error: unexpected end of file" );
+			}
 
-			fread(&fverts[i][j], sizeof(float), 1, input);
-			bytesread += sizeof(float);
+			fread( &fverts[i][j], sizeof( float ), 1, input );
+			bytesread += sizeof( float );
 		}
 	}
 
-	if (vertsfound && trisfound)
-		StoreAliasTriangles ();
+	if ( vertsfound && trisfound ) {
+		StoreAliasTriangles();
+	}
 
 	return bytesread - startbytesread;
 }
 
 
-int ParseFaceL1 (FILE *input)
-{
+int ParseFaceL1( FILE *input ){
 
-	int				i, j, startbytesread;
-	unsigned short	tshort;
+	int i, j, startbytesread;
+	unsigned short tshort;
 
-	if (trisfound)
-		Error ("Error: Multiple face chunks");
+	if ( trisfound ) {
+		Error( "Error: Multiple face chunks" );
+	}
 
 	trisfound = 1;
 	startbytesread = bytesread;
 
-	if (feof(input))
-		Error ("Error: unexpected end of file");
+	if ( feof( input ) ) {
+		Error( "Error: unexpected end of file" );
+	}
 
-	fread(&tshort, sizeof(tshort), 1, input);
-	bytesread += sizeof(tshort);
+	fread( &tshort, sizeof( tshort ), 1, input );
+	bytesread += sizeof( tshort );
 	numtris = (int)tshort;
 
-	if (numtris > MAXTRIANGLES)
-		Error ("Error: Too many triangles");
+	if ( numtris > MAXTRIANGLES ) {
+		Error( "Error: Too many triangles" );
+	}
 
-	for (i=0 ; i<numtris ; i++)
+	for ( i = 0 ; i < numtris ; i++ )
 	{
-		for (j=0 ; j<4 ; j++)
+		for ( j = 0 ; j < 4 ; j++ )
 		{
-			if (feof(input))
-				Error ("Error: unexpected end of file");
+			if ( feof( input ) ) {
+				Error( "Error: unexpected end of file" );
+			}
 
-			fread(&tshort, sizeof(tshort), 1, input);
-			bytesread += sizeof(tshort);
+			fread( &tshort, sizeof( tshort ), 1, input );
+			bytesread += sizeof( tshort );
 			tris[i].v[j] = (int)tshort;
 		}
 	}
 
-	if (vertsfound && trisfound)
-		StoreAliasTriangles ();
+	if ( vertsfound && trisfound ) {
+		StoreAliasTriangles();
+	}
 
 	return bytesread - startbytesread;
 }
 
 
-int ParseChunk (FILE *input)
-{
-#define BLOCK_SIZE	4096
-	char			temp[BLOCK_SIZE];
-	unsigned short	type;
-	int				i, length, w, t, retval;
+int ParseChunk( FILE *input ){
+#define BLOCK_SIZE  4096
+	char temp[BLOCK_SIZE];
+	unsigned short type;
+	int i, length, w, t, retval;
 
 	level++;
 	retval = 0;
 
 // chunk type
-	if (feof(input))
-		Error ("Error: unexpected end of file");
+	if ( feof( input ) ) {
+		Error( "Error: unexpected end of file" );
+	}
 
-	fread(&type, sizeof(type), 1, input);
-	bytesread += sizeof(type);
+	fread( &type, sizeof( type ), 1, input );
+	bytesread += sizeof( type );
 
 // chunk length
-	if (feof(input))
-		Error ("Error: unexpected end of file");
+	if ( feof( input ) ) {
+		Error( "Error: unexpected end of file" );
+	}
 
-	fread (&length, sizeof(length), 1, input);
-	bytesread += sizeof(length);
+	fread( &length, sizeof( length ), 1, input );
+	bytesread += sizeof( length );
 	w = length - 6;
 
 // process chunk if we care about it, otherwise skip it
-	switch (type)
+	switch ( type )
 	{
 	case TRI_VERTEXL:
-		w -= ParseVertexL (input);
+		w -= ParseVertexL( input );
 		goto ParseSubchunk;
 
 	case TRI_FACEL1:
-		w -= ParseFaceL1 (input);
+		w -= ParseFaceL1( input );
 		goto ParseSubchunk;
 
 	case EDIT_OBJECT:
-	// read the name
+		// read the name
 		i = 0;
 
 		do
 		{
-			if (feof(input))
-				Error ("Error: unexpected end of file");
+			if ( feof( input ) ) {
+				Error( "Error: unexpected end of file" );
+			}
 
-			fread (&temp[i], 1, 1, input);
+			fread( &temp[i], 1, 1, input );
 			i++;
 			w--;
 			bytesread++;
-		} while (temp[i-1]);
+		} while ( temp[i - 1] );
 
 	case MAIN3DS:
 	case OBJ_TRIMESH:
 	case EDIT3DS:
-	// parse through subchunks
+		// parse through subchunks
 ParseSubchunk:
-		while (w > 0)
+		while ( w > 0 )
 		{
-			w -= ParseChunk (input);
+			w -= ParseChunk( input );
 		}
 
 		retval = length;
 		goto Done;
 
 	default:
-	// skip other chunks
-		while (w > 0)
+		// skip other chunks
+		while ( w > 0 )
 		{
 			t = w;
 
-			if (t > BLOCK_SIZE)
+			if ( t > BLOCK_SIZE ) {
 				t = BLOCK_SIZE;
+			}
 
-			if (feof(input))
-				Error ("Error: unexpected end of file");
+			if ( feof( input ) ) {
+				Error( "Error: unexpected end of file" );
+			}
 
-			fread (&temp, t, 1, input);
+			fread( &temp, t, 1, input );
 			bytesread += t;
 
 			w -= t;
@@ -254,10 +266,9 @@ Done:
 }
 
 
-void Load3DSTriangleList (char *filename, triangle_t **pptri, int *numtriangles)
-{
+void Load3DSTriangleList( char *filename, triangle_t **pptri, int *numtriangles ){
 	FILE        *input;
-	short int	tshort;
+	short int tshort;
 
 	bytesread = 0;
 	level = 0;
@@ -266,36 +277,36 @@ void Load3DSTriangleList (char *filename, triangle_t **pptri, int *numtriangles)
 	vertsfound = 0;
 	trisfound = 0;
 
-	if ((input = fopen(filename, "rb")) == 0) {
-		fprintf(stderr,"reader: could not open file '%s'\n", filename);
-		exit(0);
+	if ( ( input = fopen( filename, "rb" ) ) == 0 ) {
+		fprintf( stderr,"reader: could not open file '%s'\n", filename );
+		exit( 0 );
 	}
 
-	fread(&tshort, sizeof(tshort), 1, input);
+	fread( &tshort, sizeof( tshort ), 1, input );
 
 // should only be MAIN3DS, but some files seem to start with EDIT3DS, with
 // no MAIN3DS
-	if ((tshort != MAIN3DS) && (tshort != EDIT3DS)) {
-		fprintf(stderr,"File is not a 3DS file.\n");
-		exit(0);
+	if ( ( tshort != MAIN3DS ) && ( tshort != EDIT3DS ) ) {
+		fprintf( stderr,"File is not a 3DS file.\n" );
+		exit( 0 );
 	}
 
 // back to top of file so we can parse the first chunk descriptor
-	fseek(input, 0, SEEK_SET);
+	fseek( input, 0, SEEK_SET );
 
-	ptri = safe_malloc (MAXTRIANGLES * sizeof(triangle_t));
+	ptri = safe_malloc( MAXTRIANGLES * sizeof( triangle_t ) );
 
 	*pptri = ptri;
 
 // parse through looking for the relevant chunk tree (MAIN3DS | EDIT3DS | EDIT_OBJECT |
 // OBJ_TRIMESH | {TRI_VERTEXL, TRI_FACEL1}) and skipping other chunks
-	ParseChunk (input);
+	ParseChunk( input );
 
-	if (vertsfound || trisfound)
-		Error ("Incomplete triangle set");
+	if ( vertsfound || trisfound ) {
+		Error( "Incomplete triangle set" );
+	}
 
 	*numtriangles = totaltris;
 
-	fclose (input);
+	fclose( input );
 }
-