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

Merge pull request #356 from Azaezel/alpha40_mountchainCollisions

Browse source 
sceneobject mountchain enable/disable collision aug
This commit is contained in:
Brian Roberts 2020-10-11 16:00:56 -05:00 • committed by GitHub
commit 8a252458d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/scene/sceneObject.cpp
View file

@ -293,6 +293,8 @@ bool SceneObject::collideBox(const Point3F &start, const Point3F &end, RayInfo *
void SceneObject::disableCollision() void SceneObject::disableCollision()
{ {
for (SceneObject* ptr = getMountList(); ptr; ptr = ptr->getMountLink())
ptr->disableCollision();
mCollisionCount++; mCollisionCount++;
AssertFatal(mCollisionCount < 50, "SceneObject::disableCollision called 50 times on the same object. Is this inside a circular loop?" ); AssertFatal(mCollisionCount < 50, "SceneObject::disableCollision called 50 times on the same object. Is this inside a circular loop?" );
} }
@ -301,6 +303,8 @@ void SceneObject::disableCollision()
void SceneObject::enableCollision() void SceneObject::enableCollision()
{ {
for (SceneObject* ptr = getMountList(); ptr; ptr = ptr->getMountLink())
ptr->enableCollision();
if (mCollisionCount) if (mCollisionCount)
--mCollisionCount; --mCollisionCount;
} }