TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed the fadeout coloration when using textures, as well as some cleanup for the code.

Browse source
This commit is contained in:
Areloch 2017-01-23 18:52:30 -06:00
parent ec8b657b71
commit 80a2a8c29a
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Engine/source/T3D/fx/lightning.cpp
View file

@ -200,7 +200,7 @@ void LightningStrikeEvent::unpack(NetConnection* con, BitStream* stream)
{ {
if(!stream->readFlag()) if(!stream->readFlag())
return; return;
S32 mClientId = stream->readRangedU32(0, NetConnection::MaxGhostCount); mClientId = stream->readRangedU32(0, NetConnection::MaxGhostCount);
mLightning = NULL; mLightning = NULL;
NetObject* pObject = con->resolveGhost(mClientId); NetObject* pObject = con->resolveGhost(mClientId);
if (pObject) if (pObject)
@ -214,10 +214,10 @@ void LightningStrikeEvent::unpack(NetConnection* con, BitStream* stream)
// target id // target id
S32 mTargetID = stream->readRangedU32(0, NetConnection::MaxGhostCount); S32 mTargetID = stream->readRangedU32(0, NetConnection::MaxGhostCount);
NetObject* pObject = con->resolveGhost(mTargetID); NetObject* tObject = con->resolveGhost(mTargetID);
if( pObject != NULL ) if(tObject != NULL )
{ {
mTarget = dynamic_cast<SceneObject*>(pObject); mTarget = dynamic_cast<SceneObject*>(tObject);
} }
if( bool(mTarget) == false ) if( bool(mTarget) == false )
{ {
@ -325,7 +325,8 @@ void LightningData::packData(BitStream* stream)
stream->writeInt(mNumStrikeTextures, 4); stream->writeInt(mNumStrikeTextures, 4);
for (i = 0; i < MaxTextures; i++) { for (i = 0; i < MaxTextures; i++)
{
stream->writeString(strikeTextureNames[i]); stream->writeString(strikeTextureNames[i]);
} }
@ -342,7 +343,8 @@ void LightningData::unpackData(BitStream* stream)
mNumStrikeTextures = stream->readInt(4); mNumStrikeTextures = stream->readInt(4);
for (i = 0; i < MaxTextures; i++) { for (i = 0; i < MaxTextures; i++)
{
strikeTextureNames[i] = stream->readSTString(); strikeTextureNames[i] = stream->readSTString();
} }
@ -379,16 +381,16 @@ Lightning::~Lightning()
{ {
while( mThunderListHead ) while( mThunderListHead )
{ {
Thunder* next = mThunderListHead->next; Thunder* nextThunder = mThunderListHead->next;
delete mThunderListHead; delete mThunderListHead;
mThunderListHead = next; mThunderListHead = nextThunder;
} }
while( mStrikeListHead ) while( mStrikeListHead )
{ {
Strike* next = mStrikeListHead->next; Strike* nextStrike = mStrikeListHead->next;
delete mStrikeListHead; delete mStrikeListHead;
mStrikeListHead = next; mStrikeListHead = nextStrike;
} }
} }
@ -489,6 +491,7 @@ void Lightning::renderObject(ObjectRenderInst *ri, SceneRenderState *state, Base
desc.setBlend( true, GFXBlendSrcAlpha, GFXBlendOne); desc.setBlend( true, GFXBlendSrcAlpha, GFXBlendOne);
desc.setCullMode(GFXCullNone); desc.setCullMode(GFXCullNone);
desc.zWriteEnable = false; desc.zWriteEnable = false;
desc.vertexColorEnable = true;
if (mDataBlock->mNumStrikeTextures != 0) if (mDataBlock->mNumStrikeTextures != 0)
{ {
@ -518,7 +521,7 @@ void Lightning::renderObject(ObjectRenderInst *ri, SceneRenderState *state, Base
GFX->setTexture(0, mDataBlock->strikeTextures[0]); GFX->setTexture(0, mDataBlock->strikeTextures[0]);
} }
for( U32 i=0; i<3; i++ ) for( U32 i=0; i<MAX_LIGHTNING; i++ )
{ {
if( walk->bolt[i].isFading ) if( walk->bolt[i].isFading )
{ {
@ -611,7 +614,7 @@ void Lightning::advanceTime(F32 dt)
while (*pWalker != NULL) { while (*pWalker != NULL) {
Strike* pStrike = *pWalker; Strike* pStrike = *pWalker;
for( U32 i=0; i<3; i++ ) for( U32 i=0; i<MAX_LIGHTNING; i++ )
{ {
pStrike->bolt[i].update( dt ); pStrike->bolt[i].update( dt );
} }
@ -695,7 +698,7 @@ void Lightning::processEvent(LightningStrikeEvent* pEvent)
pStrike->currentAge = 0.0f; pStrike->currentAge = 0.0f;
pStrike->next = mStrikeListHead; pStrike->next = mStrikeListHead;
for( U32 i=0; i<3; i++ ) for( U32 i=0; i<MAX_LIGHTNING; i++ )
{ {
F32 randStart = boltStartRadius; F32 randStart = boltStartRadius;
F32 height = mObjScale.z * 0.5f + getPosition().z; F32 height = mObjScale.z * 0.5f + getPosition().z;
@ -887,6 +890,7 @@ U32 Lightning::packUpdate(NetConnection* con, U32 mask, BitStream* stream)
stream->write(color.red); stream->write(color.red);
stream->write(color.green); stream->write(color.green);
stream->write(color.blue); stream->write(color.blue);
stream->write(color.alpha);
stream->write(fadeColor.red); stream->write(fadeColor.red);
stream->write(fadeColor.green); stream->write(fadeColor.green);
stream->write(fadeColor.blue); stream->write(fadeColor.blue);
@ -918,6 +922,7 @@ void Lightning::unpackUpdate(NetConnection* con, BitStream* stream)
stream->read(&color.red); stream->read(&color.red);
stream->read(&color.green); stream->read(&color.green);
stream->read(&color.blue); stream->read(&color.blue);
stream->read(&color.alpha);
stream->read(&fadeColor.red); stream->read(&fadeColor.red);
stream->read(&fadeColor.green); stream->read(&fadeColor.green);
stream->read(&fadeColor.blue); stream->read(&fadeColor.blue);
@ -953,7 +958,7 @@ DefineEngineMethod(Lightning, strikeRandomPoint, void, (),,
object->strikeRandomPoint(); object->strikeRandomPoint();
} }
DefineEngineMethod(Lightning, strikeObject, void, (ShapeBase* pSB),, DefineEngineMethod(Lightning, strikeObject, void, (ShapeBase* pSB), (nullAsType<ShapeBase*>()),
"Creates a LightningStrikeEvent which strikes a specific object.\n" "Creates a LightningStrikeEvent which strikes a specific object.\n"
"@note This method is currently unimplemented.\n" ) "@note This method is currently unimplemented.\n" )
{ {
@ -1177,7 +1182,7 @@ void LightningBolt::generateMinorNodes()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Recursive algo to create bolts that split off from main bolt // Recursive algo to create bolts that split off from main bolt
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPoint, U32 depth, F32 width ) void LightningBolt::createSplit( const Point3F &startingPoint, const Point3F &endingPoint, U32 depth, F32 splitWidth )
{ {
if( depth == 0 ) if( depth == 0 )
return; return;
@ -1186,17 +1191,17 @@ void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPo
if( chanceToEnd > 0.70f ) if( chanceToEnd > 0.70f )
return; return;
if( width < 0.75f ) if(splitWidth < 0.75f )
width = 0.75f; splitWidth = 0.75f;
VectorF diff = endPoint - startPoint; VectorF diff = endingPoint - startingPoint;
F32 length = diff.len(); F32 length = diff.len();
diff.normalizeSafe(); diff.normalizeSafe();
LightningBolt newBolt; LightningBolt newBolt;
newBolt.startPoint = startPoint; newBolt.startPoint = startingPoint;
newBolt.endPoint = endPoint; newBolt.endPoint = endingPoint;
newBolt.width = width; newBolt.width = splitWidth;
newBolt.numMajorNodes = 3; newBolt.numMajorNodes = 3;
newBolt.maxMajorAngle = 30.0f; newBolt.maxMajorAngle = 30.0f;
newBolt.numMinorNodes = 3; newBolt.numMinorNodes = 3;
@ -1207,13 +1212,13 @@ void LightningBolt::createSplit( const Point3F &startPoint, const Point3F &endPo
splitList.pushBack( newBolt ); splitList.pushBack( newBolt );
VectorF newDir1 = MathUtils::randomDir( diff, 10.0f, 45.0f ); VectorF newDir1 = MathUtils::randomDir( diff, 10.0f, 45.0f );
Point3F newEndPoint1 = endPoint + newDir1 * gRandGen.randF( 0.5f, 1.5f ) * length; Point3F newEndPoint1 = endingPoint + newDir1 * gRandGen.randF( 0.5f, 1.5f ) * length;
VectorF newDir2 = MathUtils::randomDir( diff, 10.0f, 45.0f ); VectorF newDir2 = MathUtils::randomDir( diff, 10.0f, 45.0f );
Point3F newEndPoint2 = endPoint + newDir2 * gRandGen.randF( 0.5f, 1.5f ) * length; Point3F newEndPoint2 = endingPoint + newDir2 * gRandGen.randF( 0.5f, 1.5f ) * length;
createSplit( endPoint, newEndPoint1, depth - 1, width * 0.30f ); createSplit(endingPoint, newEndPoint1, depth - 1, splitWidth * 0.30f );
createSplit( endPoint, newEndPoint2, depth - 1, width * 0.30f ); createSplit(endingPoint, newEndPoint2, depth - 1, splitWidth * 0.30f );
} }

1
Engine/source/T3D/fx/lightning.h
View file

@ -47,6 +47,7 @@ class ShapeBase;
class LightningStrikeEvent; class LightningStrikeEvent;
class SFXTrack; class SFXTrack;
#define MAX_LIGHTNING 3
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
class LightningData : public GameBaseData class LightningData : public GameBaseData