-/* -------------------------------------------------------------------------------;
+/* -------------------------------------------------------------------------------
-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."
-------------------------------------------------------------------------------- */
+ ------------------------------------------------------------------------------- */
/* dependencies */
#include "q3map2.h"
-
-
+#include <glib.h>
/*
-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
-*/
-
-static void ExitQ3Map( void )
-{
- BSPFilesCleanup();
- if( mapDrawSurfs != NULL )
- free( mapDrawSurfs );
-}
-
-
-
-/* minimap stuff */
-
-typedef struct minimap_s
-{
- bspModel_t *model;
- int width;
- int height;
- int samples;
- float *sample_offsets;
- float sharpen_boxmult;
- float sharpen_centermult;
- float boost;
- float *data1f;
- float *sharpendata1f;
- vec3_t mins, size;
-}
-minimap_t;
-static minimap_t minimap;
-
-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)
- {
- 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)
- return qfalse; // outside!
- }
- else
- {
- 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)
- return qfalse;
- }
- }
- else
- {
- 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)
- return qfalse;
- }
- }
- }
+char *Q_strncpyz( char *dst, const char *src, size_t len ) {
+ if ( len == 0 ) {
+ abort();
}
- return in && out;
-}
-static float MiniMapSample(float x, float y)
-{
- vec3_t org, dir;
- int i, bi;
- float t0, t1;
- float samp;
- bspBrush_t *b;
- bspBrushSide_t *s;
- int cnt;
-
- org[0] = x;
- org[1] = y;
- org[2] = 0;
- dir[0] = 0;
- dir[1] = 0;
- dir[2] = 1;
-
- cnt = 0;
- samp = 0;
- for(i = 0; i < minimap.model->numBSPBrushes; ++i)
- {
- bi = minimap.model->firstBSPBrush + i;
- 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)
- continue;
- if(x > +bspPlanes[s[1].planeNum].dist)
- continue;
- if(y < -bspPlanes[s[2].planeNum].dist)
- continue;
- if(y > +bspPlanes[s[3].planeNum].dist)
- continue;
-
- if(BrushIntersectionWithLine(b, org, dir, &t0, &t1))
- {
- samp += t1 - t0;
- ++cnt;
- }
- }
- }
-
- return samp;
+ strncpy( dst, src, len );
+ dst[ len - 1 ] = '\0';
+ return dst;
}
-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);
-}
-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 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)
- {
- float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
- float val = 0;
+char *Q_strcat( char *dst, size_t dlen, const char *src ) {
+ size_t n = strlen( dst );
- for(i = 0; i < minimap.samples; ++i)
- {
- 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 */
- );
- val += thisval;
- }
- val /= minimap.samples * minimap.size[2];
- *p++ = val;
+ if ( n > dlen ) {
+ abort(); /* buffer overflow */
}
-}
-
-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 dx = minimap.size[0] / (float) minimap.width;
- float dy = minimap.size[1] / (float) minimap.height;
- for(x = 0; x < minimap.width; ++x)
- {
- float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
- float val = 0;
-
- 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
- );
- val += thisval;
- }
- val /= minimap.samples * minimap.size[2];
- *p++ = val;
- }
+ return Q_strncpyz( dst + n, src, dlen - n );
}
-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);
-
- 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];
- }
-}
-static void MiniMapSharpen(int y)
-{
- int x;
- qboolean up = (y > 0);
- qboolean down = (y < minimap.height - 1);
- float *p = &minimap.data1f[y * minimap.width];
- float *q = &minimap.sharpendata1f[y * minimap.width];
+char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) {
+ size_t n = strlen( dst );
- for(x = 0; x < minimap.width; ++x)
- {
- 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)
- val += p[-1] * minimap.sharpen_boxmult;
- if(right)
- val += p[+1] * minimap.sharpen_boxmult;
- if(up)
- val += p[-minimap.width] * minimap.sharpen_boxmult;
- if(down)
- val += p[+minimap.width] * minimap.sharpen_boxmult;
-
- ++p;
- *q++ = val;
+ if ( n > dlen ) {
+ abort(); /* buffer overflow */
}
-}
-static void MiniMapContrastBoost(int y)
-{
- int x;
- float *q = &minimap.data1f[y * minimap.width];
- for(x = 0; x < minimap.width; ++x)
- {
- *q = *q * minimap.boost / ((minimap.boost - 1) * *q + 1);
- ++q;
- }
+ return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) );
}
-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);
-
- // 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]);
-
- 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;
- }
- }
-
- /* 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(mins, extend, mins);
- VectorAdd(maxs, extend, maxs);
-
- 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]);
-}
/*
-MiniMapSetupBrushes()
-determines solid non-sky brushes in the world
-*/
+ ExitQ3Map()
+ cleanup routine
+ */
-void MiniMapSetupBrushes( void )
-{
- int i, b, compileFlags;
- bspBrush_t *brush;
- bspShader_t *shader;
- shaderInfo_t *si;
-
-
- /* note it */
- Sys_FPrintf( SYS_VRB, "--- MiniMapSetupBrushes ---\n" );
-
- /* allocate */
- if( opaqueBrushes == NULL )
- opaqueBrushes = safe_malloc( numBSPBrushes / 8 + 1 );
-
- /* clear */
- memset( opaqueBrushes, 0, numBSPBrushes / 8 + 1 );
- numOpaqueBrushes = 0;
-
- /* walk the list of worldspawn brushes */
- for( i = 0; i < minimap.model->numBSPBrushes; i++ )
- {
- /* get brush */
- b = minimap.model->firstBSPBrush + i;
- brush = &bspBrushes[ b ];
-
-#if 0
- /* check all sides */
- compileFlags = 0;
- for( j = 0; j < brush->numSides; j++ )
- {
- /* do bsp shader calculations */
- side = &bspBrushSides[ brush->firstSide + j ];
- shader = &bspShaders[ side->shaderNum ];
-
- /* get shader info */
- si = ShaderInfoForShader( shader->shader );
- if( si == NULL )
- continue;
-
- /* or together compile flags */
- compileFlags |= si->compileFlags;
- }
-#else
- shader = &bspShaders[ brush->shaderNum ];
- si = ShaderInfoForShader( shader->shader );
- if( si == NULL )
- compileFlags = 0;
- else
- compileFlags = si->compileFlags;
-#endif
-
- /* determine if this brush is solid */
- if( (compileFlags & (C_SOLID | C_SKY)) == C_SOLID )
- {
- opaqueBrushes[ b >> 3 ] |= (1 << (b & 7));
- numOpaqueBrushes++;
- maxOpaqueBrush = i;
- }
+static void ExitQ3Map( void ){
+ BSPFilesCleanup();
+ if ( mapDrawSurfs != NULL ) {
+ free( mapDrawSurfs );
}
-
- /* emit some statistics */
- Sys_FPrintf( SYS_VRB, "%9d solid brushes\n", numOpaqueBrushes );
}
-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)
- {
- 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)
- {
- *bestj = j;
- *bestk = k;
- *bestval = val;
- }
- }
-
- return *bestval < 3;
-}
+/*
+ ShiftBSPMain()
+ shifts a map: for testing physics with huge coordinates
+ */
-void MiniMapMakeSampleOffsets()
-{
- int i, j, k, jj, kk;
- float val, valj, valk, sx, sy, rx, ry;
+int ShiftBSPMain( int argc, char **argv ){
+ int i, j;
+ float f, a;
+ vec3_t scale;
+ vec3_t vec;
+ char str[ 1024 ];
+ int uniform, axis;
+ qboolean texscale;
+ float *old_xyzst = NULL;
+ float spawn_ref = 0;
- Sys_Printf( "Generating good sample offsets (this may take a while)...\n" );
- /* start with entirely random samples */
- for(i = 0; i < minimap.samples; ++i)
- {
- minimap.sample_offsets[2*i+0] = Random();
- minimap.sample_offsets[2*i+1] = Random();
+ /* arg checking */
+ if ( argc < 3 ) {
+ Sys_Printf( "Usage: q3map [-v] -shift [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
+ return 0;
}
- for(i = 0; i < 1000; ++i)
+ texscale = qfalse;
+ for ( i = 1; i < argc - 2; ++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))
- 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))
- valk = -1;
- minimap.sample_offsets[2*k+0] = sx;
- minimap.sample_offsets[2*k+1] = sy;
-
- if(valj > valk)
- {
- if(valj > val)
- {
- /* valj is the greatest */
- minimap.sample_offsets[2*j+0] = rx;
- minimap.sample_offsets[2*j+1] = ry;
- i = -1;
- }
- else
- {
- /* valj is the greater and it is useless - forget it */
- }
- }
- else
- {
- if(valk > val)
- {
- /* valk is the greatest */
- minimap.sample_offsets[2*k+0] = rx;
- minimap.sample_offsets[2*k+1] = ry;
- i = -1;
- }
- else
- {
- /* valk is the greater and it is useless - forget it */
- }
- }
+ if ( !strcmp( argv[i], "-tex" ) ) {
+ texscale = qtrue;
+ }
+ else if ( !strcmp( argv[i], "-spawn_ref" ) ) {
+ spawn_ref = atof( argv[i + 1] );
+ ++i;
}
- 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] == '\\'))
- --endpos;
- while(relative[0] == '.' && relative[1] == '.' && (relative[2] == '/' || relative[2] == '\\'))
- {
- relative += 3;
- while(endpos != absolute)
- {
- --endpos;
- if(*endpos == '/' || *endpos == '\\')
- break;
- }
- while(endpos != absolute && (endpos[-1] == '/' || endpos[-1] == '\\'))
- --endpos;
+ /* get shift */
+ // if(argc-2 >= i) // always true
+ 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 ) {
+ scale[0] = atof( argv[ argc - 4 ] );
}
- memcpy(out, absolute, endpos - absolute);
- out[endpos - absolute] = '/';
- strcpy(out + (endpos - absolute + 1), relative);
-}
-int MiniMapBSPMain( int argc, char **argv )
-{
- char minimapFilename[1024];
- char basename[1024];
- char path[1024];
- char relativeMinimapFilename[1024];
- float minimapSharpen;
- float border;
- byte *data4b, *p;
- float *q;
- int x, y;
- int i;
- miniMapMode_t mode;
- vec3_t mins, maxs;
- qboolean keepaspect;
+ uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) );
- /* arg checking */
- 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;
- }
- /* load the BSP first */
+ /* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
+
+ /* load the bsp */
Sys_Printf( "Loading %s\n", source );
- BeginMapShaderFile( source );
- LoadShaderInfo();
LoadBSPFile( source );
+ ParseEntities();
- minimap.model = &bspModels[0];
- VectorCopy(minimap.model->mins, mins);
- VectorCopy(minimap.model->maxs, maxs);
+ /* note it */
+ Sys_Printf( "--- ShiftBSP ---\n" );
+ Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities );
- *minimapFilename = 0;
- minimapSharpen = game->miniMapSharpen;
- minimap.width = minimap.height = game->miniMapSize;
- border = game->miniMapBorder;
- keepaspect = game->miniMapKeepAspect;
- mode = game->miniMapMode;
+ /* shift entity keys */
+ for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
+ {
+ /* shift origin */
+ GetVectorForKey( &entities[ i ], "origin", vec );
+ 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 ) ) {
+ vec[2] -= spawn_ref;
+ }
+ sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
+ SetKeyValue( &entities[ i ], "origin", str );
+ }
- minimap.samples = 1;
- minimap.sample_offsets = NULL;
- minimap.boost = 1.0;
+ }
- /* process arguments */
- for( i = 1; i < (argc - 1); i++ )
+ /* shift models */
+ for ( i = 0; i < numBSPModels; i++ )
{
- 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]);
- i++;
- Sys_Printf( "Sharpening coefficient set to %f\n", minimapSharpen );
- }
- 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);
- MiniMapMakeSampleOffsets();
- }
- 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);
- minimap.sample_offsets = NULL;
- }
- 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" ) )
- {
- keepaspect = qtrue;
- Sys_Printf( "Keeping aspect ratio by letterboxing\n", border );
- }
- 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]);
- 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]);
- i += 6;
- Sys_Printf( "Map mins/maxs overridden\n" );
- }
- 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" ) )
- {
- mode = MINIMAP_MODE_BLACK;
- Sys_Printf( "Writing as black alpha image\n" );
- }
- else if( !strcmp( argv[ i ], "-white" ) )
- {
- mode = MINIMAP_MODE_WHITE;
- Sys_Printf( "Writing as white alpha image\n" );
- }
- else if( !strcmp( argv[ i ], "-boost" ) )
- {
- minimap.boost = atof(argv[i + 1]);
- i++;
- Sys_Printf( "Contrast boost set to %f\n", minimap.boost );
- }
+ bspModels[ i ].mins[0] += scale[0];
+ bspModels[ i ].mins[1] += scale[1];
+ bspModels[ i ].mins[2] += scale[2];
+ bspModels[ i ].maxs[0] += scale[0];
+ bspModels[ i ].maxs[1] += scale[1];
+ bspModels[ i ].maxs[2] += scale[2];
}
- MiniMapMakeMinsMaxs(mins, maxs, border, keepaspect);
+ /* shift nodes */
+ for ( i = 0; i < numBSPNodes; i++ )
+ {
+ bspNodes[ i ].mins[0] += scale[0];
+ bspNodes[ i ].mins[1] += scale[1];
+ bspNodes[ i ].mins[2] += scale[2];
+ bspNodes[ i ].maxs[0] += scale[0];
+ bspNodes[ i ].maxs[1] += scale[1];
+ bspNodes[ i ].maxs[2] += scale[2];
+ }
- if(!*minimapFilename)
+ /* shift leafs */
+ for ( i = 0; i < numBSPLeafs; i++ )
{
- 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);
+ bspLeafs[ i ].mins[0] += scale[0];
+ bspLeafs[ i ].mins[1] += scale[1];
+ bspLeafs[ i ].mins[2] += scale[2];
+ bspLeafs[ i ].maxs[0] += scale[0];
+ bspLeafs[ i ].maxs[1] += scale[1];
+ bspLeafs[ i ].maxs[2] += scale[2];
}
- ExtractFilePath(minimapFilename, path);
- Q_mkdir(path);
- if(minimapSharpen >= 0)
+ /* shift drawverts */
+ for ( i = 0; i < numBSPDrawVerts; i++ )
{
- minimap.sharpen_centermult = 8 * minimapSharpen + 1;
- minimap.sharpen_boxmult = -minimapSharpen;
+ bspDrawVerts[i].xyz[0] += scale[0];
+ bspDrawVerts[i].xyz[1] += scale[1];
+ bspDrawVerts[i].xyz[2] += scale[2];
}
- 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));
+ /* shift planes */
- MiniMapSetupBrushes();
+ vec3_t point;
- if(minimap.samples <= 1)
+ for ( i = 0; i < numBSPPlanes; i++ )
{
- Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSupersampling);
- }
- else
- {
- if(minimap.sample_offsets)
- {
- Sys_Printf( "\n--- MiniMapSupersampled (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSupersampled);
+ //find point on plane
+ for ( j=0; j<3; j++ ){
+ if ( fabs( bspPlanes[ i ].normal[j] ) > 0.5 ){
+ point[j] = bspPlanes[ i ].dist / bspPlanes[ i ].normal[j];
+ point[(j+1)%3] = point[(j+2)%3] = 0;
+ break;
+ }
}
- else
- {
- Sys_Printf( "\n--- MiniMapRandomlySupersampled (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapRandomlySupersampled);
+ //shift point
+ for ( j=0; j<3; j++ ){
+ point[j] += scale[j];
}
+ //calc new plane dist
+ bspPlanes[ i ].dist = DotProduct( point, bspPlanes[ i ].normal );
}
- if(minimap.boost != 1.0)
- {
- Sys_Printf( "\n--- MiniMapContrastBoost (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapContrastBoost);
- }
-
- if(minimap.sharpendata1f)
- {
- Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height );
- RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSharpen);
- q = minimap.sharpendata1f;
- }
- else
- {
- q = minimap.data1f;
- }
-
- Sys_Printf( "\nConverting...");
-
- 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;
- }
- 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;
- }
- 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;
+ /* scale gridsize */
+ /*
+ GetVectorForKey( &entities[ 0 ], "gridsize", vec );
+ if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) {
+ VectorCopy( gridSize, vec );
}
+ vec[0] *= scale[0];
+ vec[1] *= scale[1];
+ vec[2] *= scale[2];
+ sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
+ SetKeyValue( &entities[ 0 ], "gridsize", str );
+*/
+ /* inject command line parameters */
+ InjectCommandLine( argv, 0, argc - 1 );
- Sys_Printf( " done.\n" );
+ /* write the bsp */
+ UnparseEntities();
+ StripExtension( source );
+ DefaultExtension( source, "_sh.bsp" );
+ Sys_Printf( "Writing %s\n", source );
+ WriteBSPFile( source );
/* return to sender */
return 0;
}
+void FixDOSName( char *src ){
+ if ( src == NULL ) {
+ return;
+ }
-
-
-/*
-MD4BlockChecksum()
-calculates an md4 checksum for a block of data
-*/
-
-static int MD4BlockChecksum( void *buffer, int length )
-{
- return Com_BlockChecksum(buffer, length);
+ while ( *src )
+ {
+ if ( *src == '\\' ) {
+ *src = '/';
+ }
+ src++;
+ }
}
/*
-FixAAS()
-resets an aas checksum to match the given BSP
+ Check if newcoming texture is unique and not excluded
*/
-
-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 )
- {
- Sys_Printf( "Usage: q3map -fixaas [-v] <mapname>\n" );
- return 0;
+void tex2list( char texlist[512][MAX_QPATH], int *texnum, char EXtex[2048][MAX_QPATH], int *EXtexnum ){
+ int i;
+ if ( token[0] == '\0') return;
+ StripExtension( token );
+ FixDOSName( token );
+ for ( i = 0; i < *texnum; i++ ){
+ if ( !stricmp( texlist[i], token ) ) return;
}
-
- /* 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 )
- {
- /* mangle name */
- strcpy( aas, source );
- StripExtension( aas );
- strcat( aas, *ext );
- Sys_Printf( "Trying %s\n", aas );
- ext++;
-
- /* fix it */
- file = fopen( aas, "r+b" );
- if( !file )
- continue;
- if( fwrite( &checksum, 4, 1, file ) != 1 )
- Error( "Error writing checksum to %s", aas );
- fclose( file );
+ for ( i = 0; i < *EXtexnum; i++ ){
+ if ( !stricmp( EXtex[i], token ) ) return;
}
-
- /* return to sender */
- return 0;
+ strcpy ( texlist[*texnum], token );
+ (*texnum)++;
+ return;
}
-
/*
-AnalyzeBSP() - ydnar
-analyzes a Quake engine BSP file
+ Check if newcoming res is unique
*/
-
-typedef struct abspHeader_s
-{
- char ident[ 4 ];
- int version;
-
- bspLump_t lumps[ 1 ]; /* unknown size */
+void res2list( char data[512][MAX_QPATH], int *num ){
+ int i;
+ if ( data[*num][0] == '\0') return;
+ for ( i = 0; i < *num; i++ ){
+ if ( !stricmp( data[i], data[*num] ) ) return;
+ }
+ (*num)++;
+ return;
}
-abspHeader_t;
-typedef struct abspLumpTest_s
-{
- 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 )
- {
- Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] <mapname>\n" );
- return 0;
+void parseEXblock ( char data[512][MAX_QPATH], int *num, const char *exName ){
+ if ( !GetToken( qtrue ) || strcmp( token, "{" ) ) {
+ Error( "ReadExclusionsFile: %s, line %d: { not found", exName, scriptline );
}
-
- /* process arguments */
- for( i = 1; i < (argc - 1); i++ )
+ while ( 1 )
{
- /* -format map|ase|... */
- if( !strcmp( argv[ i ], "-lumpswap" ) )
- {
- Sys_Printf( "Swapped lump structs enabled\n" );
- 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 )
- {
- 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++ )
- {
- /* call of duty swapped lump pairs */
- 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, (length < 1024 ? length : 1024) );
- lumpString[ 1024 ] = '\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 )
- {
- /* 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 ] == '"' )
- Sys_Printf( "Type guess: IBSP LUMP_ENTITIES\n" );
- 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++ )
- {
- if( (length % lumpTest->radix) != 0 )
- continue;
- count = length / lumpTest->radix;
- if( count < lumpTest->minCount )
- continue;
- Sys_Printf( "Type guess: %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix );
- }
- }
+ if ( !GetToken( qtrue ) ) {
+ break;
}
-
- Sys_Printf( "---------------------------------------\n" );
-
- /* end of file */
- if( offset + length >= size )
+ if ( !strcmp( token, "}" ) ) {
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
-*/
-
-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");
- return -1;
- }
-
- /* enable info mode */
- infoMode = qtrue;
-
- /* walk file list */
- 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" ) )
- StripExtension( source );
- DefaultExtension( source, ".bsp" );
- f = fopen( source, "rb" );
- if( f )
- {
- size = Q_filelength (f);
- fclose( f );
}
- else
- size = 0;
-
- /* load the bsp file and print lump sizes */
- Sys_Printf( "%s\n", 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( "---------------------------------\n" );
- }
-
- /* return count */
- return i;
-}
-
+ if ( token[0] == '{' ) {
+ Error( "ReadExclusionsFile: %s, line %d: brace, opening twice in a row.", exName, scriptline );
+ }
-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);
-
- // assume:
- // s = f(x, y, z)
- // s(v + norm) = s(v) when n ortho xyz
-
- // s(v) = DotProduct(v, scoeffs) + scoeffs[3]
-
- // solve:
- // scoeffs * (axyz, 1) == ast[0]
- // scoeffs * (bxyz, 1) == bst[0]
- // scoeffs * (cxyz, 1) == cst[0]
- // scoeffs * (norm, 0) == 0
- // scoeffs * [axyz, 1 | bxyz, 1 | cxyz, 1 | norm, 0] = [ast[0], bst[0], cst[0], 0]
- solvematrix[0] = axyz[0];
- solvematrix[4] = axyz[1];
- solvematrix[8] = axyz[2];
- solvematrix[12] = 1;
- solvematrix[1] = bxyz[0];
- solvematrix[5] = bxyz[1];
- solvematrix[9] = bxyz[2];
- solvematrix[13] = 1;
- solvematrix[2] = cxyz[0];
- solvematrix[6] = cxyz[1];
- solvematrix[10] = cxyz[2];
- solvematrix[14] = 1;
- solvematrix[3] = norm[0];
- solvematrix[7] = norm[1];
- 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!");
- return;
+ /* add to list */
+ strcpy( data[*num], token );
+ (*num)++;
}
-
- m4x4_invert(solvematrix);
-
- scoeffs[0] = ast[0];
- scoeffs[1] = bst[0];
- scoeffs[2] = cst[0];
- scoeffs[3] = 0;
- 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);
-
- 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];
- bst_out[0] = scoeffs[0] * bxyz_new[0] + scoeffs[1] * bxyz_new[1] + scoeffs[2] * bxyz_new[2] + scoeffs[3];
- bst_out[1] = tcoeffs[0] * bxyz_new[0] + tcoeffs[1] * bxyz_new[1] + tcoeffs[2] * bxyz_new[2] + tcoeffs[3];
- cst_out[0] = scoeffs[0] * cxyz_new[0] + scoeffs[1] * cxyz_new[1] + scoeffs[2] * cxyz_new[2] + scoeffs[3];
- cst_out[1] = tcoeffs[0] * cxyz_new[0] + tcoeffs[1] * cxyz_new[1] + tcoeffs[2] * cxyz_new[2] + tcoeffs[3];
+ return;
}
+char q3map2path[1024];
/*
-ScaleBSPMain()
-amaze and confuse your enemies with wierd scaled maps!
-*/
+ pk3BSPMain()
+ map autopackager, works for Q3 type of shaders and ents
+ */
-int ScaleBSPMain( int argc, char **argv )
-{
- int i, j;
- float f, a;
- vec3_t scale;
- vec3_t vec;
- char str[ 1024 ];
- int uniform, axis;
- qboolean texscale;
- float *old_xyzst = NULL;
- float spawn_ref = 0;
-
-
- /* arg checking */
- 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)
- {
- if(!strcmp(argv[i], "-tex"))
- {
- texscale = qtrue;
+int pk3BSPMain( int argc, char **argv ){
+ int i, j;
+ qboolean dbg = qfalse, png = qfalse;
+
+ /* process arguments */
+ for ( i = 1; i < ( argc - 1 ); i++ ){
+ if ( !strcmp( argv[ i ], "-dbg" ) ) {
+ dbg = qtrue;
}
- else if(!strcmp(argv[i], "-spawn_ref"))
- {
- spawn_ref = atof(argv[i+1]);
- ++i;
+ else if ( !strcmp( argv[ i ], "-png" ) ) {
+ png = qtrue;
}
- 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[1] = scale[0] = atof( argv[ argc - 3 ] );
- if(argc-4 >= i)
- scale[0] = atof( argv[ argc - 4 ] );
- uniform = ((scale[0] == scale[1]) && (scale[1] == scale[2]));
- 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++ )
+
+
+ char packname[ 1024 ], base[ 1024 ], nameOFmap[ 1024 ];
+ int len;
+ strcpy( packname, EnginePath );
+
+
+ /* copy map name */
+ strcpy( base, source );
+ StripExtension( base );
+
+ /* extract map name */
+ len = strlen( base ) - 1;
+ while ( len > 0 && base[ len ] != '/' && base[ len ] != '\\' )
+ len--;
+ strcpy( nameOFmap, &base[ len + 1 ] );
+
+
+ qboolean dsSHs[512] = {qfalse};
+
+ for ( i = 0; i < numBSPDrawSurfaces; i++ ){
+ /* can't exclude nodraw patches here (they want shaders :0!) */
+ //if ( !( bspDrawSurfaces[i].surfaceType == 2 && bspDrawSurfaces[i].numIndexes == 0 ) ) dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue;
+ dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue;
+ //Sys_Printf( "%s\n", bspShaders[bspDrawSurfaces[i].shaderNum].shader );
+ }
+
+ int pk3ShadersN = 0;
+ char pk3Shaders[512][MAX_QPATH];
+ int pk3SoundsN = 0;
+ char pk3Sounds[512][MAX_QPATH];
+ int pk3ShaderfilesN = 0;
+ char pk3Shaderfiles[512][MAX_QPATH];
+ int pk3TexturesN = 0;
+ char pk3Textures[512][MAX_QPATH];
+ int pk3VideosN = 0;
+ char pk3Videos[512][MAX_QPATH];
+
+
+
+ for ( i = 0; i < numBSPShaders; i++ ){
+ if ( dsSHs[i] ){
+ strcpy( pk3Shaders[pk3ShadersN], bspShaders[i].shader );
+ res2list( pk3Shaders, &pk3ShadersN );
+ //pk3ShadersN++;
+ //Sys_Printf( "%s\n", bspShaders[i].shader );
+ }
+ }
+
+ //ent keys
+ epair_t *ep;
+ for ( ep = entities[0].epairs; ep != NULL; ep = ep->next )
+ {
+ if ( !strnicmp( ep->key, "vertexremapshader", 17 ) ) {
+ sscanf( ep->value, "%*[^;] %*[;] %s", pk3Shaders[pk3ShadersN] );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
+ }
+ strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[0], "music" ) );
+ res2list( pk3Sounds, &pk3SoundsN );
+
+ 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))
- 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))
- vec[2] -= spawn_ref;
- sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
- SetKeyValue( &entities[ i ], "origin", str );
+ strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[i], "noise" ) );
+ if ( pk3Sounds[pk3SoundsN][0] != '*' ) res2list( pk3Sounds, &pk3SoundsN );
+
+ if ( !stricmp( ValueForKey( &entities[i], "classname" ), "func_plat" ) ){
+ strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_strt.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
+ strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_end.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
}
+ if ( !stricmp( ValueForKey( &entities[i], "classname" ), "target_push" ) ){
+ if ( !(IntForKey( &entities[i], "spawnflags") & 1) ){
+ strcpy( pk3Sounds[pk3SoundsN], "sound/misc/windfly.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
+ }
+ }
+ strcpy( pk3Shaders[pk3ShadersN], ValueForKey( &entities[i], "targetShaderNewName" ) );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
- a = FloatForKey( &entities[ i ], "angle" );
- if(a == -1 || a == -2) // z scale
- axis = 2;
- else if(fabs(sin(DEG2RAD(a))) < 0.707)
- axis = 0;
- else
- axis = 1;
-
- /* scale door lip */
- f = FloatForKey( &entities[ i ], "lip" );
- if( f )
- {
- f *= scale[axis];
- sprintf( str, "%f", f );
- SetKeyValue( &entities[ i ], "lip", str );
+ //levelshot
+ sprintf( pk3Shaders[ pk3ShadersN ], "levelshots/%s", nameOFmap );
+ res2list( pk3Shaders, &pk3ShadersN );
+
+
+ if( dbg ){
+ Sys_Printf( "\tDrawsurface+ent calls....%i\n", pk3ShadersN );
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ Sys_Printf( "%s\n", pk3Shaders[i] );
}
-
- /* scale plat height */
- f = FloatForKey( &entities[ i ], "height" );
- if( f )
- {
- f *= scale[2];
- sprintf( str, "%f", f );
- SetKeyValue( &entities[ i ], "height", str );
+ Sys_Printf( "\tSounds....%i\n", pk3SoundsN );
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ Sys_Printf( "%s\n", pk3Sounds[i] );
+ }
+ }
+
+ vfsListShaderFiles( pk3Shaderfiles, &pk3ShaderfilesN );
+
+ if( dbg ){
+ Sys_Printf( "\tSchroider fileses.....%i\n", pk3ShaderfilesN );
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ Sys_Printf( "%s\n", pk3Shaderfiles[i] );
}
+ }
- // TODO maybe allow a definition file for entities to specify which values are scaled how?
+
+ /* load exclusions file */
+ int EXpk3TexturesN = 0;
+ char EXpk3Textures[2048][MAX_QPATH];
+ int EXpk3ShadersN = 0;
+ char EXpk3Shaders[2048][MAX_QPATH];
+ int EXpk3SoundsN = 0;
+ char EXpk3Sounds[2048][MAX_QPATH];
+ int EXpk3ShaderfilesN = 0;
+ char EXpk3Shaderfiles[512][MAX_QPATH];
+ int EXpk3VideosN = 0;
+ char EXpk3Videos[512][MAX_QPATH];
+
+ char exName[ 1024 ];
+ byte *buffer;
+ int size;
+
+ strcpy( exName, q3map2path );
+ char *cut = strrchr( exName, '\\' );
+ char *cut2 = strrchr( exName, '/' );
+ if ( cut == NULL && cut2 == NULL ){
+ Sys_Printf( "WARNING: Unable to load exclusions file.\n" );
+ goto skipEXfile;
}
-
- /* scale models */
- for( i = 0; i < numBSPModels; i++ )
- {
- bspModels[ i ].mins[0] *= scale[0];
- bspModels[ i ].mins[1] *= scale[1];
- bspModels[ i ].mins[2] *= scale[2];
- bspModels[ i ].maxs[0] *= scale[0];
- bspModels[ i ].maxs[1] *= scale[1];
- bspModels[ i ].maxs[2] *= scale[2];
- }
-
- /* scale nodes */
- for( i = 0; i < numBSPNodes; i++ )
- {
- bspNodes[ i ].mins[0] *= scale[0];
- bspNodes[ i ].mins[1] *= scale[1];
- bspNodes[ i ].mins[2] *= scale[2];
- bspNodes[ i ].maxs[0] *= scale[0];
- bspNodes[ i ].maxs[1] *= scale[1];
- bspNodes[ i ].maxs[2] *= scale[2];
- }
-
- /* scale leafs */
- for( i = 0; i < numBSPLeafs; i++ )
- {
- bspLeafs[ i ].mins[0] *= scale[0];
- bspLeafs[ i ].mins[1] *= scale[1];
- bspLeafs[ i ].mins[2] *= scale[2];
- bspLeafs[ i ].maxs[0] *= scale[0];
- bspLeafs[ i ].maxs[1] *= scale[1];
- bspLeafs[ i ].maxs[2] *= scale[2];
- }
-
- if(texscale)
+ if ( cut2 > cut ) cut = cut2;
+ //cut++;
+ cut[1] = '\0';
+ strcat( exName, game->arg );
+ strcat( exName, ".exclude" );
+
+ Sys_Printf( "Loading %s\n", exName );
+ size = TryLoadFile( exName, (void**) &buffer );
+ if ( size <= 0 ) {
+ Sys_Printf( "WARNING: Unable to find exclusions file %s.\n", exName );
+ goto skipEXfile;
+ }
+
+ /* parse the file */
+ ParseFromMemory( (char *) buffer, size );
+
+ /* blocks pointers */
+ //int *exptrN;
+ //char *exptr[512][64];
+
+
+ /* tokenize it */
+ while ( 1 )
{
- 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];
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+
+ /* blocks */
+ if ( !stricmp( token, "textures" ) ){
+ parseEXblock ( EXpk3Textures, &EXpk3TexturesN, exName );
+ }
+ else if ( !stricmp( token, "shaders" ) ){
+ parseEXblock ( EXpk3Shaders, &EXpk3ShadersN, exName );
+ }
+ else if ( !stricmp( token, "shaderfiles" ) ){
+ parseEXblock ( EXpk3Shaderfiles, &EXpk3ShaderfilesN, exName );
+ }
+ else if ( !stricmp( token, "sounds" ) ){
+ parseEXblock ( EXpk3Sounds, &EXpk3SoundsN, exName );
+ }
+ else if ( !stricmp( token, "videos" ) ){
+ parseEXblock ( EXpk3Videos, &EXpk3VideosN, exName );
+ }
+ else{
+ Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
}
}
- /* scale drawverts */
- for( i = 0; i < numBSPDrawVerts; i++ )
- {
- bspDrawVerts[i].xyz[0] *= scale[0];
- bspDrawVerts[i].xyz[1] *= scale[1];
- bspDrawVerts[i].xyz[2] *= scale[2];
- 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);
+ /* free the buffer */
+ free( buffer );
+
+skipEXfile:
+
+ if( dbg ){
+ Sys_Printf( "\tEXpk3Textures....%i\n", EXpk3TexturesN );
+ for ( i = 0; i < EXpk3TexturesN; i++ ) Sys_Printf( "%s\n", EXpk3Textures[i] );
+ Sys_Printf( "\tEXpk3Shaders....%i\n", EXpk3ShadersN );
+ for ( i = 0; i < EXpk3ShadersN; i++ ) Sys_Printf( "%s\n", EXpk3Shaders[i] );
+ Sys_Printf( "\tEXpk3Shaderfiles....%i\n", EXpk3ShaderfilesN );
+ for ( i = 0; i < EXpk3ShaderfilesN; i++ ) Sys_Printf( "%s\n", EXpk3Shaderfiles[i] );
+ Sys_Printf( "\tEXpk3Sounds....%i\n", EXpk3SoundsN );
+ for ( i = 0; i < EXpk3SoundsN; i++ ) Sys_Printf( "%s\n", EXpk3Sounds[i] );
+ Sys_Printf( "\tEXpk3Videos....%i\n", EXpk3VideosN );
+ for ( i = 0; i < EXpk3VideosN; i++ ) Sys_Printf( "%s\n", EXpk3Videos[i] );
}
- if(texscale)
- {
- for(i = 0; i < numBSPDrawSurfaces; i++)
+ char temp[ 1024 ];
+
+ //Parse Shader Files
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ qboolean wantShader = qfalse;
+ qboolean wantShaderFile = qfalse;
+ char shadername[ 1024 ];
+ char lastwantedShader[ 1024 ];
+
+
+ /* load the shader */
+ sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] );
+ LoadScriptFile( temp, 0 );
+
+ /* tokenize it */
+ while ( 1 )
{
- switch(bspDrawSurfaces[i].surfaceType)
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ //dump shader names
+ if( dbg ) Sys_Printf( "%s\n", token );
+
+ /* do wanna le shader? */
+ wantShader = qfalse;
+ for ( j = 0; j < pk3ShadersN; j++ ){
+ if ( !stricmp( pk3Shaders[j], token) ){
+ strcpy ( shadername, pk3Shaders[j] );
+ pk3Shaders[j][0] = '\0';
+ wantShader = qtrue;
+ break;
+ }
+ }
+
+ /* handle { } section */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( strcmp( token, "{" ) ) {
+ Error( "ParseShaderFile: %s, line %d: { not found!\nFound instead: %s",
+ temp, scriptline, token );
+ }
+
+ while ( 1 )
{
- 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)
+ /* get the next token */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( !strcmp( token, "}" ) ) {
+ break;
+ }
+
+
+ /* -----------------------------------------------------------------
+ shader stages (passes)
+ ----------------------------------------------------------------- */
+
+ /* parse stage directives */
+ if ( !strcmp( token, "{" ) ) {
+ while ( 1 )
{
- 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);
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( !strcmp( token, "}" ) ) {
+ break;
+ }
+ if ( !wantShader ) continue;
+
+ /* digest any images */
+ if ( !stricmp( token, "map" ) ||
+ !stricmp( token, "clampMap" ) ) {
+
+ /* get an image */
+ GetToken( qfalse );
+ if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) {
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ }
+ }
+ else if ( !stricmp( token, "animMap" ) ||
+ !stricmp( token, "clampAnimMap" ) ) {
+ GetToken( qfalse );// skip num
+ while ( TokenAvailable() ){
+ GetToken( qfalse );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ }
+ }
+ else if ( !stricmp( token, "videoMap" ) ){
+ GetToken( qfalse );
+ FixDOSName( token );
+ if ( strchr( token, "/" ) == NULL ){
+ sprintf( temp, "video/%s", token );
+ strcpy( token, temp );
+ }
+ for ( j = 0; j < pk3VideosN; j++ ){
+ if ( !stricmp( pk3Videos[j], token ) ){
+ goto away;
+ }
+ }
+ for ( j = 0; j < EXpk3VideosN; j++ ){
+ if ( !stricmp( EXpk3Videos[j], token ) ){
+ goto away;
+ }
+ }
+ strcpy ( pk3Videos[pk3VideosN], token );
+ pk3VideosN++;
+ away:
+ j = 0;
+ }
+ }
+ }
+ /* skip to the next shader */
+ else if ( !wantShader ) continue;
+
+ /* -----------------------------------------------------------------
+ surfaceparm * directives
+ ----------------------------------------------------------------- */
+
+ /* match surfaceparm */
+ else if ( !stricmp( token, "surfaceparm" ) ) {
+ GetToken( qfalse );
+ if ( !stricmp( token, "nodraw" ) ) {
+ wantShader = qfalse;
+ }
+ }
+
+ /* skyparms <outer image> <cloud height> <inner image> */
+ else if ( !stricmp( token, "skyParms" ) ) {
+ /* get image base */
+ GetToken( qfalse );
+
+ /* ignore bogus paths */
+ if ( stricmp( token, "-" ) && stricmp( token, "full" ) ) {
+ strcpy ( temp, token );
+ sprintf( token, "%s_up", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ sprintf( token, "%s_dn", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ sprintf( token, "%s_lf", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ sprintf( token, "%s_rt", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ sprintf( token, "%s_bk", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ sprintf( token, "%s_ft", temp );
+ tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+ }
+ /* skip rest of line */
+ GetToken( qfalse );
+ GetToken( qfalse );
+ }
+ }
+ //exclude shader
+ if ( wantShader ){
+ for ( j = 0; j < EXpk3ShadersN; j++ ){
+ if ( !stricmp( EXpk3Shaders[j], shadername ) ){
+ wantShader = qfalse;
+ break;
+ }
+ }
+ /* shouldnt make shaders for shipped with the game textures aswell */
+ if ( wantShader ){
+ for ( j = 0; j < EXpk3TexturesN; j++ ){
+ if ( !stricmp( EXpk3Textures[j], shadername ) ){
+ wantShader = qfalse;
+ break;
+ }
}
+ }
+ if ( wantShader ){
+ wantShaderFile = qtrue;
+ strcpy( lastwantedShader, shadername );
+ }
+ }
+ }
+ //exclude shader file
+ if ( wantShaderFile ){
+ for ( j = 0; j < EXpk3ShaderfilesN; j++ ){
+ if ( !stricmp( EXpk3Shaderfiles[j], pk3Shaderfiles[ i ] ) ){
+ Sys_Printf( "WARNING: excluded shader %s, since it was located in restricted shader file: %s\n", lastwantedShader, pk3Shaderfiles[i] );
+ pk3Shaderfiles[ i ][0] = '\0';
break;
+ }
}
}
- }
-
- /* scale planes */
- if(uniform)
- {
- for( i = 0; i < numBSPPlanes; i++ )
- {
- bspPlanes[ i ].dist *= scale[0];
+ else {
+ pk3Shaderfiles[ i ][0] = '\0';
}
+
}
- else
- {
- 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);
- bspPlanes[ i ].dist *= f;
+
+
+
+/* exclude stuff */
+//pure textures (shader ones are done)
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ if ( pk3Shaders[i][0] != '\0' ){
+ FixDOSName( pk3Shaders[i] );
+ for ( j = 0; j < pk3TexturesN; j++ ){
+ if ( !stricmp( pk3Shaders[i], pk3Textures[j] ) ){
+ pk3Shaders[i][0] = '\0';
+ break;
+ }
+ }
+ if ( pk3Shaders[i][0] == '\0' ) continue;
+ for ( j = 0; j < EXpk3TexturesN; j++ ){
+ if ( !stricmp( pk3Shaders[i], EXpk3Textures[j] ) ){
+ pk3Shaders[i][0] = '\0';
+ break;
+ }
+ }
}
}
-
- /* scale gridsize */
- GetVectorForKey( &entities[ 0 ], "gridsize", vec );
- if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) == 0.0f )
- VectorCopy( gridSize, vec );
- vec[0] *= scale[0];
- vec[1] *= scale[1];
- vec[2] *= scale[2];
- sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
- SetKeyValue( &entities[ 0 ], "gridsize", str );
-
- /* inject command line parameters */
- 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;
-}
+//snds
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ FixDOSName( pk3Sounds[i] );
+ for ( j = 0; j < EXpk3SoundsN; j++ ){
+ if ( !stricmp( pk3Sounds[i], EXpk3Sounds[j] ) ){
+ pk3Sounds[i][0] = '\0';
+ break;
+ }
+ }
+ }
-/*
-PseudoCompileBSP()
-a stripped down ProcessModels
-*/
-void PseudoCompileBSP(qboolean need_tree)
-{
- int models;
- char modelValue[10];
- entity_t *entity;
- face_t *faces;
- tree_t *tree;
- node_t *node;
- brush_t *brush;
- side_t *side;
- int i;
+ if( dbg ){
+ Sys_Printf( "\tShader referenced textures....%i\n", pk3TexturesN );
+ for ( i = 0; i < pk3TexturesN; i++ ){
+ Sys_Printf( "%s\n", pk3Textures[i] );
+ }
+ Sys_Printf( "\tShader files....\n" );
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ if ( pk3Shaderfiles[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaderfiles[i] );
+ }
+ Sys_Printf( "\tPure textures....\n" );
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ if ( pk3Shaders[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaders[i] );
+ }
+ }
- 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++ )
- {
- /* get entity */
- entity = &entities[ mapEntityNum ];
- if( entity->brushes == NULL && entity->patches == NULL )
- continue;
- if(mapEntityNum != 0)
- {
- sprintf( modelValue, "*%d", models++);
- SetKeyValue(entity, "model", modelValue);
- }
-
- /* process the model */
- Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
- BeginModel();
+ sprintf( packname, "%s/%s_autopacked.pk3", EnginePath, nameOFmap );
+ remove( packname );
- entity->firstDrawSurf = numMapDrawSurfs;
+ Sys_Printf( "--- ZipZip ---\n" );
- ClearMetaTriangles();
- PatchMapDrawSurfs(entity);
+ Sys_Printf( "\n\tShader referenced textures....\n" );
- if(mapEntityNum == 0 && need_tree)
- {
- faces = MakeStructuralBSPFaceList(entities[0].brushes);
- tree = FaceBSP(faces);
- node = tree->headnode;
+ for ( i = 0; i < pk3TexturesN; i++ ){
+ if ( png ){
+ sprintf( temp, "%s.png", pk3Textures[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
}
- else
- {
- node = AllocNode();
- node->planenum = PLANENUM_LEAF;
- tree = AllocTree();
- tree->headnode = node;
+ sprintf( temp, "%s.tga", pk3Textures[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ sprintf( temp, "%s.jpg", pk3Textures[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
}
+ Sys_Printf( " !FAIL! %s\n", pk3Textures[i] );
+ }
- /* a minimized ClipSidesIntoTree */
- for( brush = entity->brushes; brush; brush = brush->next )
- {
- /* walk the brush sides */
- for( i = 0; i < brush->numsides; i++ )
- {
- /* get side */
- side = &brush->sides[ i ];
- if( side->winding == NULL )
- continue;
- /* shader? */
- if( side->shaderInfo == NULL )
+ Sys_Printf( "\n\tPure textures....\n" );
+
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ if ( pk3Shaders[i][0] != '\0' ){
+ if ( png ){
+ sprintf( temp, "%s.png", pk3Shaders[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
continue;
- /* save this winding as a visible surface */
- DrawSurfaceForSide(entity, brush, side, side->winding);
+ }
+ }
+ sprintf( temp, "%s.tga", pk3Shaders[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ sprintf( temp, "%s.jpg", pk3Shaders[i] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
}
+ Sys_Printf( " !FAIL! %s\n", pk3Shaders[i] );
}
+ }
- if(meta)
- {
- ClassifyEntitySurfaces(entity);
- MakeEntityDecals(entity);
- MakeEntityMetaTriangles(entity);
- SmoothMetaTriangles();
- MergeMetaTriangles();
+ Sys_Printf( "\n\tShaizers....\n" );
+
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ if ( pk3Shaderfiles[i][0] != '\0' ){
+ sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Shaders[i] );
}
- FilterDrawsurfsIntoTree(entity, tree);
+ }
- FilterStructuralBrushesIntoTree(entity, tree);
- FilterDetailBrushesIntoTree(entity, tree);
+ Sys_Printf( "\n\tSounds....\n" );
- EmitBrushes(entity->brushes, &entity->firstBrush, &entity->numBrushes );
- EndModel(entity, node);
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ if ( pk3Sounds[i][0] != '\0' ){
+ if ( vfsPackFile( pk3Sounds[ i ], packname ) ){
+ Sys_Printf( "++%s\n", pk3Sounds[ i ] );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Sounds[i] );
+ }
}
- EndBSPFile(qfalse);
-}
-/*
-ConvertBSPMain()
-main argument processing function for bsp conversion
-*/
+ Sys_Printf( "\n\tVideos....\n" );
-int ConvertBSPMain( int argc, char **argv )
-{
- int i;
- int (*convertFunc)( char * );
- game_t *convertGame;
- char ext[1024];
- qboolean map_allowed, force_bsp;
-
-
- /* set default */
- convertFunc = ConvertBSPToASE;
- convertGame = NULL;
- map_allowed = qtrue;
- force_bsp = qfalse;
-
- /* arg checking */
- if( argc < 1 )
- {
- Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
- return 0;
+ for ( i = 0; i < pk3VideosN; i++ ){
+ if ( vfsPackFile( pk3Videos[i], packname ) ){
+ Sys_Printf( "++%s\n", pk3Videos[i] );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Videos[i] );
}
-
- /* process arguments */
- for( i = 1; i < (argc - 1); i++ )
- {
- /* -format map|ase|... */
- if( !strcmp( argv[ i ], "-format" ) )
- {
- i++;
- if( !Q_stricmp( argv[ i ], "ase" ) )
- {
- convertFunc = ConvertBSPToASE;
- map_allowed = qfalse;
- }
- else if( !Q_stricmp( argv[ i ], "obj" ) )
- {
- convertFunc = ConvertBSPToOBJ;
- map_allowed = qfalse;
- }
- else if( !Q_stricmp( argv[ i ], "map_bp" ) )
- {
- convertFunc = ConvertBSPToMap_BP;
- map_allowed = qtrue;
- }
- else if( !Q_stricmp( argv[ i ], "map" ) )
- {
- convertFunc = ConvertBSPToMap;
- map_allowed = qtrue;
- }
- else
- {
- convertGame = GetGame( argv[ i ] );
- map_allowed = qfalse;
- if( convertGame == NULL )
- Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
- }
- }
- else if( !strcmp( argv[ i ], "-ne" ) )
- {
- normalEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
- }
- else if( !strcmp( argv[ i ], "-de" ) )
- {
- distanceEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
- }
- else if( !strcmp( argv[ i ], "-shadersasbitmap" ) )
- shadersAsBitmap = qtrue;
- else if( !strcmp( argv[ i ], "-lightmapsastexcoord" ) )
- lightmapsAsTexcoord = qtrue;
- else if( !strcmp( argv[ i ], "-forcereadbsp" ) )
- force_bsp = qtrue;
- else if( !strcmp( argv[ i ], "-meta" ) )
- meta = qtrue;
- else if( !strcmp( argv[ i ], "-patchmeta" ) )
- {
- meta = qtrue;
- patchMeta = qtrue;
+
+ Sys_Printf( "\n\t.\n" );
+
+ sprintf( temp, "maps/%s.bsp", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
}
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
}
- LoadShaderInfo();
-
- /* clean up map name */
- strcpy(source, ExpandArg(argv[i]));
- ExtractFileExtension(source, ext);
- if(!Q_stricmp(ext, "map") && !force_bsp)
- {
- 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);
- ParseEntities();
- }
-
- /* bsp format convert? */
- 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;
+ sprintf( temp, "maps/%s.aas", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
+ }
+
+ sprintf( temp, "scripts/%s.arena", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
+ }
+
+ sprintf( temp, "scripts/%s.defi", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
}
-
- /* normal convert */
- return convertFunc( source );
-}
+ Sys_Printf( "\nSaved to %s\n", packname );
+ /* return to sender */
+ return 0;
+}
/*
-main()
-q3map mojo...
-*/
+ main()
+ q3map mojo...
+ */
+
+int main( int argc, char **argv ){
+ int i, r;
+ double start, end;
+ extern qboolean werror;
+
-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++ )
{
+ /* -help */
+ if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" )
+ || !strcmp( argv[ i ], "-help" ) ) {
+ HelpMain(argv[i+1]);
+ return 0;
+ }
+
/* -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;
}
-
+
+ /* make all warnings into errors */
+ else if ( !strcmp( argv[ i ], "-werror" ) ) {
+ werror = 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 ] );
argv[ i ] = NULL;
}
+
+ else if( !strcmp( argv[ i ], "-nocmdline" ) )
+ {
+ Sys_Printf( "noCmdLine\n" );
+ nocmdline = qtrue;
+ argv[ i ] = NULL;
+ }
+
}
/* init model library */
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 );
-
+ Sys_Printf( "%s\n", argv[0] );
+
+ strcpy( q3map2path, argv[0] );//fuer autoPack func
+
/* 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" ) )
- r = FixAAS( argc - 1, argv + 1 );
-
+ if ( !strcmp( argv[ 1 ], "-fixaas" ) ) {
+ r = FixAASMain( argc - 1, argv + 1 );
+ }
+
/* analyze */
- else if( !strcmp( argv[ 1 ], "-analyze" ) )
- r = AnalyzeBSP( argc - 1, argv + 1 );
-
+ else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
+ r = AnalyzeBSPMain( argc - 1, argv + 1 );
+ }
+
/* info */
- else if( !strcmp( argv[ 1 ], "-info" ) )
- r = BSPInfo( argc - 2, argv + 2 );
-
+ else if ( !strcmp( argv[ 1 ], "-info" ) ) {
+ r = BSPInfoMain( 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" ) )
- {
- Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
- argv[ 1 ] = "-fast"; /* eek a hack */
+ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) {
+ Sys_FPrintf( SYS_WRN, "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" );
+ argv[ 1 ] = "-fast"; /* eek a hack */
r = LightMain( argc, argv );
}
-
+
+ /* QBall: export entities */
+ else if ( !strcmp( argv[ 1 ], "-exportents" ) ) {
+ r = ExportEntitiesMain( argc - 1, argv + 1 );
+ }
+
/* 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 );
-
+ }
+
+ /* bsp shifting */
+ else if ( !strcmp( argv[ 1 ], "-shift" ) ) {
+ r = ShiftBSPMain( argc - 1, argv + 1 );
+ }
+
+ /* autopacking */
+ else if ( !strcmp( argv[ 1 ], "-pk3" ) ) {
+ r = pk3BSPMain( 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