X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=libs%2Fpicomodel%2Fpicomodel.c;h=79655ce842689a4eaf7b4db4a746184f7e57ae60;hp=311f6de760c7791bb9e94f717d481a192c46dfdc;hb=3ad35c718a0418a388f47bc2d425e6ab3c398788;hpb=938363014f85d1ebd30bc110e3e889e4169dca21 diff --git a/libs/picomodel/picomodel.c b/libs/picomodel/picomodel.c index 311f6de7..79655ce8 100644 --- a/libs/picomodel/picomodel.c +++ b/libs/picomodel/picomodel.c @@ -991,7 +991,7 @@ void PicoSetSurfaceST( picoSurface_t *surface, int array, int num, picoVec2_t st -void PicoSetSurfaceColor( picoSurface_t *surface, int array, int num, picoColor_t color ){ +void PicoSetSurfaceColor( picoSurface_t *surface, int array, int num, const picoColor_t color ){ if ( surface == NULL || num < 0 || color == NULL ) { return; } @@ -1603,7 +1603,7 @@ picoVertexCombinationHash_t *PicoAddVertexCombinationToHashTable( picoVertexComb fixme: needs non-naive algorithm */ -int PicoFindSurfaceVertexNum( picoSurface_t *surface, picoVec3_t xyz, picoVec3_t normal, int numSTs, picoVec2_t *st, int numColors, picoColor_t *color, picoIndex_t smoothingGroup ){ +int PicoFindSurfaceVertexNum( picoSurface_t *surface, picoVec3_t xyz, picoVec3_t normal, int numSTs, picoVec2_t *st, int numColors, const picoColor_t *color, picoIndex_t smoothingGroup ){ int i, j; @@ -1647,7 +1647,7 @@ int PicoFindSurfaceVertexNum( picoSurface_t *surface, picoVec3_t xyz, picoVec3_t if ( numColors > 0 && color != NULL ) { for ( j = 0; j < numSTs; j++ ) { - if ( *( (int*) surface->color[ j ] ) != *( (int*) color[ j ] ) ) { + if ( *( (const int*) surface->color[ j ] ) != *( (const int*) color[ j ] ) ) { break; } } @@ -2248,7 +2248,7 @@ int PicoRemapModel( picoModel_t *model, char *remapFile ){ */ 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, const picoColor_t **colors, picoShader_t* shader, const char *name, picoIndex_t* smoothingGroup ){ int i,j; int vertDataIndex;