Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix old api usage for #4185

Browse Source
This commit is contained in:
mafiesto4
2026-09-14 08:30:51 +02:00
parent b586c6a0fb
commit e669e9ca65
57 changed files with 89 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Level/Actor.h
+5 -5
View File
@@ -689,7 +689,7 @@ public:
public:
/// <summary>
/// Gets actor bounding sphere that defines 3D space intersecting with the actor (for determination of the visibility for actor).
/// [DEPRECATED IN 1.13]
/// [Deprecated in 1.13]
/// </summary>
API_PROPERTY() DEPRECATED("Use GetBoundingSphere instead.") FORCE_INLINE const BoundingSphere& GetSphere() const
{
@@ -706,7 +706,7 @@ public:
/// <summary>
/// Gets actor bounding box that defines 3D space intersecting with the actor (for determination of the visibility for actor).
/// [DEPRECATED IN 1.13]
/// [Deprecated in 1.13]
/// </summary>
API_PROPERTY() DEPRECATED("Use GetBoundingBox instead.") FORCE_INLINE const BoundingBox& GetBox() const
{
@@ -723,7 +723,7 @@ public:
/// <summary>
/// Gets actor bounding box of the actor including all child actors (children included in recursive way)
/// [DEPRECATED IN 1.13]
/// [Deprecated in 1.13]
/// </summary>
API_PROPERTY() DEPRECATED("Use GetBoundingBoxWithChildren instead.") BoundingBox GetBoxWithChildren() const;
@@ -735,7 +735,7 @@ public:
#if USE_EDITOR
/// <summary>
/// Gets actor bounding box (single actor, no children included) for editor tools.
/// [DEPRECATED IN 1.13]
/// [Deprecated in 1.13]
/// </summary>
API_PROPERTY() DEPRECATED("Use GetEditorBoundingBox instead.") virtual BoundingBox GetEditorBox() const;
@@ -746,7 +746,7 @@ public:
/// <summary>
/// Gets actor bounding box of the actor including all child actors for editor tools.
/// [DEPRECATED IN 1.13]
/// [Deprecated in 1.13]
/// </summary>
API_PROPERTY() DEPRECATED("Use GetEditorBoundingBoxWithChildren instead.") BoundingBox GetEditorBoxChildren() const;
Source/Engine/Level/Actors/AnimatedModel.cpp
+1 -1
View File
@@ -1216,7 +1216,7 @@ void AnimatedModel::OnDebugDraw()
ModelInstanceActor::OnDebugDraw();
}
BoundingBox AnimatedModel::GetEditorBox() const
BoundingBox AnimatedModel::GetEditorBoundingBox() const
{
if (SkinnedModel)
SkinnedModel->WaitForLoaded(100);
Source/Engine/Level/Actors/AnimatedModel.h
+1 -1
View File
@@ -479,7 +479,7 @@ public:
#if USE_EDITOR
void OnDebugDrawSelected() override;
void OnDebugDraw() override;
BoundingBox GetEditorBox() const override;
BoundingBox GetEditorBoundingBox() const override;
#endif
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;
void Serialize(SerializeStream& stream, const void* otherObj) override;
Source/Engine/Level/Actors/Camera.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ void Camera::BeginPlay(SceneBeginData* data)
Actor::BeginPlay(data);
}
BoundingBox Camera::GetEditorBox() const
BoundingBox Camera::GetEditorBoundingBox() const
{
const Vector3 size(100);
const Vector3 pos = _transform.Translation + _transform.Orientation * Vector3::Forward * 30.0f;
Source/Engine/Level/Actors/Camera.h
+1 -1
View File
@@ -257,7 +257,7 @@ private:
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override;
BoundingBox GetEditorBoundingBox() const override;
bool HasContentLoaded() const override;
void Draw(RenderContext& renderContext) override;
void OnDebugDrawSelected() override;
Source/Engine/Level/Actors/Decal.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ void Decal::OnDebugDrawSelected()
Actor::OnDebugDrawSelected();
}
BoundingBox Decal::GetEditorBox() const
BoundingBox Decal::GetEditorBoundingBox() const
{
const Vector3 size(10.0f);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/Decal.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
// [Actor]
#if USE_EDITOR
void OnDebugDrawSelected() override;
BoundingBox GetEditorBox() const override;
BoundingBox GetEditorBoundingBox() const override;
#endif
void OnLayerChanged() override;
void Draw(RenderContext& renderContext) override;
Source/Engine/Level/Actors/EmptyActor.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ EmptyActor::EmptyActor(const SpawnParams& params)
#if USE_EDITOR
BoundingBox EmptyActor::GetEditorBox() const
BoundingBox EmptyActor::GetEditorBoundingBox() const
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/EmptyActor.h
+1 -1
View File
@@ -14,7 +14,7 @@ class FLAXENGINE_API EmptyActor : public Actor
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override;
BoundingBox GetEditorBoundingBox() const override;
#endif
protected:
Source/Engine/Level/Actors/EnvironmentProbe.h
+1 -1
View File
@@ -152,7 +152,7 @@ private:
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
BoundingBox GetEditorBoundingBox() const override
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/ExponentialHeightFog.h
+1 -1
View File
@@ -141,7 +141,7 @@ private:
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
BoundingBox GetEditorBoundingBox() const override
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/Light.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
void OnEnable() override;
void OnDisable() override;
#if USE_EDITOR
BoundingBox GetEditorBox() const override
BoundingBox GetEditorBoundingBox() const override
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/Sky.h
+1 -1
View File
@@ -63,7 +63,7 @@ private:
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
BoundingBox GetEditorBoundingBox() const override
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Actors/Skybox.h
+1 -1
View File
@@ -57,7 +57,7 @@ private:
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
BoundingBox GetEditorBoundingBox() const override
{
const Vector3 size(50);
return BoundingBox(_transform.Translation - size, _transform.Translation + size);
Source/Engine/Level/Scene/Scene.cpp
+3 -3
View File
@@ -44,9 +44,9 @@ BoundingBox SceneNavigation::GetNavigationBounds()
if (Volumes.IsEmpty())
return BoundingBox::Empty;
PROFILE_CPU_NAMED("GetNavigationBounds");
auto box = Volumes[0]->GetBox();
auto box = Volumes[0]->GetBoundingBox();
for (int32 i = 1; i < Volumes.Count(); i++)
BoundingBox::Merge(box, Volumes[i]->GetBox(), box);
BoundingBox::Merge(box, Volumes[i]->GetBoundingBox(), box);
return box;
}
@@ -55,7 +55,7 @@ NavMeshBoundsVolume* SceneNavigation::FindNavigationBoundsOverlap(const Bounding
NavMeshBoundsVolume* result = nullptr;
for (int32 i = 0; i < Volumes.Count(); i++)
{
if (Volumes[i]->GetBox().Intersects(bounds))
if (Volumes[i]->GetBoundingBox().Intersects(bounds))
{
result = Volumes[i];
break;
Source/Engine/Level/Scene/SceneRendering.cpp
+2 -2
View File
@@ -184,7 +184,7 @@ void SceneRendering::AddActor(Actor* a, int32& key)
auto& e = list[key];
e.Actor = a;
e.LayerMask = a->GetLayerMask();
e.Bounds = a->GetSphere();
e.Bounds = a->GetBoundingSphere();
e.NoCulling = a->_drawNoCulling;
for (auto* listener : _listeners)
listener->OnSceneRenderingAddActor(a);
@@ -207,7 +207,7 @@ void SceneRendering::UpdateActor(Actor* a, int32& key, ISceneRenderingListener::
if (flags & ISceneRenderingListener::Layer)
e.LayerMask = a->GetLayerMask();
if (flags & ISceneRenderingListener::Bounds)
e.Bounds = a->GetSphere();
e.Bounds = a->GetBoundingSphere();
}
}
if (lock)