/* -------------------------------------------------------------------------------;
-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
--------------------------------------------------------------------------------
+ -------------------------------------------------------------------------------
-This code has been altered significantly from its original form, to support
-several games based on the Quake III Arena engine, in the form of "Q3Map2."
+ This code has been altered significantly from its original form, to support
+ several games based on the Quake III Arena engine, in the form of "Q3Map2."
-------------------------------------------------------------------------------- */
+ ------------------------------------------------------------------------------- */
/*
-Random()
-returns a pseudorandom number between 0 and 1
-*/
+ Random()
+ returns a pseudorandom number between 0 and 1
+ */
-vec_t Random( void )
-{
+vec_t Random( void ){
return (vec_t) rand() / RAND_MAX;
}
/*
-ExitQ3Map()
-cleanup routine
-*/
+ ExitQ3Map()
+ cleanup routine
+ */
-static void ExitQ3Map( void )
-{
+static void ExitQ3Map( void ){
BSPFilesCleanup();
- if( mapDrawSurfs != NULL )
+ if ( mapDrawSurfs != NULL ) {
free( mapDrawSurfs );
+ }
}
minimap_t;
static minimap_t minimap;
-qboolean BrushIntersectionWithLine(bspBrush_t *brush, vec3_t start, vec3_t dir, float *t_in, float *t_out)
-{
+qboolean BrushIntersectionWithLine( bspBrush_t *brush, vec3_t start, vec3_t dir, float *t_in, float *t_out ){
int i;
qboolean in = qfalse, out = qfalse;
bspBrushSide_t *sides = &bspBrushSides[brush->firstSide];
- for(i = 0; i < brush->numSides; ++i)
+ for ( i = 0; i < brush->numSides; ++i )
{
bspPlane_t *p = &bspPlanes[sides[i].planeNum];
- float sn = DotProduct(start, p->normal);
- float dn = DotProduct(dir, p->normal);
- if(dn == 0)
- {
- if(sn > p->dist)
+ float sn = DotProduct( start, p->normal );
+ float dn = DotProduct( dir, p->normal );
+ if ( dn == 0 ) {
+ if ( sn > p->dist ) {
return qfalse; // outside!
+ }
}
else
{
- float t = (p->dist - sn) / dn;
- if(dn < 0)
- {
- if(!in || t > *t_in)
- {
+ float t = ( p->dist - sn ) / dn;
+ if ( dn < 0 ) {
+ if ( !in || t > *t_in ) {
*t_in = t;
in = qtrue;
// as t_in can only increase, and t_out can only decrease, early out
- if(out && *t_in >= *t_out)
+ if ( out && *t_in >= *t_out ) {
return qfalse;
+ }
}
}
else
{
- if(!out || t < *t_out)
- {
+ if ( !out || t < *t_out ) {
*t_out = t;
out = qtrue;
// as t_in can only increase, and t_out can only decrease, early out
- if(in && *t_in >= *t_out)
+ if ( in && *t_in >= *t_out ) {
return qfalse;
+ }
}
}
}
return in && out;
}
-static float MiniMapSample(float x, float y)
-{
+static float MiniMapSample( float x, float y ){
vec3_t org, dir;
int i, bi;
float t0, t1;
cnt = 0;
samp = 0;
- for(i = 0; i < minimap.model->numBSPBrushes; ++i)
+ for ( i = 0; i < minimap.model->numBSPBrushes; ++i )
{
bi = minimap.model->firstBSPBrush + i;
- if(opaqueBrushes[bi >> 3] & (1 << (bi & 7)))
- {
+ if ( opaqueBrushes[bi >> 3] & ( 1 << ( bi & 7 ) ) ) {
b = &bspBrushes[bi];
// sort out mins/maxs of the brush
s = &bspBrushSides[b->firstSide];
- if(x < -bspPlanes[s[0].planeNum].dist)
+ if ( x < -bspPlanes[s[0].planeNum].dist ) {
continue;
- if(x > +bspPlanes[s[1].planeNum].dist)
+ }
+ if ( x > +bspPlanes[s[1].planeNum].dist ) {
continue;
- if(y < -bspPlanes[s[2].planeNum].dist)
+ }
+ if ( y < -bspPlanes[s[2].planeNum].dist ) {
continue;
- if(y > +bspPlanes[s[3].planeNum].dist)
+ }
+ if ( y > +bspPlanes[s[3].planeNum].dist ) {
continue;
+ }
- if(BrushIntersectionWithLine(b, org, dir, &t0, &t1))
- {
+ if ( BrushIntersectionWithLine( b, org, dir, &t0, &t1 ) ) {
samp += t1 - t0;
++cnt;
}
return samp;
}
-void RandomVector2f(float v[2])
-{
+void RandomVector2f( float v[2] ){
do
{
v[0] = 2 * Random() - 1;
v[1] = 2 * Random() - 1;
}
- while(v[0] * v[0] + v[1] * v[1] > 1);
+ while ( v[0] * v[0] + v[1] * v[1] > 1 );
}
-static void MiniMapRandomlySupersampled(int y)
-{
+static void MiniMapRandomlySupersampled( int y ){
int x, i;
float *p = &minimap.data1f[y * minimap.width];
- float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height);
+ float ymin = minimap.mins[1] + minimap.size[1] * ( y / (float) minimap.height );
float dx = minimap.size[0] / (float) minimap.width;
float dy = minimap.size[1] / (float) minimap.height;
float uv[2];
float thisval;
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
- float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
+ float xmin = minimap.mins[0] + minimap.size[0] * ( x / (float) minimap.width );
float val = 0;
- for(i = 0; i < minimap.samples; ++i)
+ for ( i = 0; i < minimap.samples; ++i )
{
- RandomVector2f(uv);
+ RandomVector2f( uv );
thisval = MiniMapSample(
- xmin + (uv[0] + 0.5) * dx, /* exaggerated random pattern for better results */
- ymin + (uv[1] + 0.5) * dy /* exaggerated random pattern for better results */
- );
+ xmin + ( uv[0] + 0.5 ) * dx, /* exaggerated random pattern for better results */
+ ymin + ( uv[1] + 0.5 ) * dy /* exaggerated random pattern for better results */
+ );
val += thisval;
}
val /= minimap.samples * minimap.size[2];
}
}
-static void MiniMapSupersampled(int y)
-{
+static void MiniMapSupersampled( int y ){
int x, i;
float *p = &minimap.data1f[y * minimap.width];
- float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height);
+ float ymin = minimap.mins[1] + minimap.size[1] * ( y / (float) minimap.height );
float dx = minimap.size[0] / (float) minimap.width;
float dy = minimap.size[1] / (float) minimap.height;
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
- float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
+ float xmin = minimap.mins[0] + minimap.size[0] * ( x / (float) minimap.width );
float val = 0;
- for(i = 0; i < minimap.samples; ++i)
+ for ( i = 0; i < minimap.samples; ++i )
{
float thisval = MiniMapSample(
- xmin + minimap.sample_offsets[2*i+0] * dx,
- ymin + minimap.sample_offsets[2*i+1] * dy
- );
+ xmin + minimap.sample_offsets[2 * i + 0] * dx,
+ ymin + minimap.sample_offsets[2 * i + 1] * dy
+ );
val += thisval;
}
val /= minimap.samples * minimap.size[2];
}
}
-static void MiniMapNoSupersampling(int y)
-{
+static void MiniMapNoSupersampling( int y ){
int x;
float *p = &minimap.data1f[y * minimap.width];
- float ymin = minimap.mins[1] + minimap.size[1] * ((y + 0.5) / (float) minimap.height);
+ float ymin = minimap.mins[1] + minimap.size[1] * ( ( y + 0.5 ) / (float) minimap.height );
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
- float xmin = minimap.mins[0] + minimap.size[0] * ((x + 0.5) / (float) minimap.width);
- *p++ = MiniMapSample(xmin, ymin) / minimap.size[2];
+ float xmin = minimap.mins[0] + minimap.size[0] * ( ( x + 0.5 ) / (float) minimap.width );
+ *p++ = MiniMapSample( xmin, ymin ) / minimap.size[2];
}
}
-static void MiniMapSharpen(int y)
-{
+static void MiniMapSharpen( int y ){
int x;
- qboolean up = (y > 0);
- qboolean down = (y < minimap.height - 1);
+ qboolean up = ( y > 0 );
+ qboolean down = ( y < minimap.height - 1 );
float *p = &minimap.data1f[y * minimap.width];
float *q = &minimap.sharpendata1f[y * minimap.width];
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
- qboolean left = (x > 0);
- qboolean right = (x < minimap.width - 1);
+ qboolean left = ( x > 0 );
+ qboolean right = ( x < minimap.width - 1 );
float val = p[0] * minimap.sharpen_centermult;
- if(left && up)
- val += p[-1 -minimap.width] * minimap.sharpen_boxmult;
- if(left && down)
- val += p[-1 +minimap.width] * minimap.sharpen_boxmult;
- if(right && up)
- val += p[+1 -minimap.width] * minimap.sharpen_boxmult;
- if(right && down)
- val += p[+1 +minimap.width] * minimap.sharpen_boxmult;
-
- if(left)
+ if ( left && up ) {
+ val += p[-1 - minimap.width] * minimap.sharpen_boxmult;
+ }
+ if ( left && down ) {
+ val += p[-1 + minimap.width] * minimap.sharpen_boxmult;
+ }
+ if ( right && up ) {
+ val += p[+1 - minimap.width] * minimap.sharpen_boxmult;
+ }
+ if ( right && down ) {
+ val += p[+1 + minimap.width] * minimap.sharpen_boxmult;
+ }
+
+ if ( left ) {
val += p[-1] * minimap.sharpen_boxmult;
- if(right)
+ }
+ if ( right ) {
val += p[+1] * minimap.sharpen_boxmult;
- if(up)
+ }
+ if ( up ) {
val += p[-minimap.width] * minimap.sharpen_boxmult;
- if(down)
+ }
+ if ( down ) {
val += p[+minimap.width] * minimap.sharpen_boxmult;
+ }
++p;
*q++ = val;
}
}
-static void MiniMapContrastBoost(int y)
-{
+static void MiniMapContrastBoost( int y ){
int x;
float *q = &minimap.data1f[y * minimap.width];
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
- *q = *q * minimap.boost / ((minimap.boost - 1) * *q + 1);
+ *q = *q * minimap.boost / ( ( minimap.boost - 1 ) * *q + 1 );
++q;
}
}
-static void MiniMapBrightnessContrast(int y)
-{
+static void MiniMapBrightnessContrast( int y ){
int x;
float *q = &minimap.data1f[y * minimap.width];
- for(x = 0; x < minimap.width; ++x)
+ for ( x = 0; x < minimap.width; ++x )
{
*q = *q * minimap.contrast + minimap.brightness;
++q;
}
}
-void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in, float border, qboolean keepaspect)
-{
+void MiniMapMakeMinsMaxs( vec3_t mins_in, vec3_t maxs_in, float border, qboolean keepaspect ){
vec3_t mins, maxs, extend;
- VectorCopy(mins_in, mins);
- VectorCopy(maxs_in, maxs);
+ VectorCopy( mins_in, mins );
+ VectorCopy( maxs_in, maxs );
// line compatible to nexuiz mapinfo
- Sys_Printf("size %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
+ Sys_Printf( "size %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2] );
- if(keepaspect)
- {
- VectorSubtract(maxs, mins, extend);
- if(extend[1] > extend[0])
- {
- mins[0] -= (extend[1] - extend[0]) * 0.5;
- maxs[0] += (extend[1] - extend[0]) * 0.5;
+ if ( keepaspect ) {
+ VectorSubtract( maxs, mins, extend );
+ if ( extend[1] > extend[0] ) {
+ mins[0] -= ( extend[1] - extend[0] ) * 0.5;
+ maxs[0] += ( extend[1] - extend[0] ) * 0.5;
}
else
{
- mins[1] -= (extend[0] - extend[1]) * 0.5;
- maxs[1] += (extend[0] - extend[1]) * 0.5;
+ mins[1] -= ( extend[0] - extend[1] ) * 0.5;
+ maxs[1] += ( extend[0] - extend[1] ) * 0.5;
}
}
/* border: amount of black area around the image */
/* input: border, 1-2*border, border but we need border/(1-2*border) */
- VectorSubtract(maxs, mins, extend);
- VectorScale(extend, border / (1 - 2 * border), extend);
+ VectorSubtract( maxs, mins, extend );
+ VectorScale( extend, border / ( 1 - 2 * border ), extend );
- VectorSubtract(mins, extend, mins);
- VectorAdd(maxs, extend, maxs);
+ VectorSubtract( mins, extend, mins );
+ VectorAdd( maxs, extend, maxs );
- VectorCopy(mins, minimap.mins);
- VectorSubtract(maxs, mins, minimap.size);
+ VectorCopy( mins, minimap.mins );
+ VectorSubtract( maxs, mins, minimap.size );
// line compatible to nexuiz mapinfo
- Sys_Printf("size_texcoords %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
+ Sys_Printf( "size_texcoords %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2] );
}
/*
-MiniMapSetupBrushes()
-determines solid non-sky brushes in the world
-*/
-
-void MiniMapSetupBrushes( void )
-{
- SetupBrushesFlags(C_SOLID | C_SKY, C_SOLID, 0, 0);
- // at least one must be solid
- // none may be sky
- // not all may be nodraw
+ MiniMapSetupBrushes()
+ determines solid non-sky brushes in the world
+ */
+
+void MiniMapSetupBrushes( void ){
+ SetupBrushesFlags( C_SOLID | C_SKY, C_SOLID, 0, 0 );
+ // at least one must be solid
+ // none may be sky
+ // not all may be nodraw
}
-qboolean MiniMapEvaluateSampleOffsets(int *bestj, int *bestk, float *bestval)
-{
+qboolean MiniMapEvaluateSampleOffsets( int *bestj, int *bestk, float *bestval ){
float val, dx, dy;
int j, k;
*bestj = *bestk = -1;
*bestval = 3; /* max possible val is 2 */
- for(j = 0; j < minimap.samples; ++j)
- for(k = j + 1; k < minimap.samples; ++k)
+ for ( j = 0; j < minimap.samples; ++j )
+ for ( k = j + 1; k < minimap.samples; ++k )
{
- dx = minimap.sample_offsets[2*j+0] - minimap.sample_offsets[2*k+0];
- dy = minimap.sample_offsets[2*j+1] - minimap.sample_offsets[2*k+1];
- if(dx > +0.5) dx -= 1;
- if(dx < -0.5) dx += 1;
- if(dy > +0.5) dy -= 1;
- if(dy < -0.5) dy += 1;
+ dx = minimap.sample_offsets[2 * j + 0] - minimap.sample_offsets[2 * k + 0];
+ dy = minimap.sample_offsets[2 * j + 1] - minimap.sample_offsets[2 * k + 1];
+ if ( dx > +0.5 ) {
+ dx -= 1;
+ }
+ if ( dx < -0.5 ) {
+ dx += 1;
+ }
+ if ( dy > +0.5 ) {
+ dy -= 1;
+ }
+ if ( dy < -0.5 ) {
+ dy += 1;
+ }
val = dx * dx + dy * dy;
- if(val < *bestval)
- {
+ if ( val < *bestval ) {
*bestj = j;
*bestk = k;
*bestval = val;
}
}
-
+
return *bestval < 3;
}
-void MiniMapMakeSampleOffsets()
-{
+void MiniMapMakeSampleOffsets(){
int i, j, k, jj, kk;
float val, valj, valk, sx, sy, rx, ry;
Sys_Printf( "Generating good sample offsets (this may take a while)...\n" );
/* start with entirely random samples */
- for(i = 0; i < minimap.samples; ++i)
+ for ( i = 0; i < minimap.samples; ++i )
{
- minimap.sample_offsets[2*i+0] = Random();
- minimap.sample_offsets[2*i+1] = Random();
+ minimap.sample_offsets[2 * i + 0] = Random();
+ minimap.sample_offsets[2 * i + 1] = Random();
}
- for(i = 0; i < 1000; ++i)
+ for ( i = 0; i < 1000; ++i )
{
- if(MiniMapEvaluateSampleOffsets(&j, &k, &val))
- {
- sx = minimap.sample_offsets[2*j+0];
- sy = minimap.sample_offsets[2*j+1];
- minimap.sample_offsets[2*j+0] = rx = Random();
- minimap.sample_offsets[2*j+1] = ry = Random();
- if(!MiniMapEvaluateSampleOffsets(&jj, &kk, &valj))
+ if ( MiniMapEvaluateSampleOffsets( &j, &k, &val ) ) {
+ sx = minimap.sample_offsets[2 * j + 0];
+ sy = minimap.sample_offsets[2 * j + 1];
+ minimap.sample_offsets[2 * j + 0] = rx = Random();
+ minimap.sample_offsets[2 * j + 1] = ry = Random();
+ if ( !MiniMapEvaluateSampleOffsets( &jj, &kk, &valj ) ) {
valj = -1;
- minimap.sample_offsets[2*j+0] = sx;
- minimap.sample_offsets[2*j+1] = sy;
-
- sx = minimap.sample_offsets[2*k+0];
- sy = minimap.sample_offsets[2*k+1];
- minimap.sample_offsets[2*k+0] = rx;
- minimap.sample_offsets[2*k+1] = ry;
- if(!MiniMapEvaluateSampleOffsets(&jj, &kk, &valk))
+ }
+ minimap.sample_offsets[2 * j + 0] = sx;
+ minimap.sample_offsets[2 * j + 1] = sy;
+
+ sx = minimap.sample_offsets[2 * k + 0];
+ sy = minimap.sample_offsets[2 * k + 1];
+ minimap.sample_offsets[2 * k + 0] = rx;
+ minimap.sample_offsets[2 * k + 1] = ry;
+ if ( !MiniMapEvaluateSampleOffsets( &jj, &kk, &valk ) ) {
valk = -1;
- minimap.sample_offsets[2*k+0] = sx;
- minimap.sample_offsets[2*k+1] = sy;
+ }
+ minimap.sample_offsets[2 * k + 0] = sx;
+ minimap.sample_offsets[2 * k + 1] = sy;
- if(valj > valk)
- {
- if(valj > val)
- {
+ if ( valj > valk ) {
+ if ( valj > val ) {
/* valj is the greatest */
- minimap.sample_offsets[2*j+0] = rx;
- minimap.sample_offsets[2*j+1] = ry;
+ minimap.sample_offsets[2 * j + 0] = rx;
+ minimap.sample_offsets[2 * j + 1] = ry;
i = -1;
}
else
}
else
{
- if(valk > val)
- {
+ if ( valk > val ) {
/* valk is the greatest */
- minimap.sample_offsets[2*k+0] = rx;
- minimap.sample_offsets[2*k+1] = ry;
+ minimap.sample_offsets[2 * k + 0] = rx;
+ minimap.sample_offsets[2 * k + 1] = ry;
i = -1;
}
else
}
}
}
- else
+ else{
break;
+ }
}
}
-void MergeRelativePath(char *out, const char *absolute, const char *relative)
-{
- const char *endpos = absolute + strlen(absolute);
- while(endpos != absolute && (endpos[-1] == '/' || endpos[-1] == '\\'))
+void MergeRelativePath( char *out, const char *absolute, const char *relative ){
+ const char *endpos = absolute + strlen( absolute );
+ while ( endpos != absolute && ( endpos[-1] == '/' || endpos[-1] == '\\' ) )
--endpos;
- while(relative[0] == '.' && relative[1] == '.' && (relative[2] == '/' || relative[2] == '\\'))
+ while ( relative[0] == '.' && relative[1] == '.' && ( relative[2] == '/' || relative[2] == '\\' ) )
{
relative += 3;
- while(endpos != absolute)
+ while ( endpos != absolute )
{
--endpos;
- if(*endpos == '/' || *endpos == '\\')
+ if ( *endpos == '/' || *endpos == '\\' ) {
break;
+ }
}
- while(endpos != absolute && (endpos[-1] == '/' || endpos[-1] == '\\'))
+ while ( endpos != absolute && ( endpos[-1] == '/' || endpos[-1] == '\\' ) )
--endpos;
}
- memcpy(out, absolute, endpos - absolute);
+ memcpy( out, absolute, endpos - absolute );
out[endpos - absolute] = '/';
- strcpy(out + (endpos - absolute + 1), relative);
+ strcpy( out + ( endpos - absolute + 1 ), relative );
}
-int MiniMapBSPMain( int argc, char **argv )
-{
+int MiniMapBSPMain( int argc, char **argv ){
char minimapFilename[1024];
char basename[1024];
char path[1024];
qboolean keepaspect;
/* arg checking */
- if( argc < 2 )
- {
+ if ( argc < 2 ) {
Sys_Printf( "Usage: q3map [-v] -minimap [-size n] [-sharpen f] [-samples n | -random n] [-o filename.tga] [-minmax Xmin Ymin Zmin Xmax Ymax Zmax] <mapname>\n" );
return 0;
}
LoadBSPFile( source );
minimap.model = &bspModels[0];
- VectorCopy(minimap.model->mins, mins);
- VectorCopy(minimap.model->maxs, maxs);
+ VectorCopy( minimap.model->mins, mins );
+ VectorCopy( minimap.model->maxs, maxs );
*minimapFilename = 0;
minimapSharpen = game->miniMapSharpen;
minimap.contrast = 1.0;
/* process arguments */
- for( i = 1; i < (argc - 1); i++ )
+ for ( i = 1; i < ( argc - 1 ); i++ )
{
- if( !strcmp( argv[ i ], "-size" ) )
- {
- minimap.width = minimap.height = atoi(argv[i + 1]);
+ if ( !strcmp( argv[ i ], "-size" ) ) {
+ minimap.width = minimap.height = atoi( argv[i + 1] );
i++;
Sys_Printf( "Image size set to %i\n", minimap.width );
- }
- else if( !strcmp( argv[ i ], "-sharpen" ) )
- {
- minimapSharpen = atof(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-sharpen" ) ) {
+ minimapSharpen = atof( argv[i + 1] );
i++;
Sys_Printf( "Sharpening coefficient set to %f\n", minimapSharpen );
- }
- else if( !strcmp( argv[ i ], "-samples" ) )
- {
- minimap.samples = atoi(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-samples" ) ) {
+ minimap.samples = atoi( argv[i + 1] );
i++;
Sys_Printf( "Samples set to %i\n", minimap.samples );
- if(minimap.sample_offsets)
- free(minimap.sample_offsets);
- minimap.sample_offsets = malloc(2 * sizeof(*minimap.sample_offsets) * minimap.samples);
+ if ( minimap.sample_offsets ) {
+ free( minimap.sample_offsets );
+ }
+ minimap.sample_offsets = malloc( 2 * sizeof( *minimap.sample_offsets ) * minimap.samples );
MiniMapMakeSampleOffsets();
- }
- else if( !strcmp( argv[ i ], "-random" ) )
- {
- minimap.samples = atoi(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-random" ) ) {
+ minimap.samples = atoi( argv[i + 1] );
i++;
Sys_Printf( "Random samples set to %i\n", minimap.samples );
- if(minimap.sample_offsets)
- free(minimap.sample_offsets);
+ if ( minimap.sample_offsets ) {
+ free( minimap.sample_offsets );
+ }
minimap.sample_offsets = NULL;
- }
- else if( !strcmp( argv[ i ], "-border" ) )
- {
- border = atof(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-border" ) ) {
+ border = atof( argv[i + 1] );
i++;
Sys_Printf( "Border set to %f\n", border );
- }
- else if( !strcmp( argv[ i ], "-keepaspect" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-keepaspect" ) ) {
keepaspect = qtrue;
Sys_Printf( "Keeping aspect ratio by letterboxing\n", border );
- }
- else if( !strcmp( argv[ i ], "-nokeepaspect" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-nokeepaspect" ) ) {
keepaspect = qfalse;
Sys_Printf( "Not keeping aspect ratio\n", border );
- }
- else if( !strcmp( argv[ i ], "-o" ) )
- {
- strcpy(minimapFilename, argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-o" ) ) {
+ strcpy( minimapFilename, argv[i + 1] );
i++;
Sys_Printf( "Output file name set to %s\n", minimapFilename );
- }
- else if( !strcmp( argv[ i ], "-minmax" ) && i < (argc - 7) )
- {
- mins[0] = atof(argv[i + 1]);
- mins[1] = atof(argv[i + 2]);
- mins[2] = atof(argv[i + 3]);
- maxs[0] = atof(argv[i + 4]);
- maxs[1] = atof(argv[i + 5]);
- maxs[2] = atof(argv[i + 6]);
+ }
+ else if ( !strcmp( argv[ i ], "-minmax" ) && i < ( argc - 7 ) ) {
+ mins[0] = atof( argv[i + 1] );
+ mins[1] = atof( argv[i + 2] );
+ mins[2] = atof( argv[i + 3] );
+ maxs[0] = atof( argv[i + 4] );
+ maxs[1] = atof( argv[i + 5] );
+ maxs[2] = atof( argv[i + 6] );
i += 6;
Sys_Printf( "Map mins/maxs overridden\n" );
- }
- else if( !strcmp( argv[ i ], "-gray" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-gray" ) ) {
mode = MINIMAP_MODE_GRAY;
Sys_Printf( "Writing as white-on-black image\n" );
- }
- else if( !strcmp( argv[ i ], "-black" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-black" ) ) {
mode = MINIMAP_MODE_BLACK;
Sys_Printf( "Writing as black alpha image\n" );
- }
- else if( !strcmp( argv[ i ], "-white" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-white" ) ) {
mode = MINIMAP_MODE_WHITE;
Sys_Printf( "Writing as white alpha image\n" );
- }
- else if( !strcmp( argv[ i ], "-boost" ) && i < (argc - 2) )
- {
- minimap.boost = atof(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-boost" ) && i < ( argc - 2 ) ) {
+ minimap.boost = atof( argv[i + 1] );
i++;
Sys_Printf( "Contrast boost set to %f\n", minimap.boost );
- }
- else if( !strcmp( argv[ i ], "-brightness" ) && i < (argc - 2) )
- {
- minimap.brightness = atof(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-brightness" ) && i < ( argc - 2 ) ) {
+ minimap.brightness = atof( argv[i + 1] );
i++;
Sys_Printf( "Brightness set to %f\n", minimap.brightness );
- }
- else if( !strcmp( argv[ i ], "-contrast" ) && i < (argc - 2) )
- {
- minimap.contrast = atof(argv[i + 1]);
+ }
+ else if ( !strcmp( argv[ i ], "-contrast" ) && i < ( argc - 2 ) ) {
+ minimap.contrast = atof( argv[i + 1] );
i++;
Sys_Printf( "Contrast set to %f\n", minimap.contrast );
- }
- else if( !strcmp( argv[ i ], "-autolevel" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-autolevel" ) ) {
autolevel = qtrue;
Sys_Printf( "Auto level enabled\n", border );
- }
- else if( !strcmp( argv[ i ], "-noautolevel" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-noautolevel" ) ) {
autolevel = qfalse;
Sys_Printf( "Auto level disabled\n", border );
- }
+ }
}
- MiniMapMakeMinsMaxs(mins, maxs, border, keepaspect);
+ MiniMapMakeMinsMaxs( mins, maxs, border, keepaspect );
- if(!*minimapFilename)
- {
- ExtractFileBase(source, basename);
- ExtractFilePath(source, path);
- sprintf(relativeMinimapFilename, game->miniMapNameFormat, basename);
- MergeRelativePath(minimapFilename, path, relativeMinimapFilename);
- Sys_Printf("Output file name automatically set to %s\n", minimapFilename);
+ if ( !*minimapFilename ) {
+ ExtractFileBase( source, basename );
+ ExtractFilePath( source, path );
+ sprintf( relativeMinimapFilename, game->miniMapNameFormat, basename );
+ MergeRelativePath( minimapFilename, path, relativeMinimapFilename );
+ Sys_Printf( "Output file name automatically set to %s\n", minimapFilename );
}
- ExtractFilePath(minimapFilename, path);
- Q_mkdir(path);
+ ExtractFilePath( minimapFilename, path );
+ Q_mkdir( path );
- if(minimapSharpen >= 0)
- {
+ if ( minimapSharpen >= 0 ) {
minimap.sharpen_centermult = 8 * minimapSharpen + 1;
minimap.sharpen_boxmult = -minimapSharpen;
}
- minimap.data1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
- data4b = safe_malloc(minimap.width * minimap.height * 4);
- if(minimapSharpen >= 0)
- minimap.sharpendata1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
+ minimap.data1f = safe_malloc( minimap.width * minimap.height * sizeof( *minimap.data1f ) );
+ data4b = safe_malloc( minimap.width * minimap.height * 4 );
+ if ( minimapSharpen >= 0 ) {
+ minimap.sharpendata1f = safe_malloc( minimap.width * minimap.height * sizeof( *minimap.data1f ) );
+ }
MiniMapSetupBrushes();
- if(minimap.samples <= 1)
- {
+ if ( minimap.samples <= 1 ) {
Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSupersampling);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapNoSupersampling );
}
else
{
- if(minimap.sample_offsets)
- {
+ if ( minimap.sample_offsets ) {
Sys_Printf( "\n--- MiniMapSupersampled (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSupersampled);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapSupersampled );
}
else
{
Sys_Printf( "\n--- MiniMapRandomlySupersampled (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapRandomlySupersampled);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapRandomlySupersampled );
}
}
- if(minimap.boost != 1.0)
- {
+ if ( minimap.boost != 1.0 ) {
Sys_Printf( "\n--- MiniMapContrastBoost (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapContrastBoost);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapContrastBoost );
}
- if(autolevel)
- {
+ if ( autolevel ) {
Sys_Printf( "\n--- MiniMapAutoLevel (%d) ---\n", minimap.height );
float mi = 1, ma = 0;
float s, o;
// TODO threads!
q = minimap.data1f;
- for(y = 0; y < minimap.height; ++y)
- for(x = 0; x < minimap.width; ++x)
+ for ( y = 0; y < minimap.height; ++y )
+ for ( x = 0; x < minimap.width; ++x )
{
float v = *q++;
- if(v < mi)
+ if ( v < mi ) {
mi = v;
- if(v > ma)
+ }
+ if ( v > ma ) {
ma = v;
+ }
}
- if(ma > mi)
- {
- s = 1 / (ma - mi);
- o = mi / (ma - mi);
+ if ( ma > mi ) {
+ s = 1 / ( ma - mi );
+ o = mi / ( ma - mi );
// equations:
// brightness + contrast * v
Sys_Printf( "Auto level: Brightness changed to %f\n", minimap.brightness );
Sys_Printf( "Auto level: Contrast changed to %f\n", minimap.contrast );
}
- else
+ else{
Sys_Printf( "Auto level: failed because all pixels are the same value\n" );
+ }
}
- if(minimap.brightness != 0 || minimap.contrast != 1)
- {
+ if ( minimap.brightness != 0 || minimap.contrast != 1 ) {
Sys_Printf( "\n--- MiniMapBrightnessContrast (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapBrightnessContrast);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapBrightnessContrast );
}
- if(minimap.sharpendata1f)
- {
+ if ( minimap.sharpendata1f ) {
Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSharpen);
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapSharpen );
q = minimap.sharpendata1f;
}
else
q = minimap.data1f;
}
- Sys_Printf( "\nConverting...");
+ Sys_Printf( "\nConverting..." );
- switch(mode)
+ switch ( mode )
{
- case MINIMAP_MODE_GRAY:
- p = data4b;
- for(y = 0; y < minimap.height; ++y)
- for(x = 0; x < minimap.width; ++x)
- {
- byte b;
- float v = *q++;
- if(v < 0) v = 0;
- if(v > 255.0/256.0) v = 255.0/256.0;
- b = v * 256;
- *p++ = b;
+ case MINIMAP_MODE_GRAY:
+ p = data4b;
+ for ( y = 0; y < minimap.height; ++y )
+ for ( x = 0; x < minimap.width; ++x )
+ {
+ byte b;
+ float v = *q++;
+ if ( v < 0 ) {
+ v = 0;
}
- Sys_Printf( " writing to %s...", minimapFilename );
- WriteTGAGray(minimapFilename, data4b, minimap.width, minimap.height);
- break;
- case MINIMAP_MODE_BLACK:
- p = data4b;
- for(y = 0; y < minimap.height; ++y)
- for(x = 0; x < minimap.width; ++x)
- {
- byte b;
- float v = *q++;
- if(v < 0) v = 0;
- if(v > 255.0/256.0) v = 255.0/256.0;
- b = v * 256;
- *p++ = 0;
- *p++ = 0;
- *p++ = 0;
- *p++ = b;
+ if ( v > 255.0 / 256.0 ) {
+ v = 255.0 / 256.0;
}
- Sys_Printf( " writing to %s...", minimapFilename );
- WriteTGA(minimapFilename, data4b, minimap.width, minimap.height);
- break;
- case MINIMAP_MODE_WHITE:
- p = data4b;
- for(y = 0; y < minimap.height; ++y)
- for(x = 0; x < minimap.width; ++x)
- {
- byte b;
- float v = *q++;
- if(v < 0) v = 0;
- if(v > 255.0/256.0) v = 255.0/256.0;
- b = v * 256;
- *p++ = 255;
- *p++ = 255;
- *p++ = 255;
- *p++ = b;
+ b = v * 256;
+ *p++ = b;
+ }
+ Sys_Printf( " writing to %s...", minimapFilename );
+ WriteTGAGray( minimapFilename, data4b, minimap.width, minimap.height );
+ break;
+ case MINIMAP_MODE_BLACK:
+ p = data4b;
+ for ( y = 0; y < minimap.height; ++y )
+ for ( x = 0; x < minimap.width; ++x )
+ {
+ byte b;
+ float v = *q++;
+ if ( v < 0 ) {
+ v = 0;
}
- Sys_Printf( " writing to %s...", minimapFilename );
- WriteTGA(minimapFilename, data4b, minimap.width, minimap.height);
- break;
+ if ( v > 255.0 / 256.0 ) {
+ v = 255.0 / 256.0;
+ }
+ b = v * 256;
+ *p++ = 0;
+ *p++ = 0;
+ *p++ = 0;
+ *p++ = b;
+ }
+ Sys_Printf( " writing to %s...", minimapFilename );
+ WriteTGA( minimapFilename, data4b, minimap.width, minimap.height );
+ break;
+ case MINIMAP_MODE_WHITE:
+ p = data4b;
+ for ( y = 0; y < minimap.height; ++y )
+ for ( x = 0; x < minimap.width; ++x )
+ {
+ byte b;
+ float v = *q++;
+ if ( v < 0 ) {
+ v = 0;
+ }
+ if ( v > 255.0 / 256.0 ) {
+ v = 255.0 / 256.0;
+ }
+ b = v * 256;
+ *p++ = 255;
+ *p++ = 255;
+ *p++ = 255;
+ *p++ = b;
+ }
+ Sys_Printf( " writing to %s...", minimapFilename );
+ WriteTGA( minimapFilename, data4b, minimap.width, minimap.height );
+ break;
}
Sys_Printf( " done.\n" );
/*
-MD4BlockChecksum()
-calculates an md4 checksum for a block of data
-*/
+ MD4BlockChecksum()
+ calculates an md4 checksum for a block of data
+ */
-static int MD4BlockChecksum( void *buffer, int length )
-{
- return Com_BlockChecksum(buffer, length);
+static int MD4BlockChecksum( void *buffer, int length ){
+ return Com_BlockChecksum( buffer, length );
}
/*
-FixAAS()
-resets an aas checksum to match the given BSP
-*/
+ FixAAS()
+ resets an aas checksum to match the given BSP
+ */
+
+int FixAAS( int argc, char **argv ){
+ int length, checksum;
+ void *buffer;
+ FILE *file;
+ char aas[ 1024 ], **ext;
+ char *exts[] =
+ {
+ ".aas",
+ "_b0.aas",
+ "_b1.aas",
+ NULL
+ };
+
-int FixAAS( int argc, char **argv )
-{
- int length, checksum;
- void *buffer;
- FILE *file;
- char aas[ 1024 ], **ext;
- char *exts[] =
- {
- ".aas",
- "_b0.aas",
- "_b1.aas",
- NULL
- };
-
-
/* arg checking */
- if( argc < 2 )
- {
+ if ( argc < 2 ) {
Sys_Printf( "Usage: q3map -fixaas [-v] <mapname>\n" );
return 0;
}
-
+
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
-
+
/* note it */
Sys_Printf( "--- FixAAS ---\n" );
-
+
/* load the bsp */
Sys_Printf( "Loading %s\n", source );
length = LoadFile( source, &buffer );
-
+
/* create bsp checksum */
Sys_Printf( "Creating checksum...\n" );
checksum = LittleLong( MD4BlockChecksum( buffer, length ) );
-
+
/* write checksum to aas */
ext = exts;
- while( *ext )
+ while ( *ext )
{
/* mangle name */
strcpy( aas, source );
strcat( aas, *ext );
Sys_Printf( "Trying %s\n", aas );
ext++;
-
+
/* fix it */
file = fopen( aas, "r+b" );
- if( !file )
+ if ( !file ) {
continue;
- if( fwrite( &checksum, 4, 1, file ) != 1 )
+ }
+ if ( fwrite( &checksum, 4, 1, file ) != 1 ) {
Error( "Error writing checksum to %s", aas );
+ }
fclose( file );
}
-
+
/* return to sender */
return 0;
}
/*
-AnalyzeBSP() - ydnar
-analyzes a Quake engine BSP file
-*/
+ AnalyzeBSP() - ydnar
+ analyzes a Quake engine BSP file
+ */
typedef struct abspHeader_s
{
- char ident[ 4 ];
- int version;
-
- bspLump_t lumps[ 1 ]; /* unknown size */
+ char ident[ 4 ];
+ int version;
+
+ bspLump_t lumps[ 1 ]; /* unknown size */
}
abspHeader_t;
typedef struct abspLumpTest_s
{
- int radix, minCount;
- char *name;
+ int radix, minCount;
+ char *name;
}
abspLumpTest_t;
-int AnalyzeBSP( int argc, char **argv )
-{
- abspHeader_t *header;
- int size, i, version, offset, length, lumpInt, count;
- char ident[ 5 ];
- void *lump;
- float lumpFloat;
- char lumpString[ 1024 ], source[ 1024 ];
- qboolean lumpSwap = qfalse;
- abspLumpTest_t *lumpTest;
- static abspLumpTest_t lumpTests[] =
- {
- { sizeof( bspPlane_t ), 6, "IBSP LUMP_PLANES" },
- { sizeof( bspBrush_t ), 1, "IBSP LUMP_BRUSHES" },
- { 8, 6, "IBSP LUMP_BRUSHSIDES" },
- { sizeof( bspBrushSide_t ), 6, "RBSP LUMP_BRUSHSIDES" },
- { sizeof( bspModel_t ), 1, "IBSP LUMP_MODELS" },
- { sizeof( bspNode_t ), 2, "IBSP LUMP_NODES" },
- { sizeof( bspLeaf_t ), 1, "IBSP LUMP_LEAFS" },
- { 104, 3, "IBSP LUMP_DRAWSURFS" },
- { 44, 3, "IBSP LUMP_DRAWVERTS" },
- { 4, 6, "IBSP LUMP_DRAWINDEXES" },
- { 128 * 128 * 3, 1, "IBSP LUMP_LIGHTMAPS" },
- { 256 * 256 * 3, 1, "IBSP LUMP_LIGHTMAPS (256 x 256)" },
- { 512 * 512 * 3, 1, "IBSP LUMP_LIGHTMAPS (512 x 512)" },
- { 0, 0, NULL }
- };
-
-
- /* arg checking */
- if( argc < 1 )
+int AnalyzeBSP( int argc, char **argv ){
+ abspHeader_t *header;
+ int size, i, version, offset, length, lumpInt, count;
+ char ident[ 5 ];
+ void *lump;
+ float lumpFloat;
+ char lumpString[ 1024 ], source[ 1024 ];
+ qboolean lumpSwap = qfalse;
+ abspLumpTest_t *lumpTest;
+ static abspLumpTest_t lumpTests[] =
{
+ { sizeof( bspPlane_t ), 6, "IBSP LUMP_PLANES" },
+ { sizeof( bspBrush_t ), 1, "IBSP LUMP_BRUSHES" },
+ { 8, 6, "IBSP LUMP_BRUSHSIDES" },
+ { sizeof( bspBrushSide_t ), 6, "RBSP LUMP_BRUSHSIDES" },
+ { sizeof( bspModel_t ), 1, "IBSP LUMP_MODELS" },
+ { sizeof( bspNode_t ), 2, "IBSP LUMP_NODES" },
+ { sizeof( bspLeaf_t ), 1, "IBSP LUMP_LEAFS" },
+ { 104, 3, "IBSP LUMP_DRAWSURFS" },
+ { 44, 3, "IBSP LUMP_DRAWVERTS" },
+ { 4, 6, "IBSP LUMP_DRAWINDEXES" },
+ { 128 * 128 * 3, 1, "IBSP LUMP_LIGHTMAPS" },
+ { 256 * 256 * 3, 1, "IBSP LUMP_LIGHTMAPS (256 x 256)" },
+ { 512 * 512 * 3, 1, "IBSP LUMP_LIGHTMAPS (512 x 512)" },
+ { 0, 0, NULL }
+ };
+
+
+ /* arg checking */
+ if ( argc < 1 ) {
Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
return 0;
}
-
+
/* process arguments */
- for( i = 1; i < (argc - 1); i++ )
+ for ( i = 1; i < ( argc - 1 ); i++ )
{
/* -format map|ase|... */
- if( !strcmp( argv[ i ], "-lumpswap" ) )
- {
+ if ( !strcmp( argv[ i ], "-lumpswap" ) ) {
Sys_Printf( "Swapped lump structs enabled\n" );
- lumpSwap = qtrue;
- }
+ lumpSwap = qtrue;
+ }
}
-
+
/* clean up map name */
strcpy( source, ExpandArg( argv[ i ] ) );
Sys_Printf( "Loading %s\n", source );
-
+
/* load the file */
size = LoadFile( source, (void**) &header );
- if( size == 0 || header == NULL )
- {
+ if ( size == 0 || header == NULL ) {
Sys_Printf( "Unable to load %s.\n", source );
return -1;
}
-
+
/* analyze ident/version */
memcpy( ident, header->ident, 4 );
ident[ 4 ] = '\0';
version = LittleLong( header->version );
-
+
Sys_Printf( "Identity: %s\n", ident );
Sys_Printf( "Version: %d\n", version );
Sys_Printf( "---------------------------------------\n" );
-
+
/* analyze each lump */
- for( i = 0; i < 100; i++ )
+ for ( i = 0; i < 100; i++ )
{
/* call of duty swapped lump pairs */
- if( lumpSwap )
- {
+ if ( lumpSwap ) {
offset = LittleLong( header->lumps[ i ].length );
length = LittleLong( header->lumps[ i ].offset );
}
-
+
/* standard lump pairs */
else
{
offset = LittleLong( header->lumps[ i ].offset );
length = LittleLong( header->lumps[ i ].length );
}
-
+
/* extract data */
lump = (byte*) header + offset;
- lumpInt = LittleLong( (int) *((int*) lump) );
- lumpFloat = LittleFloat( (float) *((float*) lump) );
- memcpy( lumpString, (char*) lump, ((size_t)length < sizeof(lumpString) ? (size_t)length : sizeof(lumpString)-1) );
- lumpString[ sizeof(lumpString)-1 ] = '\0';
-
+ lumpInt = LittleLong( (int) *( (int*) lump ) );
+ lumpFloat = LittleFloat( (float) *( (float*) lump ) );
+ memcpy( lumpString, (char*) lump, ( (size_t)length < sizeof( lumpString ) ? (size_t)length : sizeof( lumpString ) - 1 ) );
+ lumpString[ sizeof( lumpString ) - 1 ] = '\0';
+
/* print basic lump info */
Sys_Printf( "Lump: %d\n", i );
Sys_Printf( "Offset: %d bytes\n", offset );
Sys_Printf( "Length: %d bytes\n", length );
-
+
/* only operate on valid lumps */
- if( length > 0 )
- {
+ if ( length > 0 ) {
/* print data in 4 formats */
Sys_Printf( "As hex: %08X\n", lumpInt );
Sys_Printf( "As int: %d\n", lumpInt );
Sys_Printf( "As float: %f\n", lumpFloat );
Sys_Printf( "As string: %s\n", lumpString );
-
+
/* guess lump type */
- if( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' )
+ if ( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' ) {
Sys_Printf( "Type guess: IBSP LUMP_ENTITIES\n" );
- else if( strstr( lumpString, "textures/" ) )
+ }
+ else if ( strstr( lumpString, "textures/" ) ) {
Sys_Printf( "Type guess: IBSP LUMP_SHADERS\n" );
+ }
else
{
/* guess based on size/count */
- for( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ )
+ for ( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ )
{
- if( (length % lumpTest->radix) != 0 )
+ if ( ( length % lumpTest->radix ) != 0 ) {
continue;
+ }
count = length / lumpTest->radix;
- if( count < lumpTest->minCount )
+ if ( count < lumpTest->minCount ) {
continue;
+ }
Sys_Printf( "Type guess: %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix );
}
}
}
-
+
Sys_Printf( "---------------------------------------\n" );
-
+
/* end of file */
- if( offset + length >= size )
+ if ( offset + length >= size ) {
break;
+ }
}
-
+
/* last stats */
Sys_Printf( "Lump count: %d\n", i + 1 );
Sys_Printf( "File size: %d bytes\n", size );
-
+
/* return to caller */
return 0;
}
/*
-BSPInfo()
-emits statistics about the bsp file
-*/
+ BSPInfo()
+ emits statistics about the bsp file
+ */
+
+int BSPInfo( int count, char **fileNames ){
+ int i;
+ char source[ 1024 ], ext[ 64 ];
+ int size;
+ FILE *f;
+
-int BSPInfo( int count, char **fileNames )
-{
- int i;
- char source[ 1024 ], ext[ 64 ];
- int size;
- FILE *f;
-
-
/* dummy check */
- if( count < 1 )
- {
- Sys_Printf( "No files to dump info for.\n");
+ if ( count < 1 ) {
+ Sys_Printf( "No files to dump info for.\n" );
return -1;
}
-
+
/* enable info mode */
infoMode = qtrue;
-
+
/* walk file list */
- for( i = 0; i < count; i++ )
+ for ( i = 0; i < count; i++ )
{
Sys_Printf( "---------------------------------\n" );
-
+
/* mangle filename and get size */
strcpy( source, fileNames[ i ] );
ExtractFileExtension( source, ext );
- if( !Q_stricmp( ext, "map" ) )
+ if ( !Q_stricmp( ext, "map" ) ) {
StripExtension( source );
+ }
DefaultExtension( source, ".bsp" );
f = fopen( source, "rb" );
- if( f )
- {
- size = Q_filelength (f);
+ if ( f ) {
+ size = Q_filelength( f );
fclose( f );
}
- else
+ else{
size = 0;
-
+ }
+
/* load the bsp file and print lump sizes */
Sys_Printf( "%s\n", source );
- LoadBSPFile( source );
+ LoadBSPFile( source );
PrintBSPFileSizes();
-
+
/* print sizes */
Sys_Printf( "\n" );
Sys_Printf( " total %9d\n", size );
Sys_Printf( " %9d KB\n", size / 1024 );
- Sys_Printf( " %9d MB\n", size / (1024 * 1024) );
-
+ Sys_Printf( " %9d MB\n", size / ( 1024 * 1024 ) );
+
Sys_Printf( "---------------------------------\n" );
}
-
+
/* return count */
return i;
}
-static void ExtrapolateTexcoords(const float *axyz, const float *ast, const float *bxyz, const float *bst, const float *cxyz, const float *cst, const float *axyz_new, float *ast_out, const float *bxyz_new, float *bst_out, const float *cxyz_new, float *cst_out)
-{
+static void ExtrapolateTexcoords( const float *axyz, const float *ast, const float *bxyz, const float *bst, const float *cxyz, const float *cst, const float *axyz_new, float *ast_out, const float *bxyz_new, float *bst_out, const float *cxyz_new, float *cst_out ){
vec4_t scoeffs, tcoeffs;
float md;
m4x4_t solvematrix;
vec3_t norm;
vec3_t dab, dac;
- VectorSubtract(bxyz, axyz, dab);
- VectorSubtract(cxyz, axyz, dac);
- CrossProduct(dab, dac, norm);
-
+ VectorSubtract( bxyz, axyz, dab );
+ VectorSubtract( cxyz, axyz, dac );
+ CrossProduct( dab, dac, norm );
+
// assume:
// s = f(x, y, z)
// s(v + norm) = s(v) when n ortho xyz
-
+
// s(v) = DotProduct(v, scoeffs) + scoeffs[3]
// solve:
solvematrix[11] = norm[2];
solvematrix[15] = 0;
- md = m4_det(solvematrix);
- if(md*md < 1e-10)
- {
- Sys_Printf("Cannot invert some matrix, some texcoords aren't extrapolated!");
+ md = m4_det( solvematrix );
+ if ( md * md < 1e-10 ) {
+ Sys_Printf( "Cannot invert some matrix, some texcoords aren't extrapolated!" );
return;
}
- m4x4_invert(solvematrix);
+ m4x4_invert( solvematrix );
scoeffs[0] = ast[0];
scoeffs[1] = bst[0];
scoeffs[2] = cst[0];
scoeffs[3] = 0;
- m4x4_transform_vec4(solvematrix, scoeffs);
+ m4x4_transform_vec4( solvematrix, scoeffs );
tcoeffs[0] = ast[1];
tcoeffs[1] = bst[1];
tcoeffs[2] = cst[1];
tcoeffs[3] = 0;
- m4x4_transform_vec4(solvematrix, tcoeffs);
+ m4x4_transform_vec4( solvematrix, tcoeffs );
ast_out[0] = scoeffs[0] * axyz_new[0] + scoeffs[1] * axyz_new[1] + scoeffs[2] * axyz_new[2] + scoeffs[3];
ast_out[1] = tcoeffs[0] * axyz_new[0] + tcoeffs[1] * axyz_new[1] + tcoeffs[2] * axyz_new[2] + tcoeffs[3];
}
/*
-ScaleBSPMain()
-amaze and confuse your enemies with wierd scaled maps!
-*/
+ ScaleBSPMain()
+ amaze and confuse your enemies with wierd scaled maps!
+ */
-int ScaleBSPMain( int argc, char **argv )
-{
- int i, j;
- float f, a;
+int ScaleBSPMain( int argc, char **argv ){
+ int i, j;
+ float f, a;
vec3_t scale;
- vec3_t vec;
- char str[ 1024 ];
+ vec3_t vec;
+ char str[ 1024 ];
int uniform, axis;
qboolean texscale;
float *old_xyzst = NULL;
float spawn_ref = 0;
-
-
+
+
/* arg checking */
- if( argc < 3 )
- {
+ if ( argc < 3 ) {
Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
return 0;
}
-
+
texscale = qfalse;
- for(i = 1; i < argc-2; ++i)
+ for ( i = 1; i < argc - 2; ++i )
{
- if(!strcmp(argv[i], "-tex"))
- {
+ if ( !strcmp( argv[i], "-tex" ) ) {
texscale = qtrue;
}
- else if(!strcmp(argv[i], "-spawn_ref"))
- {
- spawn_ref = atof(argv[i+1]);
+ else if ( !strcmp( argv[i], "-spawn_ref" ) ) {
+ spawn_ref = atof( argv[i + 1] );
++i;
}
- else
+ else{
break;
+ }
}
-
+
/* get scale */
// if(argc-2 >= i) // always true
- scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
- if(argc-3 >= i)
+ scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
+ if ( argc - 3 >= i ) {
scale[1] = scale[0] = atof( argv[ argc - 3 ] );
- if(argc-4 >= i)
+ }
+ if ( argc - 4 >= i ) {
scale[0] = atof( argv[ argc - 4 ] );
+ }
- uniform = ((scale[0] == scale[1]) && (scale[1] == scale[2]));
+ uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) );
- if( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f )
- {
+ if ( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f ) {
Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
Sys_Printf( "Non-zero scale value required.\n" );
return 0;
}
-
+
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
-
+
/* load the bsp */
Sys_Printf( "Loading %s\n", source );
LoadBSPFile( source );
ParseEntities();
-
+
/* note it */
Sys_Printf( "--- ScaleBSP ---\n" );
Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities );
-
+
/* scale entity keys */
- for( i = 0; i < numBSPEntities && i < numEntities; i++ )
+ for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
{
/* scale origin */
GetVectorForKey( &entities[ i ], "origin", vec );
- if( (vec[ 0 ] || vec[ 1 ] || vec[ 2 ]) )
- {
- if(!strncmp(ValueForKey(&entities[i], "classname"), "info_player_", 12))
+ if ( ( vec[ 0 ] || vec[ 1 ] || vec[ 2 ] ) ) {
+ if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
vec[2] += spawn_ref;
+ }
vec[0] *= scale[0];
vec[1] *= scale[1];
vec[2] *= scale[2];
- if(!strncmp(ValueForKey(&entities[i], "classname"), "info_player_", 12))
+ if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
vec[2] -= spawn_ref;
+ }
sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
SetKeyValue( &entities[ i ], "origin", str );
}
a = FloatForKey( &entities[ i ], "angle" );
- if(a == -1 || a == -2) // z scale
+ if ( a == -1 || a == -2 ) { // z scale
axis = 2;
- else if(fabs(sin(DEG2RAD(a))) < 0.707)
+ }
+ else if ( fabs( sin( DEG2RAD( a ) ) ) < 0.707 ) {
axis = 0;
- else
+ }
+ else{
axis = 1;
-
+ }
+
/* scale door lip */
f = FloatForKey( &entities[ i ], "lip" );
- if( f )
- {
+ if ( f ) {
f *= scale[axis];
sprintf( str, "%f", f );
SetKeyValue( &entities[ i ], "lip", str );
}
-
+
/* scale plat height */
f = FloatForKey( &entities[ i ], "height" );
- if( f )
- {
+ if ( f ) {
f *= scale[2];
sprintf( str, "%f", f );
SetKeyValue( &entities[ i ], "height", str );
// TODO maybe allow a definition file for entities to specify which values are scaled how?
}
-
+
/* scale models */
- for( i = 0; i < numBSPModels; i++ )
+ for ( i = 0; i < numBSPModels; i++ )
{
bspModels[ i ].mins[0] *= scale[0];
bspModels[ i ].mins[1] *= scale[1];
bspModels[ i ].maxs[1] *= scale[1];
bspModels[ i ].maxs[2] *= scale[2];
}
-
+
/* scale nodes */
- for( i = 0; i < numBSPNodes; i++ )
+ for ( i = 0; i < numBSPNodes; i++ )
{
bspNodes[ i ].mins[0] *= scale[0];
bspNodes[ i ].mins[1] *= scale[1];
bspNodes[ i ].maxs[1] *= scale[1];
bspNodes[ i ].maxs[2] *= scale[2];
}
-
+
/* scale leafs */
- for( i = 0; i < numBSPLeafs; i++ )
+ for ( i = 0; i < numBSPLeafs; i++ )
{
bspLeafs[ i ].mins[0] *= scale[0];
bspLeafs[ i ].mins[1] *= scale[1];
bspLeafs[ i ].maxs[1] *= scale[1];
bspLeafs[ i ].maxs[2] *= scale[2];
}
-
- if(texscale)
- {
- Sys_Printf("Using texture unlocking (and probably breaking texture alignment a lot)\n");
- old_xyzst = safe_malloc(sizeof(*old_xyzst) * numBSPDrawVerts * 5);
- for(i = 0; i < numBSPDrawVerts; i++)
+
+ if ( texscale ) {
+ Sys_Printf( "Using texture unlocking (and probably breaking texture alignment a lot)\n" );
+ old_xyzst = safe_malloc( sizeof( *old_xyzst ) * numBSPDrawVerts * 5 );
+ for ( i = 0; i < numBSPDrawVerts; i++ )
{
- old_xyzst[5*i+0] = bspDrawVerts[i].xyz[0];
- old_xyzst[5*i+1] = bspDrawVerts[i].xyz[1];
- old_xyzst[5*i+2] = bspDrawVerts[i].xyz[2];
- old_xyzst[5*i+3] = bspDrawVerts[i].st[0];
- old_xyzst[5*i+4] = bspDrawVerts[i].st[1];
+ old_xyzst[5 * i + 0] = bspDrawVerts[i].xyz[0];
+ old_xyzst[5 * i + 1] = bspDrawVerts[i].xyz[1];
+ old_xyzst[5 * i + 2] = bspDrawVerts[i].xyz[2];
+ old_xyzst[5 * i + 3] = bspDrawVerts[i].st[0];
+ old_xyzst[5 * i + 4] = bspDrawVerts[i].st[1];
}
}
/* scale drawverts */
- for( i = 0; i < numBSPDrawVerts; i++ )
+ for ( i = 0; i < numBSPDrawVerts; i++ )
{
bspDrawVerts[i].xyz[0] *= scale[0];
bspDrawVerts[i].xyz[1] *= scale[1];
bspDrawVerts[i].normal[0] /= scale[0];
bspDrawVerts[i].normal[1] /= scale[1];
bspDrawVerts[i].normal[2] /= scale[2];
- VectorNormalize(bspDrawVerts[i].normal, bspDrawVerts[i].normal);
+ VectorNormalize( bspDrawVerts[i].normal, bspDrawVerts[i].normal );
}
- if(texscale)
- {
- for(i = 0; i < numBSPDrawSurfaces; i++)
+ if ( texscale ) {
+ for ( i = 0; i < numBSPDrawSurfaces; i++ )
{
- switch(bspDrawSurfaces[i].surfaceType)
+ switch ( bspDrawSurfaces[i].surfaceType )
{
- case SURFACE_FACE:
- case SURFACE_META:
- if(bspDrawSurfaces[i].numIndexes % 3)
- Error("Not a triangulation!");
- for(j = bspDrawSurfaces[i].firstIndex; j < bspDrawSurfaces[i].firstIndex + bspDrawSurfaces[i].numIndexes; j += 3)
- {
- int ia = bspDrawIndexes[j] + bspDrawSurfaces[i].firstVert, ib = bspDrawIndexes[j+1] + bspDrawSurfaces[i].firstVert, ic = bspDrawIndexes[j+2] + bspDrawSurfaces[i].firstVert;
- bspDrawVert_t *a = &bspDrawVerts[ia], *b = &bspDrawVerts[ib], *c = &bspDrawVerts[ic];
- float *oa = &old_xyzst[ia*5], *ob = &old_xyzst[ib*5], *oc = &old_xyzst[ic*5];
- // extrapolate:
- // a->xyz -> oa
- // b->xyz -> ob
- // c->xyz -> oc
- ExtrapolateTexcoords(
- &oa[0], &oa[3],
- &ob[0], &ob[3],
- &oc[0], &oc[3],
- a->xyz, a->st,
- b->xyz, b->st,
- c->xyz, c->st);
- }
- break;
+ case SURFACE_FACE:
+ case SURFACE_META:
+ if ( bspDrawSurfaces[i].numIndexes % 3 ) {
+ Error( "Not a triangulation!" );
+ }
+ for ( j = bspDrawSurfaces[i].firstIndex; j < bspDrawSurfaces[i].firstIndex + bspDrawSurfaces[i].numIndexes; j += 3 )
+ {
+ int ia = bspDrawIndexes[j] + bspDrawSurfaces[i].firstVert, ib = bspDrawIndexes[j + 1] + bspDrawSurfaces[i].firstVert, ic = bspDrawIndexes[j + 2] + bspDrawSurfaces[i].firstVert;
+ bspDrawVert_t *a = &bspDrawVerts[ia], *b = &bspDrawVerts[ib], *c = &bspDrawVerts[ic];
+ float *oa = &old_xyzst[ia * 5], *ob = &old_xyzst[ib * 5], *oc = &old_xyzst[ic * 5];
+ // extrapolate:
+ // a->xyz -> oa
+ // b->xyz -> ob
+ // c->xyz -> oc
+ ExtrapolateTexcoords(
+ &oa[0], &oa[3],
+ &ob[0], &ob[3],
+ &oc[0], &oc[3],
+ a->xyz, a->st,
+ b->xyz, b->st,
+ c->xyz, c->st );
+ }
+ break;
}
}
}
-
+
/* scale planes */
- if(uniform)
- {
- for( i = 0; i < numBSPPlanes; i++ )
+ if ( uniform ) {
+ for ( i = 0; i < numBSPPlanes; i++ )
{
bspPlanes[ i ].dist *= scale[0];
}
}
else
{
- for( i = 0; i < numBSPPlanes; i++ )
+ for ( i = 0; i < numBSPPlanes; i++ )
{
bspPlanes[ i ].normal[0] /= scale[0];
bspPlanes[ i ].normal[1] /= scale[1];
bspPlanes[ i ].normal[2] /= scale[2];
- f = 1/VectorLength(bspPlanes[i].normal);
- VectorScale(bspPlanes[i].normal, f, bspPlanes[i].normal);
+ f = 1 / VectorLength( bspPlanes[i].normal );
+ VectorScale( bspPlanes[i].normal, f, bspPlanes[i].normal );
bspPlanes[ i ].dist *= f;
}
}
-
+
/* scale gridsize */
GetVectorForKey( &entities[ 0 ], "gridsize", vec );
- if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) == 0.0f )
+ if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) {
VectorCopy( gridSize, vec );
+ }
vec[0] *= scale[0];
vec[1] *= scale[1];
vec[2] *= scale[2];
SetKeyValue( &entities[ 0 ], "gridsize", str );
/* inject command line parameters */
- InjectCommandLine(argv, 0, argc - 1);
-
+ InjectCommandLine( argv, 0, argc - 1 );
+
/* write the bsp */
UnparseEntities();
StripExtension( source );
DefaultExtension( source, "_s.bsp" );
Sys_Printf( "Writing %s\n", source );
WriteBSPFile( source );
-
+
/* return to sender */
return 0;
}
/*
-PseudoCompileBSP()
-a stripped down ProcessModels
-*/
-void PseudoCompileBSP(qboolean need_tree)
-{
+ PseudoCompileBSP()
+ a stripped down ProcessModels
+ */
+void PseudoCompileBSP( qboolean need_tree ){
int models;
char modelValue[10];
entity_t *entity;
side_t *side;
int i;
- SetDrawSurfacesBuffer();
+ SetDrawSurfacesBuffer();
mapDrawSurfs = safe_malloc( sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
memset( mapDrawSurfs, 0, sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
numMapDrawSurfs = 0;
BeginBSPFile();
models = 1;
- for( mapEntityNum = 0; mapEntityNum < numEntities; mapEntityNum++ )
+ for ( mapEntityNum = 0; mapEntityNum < numEntities; mapEntityNum++ )
{
/* get entity */
entity = &entities[ mapEntityNum ];
- if( entity->brushes == NULL && entity->patches == NULL )
+ if ( entity->brushes == NULL && entity->patches == NULL ) {
continue;
+ }
- if(mapEntityNum != 0)
- {
- sprintf( modelValue, "*%d", models++);
- SetKeyValue(entity, "model", modelValue);
+ if ( mapEntityNum != 0 ) {
+ sprintf( modelValue, "*%d", models++ );
+ SetKeyValue( entity, "model", modelValue );
}
-
+
/* process the model */
Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
BeginModel();
entity->firstDrawSurf = numMapDrawSurfs;
ClearMetaTriangles();
- PatchMapDrawSurfs(entity);
+ PatchMapDrawSurfs( entity );
- if(mapEntityNum == 0 && need_tree)
- {
- faces = MakeStructuralBSPFaceList(entities[0].brushes);
- tree = FaceBSP(faces);
+ if ( mapEntityNum == 0 && need_tree ) {
+ faces = MakeStructuralBSPFaceList( entities[0].brushes );
+ tree = FaceBSP( faces );
node = tree->headnode;
}
else
}
/* a minimized ClipSidesIntoTree */
- for( brush = entity->brushes; brush; brush = brush->next )
+ for ( brush = entity->brushes; brush; brush = brush->next )
{
/* walk the brush sides */
- for( i = 0; i < brush->numsides; i++ )
+ for ( i = 0; i < brush->numsides; i++ )
{
/* get side */
side = &brush->sides[ i ];
- if( side->winding == NULL )
+ if ( side->winding == NULL ) {
continue;
+ }
/* shader? */
- if( side->shaderInfo == NULL )
+ if ( side->shaderInfo == NULL ) {
continue;
+ }
/* save this winding as a visible surface */
- DrawSurfaceForSide(entity, brush, side, side->winding);
+ DrawSurfaceForSide( entity, brush, side, side->winding );
}
}
- if(meta)
- {
- ClassifyEntitySurfaces(entity);
- MakeEntityDecals(entity);
- MakeEntityMetaTriangles(entity);
+ if ( meta ) {
+ ClassifyEntitySurfaces( entity );
+ MakeEntityDecals( entity );
+ MakeEntityMetaTriangles( entity );
SmoothMetaTriangles();
MergeMetaTriangles();
}
- FilterDrawsurfsIntoTree(entity, tree);
+ FilterDrawsurfsIntoTree( entity, tree );
- FilterStructuralBrushesIntoTree(entity, tree);
- FilterDetailBrushesIntoTree(entity, tree);
+ FilterStructuralBrushesIntoTree( entity, tree );
+ FilterDetailBrushesIntoTree( entity, tree );
- EmitBrushes(entity->brushes, &entity->firstBrush, &entity->numBrushes );
- EndModel(entity, node);
+ EmitBrushes( entity->brushes, &entity->firstBrush, &entity->numBrushes );
+ EndModel( entity, node );
}
- EndBSPFile(qfalse);
+ EndBSPFile( qfalse );
}
/*
-ConvertBSPMain()
-main argument processing function for bsp conversion
-*/
+ ConvertBSPMain()
+ main argument processing function for bsp conversion
+ */
+
+int ConvertBSPMain( int argc, char **argv ){
+ int i;
+ int ( *convertFunc )( char * );
+ game_t *convertGame;
+ char ext[1024];
+ qboolean map_allowed, force_bsp, force_map;
+
-int ConvertBSPMain( int argc, char **argv )
-{
- int i;
- int (*convertFunc)( char * );
- game_t *convertGame;
- char ext[1024];
- qboolean map_allowed, force_bsp, force_map;
-
-
/* set default */
convertFunc = ConvertBSPToASE;
convertGame = NULL;
map_allowed = qfalse;
force_bsp = qfalse;
force_map = qfalse;
-
+
/* arg checking */
- if( argc < 1 )
- {
+ if ( argc < 1 ) {
Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
return 0;
}
-
+
/* process arguments */
- for( i = 1; i < (argc - 1); i++ )
+ for ( i = 1; i < ( argc - 1 ); i++ )
{
/* -format map|ase|... */
- if( !strcmp( argv[ i ], "-format" ) )
- {
+ if ( !strcmp( argv[ i ], "-format" ) ) {
i++;
- if( !Q_stricmp( argv[ i ], "ase" ) )
- {
+ if ( !Q_stricmp( argv[ i ], "ase" ) ) {
convertFunc = ConvertBSPToASE;
map_allowed = qfalse;
}
- else if( !Q_stricmp( argv[ i ], "obj" ) )
- {
+ else if ( !Q_stricmp( argv[ i ], "obj" ) ) {
convertFunc = ConvertBSPToOBJ;
map_allowed = qfalse;
}
- else if( !Q_stricmp( argv[ i ], "map_bp" ) )
- {
+ else if ( !Q_stricmp( argv[ i ], "map_bp" ) ) {
convertFunc = ConvertBSPToMap_BP;
map_allowed = qtrue;
}
- else if( !Q_stricmp( argv[ i ], "map" ) )
- {
+ else if ( !Q_stricmp( argv[ i ], "map" ) ) {
convertFunc = ConvertBSPToMap;
map_allowed = qtrue;
}
{
convertGame = GetGame( argv[ i ] );
map_allowed = qfalse;
- if( convertGame == NULL )
+ if ( convertGame == NULL ) {
Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
+ }
}
- }
- else if( !strcmp( argv[ i ], "-ne" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-ne" ) ) {
normalEpsilon = atof( argv[ i + 1 ] );
- i++;
+ i++;
Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
- }
- else if( !strcmp( argv[ i ], "-de" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-de" ) ) {
distanceEpsilon = atof( argv[ i + 1 ] );
- i++;
+ i++;
Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
- }
- else if( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) )
+ }
+ else if ( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) ) {
shadersAsBitmap = qtrue;
- else if( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) )
+ }
+ else if ( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) ) {
lightmapsAsTexcoord = qtrue;
- else if( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !strcmp( argv[ i ], "-deluxemapsastexcoord" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !strcmp( argv[ i ], "-deluxemapsastexcoord" ) ) {
lightmapsAsTexcoord = qtrue;
deluxemap = qtrue;
}
- else if( !strcmp( argv[ i ], "-readbsp" ) )
+ else if ( !strcmp( argv[ i ], "-readbsp" ) ) {
force_bsp = qtrue;
- else if( !strcmp( argv[ i ], "-readmap" ) )
+ }
+ else if ( !strcmp( argv[ i ], "-readmap" ) ) {
force_map = qtrue;
- else if( !strcmp( argv[ i ], "-meta" ) )
+ }
+ else if ( !strcmp( argv[ i ], "-meta" ) ) {
meta = qtrue;
- else if( !strcmp( argv[ i ], "-patchmeta" ) )
- {
+ }
+ else if ( !strcmp( argv[ i ], "-patchmeta" ) ) {
meta = qtrue;
patchMeta = qtrue;
}
}
LoadShaderInfo();
-
+
/* clean up map name */
- strcpy(source, ExpandArg(argv[i]));
- ExtractFileExtension(source, ext);
+ strcpy( source, ExpandArg( argv[i] ) );
+ ExtractFileExtension( source, ext );
- if(!map_allowed && !force_map)
+ if ( !map_allowed && !force_map ) {
force_bsp = qtrue;
+ }
- if(force_map || (!force_bsp && !Q_stricmp(ext, "map") && map_allowed))
- {
- if(!map_allowed)
- Sys_Printf("WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n");
- StripExtension(source);
- DefaultExtension(source, ".map");
- Sys_Printf("Loading %s\n", source);
- LoadMapFile(source, qfalse, convertGame == NULL);
- PseudoCompileBSP(convertGame != NULL);
+ if ( force_map || ( !force_bsp && !Q_stricmp( ext, "map" ) && map_allowed ) ) {
+ if ( !map_allowed ) {
+ Sys_Printf( "WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n" );
+ }
+ StripExtension( source );
+ DefaultExtension( source, ".map" );
+ Sys_Printf( "Loading %s\n", source );
+ LoadMapFile( source, qfalse, convertGame == NULL );
+ PseudoCompileBSP( convertGame != NULL );
}
else
{
- StripExtension(source);
- DefaultExtension(source, ".bsp");
- Sys_Printf("Loading %s\n", source);
- LoadBSPFile(source);
+ StripExtension( source );
+ DefaultExtension( source, ".bsp" );
+ Sys_Printf( "Loading %s\n", source );
+ LoadBSPFile( source );
ParseEntities();
}
-
+
/* bsp format convert? */
- if( convertGame != NULL )
- {
+ if ( convertGame != NULL ) {
/* set global game */
game = convertGame;
-
+
/* write bsp */
StripExtension( source );
DefaultExtension( source, "_c.bsp" );
Sys_Printf( "Writing %s\n", source );
WriteBSPFile( source );
-
+
/* return to sender */
return 0;
}
-
+
/* normal convert */
return convertFunc( source );
}
/*
-main()
-q3map mojo...
-*/
+ main()
+ q3map mojo...
+ */
+
+int main( int argc, char **argv ){
+ int i, r;
+ double start, end;
+
-int main( int argc, char **argv )
-{
- int i, r;
- double start, end;
-
-
/* we want consistent 'randomness' */
srand( 0 );
-
+
/* start timer */
start = I_FloatTime();
/* this was changed to emit version number over the network */
printf( Q3MAP_VERSION "\n" );
-
+
/* set exit call */
atexit( ExitQ3Map );
/* read general options first */
- for( i = 1; i < argc; i++ )
+ for ( i = 1; i < argc; i++ )
{
/* -connect */
- if( !strcmp( argv[ i ], "-connect" ) )
- {
+ if ( !strcmp( argv[ i ], "-connect" ) ) {
argv[ i ] = NULL;
i++;
Broadcast_Setup( argv[ i ] );
argv[ i ] = NULL;
}
-
+
/* verbose */
- else if( !strcmp( argv[ i ], "-v" ) )
- {
- if(!verbose)
- {
+ else if ( !strcmp( argv[ i ], "-v" ) ) {
+ if ( !verbose ) {
verbose = qtrue;
argv[ i ] = NULL;
}
}
-
+
/* force */
- else if( !strcmp( argv[ i ], "-force" ) )
- {
+ else if ( !strcmp( argv[ i ], "-force" ) ) {
force = qtrue;
argv[ i ] = NULL;
}
-
+
/* patch subdivisions */
- else if( !strcmp( argv[ i ], "-subdivisions" ) )
- {
+ else if ( !strcmp( argv[ i ], "-subdivisions" ) ) {
argv[ i ] = NULL;
i++;
patchSubdivisions = atoi( argv[ i ] );
argv[ i ] = NULL;
- if( patchSubdivisions <= 0 )
+ if ( patchSubdivisions <= 0 ) {
patchSubdivisions = 1;
+ }
}
-
+
/* threads */
- else if( !strcmp( argv[ i ], "-threads" ) )
- {
+ else if ( !strcmp( argv[ i ], "-threads" ) ) {
argv[ i ] = NULL;
i++;
numthreads = atoi( argv[ i ] );
PicoSetPrintFunc( PicoPrintFunc );
PicoSetLoadFileFunc( PicoLoadFileFunc );
PicoSetFreeFileFunc( free );
-
+
/* set number of threads */
ThreadSetDefault();
-
+
/* generate sinusoid jitter table */
- for( i = 0; i < MAX_JITTERS; i++ )
+ for ( i = 0; i < MAX_JITTERS; i++ )
{
jitters[ i ] = sin( i * 139.54152147 );
//% Sys_Printf( "Jitter %4d: %f\n", i, jitters[ i ] );
}
-
+
/* we print out two versions, q3map's main version (since it evolves a bit out of GtkRadiant)
and we put the GtkRadiant version to make it easy to track with what version of Radiant it was built with */
-
+
Sys_Printf( "Q3Map - v1.0r (c) 1999 Id Software Inc.\n" );
Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
Sys_Printf( "NetRadiant - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
Sys_Printf( "%s\n", Q3MAP_MOTD );
-
+
/* ydnar: new path initialization */
InitPaths( &argc, argv );
/* set game options */
- if (!patchSubdivisions)
+ if ( !patchSubdivisions ) {
patchSubdivisions = game->patchSubdivisions;
-
+ }
+
/* check if we have enough options left to attempt something */
- if( argc < 2 )
+ if ( argc < 2 ) {
Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
-
+ }
+
/* fixaas */
- if( !strcmp( argv[ 1 ], "-fixaas" ) )
+ if ( !strcmp( argv[ 1 ], "-fixaas" ) ) {
r = FixAAS( argc - 1, argv + 1 );
-
+ }
+
/* analyze */
- else if( !strcmp( argv[ 1 ], "-analyze" ) )
+ else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
r = AnalyzeBSP( argc - 1, argv + 1 );
-
+ }
+
/* info */
- else if( !strcmp( argv[ 1 ], "-info" ) )
+ else if ( !strcmp( argv[ 1 ], "-info" ) ) {
r = BSPInfo( argc - 2, argv + 2 );
-
+ }
+
/* vis */
- else if( !strcmp( argv[ 1 ], "-vis" ) )
+ else if ( !strcmp( argv[ 1 ], "-vis" ) ) {
r = VisMain( argc - 1, argv + 1 );
-
+ }
+
/* light */
- else if( !strcmp( argv[ 1 ], "-light" ) )
+ else if ( !strcmp( argv[ 1 ], "-light" ) ) {
r = LightMain( argc - 1, argv + 1 );
-
+ }
+
/* vlight */
- else if( !strcmp( argv[ 1 ], "-vlight" ) )
- {
+ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) {
Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
- argv[ 1 ] = "-fast"; /* eek a hack */
+ argv[ 1 ] = "-fast"; /* eek a hack */
r = LightMain( argc, argv );
}
-
+
/* ydnar: lightmap export */
- else if( !strcmp( argv[ 1 ], "-export" ) )
+ else if ( !strcmp( argv[ 1 ], "-export" ) ) {
r = ExportLightmapsMain( argc - 1, argv + 1 );
-
+ }
+
/* ydnar: lightmap import */
- else if( !strcmp( argv[ 1 ], "-import" ) )
+ else if ( !strcmp( argv[ 1 ], "-import" ) ) {
r = ImportLightmapsMain( argc - 1, argv + 1 );
-
+ }
+
/* ydnar: bsp scaling */
- else if( !strcmp( argv[ 1 ], "-scale" ) )
+ else if ( !strcmp( argv[ 1 ], "-scale" ) ) {
r = ScaleBSPMain( argc - 1, argv + 1 );
-
+ }
+
/* ydnar: bsp conversion */
- else if( !strcmp( argv[ 1 ], "-convert" ) )
+ else if ( !strcmp( argv[ 1 ], "-convert" ) ) {
r = ConvertBSPMain( argc - 1, argv + 1 );
-
+ }
+
/* div0: minimap */
- else if( !strcmp( argv[ 1 ], "-minimap" ) )
- r = MiniMapBSPMain(argc - 1, argv + 1);
+ else if ( !strcmp( argv[ 1 ], "-minimap" ) ) {
+ r = MiniMapBSPMain( argc - 1, argv + 1 );
+ }
/* ydnar: otherwise create a bsp */
- else
+ else{
r = BSPMain( argc, argv );
-
+ }
+
/* emit time */
end = I_FloatTime();
Sys_Printf( "%9.0f seconds elapsed\n", end - start );
-
+
/* shut down connection */
Broadcast_Shutdown();
-
+
/* return any error code */
return r;
}
projects / xonotic / netradiant.git / blobdiff