quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crude origin brush generation when decompiling

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@247 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-04-05 15:46:06 +00:00
parent 0bfdbc954f
commit cc213a0182
2 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tools/quake3/q3map2/convert_map.c
View File

@ -145,6 +145,42 @@ exwinding:
// fprintf(stderr, "brushside with %s: %d matches (%f area)\n", buildSide->shaderInfo->shader, matches, best);
}
static void ConvertOriginBrush( FILE *f, int num, vec3_t origin )
{
char pattern[6][3][3] = {
{ "+++", "+-+", "-++" },
{ "+++", "-++", "++-" },
{ "+++", "++-", "+-+" },
{ "---", "+--", "-+-" },
{ "---", "--+", "+--" },
{ "---", "-+-", "--+" }
};
int i;
/* start brush */
fprintf( f, "\t// brush %d\n", num );
fprintf( f, "\t{\n" );
fprintf( f, "\tbrushDef\n" );
fprintf( f, "\t{\n" );
/* print brush side */
/* ( 640 24 -224 ) ( 448 24 -224 ) ( 448 -232 -224 ) common/caulk 0 48 0 0.500000 0.500000 0 0 0 */
for(i = 0; i < 6; ++i)
fprintf( f, "\t\t( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( %.3f %.3f %.3f ) ( ( %.8f %.8f %.8f ) ( %.8f %.8f %.8f ) ) %s %d 0 0\n",
origin[0] + (pattern[i][0][0] == '+' ? +8 : -8), origin[1] + (pattern[i][0][1] == '+' ? +8 : -8), origin[2] + (pattern[i][0][2] == '+' ? +8 : -8),
origin[0] + (pattern[i][1][0] == '+' ? +8 : -8), origin[1] + (pattern[i][1][1] == '+' ? +8 : -8), origin[2] + (pattern[i][1][2] == '+' ? +8 : -8),
origin[0] + (pattern[i][2][0] == '+' ? +8 : -8), origin[1] + (pattern[i][2][1] == '+' ? +8 : -8), origin[2] + (pattern[i][2][2] == '+' ? +8 : -8),
1/64.0, 0.0, 0.0, // TODO make these show the actual "ORIGIN" text properly
0.0, 1/64.0, 0.0,
"common/origin",
0
);
/* end brush */
fprintf( f, "\t}\n" );
fprintf( f, "\t}\n\n" );
}
static void ConvertBrush( FILE *f, int num, bspBrush_t *brush, vec3_t origin )
{
int i, j;
@ -491,6 +527,9 @@ static void ConvertModel( FILE *f, bspModel_t *model, int modelNum, vec3_t origi
buildBrush->entityNum = 0;
buildBrush->original = buildBrush;
if(origin[0] != 0 || origin[1] != 0 || origin[2] != 0)
ConvertOriginBrush(f, -1, origin);
/* go through each brush in the model */
for( i = 0; i < model->numBSPBrushes; i++ )
{
@ -521,7 +560,7 @@ ConvertEPairs()
exports entity key/value pairs to a map file
*/
static void ConvertEPairs( FILE *f, entity_t *e )
static void ConvertEPairs( FILE *f, entity_t *e, qboolean skip_origin )
{
epair_t *ep;
@ -537,6 +576,10 @@ static void ConvertEPairs( FILE *f, entity_t *e )
if( !Q_stricmp( ep->key, "model" ) && ep->value[ 0 ] == '*' )
continue;
/* ignore origin keys if skip_origin is set */
if( skip_origin && !Q_stricmp( ep->key, "origin" ) )
continue;
/* emit the epair */
fprintf( f, "\t\"%s\" \"%s\"\n", ep->key, ep->value );
}
@ -590,10 +633,6 @@ int ConvertBSPToMap( char *bspName )
fprintf( f, "// entity %d\n", i );
fprintf( f, "{\n" );
/* export keys */
ConvertEPairs( f, e );
fprintf( f, "\n" );
/* get model num */
if( i == 0 )
modelNum = 0;
@ -606,6 +645,10 @@ int ConvertBSPToMap( char *bspName )
modelNum = -1;
}
/* export keys */
ConvertEPairs( f, e, modelNum >= 0 );
fprintf( f, "\n" );
/* only handle bsp models */
if( modelNum >= 0 )
{

6
tools/quake3/q3map2/portals.c
View File

@ -668,9 +668,15 @@ qboolean FloodEntities( tree_t *tree )
/* get origin */
GetVectorForKey( e, "origin", origin );
/* as a special case, allow origin-less entities */
if( VectorCompare( origin, vec3_origin ) )
continue;
/* also allow bmodel entities outside, as they could be on a moving path that will go into the map */
if( e->brushes != NULL || e->patches != NULL )
continue;
/* handle skybox entities */
value = ValueForKey( e, "classname" );
if( !Q_stricmp( value, "_skybox" ) )