GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Serialize UpDirection.

Browse Source
This commit is contained in:
Jean-Baptiste Perrier
2021-04-07 17:01:37 +02:00
parent 2524d93f6b
commit 60e926a62f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Physics/Colliders/CharacterController.cpp
View File

@@ -22,6 +22,7 @@ CharacterController::CharacterController(const SpawnParams& params)
, _radius(50.0f) , _radius(50.0f)
, _height(150.0f) , _height(150.0f)
, _minMoveDistance(0.0f) , _minMoveDistance(0.0f)
, _upDirection(Vector3::Up)
, _isUpdatingTransform(false) , _isUpdatingTransform(false)
, _nonWalkableMode(CharacterController::NonWalkableModes::PreventClimbing) , _nonWalkableMode(CharacterController::NonWalkableModes::PreventClimbing)
, _lastFlags(CollisionFlags::None) , _lastFlags(CollisionFlags::None)
@@ -86,6 +87,7 @@ void CharacterController::SetUpDirection(const Vector3& up)
{ {
if (_controller) if (_controller)
_controller->setUpDirection(C2P(up)); _controller->setUpDirection(C2P(up));
_upDirection = up;
} }
Vector3 CharacterController::GetUpDirection() const Vector3 CharacterController::GetUpDirection() const
@@ -191,6 +193,7 @@ void CharacterController::CreateActor()
// Create controller // Create controller
_controller = (PxCapsuleController*)Physics::GetControllerManager()->createController(desc); _controller = (PxCapsuleController*)Physics::GetControllerManager()->createController(desc);
ASSERT(_controller); ASSERT(_controller);
_controller->setUpDirection(C2P(_upDirection));
const auto actor = _controller->getActor(); const auto actor = _controller->getActor();
ASSERT(actor && actor->getNbShapes() == 1); ASSERT(actor && actor->getNbShapes() == 1);
actor->getShapes(&_shape, 1); actor->getShapes(&_shape, 1);
@@ -374,6 +377,7 @@ void CharacterController::Serialize(SerializeStream& stream, const void* otherOb
SERIALIZE_MEMBER(Radius, _radius); SERIALIZE_MEMBER(Radius, _radius);
SERIALIZE_MEMBER(Height, _height); SERIALIZE_MEMBER(Height, _height);
SERIALIZE_MEMBER(MinMoveDistance, _minMoveDistance); SERIALIZE_MEMBER(MinMoveDistance, _minMoveDistance);
SERIALIZE_MEMBER(UpDirection, _upDirection);
} }
void CharacterController::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) void CharacterController::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
@@ -387,4 +391,5 @@ void CharacterController::Deserialize(DeserializeStream& stream, ISerializeModif
DESERIALIZE_MEMBER(Radius, _radius); DESERIALIZE_MEMBER(Radius, _radius);
DESERIALIZE_MEMBER(Height, _height); DESERIALIZE_MEMBER(Height, _height);
DESERIALIZE_MEMBER(MinMoveDistance, _minMoveDistance); DESERIALIZE_MEMBER(MinMoveDistance, _minMoveDistance);
DESERIALIZE_MEMBER(UpDirection, _upDirection);
} }

1
Source/Engine/Physics/Colliders/CharacterController.h
View File

@@ -65,6 +65,7 @@ private:
float _height; float _height;
float _minMoveDistance; float _minMoveDistance;
bool _isUpdatingTransform; bool _isUpdatingTransform;
Vector3 _upDirection;
NonWalkableModes _nonWalkableMode; NonWalkableModes _nonWalkableMode;
CollisionFlags _lastFlags; CollisionFlags _lastFlags;
uint32 _filterData[4]; uint32 _filterData[4];