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

ASE support: support *node_name

Browse Source
This commit is contained in:
Rudolf Polzer 2011-06-05 18:57:26 +02:00
parent bbce294abb
commit 5fe03b9130
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/picomodel/picomodel.c
View File

@ -2214,7 +2214,7 @@ Chooses an appropriate surface based on the shader, or adds a new surface if nec
void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals, void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t** normals,
int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors, int numSTs, picoVec2_t **st, int numColors, picoColor_t **colors,
picoShader_t* shader, picoIndex_t* smoothingGroup ) picoShader_t* shader, const char *name, picoIndex_t* smoothingGroup )
{ {
int i,j; int i,j;
int vertDataIndex; int vertDataIndex;
@ -2224,6 +2224,7 @@ void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t**
for ( i = 0 ; i < model->numSurfaces ; i++ ) for ( i = 0 ; i < model->numSurfaces ; i++ )
{ {
workSurface = model->surface[i]; workSurface = model->surface[i];
if ( !name || !strcmp(workSurface->name, name) )
if ( workSurface->shader == shader ) if ( workSurface->shader == shader )
{ {
break; break;
@ -2243,7 +2244,7 @@ void PicoAddTriangleToModel( picoModel_t *model, picoVec3_t** xyz, picoVec3_t**
/* do surface setup */ /* do surface setup */
PicoSetSurfaceType( workSurface, PICO_TRIANGLES ); PicoSetSurfaceType( workSurface, PICO_TRIANGLES );
PicoSetSurfaceName( workSurface, shader->name ); PicoSetSurfaceName( workSurface, name ? name : shader->name );
PicoSetSurfaceShader( workSurface, shader ); PicoSetSurfaceShader( workSurface, shader );
} }

8
libs/picomodel/pm_ase.c
View File

@ -452,7 +452,7 @@ static void _ase_submit_triangles_unshared ( picoModel_t* model , aseMaterial_t*
#endif #endif
static void _ase_submit_triangles( picoModel_t* model , aseMaterial_t* materials , aseVertex_t* vertices, aseTexCoord_t* texcoords, aseColor_t* colors, aseFace_t* faces, int numFaces ) static void _ase_submit_triangles( picoModel_t* model , aseMaterial_t* materials , aseVertex_t* vertices, aseTexCoord_t* texcoords, aseColor_t* colors, aseFace_t* faces, int numFaces, const char *name )
{ {
aseFacesIter_t i = faces, end = faces + numFaces; aseFacesIter_t i = faces, end = faces + numFaces;
for(; i != end; ++i) for(; i != end; ++i)
@ -492,7 +492,7 @@ static void _ase_submit_triangles( picoModel_t* model , aseMaterial_t* materials
} }
/* submit the triangle to the model */ /* submit the triangle to the model */
PicoAddTriangleToModel ( model , xyz , normal , 1 , st , 1 , color , subMtl->shader, smooth ); PicoAddTriangleToModel ( model , xyz , normal , 1 , st , 1 , color , subMtl->shader, name, smooth );
} }
} }
} }
@ -599,7 +599,7 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD )
else if (!_pico_stricmp(p->token,"*mesh")) else if (!_pico_stricmp(p->token,"*mesh"))
{ {
/* finish existing surface */ /* finish existing surface */
_ase_submit_triangles(model, materials, vertices, texcoords, colors, faces, numFaces); _ase_submit_triangles(model, materials, vertices, texcoords, colors, faces, numFaces, lastNodeName);
_pico_free(faces); _pico_free(faces);
_pico_free(vertices); _pico_free(vertices);
_pico_free(texcoords); _pico_free(texcoords);
@ -1152,7 +1152,7 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD )
} }
/* ydnar: finish existing surface */ /* ydnar: finish existing surface */
_ase_submit_triangles(model, materials, vertices, texcoords, colors, faces, numFaces); _ase_submit_triangles(model, materials, vertices, texcoords, colors, faces, numFaces, lastNodeName);
_pico_free(faces); _pico_free(faces);
_pico_free(vertices); _pico_free(vertices);
_pico_free(texcoords); _pico_free(texcoords);