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

support non-uniform -scale

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@193 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-02-15 09:53:49 +00:00
parent d17571c17c
commit 1fe92f1474
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/quake3/q3map2/main.c
View File

@ -384,7 +384,7 @@ int ScaleBSPMain( int argc, char **argv )
vec3_t scale; vec3_t scale;
vec3_t vec; vec3_t vec;
char str[ 1024 ]; char str[ 1024 ];
int uniform; int uniform, axis;
/* arg checking */ /* arg checking */
@ -437,21 +437,34 @@ int ScaleBSPMain( int argc, char **argv )
sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] ); sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
SetKeyValue( &entities[ i ], "origin", str ); SetKeyValue( &entities[ i ], "origin", str );
} }
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 */ /* scale door lip */
f = FloatForKey( &entities[ i ], "lip" ); f = FloatForKey( &entities[ i ], "lip" );
a = FloatForKey( &entities[ i ], "angle" );
if( f ) if( f )
{ {
if(a == -1 || a == -2) // z scale f *= scale[axis];
f *= scale[2];
else if(fabs(sin(DEG2RAD(a))) < 0.707)
f *= scale[0];
else
f *= scale[1];
sprintf( str, "%f", f ); sprintf( str, "%f", f );
SetKeyValue( &entities[ i ], "lip", str ); SetKeyValue( &entities[ i ], "lip", str );
} }
/* scale plat height */
f = FloatForKey( &entities[ i ], "height" );
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 */ /* scale models */