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

Merge remote-tracking branch 'origin/master' into 1.11

Browse Source 
# Conflicts:
#	Source/Engine/Physics/Colliders/Collider.h
This commit is contained in:
Wojtek Figat
2025-10-11 00:16:10 +02:00
parent 2bf62cc54f ef2c551cee
commit d426c5b0d9
17 changed files with 105 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Surface/VisjectSurface.Formatting.cs
View File

@@ -176,10 +176,10 @@ namespace FlaxEditor.Surface
if (connectedNodes.Count == 0)
return;
for (int i = 0; i < connectedNodes.Count - 1; i++)
for (int i = 0; i < connectedNodes.Count; i++)
{
SurfaceNode nodeA = connectedNodes[i];
List<Box> connectedOutputBoxes = nodeA.GetBoxes().Where(b => b.IsOutput && b.HasAnyConnection).ToList();
List<Box> connectedOutputBoxes = nodeA.GetBoxes().Where(b => b.HasAnyConnection).ToList();
for (int j = 0; j < connectedOutputBoxes.Count; j++)
{

2
Source/Engine/Content/Assets/Texture.cpp
View File

@@ -36,7 +36,7 @@ bool Texture::Save(const StringView& path)
bool Texture::Save(const StringView& path, const InitData* customData)
{
if (OnCheckSave())
if (OnCheckSave(path))
return true;
ScopeLock lock(Locker);

31
Source/Engine/Physics/Actors/RigidBody.cpp
View File

@@ -159,9 +159,10 @@ void RigidBody::SetCenterOfMassOffset(const Float3& value)
{
if (value == _centerOfMassOffset)
return;
Float3 delta = value - _centerOfMassOffset;
_centerOfMassOffset = value;
if (_actor)
PhysicsBackend::SetRigidDynamicActorCenterOfMassOffset(_actor, _centerOfMassOffset);
PhysicsBackend::AddRigidDynamicActorCenterOfMassOffset(_actor, delta);
}
void RigidBody::SetConstraints(const RigidbodyConstraints value)
@@ -338,6 +339,32 @@ void RigidBody::AddMovement(const Vector3& translation, const Quaternion& rotati
SetTransform(t);
}
#if USE_EDITOR
#include "Engine/Debug/DebugDraw.h"
void RigidBody::OnDebugDrawSelected()
{
// Draw center of mass
if (!_centerOfMassOffset.IsZero())
{
DEBUG_DRAW_WIRE_SPHERE(BoundingSphere(GetPosition() + (GetOrientation() * (GetCenterOfMass() - GetCenterOfMassOffset())), 5.0f), Color::Red, 0, false);
}
DEBUG_DRAW_WIRE_SPHERE(BoundingSphere(GetPosition() + (GetOrientation() * GetCenterOfMass()), 2.5f), Color::Aqua, 0, false);
// Draw all attached colliders
for (Actor* child : Children)
{
const auto collider = Cast<Collider>(child);
if (collider && collider->GetAttachedRigidBody() == this)
collider->OnDebugDrawSelf();
}
Actor::OnDebugDrawSelected();
}
#endif
void RigidBody::OnCollisionEnter(const Collision& c)
{
CollisionEnter(c);
@@ -514,7 +541,7 @@ void RigidBody::BeginPlay(SceneBeginData* data)
// Apply the Center Of Mass offset
if (!_centerOfMassOffset.IsZero())
PhysicsBackend::SetRigidDynamicActorCenterOfMassOffset(_actor, _centerOfMassOffset);
PhysicsBackend::AddRigidDynamicActorCenterOfMassOffset(_actor, _centerOfMassOffset);
// Register actor
PhysicsBackend::AddSceneActor(scene, _actor);

3
Source/Engine/Physics/Actors/RigidBody.h
View File

@@ -487,6 +487,9 @@ public:
void Serialize(SerializeStream& stream, const void* otherObj) override;
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
void AddMovement(const Vector3& translation, const Quaternion& rotation) override;
#if USE_EDITOR
void OnDebugDrawSelected() override;
#endif
// [IPhysicsActor]
void* GetPhysicsActor() const override;

51
Source/Engine/Physics/Colliders/BoxCollider.cpp
View File

@@ -86,7 +86,7 @@ void BoxCollider::OnDebugDraw()
namespace
{
OrientedBoundingBox GetWriteBox(const Vector3& min, const Vector3& max, const float margin)
OrientedBoundingBox GetWireBox(const Vector3& min, const Vector3& max, const float margin)
{
OrientedBoundingBox box;
const Vector3 vec = max - min;
@@ -111,11 +111,40 @@ namespace
}
}
void BoxCollider::OnDebugDrawSelected()
void BoxCollider::OnDebugDrawSelf()
{
const Color color = Color::GreenYellow;
DEBUG_DRAW_WIRE_BOX(_bounds, color * 0.3f, 0, false);
Vector3 corners[8];
_bounds.GetCorners(corners);
const float margin = Math::Min(1.0f, (float)_bounds.GetSize().MinValue() * 0.01f);
const Color wiresColor = color.AlphaMultiplied(0.6f);
if (margin > 0.05f)
{
DEBUG_DRAW_BOX(GetWireBox(corners[0], corners[1], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[0], corners[3], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[0], corners[4], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[1], corners[2], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[1], corners[5], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[2], corners[3], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[2], corners[6], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[3], corners[7], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[4], corners[5], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[4], corners[7], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[5], corners[6], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWireBox(corners[6], corners[7], margin), wiresColor, 0, true);
}
else
{
DEBUG_DRAW_WIRE_BOX(_bounds, wiresColor, 0, true);
}
}
void BoxCollider::OnDebugDrawSelected()
{
OnDebugDrawSelf();
if (_contactOffset > 0)
{
OrientedBoundingBox contactBounds = _bounds;
@@ -123,24 +152,6 @@ void BoxCollider::OnDebugDrawSelected()
DEBUG_DRAW_WIRE_BOX(contactBounds, Color::Blue.AlphaMultiplied(0.2f), 0, false);
}
Vector3 corners[8];
_bounds.GetCorners(corners);
const float margin = 1.0f;
const Color wiresColor = color.AlphaMultiplied(0.6f);
DEBUG_DRAW_BOX(GetWriteBox(corners[0], corners[1], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[0], corners[3], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[0], corners[4], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[1], corners[2], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[1], corners[5], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[2], corners[3], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[2], corners[6], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[3], corners[7], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[4], corners[5], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[4], corners[7], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[5], corners[6], margin), wiresColor, 0, true);
DEBUG_DRAW_BOX(GetWriteBox(corners[6], corners[7], margin), wiresColor, 0, true);
// Base
Collider::OnDebugDrawSelected();
}

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

@@ -52,6 +52,7 @@ public:
// [Collider]
#if USE_EDITOR
void OnDebugDraw() override;
void OnDebugDrawSelf() override;
void OnDebugDrawSelected() override;
#endif
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;

11
Source/Engine/Physics/Colliders/CapsuleCollider.cpp
View File

@@ -52,6 +52,17 @@ void CapsuleCollider::DrawPhysicsDebug(RenderView& view)
DEBUG_DRAW_WIRE_CAPSULE(_transform.LocalToWorld(_center), rotation, radius, height, Color::GreenYellow * 0.8f, 0, true);
}
void CapsuleCollider::OnDebugDrawSelf()
{
Quaternion rotation;
Quaternion::Multiply(_transform.Orientation, Quaternion::Euler(0, 90, 0), rotation);
const float minSize = 0.001f;
const float radius = Math::Max(Math::Abs(_radius) * _cachedScale, minSize);
const float height = Math::Max(Math::Abs(_height) * _cachedScale, minSize);
const Vector3 position = _transform.LocalToWorld(_center);
DEBUG_DRAW_WIRE_CAPSULE(position, rotation, radius, height, Color::GreenYellow, 0, false);
}
void CapsuleCollider::OnDebugDrawSelected()
{
Quaternion rotation;

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

@@ -56,6 +56,7 @@ public:
public:
// [Collider]
#if USE_EDITOR
void OnDebugDrawSelf() override;
void OnDebugDrawSelected() override;
#endif
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;

6
Source/Engine/Physics/Colliders/Collider.h
View File

@@ -158,6 +158,12 @@ protected:
/// </summary>
void RemoveStaticActor();
private:
friend RigidBody;
#if USE_EDITOR
virtual void OnDebugDrawSelf() {}
#endif
public:
// [PhysicsColliderActor]
RigidBody* GetAttachedRigidBody() const override;

7
Source/Engine/Physics/Colliders/MeshCollider.cpp
View File

@@ -85,13 +85,18 @@ void MeshCollider::DrawPhysicsDebug(RenderView& view)
}
}
void MeshCollider::OnDebugDrawSelected()
void MeshCollider::OnDebugDrawSelf()
{
if (CollisionData && CollisionData->IsLoaded())
{
const auto& debugLines = CollisionData->GetDebugLines();
DEBUG_DRAW_LINES(Span<Float3>(debugLines.Get(), debugLines.Count()), _transform.GetWorld(), Color::GreenYellow, 0, false);
}
}
void MeshCollider::OnDebugDrawSelected()
{
OnDebugDrawSelf();
// Base
Collider::OnDebugDrawSelected();

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

@@ -31,6 +31,7 @@ public:
bool CanAttach(RigidBody* rigidBody) const override;
bool CanBeTrigger() const override;
#if USE_EDITOR
void OnDebugDrawSelf() override;
void OnDebugDrawSelected() override;
#endif
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;

7
Source/Engine/Physics/Colliders/SphereCollider.cpp
View File

@@ -35,9 +35,14 @@ void SphereCollider::DrawPhysicsDebug(RenderView& view)
DEBUG_DRAW_WIRE_SPHERE(_sphere, Color::GreenYellow * 0.8f, 0, true);
}
void SphereCollider::OnDebugDrawSelected()
void SphereCollider::OnDebugDrawSelf()
{
DEBUG_DRAW_WIRE_SPHERE(_sphere, Color::GreenYellow, 0, false);
}
void SphereCollider::OnDebugDrawSelected()
{
OnDebugDrawSelf();
if (_contactOffset > 0)
{

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

@@ -36,6 +36,7 @@ public:
public:
// [Collider]
#if USE_EDITOR
void OnDebugDrawSelf() override;
void OnDebugDrawSelected() override;
#endif
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;

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

@@ -2518,7 +2518,7 @@ Vector3 PhysicsBackend::GetRigidDynamicActorCenterOfMass(void* actor)
return P2C(actorPhysX->getCMassLocalPose().p);
}
void PhysicsBackend::SetRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
void PhysicsBackend::AddRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value)
{
auto actorPhysX = (PxRigidDynamic*)actor;
auto pose = actorPhysX->getCMassLocalPose();

2
Source/Engine/Physics/PhysicsBackend.h
View File

@@ -164,7 +164,7 @@ public:
static Vector3 GetRigidDynamicActorAngularVelocity(void* actor);
static void SetRigidDynamicActorAngularVelocity(void* actor, const Vector3& value, bool wakeUp);
static Vector3 GetRigidDynamicActorCenterOfMass(void* actor);
static void SetRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value);
static void AddRigidDynamicActorCenterOfMassOffset(void* actor, const Float3& value);
static bool GetRigidDynamicActorIsSleeping(void* actor);
static void RigidDynamicActorSleep(void* actor);
static void RigidDynamicActorWakeUp(void* actor);

5
Source/Engine/Render2D/Font.cpp
View File

@@ -388,7 +388,10 @@ int32 Font::HitTestText(const StringView& text, const Float2& location, const Te
if (dst < smallestDst)
{
// Pointer is behind the last character in the line
smallestIndex = line.LastCharIndex + 1;
if (text[line.LastCharIndex] == '\n' && lineIndex != lines.Count() - 1)
smallestIndex = line.LastCharIndex;
else
smallestIndex = line.LastCharIndex + 1;
// Fix for last line
//if (lineIndex == lines.Count() - 1)

1
Source/ThirdParty/rapidjson/prettywriter.h vendored
View File

@@ -108,7 +108,6 @@ public:
}
bool String(const Ch* str, SizeType length, bool copy = false) {
RAPIDJSON_ASSERT(str != 0);
(void)copy;
PrettyPrefix(kStringType);
return Base::EndValue(Base::WriteString(str, length));