TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tabs vs space, fix net strikepoints

Browse source
This commit is contained in:
Johxz 2017-02-03 18:23:34 -06:00
parent 3cd82d9229
commit 84f610f2f2
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -870,9 +870,14 @@ void Lightning::strikeObject(ShapeBase* targetObj)
Point3F strikePoint = targetObj->getPosition(); Point3F strikePoint = targetObj->getPosition();
Point3F objectCenter; Point3F objectCenter;
targetObj->getObjBox().getCenter(&objectCenter); Box3F wb = getWorldBox();
objectCenter.convolve(targetObj->getScale()); if (!wb.isContained(strikePoint))
targetObj->getTransform().mulP(objectCenter); return;
Point3F targetRel = strikePoint - getPosition();
Point3F length(wb.len_x() / 2.0f, wb.len_y() / 2.0f, wb.len_z() / 2.0f);
Point3F strikePos = targetRel / length;
bool playerInWarmup = false; bool playerInWarmup = false;
Player *playerObj = dynamic_cast< Player * >(targetObj); Player *playerObj = dynamic_cast< Player * >(targetObj);
@ -886,7 +891,7 @@ void Lightning::strikeObject(ShapeBase* targetObj)
if (!playerInWarmup) if (!playerInWarmup)
{ {
applyDamage_callback(objectCenter, VectorF(0.0, 0.0, 1.0), targetObj); applyDamage_callback(targetObj->getWorldSphere().center, VectorF(0.0, 0.0, 1.0), targetObj);
} }
SimGroup* pClientGroup = Sim::getClientGroup(); SimGroup* pClientGroup = Sim::getClientGroup();
@ -906,7 +911,6 @@ void Lightning::strikeObject(ShapeBase* targetObj)
} }
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
U32 Lightning::packUpdate(NetConnection* con, U32 mask, BitStream* stream) U32 Lightning::packUpdate(NetConnection* con, U32 mask, BitStream* stream)
{ {