TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 23:35:45 +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 0e6ba354db
commit ad5f583893
28 changed files with 198 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

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