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

Fix including CharacterController.h in game code

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-01 23:38:16 +01:00
parent 283714a39f
commit 1bd639c86d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ CharacterController::CharacterController(const SpawnParams& params)
, _nonWalkableMode(CharacterController::NonWalkableModes::PreventClimbing)
, _lastFlags(CollisionFlags::None)
{
static_assert(sizeof(_filterData) == sizeof(PxFilterData), "Invalid filter data size.");
}
void CharacterController::SetRadius(const float value)
@@ -112,7 +113,7 @@ CharacterController::CollisionFlags CharacterController::Move(const Vector3& dis
{
const float deltaTime = Time::GetCurrentSafe()->DeltaTime.GetTotalSeconds();
PxControllerFilters filters;
filters.mFilterData = &_filterData;
filters.mFilterData = (PxFilterData*)&_filterData;
filters.mFilterCallback = Physics::GetCharacterQueryFilterCallback();
filters.mFilterFlags = PxQueryFlag::eDYNAMIC | PxQueryFlag::eSTATIC | PxQueryFlag::ePREFILTER;
@@ -281,7 +282,7 @@ void CharacterController::UpdateLayerBits()
Collider::UpdateLayerBits();
// Cache filter data
_filterData = _shape->getSimulationFilterData();
*(PxFilterData*)&_filterData = _shape->getSimulationFilterData();
}
void CharacterController::BeginPlay(SceneBeginData* data)

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

@@ -4,7 +4,6 @@
#include "Collider.h"
#include "Engine/Physics/Actors/IPhysicsActor.h"
#include <PxFiltering.h>
/// <summary>
/// Physical objects that allows to easily do player movement constrained by collisions without having to deal with a rigidbody.
@@ -68,7 +67,7 @@ private:
bool _isUpdatingTransform;
NonWalkableModes _nonWalkableMode;
CollisionFlags _lastFlags;
PxFilterData _filterData;
uint32 _filterData[4];
public: