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

misc_model: also support _skin name; also support frame field name

Browse Source
This commit is contained in:
Rudolf Polzer 2011-06-05 20:36:09 +02:00
parent bf4ab34b0a
commit 11186bfec5
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1220,7 +1220,11 @@ static void PopulateTraceNodes( void )
/* external model */ /* external model */
default: default:
frame = IntForKey( e, "_frame" ); frame = 0;
if(strcmp("", ValueForKey( e, "_frame")))
frame = IntForKey(e, "_frame");
else if(strcmp("", ValueForKey( e, "frame")))
frame = IntForKey(e, "frame");
model = LoadModel( value, frame ); model = LoadModel( value, frame );
if( model == NULL ) if( model == NULL )
continue; continue;

12
tools/quake3/q3map2/model.c
View File

@ -747,7 +747,11 @@ void AddTriangleModels( entity_t *e )
} }
/* get model frame */ /* get model frame */
frame = IntForKey( e2, "_frame" ); frame = 0;
if(strcmp("", ValueForKey( e2, "_frame")))
frame = IntForKey(e2, "_frame");
else if(strcmp("", ValueForKey( e2, "frame")))
frame = IntForKey(e2, "frame");
/* worldspawn (and func_groups) default to cast/recv shadows in worldspawn group */ /* worldspawn (and func_groups) default to cast/recv shadows in worldspawn group */
if( e == entities ) if( e == entities )
@ -888,7 +892,11 @@ void AddTriangleModels( entity_t *e )
if( shadeAngle > 0.0f ) if( shadeAngle > 0.0f )
Sys_Printf( "misc_model has shading angle of %.4f\n", shadeAngle ); Sys_Printf( "misc_model has shading angle of %.4f\n", shadeAngle );
skin = IntForKey(e2, "skin"); skin = 0;
if(strcmp("", ValueForKey( e2, "_skin")))
skin = IntForKey(e2, "_skin");
else if(strcmp("", ValueForKey( e2, "skin")))
skin = IntForKey(e2, "skin");
/* insert the model */ /* insert the model */
InsertModel( model, skin, frame, transform, remap, celShader, mapEntityNum, castShadows, recvShadows, spawnFlags, lightmapScale, lightmapSampleSize, shadeAngle ); InsertModel( model, skin, frame, transform, remap, celShader, mapEntityNum, castShadows, recvShadows, spawnFlags, lightmapScale, lightmapSampleSize, shadeAngle );