okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings that IQM blendWeights may not be initialized

Browse source
This commit is contained in:
Zack Middleton 2019-04-29 14:39:25 -05:00
parent d404519cce
commit 95b9cab4d6
2 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
code/renderergl1/tr_model_iqm.c
View file

@ -1302,19 +1302,20 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
float *nrmMat = &influenceNrmMat[9*i]; float *nrmMat = &influenceNrmMat[9*i];
int j; int j;
float blendWeights[4]; float blendWeights[4];
int numWeights;
for ( numWeights = 0; numWeights < 4; numWeights++ ) { if ( data->blendWeightsType == IQM_FLOAT ) {
if ( data->blendWeightsType == IQM_FLOAT ) blendWeights[0] = data->influenceBlendWeights.f[4*influence + 0];
blendWeights[numWeights] = data->influenceBlendWeights.f[4*influence + numWeights]; blendWeights[1] = data->influenceBlendWeights.f[4*influence + 1];
else blendWeights[2] = data->influenceBlendWeights.f[4*influence + 2];
blendWeights[numWeights] = (float)data->influenceBlendWeights.b[4*influence + numWeights] / 255.0f; blendWeights[3] = data->influenceBlendWeights.f[4*influence + 3];
} else {
if ( blendWeights[numWeights] <= 0.0f ) blendWeights[0] = (float)data->influenceBlendWeights.b[4*influence + 0] / 255.0f;
break; blendWeights[1] = (float)data->influenceBlendWeights.b[4*influence + 1] / 255.0f;
blendWeights[2] = (float)data->influenceBlendWeights.b[4*influence + 2] / 255.0f;
blendWeights[3] = (float)data->influenceBlendWeights.b[4*influence + 3] / 255.0f;
} }
if ( numWeights == 0 ) { if ( blendWeights[0] <= 0.0f ) {
// no blend joint, use identity matrix. // no blend joint, use identity matrix.
vtxMat[0] = identityMatrix[0]; vtxMat[0] = identityMatrix[0];
vtxMat[1] = identityMatrix[1]; vtxMat[1] = identityMatrix[1];
@ -1344,7 +1345,11 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10]; vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10];
vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11]; vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11];
for( j = 1; j < numWeights; j++ ) { for( j = 1; j < 3; j++ ) {
if ( blendWeights[j] <= 0.0f ) {
break;
}
vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0]; vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0];
vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1]; vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1];
vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2]; vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2];

27
code/renderergl2/tr_model_iqm.c
View file

@ -1484,19 +1484,20 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
float *nrmMat = &influenceNrmMat[9*i]; float *nrmMat = &influenceNrmMat[9*i];
int j; int j;
float blendWeights[4]; float blendWeights[4];
int numWeights;
for ( numWeights = 0; numWeights < 4; numWeights++ ) { if ( data->blendWeightsType == IQM_FLOAT ) {
if ( data->blendWeightsType == IQM_FLOAT ) blendWeights[0] = data->influenceBlendWeights.f[4*influence + 0];
blendWeights[numWeights] = data->influenceBlendWeights.f[4*influence + numWeights]; blendWeights[1] = data->influenceBlendWeights.f[4*influence + 1];
else blendWeights[2] = data->influenceBlendWeights.f[4*influence + 2];
blendWeights[numWeights] = (float)data->influenceBlendWeights.b[4*influence + numWeights] / 255.0f; blendWeights[3] = data->influenceBlendWeights.f[4*influence + 3];
} else {
if ( blendWeights[numWeights] <= 0.0f ) blendWeights[0] = (float)data->influenceBlendWeights.b[4*influence + 0] / 255.0f;
break; blendWeights[1] = (float)data->influenceBlendWeights.b[4*influence + 1] / 255.0f;
blendWeights[2] = (float)data->influenceBlendWeights.b[4*influence + 2] / 255.0f;
blendWeights[3] = (float)data->influenceBlendWeights.b[4*influence + 3] / 255.0f;
} }
if ( numWeights == 0 ) { if ( blendWeights[0] <= 0.0f ) {
// no blend joint, use identity matrix. // no blend joint, use identity matrix.
vtxMat[0] = identityMatrix[0]; vtxMat[0] = identityMatrix[0];
vtxMat[1] = identityMatrix[1]; vtxMat[1] = identityMatrix[1];
@ -1526,7 +1527,11 @@ void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10]; vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10];
vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11]; vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11];
for( j = 1; j < numWeights; j++ ) { for( j = 1; j < 3; j++ ) {
if ( blendWeights[j] <= 0.0f ) {
break;
}
vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0]; vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0];
vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1]; vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1];
vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2]; vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2];