Revert "Merge branch 'Tryibion-rot-colliders'" (#1141)

This reverts commit 73cb792989, reversing
changes made to b4fe3a44aa.
This commit is contained in:
Wojtek Figat
2024-03-07 23:24:40 +01:00
parent aca7913c93
commit 41cff47ca3
4 changed files with 12 additions and 124 deletions

View File

@@ -5,27 +5,6 @@
#include "Collider.h"
#include "Engine/Core/Math/OrientedBoundingBox.h"
/// <summary>
/// The collider orientation direction.
/// </summary>
API_ENUM() enum class ColliderOrientationDirection
{
/// <summary>
/// Orient to the X-Axis.
/// </summary>
XAxis,
/// <summary>
/// Orient to the Y-Axis.
/// </summary>
YAxis,
/// <summary>
/// Orient to the Z-Axis.
/// </summary>
ZAxis
};
/// <summary>
/// A capsule-shaped primitive collider.
/// </summary>
@@ -40,7 +19,6 @@ private:
float _radius;
float _height;
OrientedBoundingBox _orientedBox;
ColliderOrientationDirection _direction;
public:
/// <summary>
@@ -75,20 +53,6 @@ public:
/// <remarks>The capsule height will be scaled by the actor's world scale.</remarks>
API_PROPERTY() void SetHeight(float value);
/// <summary>
/// Gets the orientation direction of the capsule collider.
/// </summary>
API_PROPERTY(Attributes="EditorOrder(111), DefaultValue(typeof(ColliderOrientationDirection), \"YAxis\"), EditorDisplay(\"Collider\")")
FORCE_INLINE ColliderOrientationDirection GetColliderDirection() const
{
return _direction;
}
/// <summary>
/// Sets the orientation direction of the capsule collider.
/// </summary>
API_PROPERTY() void SetColliderDirection(ColliderOrientationDirection value);
public:
// [Collider]
#if USE_EDITOR