livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug display for baked vs. composite status, via setting DebugAvatarCompositeBaked

meow-7.2.2
Brad Payne (Vir Linden) 2012-09-05 18:25:51 -04:00
parent 825cc78732
commit 201d9853f9
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -1948,6 +1948,17 @@
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>DebugAvatarCompositeBaked</key>
<map>
<key>Comment</key>
<string>Colorize avatar meshes based on baked/composite state.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugBeaconLineWidth</key>
<map>

5
indra/newview/llviewerjointmesh.cpp
View File

@ -219,6 +219,11 @@ void LLViewerJointMesh::setColor( F32 red, F32 green, F32 blue, F32 alpha )
mColor[3] = alpha;
}
void LLViewerJointMesh::setColor( const LLColor4& color )
{
mColor = color;
}
//--------------------------------------------------------------------
// LLViewerJointMesh::getTexture()

1
indra/newview/llviewerjointmesh.h
View File

@ -99,6 +99,7 @@ public:
// Sets the shape color
void setColor( F32 red, F32 green, F32 blue, F32 alpha );
void setColor( const LLColor4& color );
// Sets the shininess
void setSpecular( const LLColor4& color, F32 shiny ) { /*mSpecular = color;*/ mShiny = shiny; };

20
indra/newview/llvoavatar.cpp
View File

@ -5763,7 +5763,7 @@ BOOL LLVOAvatar::loadMeshNodes()
// If this isn't set to white (1.0), avatars will *ALWAYS* be darker than their surroundings.
// Do not touch!!!
mesh->setColor( 1.0f, 1.0f, 1.0f, 1.0f );
mesh->setColor( LLColor4::white );
LLPolyMesh *poly_mesh = NULL;
@ -6503,7 +6503,7 @@ void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL
LLColor4 color = mTexHairColor->getColor();
for (U32 i = 0; i < mBakedTextureDatas[BAKED_HAIR].mMeshes.size(); i++)
{
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( color.mV[VX], color.mV[VY], color.mV[VZ], color.mV[VW] );
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( color );
}
}
}
@ -6764,6 +6764,10 @@ void LLVOAvatar::updateMeshTextures()
for (U32 k=0; k < mBakedTextureDatas[i].mMeshes.size(); k++)
{
mBakedTextureDatas[i].mMeshes[k]->setTexture( baked_img );
if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked"))
{
mBakedTextureDatas[i].mMeshes[k]->setColor(LLColor4::red);
}
}
}
else if (!mUseLocalAppearance && is_layer_baked[i])
@ -6794,6 +6798,10 @@ void LLVOAvatar::updateMeshTextures()
for (U32 k=0; k < mBakedTextureDatas[i].mMeshes.size(); k++)
{
mBakedTextureDatas[i].mMeshes[k]->setLayerSet( mBakedTextureDatas[i].mTexLayerSet );
if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked"))
{
mBakedTextureDatas[i].mMeshes[k]->setColor( LLColor4::yellow );
}
}
}
}
@ -6807,7 +6815,7 @@ void LLVOAvatar::updateMeshTextures()
LLViewerTexture* hair_img = getImage( TEX_HAIR, 0 );
for (U32 i = 0; i < mBakedTextureDatas[BAKED_HAIR].mMeshes.size(); i++)
{
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( color.mV[VX], color.mV[VY], color.mV[VZ], color.mV[VW] );
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( color );
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setTexture( hair_img );
}
}
@ -7721,6 +7729,10 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id )
for (U32 k = 0; k < mBakedTextureDatas[i].mMeshes.size(); k++)
{
mBakedTextureDatas[i].mMeshes[k]->setTexture( image_baked );
if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked"))
{
mBakedTextureDatas[i].mMeshes[k]->setColor( LLColor4::green );
}
}
if (mBakedTextureDatas[i].mTexLayerSet)
{
@ -7741,7 +7753,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id )
{
for (U32 i = 0; i < mBakedTextureDatas[BAKED_HAIR].mMeshes.size(); i++)
{
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( 1.f, 1.f, 1.f, 1.f );
mBakedTextureDatas[BAKED_HAIR].mMeshes[i]->setColor( LLColor4::white );
}
}
}