TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source
This commit is contained in:
Areloch 2019-05-11 21:42:27 -05:00
parent 60a29777fa
commit 3fa7a0d4fa
27 changed files with 171 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/T3D/gameObjects/playerObject.cpp
View file

@ -5,10 +5,10 @@ IMPLEMENT_CO_NETOBJECT_V1(PlayerObject);
PlayerObject::PlayerObject()
: mMeshComponent(nullptr),
mCollisionComponent(nullptr),
mAnimationComponent(nullptr),
//mAnimationComponent(nullptr),
mPhysicsComponent(nullptr)
{
mSuperClassName = StringTable->insert("Entity");
}
PlayerObject::~PlayerObject()
{
@ -48,7 +48,7 @@ bool PlayerObject::onAdd()
addComponent(mCollisionComponent);
//Animation
mAnimationComponent = new ActionAnimationComponent();
/*mAnimationComponent = new ActionAnimationComponent();
if (!mAnimationComponent->registerObject())
{
Con::errorf("PlayerObject::onAdd - unable to add ActionAnimationComponent!");
@ -69,7 +69,7 @@ bool PlayerObject::onAdd()
mArmAnimationComponent->setInternalName("armAnimationComponent");
addComponent(mArmAnimationComponent);
addComponent(mArmAnimationComponent);*/
//Physics control
mPhysicsComponent = new PlayerControllerComponent();
@ -162,4 +162,4 @@ bool PlayerObject::onAdd()
void PlayerObject::onRemove()
{
Parent::onRemove();
}
}