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

Small clean code

Browse Source
This commit is contained in:
ruan
2024-01-21 11:03:29 -04:00
parent e5160f2885
commit 19ddcad16f
2 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Source/Engine/Physics/Actors/WheeledVehicle.cpp
View File

@@ -14,7 +14,7 @@
#include "Engine/Core/Log.h" #include "Engine/Core/Log.h"
#endif #endif
WheeledVehicle::WheeledVehicle(const SpawnParams &params) WheeledVehicle::WheeledVehicle(const SpawnParams& params)
: RigidBody(params) : RigidBody(params)
{ {
_useCCD = 1; _useCCD = 1;
@@ -33,7 +33,7 @@ void WheeledVehicle::SetDriveType(DriveTypes value)
Setup(); Setup();
} }
const Array<WheeledVehicle::Wheel> &WheeledVehicle::GetWheels() const const Array<WheeledVehicle::Wheel>& WheeledVehicle::GetWheels() const
{ {
return _wheels; return _wheels;
} }
@@ -43,7 +43,7 @@ WheeledVehicle::DriveControlSettings WheeledVehicle::GetDriveControl() const
return _driveControl; return _driveControl;
} }
void WheeledVehicle::SetDriveControl(DriveControlSettings &value) void WheeledVehicle::SetDriveControl(DriveControlSettings& value)
{ {
value.RiseRateAcceleration = Math::Max(value.RiseRateAcceleration, 0.01f); value.RiseRateAcceleration = Math::Max(value.RiseRateAcceleration, 0.01f);
value.RiseRateBrake = Math::Max(value.RiseRateBrake, 0.01f); value.RiseRateBrake = Math::Max(value.RiseRateBrake, 0.01f);
@@ -69,15 +69,15 @@ void WheeledVehicle::SetDriveControl(DriveControlSettings &value)
// Apply only on changed value // Apply only on changed value
if (_driveControl.SteerVsSpeed[i].Speed != value.SteerVsSpeed[i].Speed || _driveControl.SteerVsSpeed[i].Steer != value.SteerVsSpeed[i].Steer) if (_driveControl.SteerVsSpeed[i].Speed != value.SteerVsSpeed[i].Speed || _driveControl.SteerVsSpeed[i].Steer != value.SteerVsSpeed[i].Steer)
{ {
WheeledVehicle::SteerControl &steerVsSpeed = value.SteerVsSpeed[i]; WheeledVehicle::SteerControl& steerVsSpeed = value.SteerVsSpeed[i];
steerVsSpeed.Steer = Math::Saturate(steerVsSpeed.Steer); steerVsSpeed.Steer = Math::Saturate(steerVsSpeed.Steer);
steerVsSpeed.Speed = Math::Max(steerVsSpeed.Speed, 10.0f); steerVsSpeed.Speed = Math::Max(steerVsSpeed.Speed, 10.0f);
// Clamp speeds to have an ordened list. // Clamp speeds to have an ordened list.
if (i >= 1) if (i >= 1)
{ {
WheeledVehicle::SteerControl &lastSteerVsSpeed = value.SteerVsSpeed[i - 1]; WheeledVehicle::SteerControl& lastSteerVsSpeed = value.SteerVsSpeed[i - 1];
WheeledVehicle::SteerControl &nextSteerVsSpeed = value.SteerVsSpeed[Math::Clamp(i + 1, 0, steerVsSpeedCount - 1)]; WheeledVehicle::SteerControl& nextSteerVsSpeed = value.SteerVsSpeed[Math::Clamp(i + 1, 0, steerVsSpeedCount - 1)];
float minSpeed = lastSteerVsSpeed.Speed; float minSpeed = lastSteerVsSpeed.Speed;
float maxSpeed = nextSteerVsSpeed.Speed; float maxSpeed = nextSteerVsSpeed.Speed;
@@ -88,7 +88,7 @@ void WheeledVehicle::SetDriveControl(DriveControlSettings &value)
} }
else if (steerVsSpeedCount > 1) else if (steerVsSpeedCount > 1)
{ {
WheeledVehicle::SteerControl &nextSteerVsSpeed = value.SteerVsSpeed[i + 1]; WheeledVehicle::SteerControl& nextSteerVsSpeed = value.SteerVsSpeed[i + 1];
steerVsSpeed.Speed = Math::Min(steerVsSpeed.Speed, nextSteerVsSpeed.Speed); steerVsSpeed.Speed = Math::Min(steerVsSpeed.Speed, nextSteerVsSpeed.Speed);
} }
} }
@@ -97,7 +97,7 @@ void WheeledVehicle::SetDriveControl(DriveControlSettings &value)
_driveControl = value; _driveControl = value;
} }
void WheeledVehicle::SetWheels(const Array<Wheel> &value) void WheeledVehicle::SetWheels(const Array<Wheel>& value)
{ {
#if WITH_VEHICLE #if WITH_VEHICLE
// Don't recreate whole vehicle when some wheel properties are only changed (eg. suspension) // Don't recreate whole vehicle when some wheel properties are only changed (eg. suspension)
@@ -106,8 +106,8 @@ void WheeledVehicle::SetWheels(const Array<Wheel> &value)
bool softUpdate = true; bool softUpdate = true;
for (int32 wheelIndex = 0; wheelIndex < value.Count(); wheelIndex++) for (int32 wheelIndex = 0; wheelIndex < value.Count(); wheelIndex++)
{ {
auto &oldWheel = _wheels.Get()[wheelIndex]; auto& oldWheel = _wheels.Get()[wheelIndex];
auto &newWheel = value.Get()[wheelIndex]; auto& newWheel = value.Get()[wheelIndex];
if (Math::NotNearEqual(oldWheel.SuspensionForceOffset, newWheel.SuspensionForceOffset) || oldWheel.Collider != newWheel.Collider) if (Math::NotNearEqual(oldWheel.SuspensionForceOffset, newWheel.SuspensionForceOffset) || oldWheel.Collider != newWheel.Collider)
{ {
softUpdate = false; softUpdate = false;
@@ -131,7 +131,7 @@ WheeledVehicle::EngineSettings WheeledVehicle::GetEngine() const
return _engine; return _engine;
} }
void WheeledVehicle::SetEngine(const EngineSettings &value) void WheeledVehicle::SetEngine(const EngineSettings& value)
{ {
#if WITH_VEHICLE #if WITH_VEHICLE
if (_vehicle) if (_vehicle)
@@ -145,7 +145,7 @@ WheeledVehicle::DifferentialSettings WheeledVehicle::GetDifferential() const
return _differential; return _differential;
} }
void WheeledVehicle::SetDifferential(const DifferentialSettings &value) void WheeledVehicle::SetDifferential(const DifferentialSettings& value)
{ {
#if WITH_VEHICLE #if WITH_VEHICLE
if (_vehicle) if (_vehicle)
@@ -159,7 +159,7 @@ WheeledVehicle::GearboxSettings WheeledVehicle::GetGearbox() const
return _gearbox; return _gearbox;
} }
void WheeledVehicle::SetGearbox(const GearboxSettings &value) void WheeledVehicle::SetGearbox(const GearboxSettings& value)
{ {
#if WITH_VEHICLE #if WITH_VEHICLE
if (_vehicle) if (_vehicle)
@@ -168,7 +168,7 @@ void WheeledVehicle::SetGearbox(const GearboxSettings &value)
_gearbox = value; _gearbox = value;
} }
void WheeledVehicle::SetAntiRollBars(const Array<AntiRollBar> &value) void WheeledVehicle::SetAntiRollBars(const Array<AntiRollBar>& value)
{ {
_antiRollBars = value; _antiRollBars = value;
#if WITH_VEHICLE #if WITH_VEHICLE
@@ -177,7 +177,7 @@ void WheeledVehicle::SetAntiRollBars(const Array<AntiRollBar> &value)
#endif #endif
} }
const Array<WheeledVehicle::AntiRollBar> &WheeledVehicle::GetAntiRollBars() const const Array<WheeledVehicle::AntiRollBar>& WheeledVehicle::GetAntiRollBars() const
{ {
return _antiRollBars; return _antiRollBars;
} }
@@ -298,12 +298,12 @@ void WheeledVehicle::SetTargetGear(int32 value)
#endif #endif
} }
void WheeledVehicle::GetWheelState(int32 index, WheelState &result) void WheeledVehicle::GetWheelState(int32 index, WheelState& result)
{ {
if (index >= 0 && index < _wheels.Count()) if (index >= 0 && index < _wheels.Count())
{ {
const auto collider = _wheels[index].Collider.Get(); const auto collider = _wheels[index].Collider.Get();
for (auto &wheelData : _wheelsData) for (auto& wheelData : _wheelsData)
{ {
if (wheelData.Collider == collider) if (wheelData.Collider == collider)
{ {
@@ -344,10 +344,10 @@ void WheeledVehicle::Setup()
#if USE_EDITOR #if USE_EDITOR
void WheeledVehicle::DrawPhysicsDebug(RenderView &view) void WheeledVehicle::DrawPhysicsDebug(RenderView& view)
{ {
// Wheels shapes // Wheels shapes
for (const auto &data : _wheelsData) for (const auto& data : _wheelsData)
{ {
int32 wheelIndex = 0; int32 wheelIndex = 0;
for (; wheelIndex < _wheels.Count(); wheelIndex++) for (; wheelIndex < _wheels.Count(); wheelIndex++)
@@ -357,7 +357,7 @@ void WheeledVehicle::DrawPhysicsDebug(RenderView &view)
} }
if (wheelIndex == _wheels.Count()) if (wheelIndex == _wheels.Count())
break; break;
const auto &wheel = _wheels[wheelIndex]; const auto& wheel = _wheels[wheelIndex];
if (wheel.Collider && wheel.Collider->GetParent() == this && !wheel.Collider->GetIsTrigger()) if (wheel.Collider && wheel.Collider->GetParent() == this && !wheel.Collider->GetIsTrigger())
{ {
const Vector3 currentPos = wheel.Collider->GetPosition(); const Vector3 currentPos = wheel.Collider->GetPosition();
@@ -378,7 +378,7 @@ void WheeledVehicle::DrawPhysicsDebug(RenderView &view)
void WheeledVehicle::OnDebugDrawSelected() void WheeledVehicle::OnDebugDrawSelected()
{ {
// Wheels shapes // Wheels shapes
for (const auto &data : _wheelsData) for (const auto& data : _wheelsData)
{ {
int32 wheelIndex = 0; int32 wheelIndex = 0;
for (; wheelIndex < _wheels.Count(); wheelIndex++) for (; wheelIndex < _wheels.Count(); wheelIndex++)
@@ -388,7 +388,7 @@ void WheeledVehicle::OnDebugDrawSelected()
} }
if (wheelIndex == _wheels.Count()) if (wheelIndex == _wheels.Count())
break; break;
const auto &wheel = _wheels[wheelIndex]; const auto& wheel = _wheels[wheelIndex];
if (wheel.Collider && wheel.Collider->GetParent() == this && !wheel.Collider->GetIsTrigger()) if (wheel.Collider && wheel.Collider->GetParent() == this && !wheel.Collider->GetIsTrigger())
{ {
const Vector3 currentPos = wheel.Collider->GetPosition(); const Vector3 currentPos = wheel.Collider->GetPosition();
@@ -437,7 +437,7 @@ void WheeledVehicle::OnDebugDrawSelected()
#endif #endif
void WheeledVehicle::Serialize(SerializeStream &stream, const void *otherObj) void WheeledVehicle::Serialize(SerializeStream& stream, const void *otherObj)
{ {
RigidBody::Serialize(stream, otherObj); RigidBody::Serialize(stream, otherObj);
@@ -454,7 +454,7 @@ void WheeledVehicle::Serialize(SerializeStream &stream, const void *otherObj)
SERIALIZE_MEMBER(AntiRollBars, _antiRollBars); SERIALIZE_MEMBER(AntiRollBars, _antiRollBars);
} }
void WheeledVehicle::Deserialize(DeserializeStream &stream, ISerializeModifier *modifier) void WheeledVehicle::Deserialize(DeserializeStream& stream, ISerializeModifier *modifier)
{ {
RigidBody::Deserialize(stream, modifier); RigidBody::Deserialize(stream, modifier);
@@ -550,14 +550,14 @@ void WheeledVehicle::BeginPlay(SceneBeginData *data)
#endif #endif
#if USE_EDITOR #if USE_EDITOR
GetSceneRendering()->AddPhysicsDebug<WheeledVehicle, &WheeledVehicle::DrawPhysicsDebug>(this); GetSceneRendering()->AddPhysicsDebug<WheeledVehicle,& WheeledVehicle::DrawPhysicsDebug>(this);
#endif #endif
} }
void WheeledVehicle::EndPlay() void WheeledVehicle::EndPlay()
{ {
#if USE_EDITOR #if USE_EDITOR
GetSceneRendering()->RemovePhysicsDebug<WheeledVehicle, &WheeledVehicle::DrawPhysicsDebug>(this); GetSceneRendering()->RemovePhysicsDebug<WheeledVehicle,& WheeledVehicle::DrawPhysicsDebug>(this);
#endif #endif
#if WITH_VEHICLE #if WITH_VEHICLE

3
Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
View File

@@ -59,9 +59,6 @@
#if WITH_PVD #if WITH_PVD
#include <ThirdParty/PhysX/pvd/PxPvd.h> #include <ThirdParty/PhysX/pvd/PxPvd.h>
#endif #endif
#if USE_EDITOR
#include "Editor/Editor.h"
#endif
// Temporary memory size used by the PhysX during the simulation. Must be multiply of 4kB and 16bit aligned. // Temporary memory size used by the PhysX during the simulation. Must be multiply of 4kB and 16bit aligned.
#define PHYSX_SCRATCH_BLOCK_SIZE (1024 * 128) #define PHYSX_SCRATCH_BLOCK_SIZE (1024 * 128)