Renamed LOD to Fade.

This commit is contained in:
Vincent Gee 2014-11-20 08:00:26 -05:00
parent 7b05314901
commit c5f81a85f5
2 changed files with 43 additions and 43 deletions

View file

@ -111,11 +111,11 @@ TSStatic::TSStatic()
mMeshCulling = false; mMeshCulling = false;
mUseOriginSort = false; mUseOriginSort = false;
mUseAlphaLod = false; mUseAlphaFade = false;
mAlphaLODStart = 100.0f; mAlphaFadeStart = 100.0f;
mAlphaLODEnd = 150.0f; mAlphaFadeEnd = 150.0f;
mInvertAlphaLod = false; mInvertAlphaFade = false;
mAlphaLOD = 1.0f; mAlphaFade = 1.0f;
mPhysicsRep = NULL; mPhysicsRep = NULL;
mCollisionType = CollisionMesh; mCollisionType = CollisionMesh;
@ -197,12 +197,12 @@ void TSStatic::initPersistFields()
endGroup("Collision"); endGroup("Collision");
addGroup( "AlphaLOD" ); addGroup( "AlphaFade" );
addField( "ALODEnable", TypeBool, Offset(mUseAlphaLod, TSStatic), "Turn on/off AlphaLod" ); addField( "Alpha Fade Enable", TypeBool, Offset(mUseAlphaFade, TSStatic), "Turn on/off Alpha Fade" );
addField( "ALODStart", TypeF32, Offset(mAlphaLODStart, TSStatic), "Distance of start AlphaLOD" ); addField( "Alpha Fade Start", TypeF32, Offset(mAlphaFadeStart, TSStatic), "Distance of start Alpha Fade" );
addField( "ALODEnd", TypeF32, Offset(mAlphaLODEnd, TSStatic), "Distance of end AlphaLOD" ); addField( "Alpha Fade End", TypeF32, Offset(mAlphaFadeEnd, TSStatic), "Distance of end Alpha Fade" );
addField( "ALODInverse", TypeBool, Offset(mInvertAlphaLod, TSStatic), "Invert AlphaLOD's Start & End Distance" ); addField( "Alpha Fade Inverse", TypeBool, Offset(mInvertAlphaFade, TSStatic), "Invert Alpha Fade's Start & End Distance" );
endGroup( "AlphaLOD" ); endGroup( "AlphaFade" );
addGroup("Debug"); addGroup("Debug");
@ -514,31 +514,31 @@ void TSStatic::prepRenderImage( SceneRenderState* state )
if (dist < 0.01f) if (dist < 0.01f)
dist = 0.01f; dist = 0.01f;
if (mUseAlphaLod) if (mUseAlphaFade)
{ {
mAlphaLOD = 1.0f; mAlphaFade = 1.0f;
if ((mAlphaLODStart < mAlphaLODEnd) && mAlphaLODStart > 0.1f) if ((mAlphaFadeStart < mAlphaFadeEnd) && mAlphaFadeStart > 0.1f)
{ {
if (mInvertAlphaLod) if (mInvertAlphaFade)
{ {
if (dist <= mAlphaLODStart) if (dist <= mAlphaFadeStart)
{ {
return; return;
} }
if (dist < mAlphaLODEnd) if (dist < mAlphaFadeEnd)
{ {
mAlphaLOD = ((dist - mAlphaLODStart) / (mAlphaLODEnd - mAlphaLODStart)); mAlphaFade = ((dist - mAlphaFadeStart) / (mAlphaFadeEnd - mAlphaFadeStart));
} }
} }
else else
{ {
if (dist >= mAlphaLODEnd) if (dist >= mAlphaFadeEnd)
{ {
return; return;
} }
if (dist > mAlphaLODStart) if (dist > mAlphaFadeStart)
{ {
mAlphaLOD -= ((dist - mAlphaLODStart) / (mAlphaLODEnd - mAlphaLODStart)); mAlphaFade -= ((dist - mAlphaFadeStart) / (mAlphaFadeEnd - mAlphaFadeStart));
} }
} }
} }
@ -589,14 +589,14 @@ void TSStatic::prepRenderImage( SceneRenderState* state )
mShapeInstance->animate(); mShapeInstance->animate();
if(mShapeInstance) if(mShapeInstance)
{ {
if (mUseAlphaLod) if (mUseAlphaFade)
{ {
mShapeInstance->setAlphaAlways(mAlphaLOD); mShapeInstance->setAlphaAlways(mAlphaFade);
S32 s = mShapeInstance->mMeshObjects.size(); S32 s = mShapeInstance->mMeshObjects.size();
for(S32 x = 0; x < s; x++) for(S32 x = 0; x < s; x++)
{ {
mShapeInstance->mMeshObjects[x].visible = mAlphaLOD; mShapeInstance->mMeshObjects[x].visible = mAlphaFade;
} }
} }
} }
@ -680,11 +680,11 @@ U32 TSStatic::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
stream->writeFlag( mPlayAmbient ); stream->writeFlag( mPlayAmbient );
if ( stream->writeFlag(mUseAlphaLod) ) if ( stream->writeFlag(mUseAlphaFade) )
{ {
stream->write(mAlphaLODStart); stream->write(mAlphaFadeStart);
stream->write(mAlphaLODEnd); stream->write(mAlphaFadeEnd);
stream->write(mInvertAlphaLod); stream->write(mInvertAlphaFade);
} }
if ( mLightPlugin ) if ( mLightPlugin )
@ -744,12 +744,12 @@ void TSStatic::unpackUpdate(NetConnection *con, BitStream *stream)
mPlayAmbient = stream->readFlag(); mPlayAmbient = stream->readFlag();
mUseAlphaLod = stream->readFlag(); mUseAlphaFade = stream->readFlag();
if (mUseAlphaLod) if (mUseAlphaFade)
{ {
stream->read(&mAlphaLODStart); stream->read(&mAlphaFadeStart);
stream->read(&mAlphaLODEnd); stream->read(&mAlphaFadeEnd);
stream->read(&mInvertAlphaLod); stream->read(&mInvertAlphaFade);
} }
if ( mLightPlugin ) if ( mLightPlugin )

View file

@ -97,12 +97,12 @@ class TSStatic : public SceneObject
}; };
public: public:
void setAlphaLOD(bool enable, F32 start, F32 end, bool inverse) void setAlphaFade(bool enable, F32 start, F32 end, bool inverse)
{ {
mUseAlphaLod = enable; mUseAlphaFade = enable;
mAlphaLODStart = start; mAlphaFadeStart = start;
mAlphaLODEnd = end; mAlphaFadeEnd = end;
mInvertAlphaLod = inverse; mInvertAlphaFade = inverse;
} }
/// The different types of mesh data types /// The different types of mesh data types
@ -115,11 +115,11 @@ public:
}; };
protected: protected:
bool mUseAlphaLod; bool mUseAlphaFade;
F32 mAlphaLODStart; F32 mAlphaFadeStart;
F32 mAlphaLODEnd; F32 mAlphaFadeEnd;
F32 mAlphaLOD; F32 mAlphaFade;
bool mInvertAlphaLod; bool mInvertAlphaFade;
bool onAdd(); bool onAdd();
void onRemove(); void onRemove();