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

Final Linux compliance changes(renames, tweaks for gcc compliance, etc)

Browse source
This commit is contained in:
Areloch 2016-05-29 00:58:02 -05:00
parent f5e86a83b5
commit 510b726f6f
25 changed files with 47 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/components/collision/collisionComponent.cpp
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "T3D/components/collision/collisioncomponent.h"
#include "T3D/components/collision/collisionComponent.h"
#include "T3D/components/collision/collisionComponent_ScriptBinding.h"
#include "T3D/components/physics/physicsBehavior.h"
#include "console/consoleTypes.h"

2
Engine/source/T3D/components/collision/collisionComponent_ScriptBinding.h
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
#include "console/engineAPI.h"
#include "T3D/components/collision/collisioncomponent.h"
#include "T3D/components/collision/collisionComponent.h"
#include "materials/baseMatInstance.h"
DefineConsoleMethod(CollisionComponent, getNumberOfContacts, S32, (), ,

4
Engine/source/T3D/components/collision/collisionInterfaces.cpp
View file

@ -126,7 +126,7 @@ void CollisionInterface::handleCollisionNotifyList()
mCollisionNotifyList.clear();
}
Chunker<CollisionInterface::CollisionTimeout> sTimeoutChunker;
Chunker<CollisionInterface::CollisionTimeout> sCollisionTimeoutChunker;
CollisionInterface::CollisionTimeout* CollisionInterface::sFreeTimeoutList = 0;
void CollisionInterface::queueCollision( SceneObject *obj, const VectorF &vec)
@ -174,7 +174,7 @@ void CollisionInterface::queueCollision( SceneObject *obj, const VectorF &vec)
}
else
{
ptr = sTimeoutChunker.alloc();
ptr = sCollisionTimeoutChunker.alloc();
}
ptr->object = obj;

6
Engine/source/T3D/components/collision/collisionInterfaces.h
View file

@ -82,8 +82,8 @@ public:
VectorF vector;
};
Signal< void( SceneObject* ) > CollisionInterface::onCollisionSignal;
Signal< void( SceneObject* ) > CollisionInterface::onContactSignal;
Signal< void( SceneObject* ) > onCollisionSignal;
Signal< void( SceneObject* ) > onContactSignal;
protected:
CollisionTimeout* mTimeoutList;
@ -149,7 +149,7 @@ public:
virtual PhysicsCollision* getCollisionData() = 0;
Signal< void(PhysicsCollision* collision) > CollisionInterface::onCollisionChanged;
Signal< void(PhysicsCollision* collision) > onCollisionChanged;
};
class BuildConvexInterface //: public Interface<CollisionInterface>