TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 20:40:35 +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/aiPlayerObject.cpp
View file

@ -3,9 +3,9 @@
IMPLEMENT_CO_NETOBJECT_V1(AIPlayerObject);
AIPlayerObject::AIPlayerObject()
: mAIControllerComponent(nullptr)
//: mAIControllerComponent(nullptr)
{
mSuperClassName = StringTable->insert("Entity");
}
AIPlayerObject::~AIPlayerObject()
{
@ -21,7 +21,7 @@ bool AIPlayerObject::onAdd()
if (!mDirtyGameObject)
{
//AI Controller
mAIControllerComponent = new AIControllerComponent();
/*mAIControllerComponent = new AIControllerComponent();
if (!mAIControllerComponent->registerObject())
{
Con::errorf("PlayerObject::onAdd - unable to add mAIControllerComponent!");
@ -30,7 +30,7 @@ bool AIPlayerObject::onAdd()
mAIControllerComponent->setInternalName("aiControllerComponent");
addComponent(mAIControllerComponent);
addComponent(mAIControllerComponent);*/
}
return true;
@ -39,4 +39,4 @@ bool AIPlayerObject::onAdd()
void AIPlayerObject::onRemove()
{
Parent::onRemove();
}
}

6
Engine/source/T3D/gameObjects/aiPlayerObject.h
View file

@ -1,13 +1,13 @@
#pragma once
#include "playerObject.h"
#include "T3D/components/ai/aiControllerComponent.h"
//#include "T3D/components/ai/aiControllerComponent.h"
class AIPlayerObject : public PlayerObject
{
typedef PlayerObject Parent;
AIControllerComponent* mAIControllerComponent;
//AIControllerComponent* mAIControllerComponent;
public:
AIPlayerObject();
@ -17,4 +17,4 @@ public:
virtual void onRemove();
DECLARE_CONOBJECT(AIPlayerObject);
};
};

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();
}
}

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

@ -3,8 +3,8 @@
#include "T3D/entity.h"
#include "T3D/components/render/meshComponent.h"
#include "T3D/components/collision/shapeCollisionComponent.h"
#include "T3D/components/animation/actionAnimationComponent.h"
#include "T3D/components/animation/armAnimationComponent.h"
//#include "T3D/components/animation/actionAnimationComponent.h"
//#include "T3D/components/animation/armAnimationComponent.h"
#include "T3D/components/physics/playerControllerComponent.h"
#include "T3D/components/game/stateMachineComponent.h"
#include "T3D/components/camera/cameraComponent.h"
@ -19,8 +19,8 @@ class PlayerObject : public Entity
MeshComponent* mMeshComponent;
ShapeCollisionComponent* mCollisionComponent;
ActionAnimationComponent* mAnimationComponent;
ArmAnimationComponent* mArmAnimationComponent;
//ActionAnimationComponent* mAnimationComponent;
//ArmAnimationComponent* mArmAnimationComponent;
PlayerControllerComponent* mPhysicsComponent;
StateMachineComponent* mStateMachineComponent;
CameraComponent* mCameraComponent;
@ -37,4 +37,4 @@ public:
virtual void onRemove();
DECLARE_CONOBJECT(PlayerObject);
};
};

6
Engine/source/T3D/gameObjects/soundEmitterObject.cpp
View file

@ -1,11 +1,11 @@
#include "SoundEmitterObject.h"
#include "soundEmitterObject.h"
IMPLEMENT_CO_NETOBJECT_V1(SoundEmitterObject);
SoundEmitterObject::SoundEmitterObject()
: mSoundComponent(nullptr)
{
mSuperClassName = StringTable->insert("Entity");
}
SoundEmitterObject::~SoundEmitterObject()
{
@ -35,4 +35,4 @@ bool SoundEmitterObject::onAdd()
void SoundEmitterObject::onRemove()
{
Parent::onRemove();
}
}

4
Engine/source/T3D/gameObjects/soundEmitterObject.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "T3D/entity.h"
#include "T3D/components/audio/soundComponent.h"
#include "T3D/components/audio/SoundComponent.h"
class SoundEmitterObject : public Entity
{
@ -17,4 +17,4 @@ public:
virtual void onRemove();
DECLARE_CONOBJECT(SoundEmitterObject);
};
};

3
Engine/source/T3D/gameObjects/staticShapeObject.cpp
View file

@ -7,7 +7,6 @@ StaticShapeObject::StaticShapeObject()
mCollisionComponent(nullptr),
mAnimationComponent(nullptr)
{
}
StaticShapeObject::~StaticShapeObject()
{
@ -65,4 +64,4 @@ bool StaticShapeObject::onAdd()
void StaticShapeObject::onRemove()
{
Parent::onRemove();
}
}