diff --git a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp index ea24d126f..784eebb28 100644 --- a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp +++ b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp @@ -1132,6 +1132,6 @@ void SceneAnimationPlayer::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Audio/AudioListener.cpp b/Source/Engine/Audio/AudioListener.cpp index 40e7bac3e..e9b1a11ab 100644 --- a/Source/Engine/Audio/AudioListener.cpp +++ b/Source/Engine/Audio/AudioListener.cpp @@ -63,7 +63,7 @@ void AudioListener::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); if (IsActiveInHierarchy()) diff --git a/Source/Engine/Audio/AudioSource.cpp b/Source/Engine/Audio/AudioSource.cpp index b07ea95ee..8969bc4d3 100644 --- a/Source/Engine/Audio/AudioSource.cpp +++ b/Source/Engine/Audio/AudioSource.cpp @@ -461,7 +461,7 @@ void AudioSource::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); if (IsActiveInHierarchy() && SourceIDs.HasItems()) diff --git a/Source/Engine/Core/Math/BoundingBox.cpp b/Source/Engine/Core/Math/BoundingBox.cpp index d7932e1b1..439b4341f 100644 --- a/Source/Engine/Core/Math/BoundingBox.cpp +++ b/Source/Engine/Core/Math/BoundingBox.cpp @@ -6,7 +6,7 @@ #include "../Types/String.h" const BoundingBox BoundingBox::Empty(Vector3(MAX_float), Vector3(MIN_float)); -const BoundingBox BoundingBox::Zero(Vector3(0.0f), Vector3(0.0f)); +const BoundingBox BoundingBox::Zero(Vector3(0.0f)); String BoundingBox::ToString() const { diff --git a/Source/Engine/Core/Math/BoundingBox.h b/Source/Engine/Core/Math/BoundingBox.h index f669370ff..8a349e022 100644 --- a/Source/Engine/Core/Math/BoundingBox.h +++ b/Source/Engine/Core/Math/BoundingBox.h @@ -45,6 +45,16 @@ public: { } + /// + /// Initializes a new instance of the struct. + /// + /// The location of the empty bounding box. + BoundingBox(const Vector3& point) + : Minimum(point) + , Maximum(point) + { + } + /// /// Initializes a new instance of the struct. /// diff --git a/Source/Engine/Level/Actors/AnimatedModel.cpp b/Source/Engine/Level/Actors/AnimatedModel.cpp index 85ee6d333..f0ae7017e 100644 --- a/Source/Engine/Level/Actors/AnimatedModel.cpp +++ b/Source/Engine/Level/Actors/AnimatedModel.cpp @@ -383,7 +383,7 @@ void AnimatedModel::UpdateLocalBounds() } else { - box = BoundingBox(Vector3::Zero, Vector3::Zero); + box = BoundingBox(Vector3::Zero); } // Scale bounds diff --git a/Source/Engine/Level/Actors/BoneSocket.cpp b/Source/Engine/Level/Actors/BoneSocket.cpp index 028b1c507..5efe8deed 100644 --- a/Source/Engine/Level/Actors/BoneSocket.cpp +++ b/Source/Engine/Level/Actors/BoneSocket.cpp @@ -96,7 +96,7 @@ void BoneSocket::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/DirectionalLight.cpp b/Source/Engine/Level/Actors/DirectionalLight.cpp index 240344fc6..8810b0de6 100644 --- a/Source/Engine/Level/Actors/DirectionalLight.cpp +++ b/Source/Engine/Level/Actors/DirectionalLight.cpp @@ -92,6 +92,6 @@ void DirectionalLight::OnTransformChanged() // Base LightWithShadow::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/EmptyActor.cpp b/Source/Engine/Level/Actors/EmptyActor.cpp index 309f63652..dfb64824d 100644 --- a/Source/Engine/Level/Actors/EmptyActor.cpp +++ b/Source/Engine/Level/Actors/EmptyActor.cpp @@ -22,6 +22,6 @@ void EmptyActor::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/ExponentialHeightFog.cpp b/Source/Engine/Level/Actors/ExponentialHeightFog.cpp index 77f8e16e7..366ab7de4 100644 --- a/Source/Engine/Level/Actors/ExponentialHeightFog.cpp +++ b/Source/Engine/Level/Actors/ExponentialHeightFog.cpp @@ -228,6 +228,6 @@ void ExponentialHeightFog::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/Sky.cpp b/Source/Engine/Level/Actors/Sky.cpp index 8aaf5fdd3..49f46e9b9 100644 --- a/Source/Engine/Level/Actors/Sky.cpp +++ b/Source/Engine/Level/Actors/Sky.cpp @@ -259,6 +259,6 @@ void Sky::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/Skybox.cpp b/Source/Engine/Level/Actors/Skybox.cpp index e8ea08c89..4edd596b7 100644 --- a/Source/Engine/Level/Actors/Skybox.cpp +++ b/Source/Engine/Level/Actors/Skybox.cpp @@ -146,6 +146,6 @@ void Skybox::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Level/Actors/SplineModel.cpp b/Source/Engine/Level/Actors/SplineModel.cpp index 84306716b..794658afb 100644 --- a/Source/Engine/Level/Actors/SplineModel.cpp +++ b/Source/Engine/Level/Actors/SplineModel.cpp @@ -110,7 +110,7 @@ void SplineModel::OnSplineUpdated() // Skip updates when actor is disabled or something is missing if (!_spline || !Model || !Model->IsLoaded() || !IsActiveInHierarchy() || _spline->GetSplinePointsCount() < 2) { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); BoundingSphere::FromBox(_box, _sphere); return; } diff --git a/Source/Engine/Level/Actors/StaticModel.cpp b/Source/Engine/Level/Actors/StaticModel.cpp index a884c9707..3f81b22c3 100644 --- a/Source/Engine/Level/Actors/StaticModel.cpp +++ b/Source/Engine/Level/Actors/StaticModel.cpp @@ -187,7 +187,7 @@ void StaticModel::UpdateBounds() } else { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); } BoundingSphere::FromBox(_box, _sphere); } diff --git a/Source/Engine/Level/Scene/Scene.cpp b/Source/Engine/Level/Scene/Scene.cpp index d38bd4225..94de9d713 100644 --- a/Source/Engine/Level/Scene/Scene.cpp +++ b/Source/Engine/Level/Scene/Scene.cpp @@ -362,6 +362,6 @@ void Scene::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Particles/ParticleEffect.cpp b/Source/Engine/Particles/ParticleEffect.cpp index 40594904d..f23aff28c 100644 --- a/Source/Engine/Particles/ParticleEffect.cpp +++ b/Source/Engine/Particles/ParticleEffect.cpp @@ -306,7 +306,7 @@ void ParticleEffect::UpdateBounds() // Empty bounds if there is no particle system to play or it has been never played if (bounds == BoundingBox::Empty) { - bounds = BoundingBox(_transform.Translation, _transform.Translation); + bounds = BoundingBox(_transform.Translation); } _box = bounds; diff --git a/Source/Engine/Physics/Actors/PhysicsActor.cpp b/Source/Engine/Physics/Actors/PhysicsActor.cpp index 79c4ccf7f..8e92ea902 100644 --- a/Source/Engine/Physics/Actors/PhysicsActor.cpp +++ b/Source/Engine/Physics/Actors/PhysicsActor.cpp @@ -61,7 +61,7 @@ void PhysicsActor::UpdateBounds() } else { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); } } else @@ -71,7 +71,7 @@ void PhysicsActor::UpdateBounds() } else { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); } BoundingSphere::FromBox(_box, _sphere); } diff --git a/Source/Engine/Physics/Actors/SplineRopeBody.cpp b/Source/Engine/Physics/Actors/SplineRopeBody.cpp index a610e76ce..b341f7008 100644 --- a/Source/Engine/Physics/Actors/SplineRopeBody.cpp +++ b/Source/Engine/Physics/Actors/SplineRopeBody.cpp @@ -178,6 +178,6 @@ void SplineRopeBody::OnTransformChanged() { Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/Physics/Colliders/CharacterController.cpp b/Source/Engine/Physics/Colliders/CharacterController.cpp index 7657c7594..4315ce8ba 100644 --- a/Source/Engine/Physics/Colliders/CharacterController.cpp +++ b/Source/Engine/Physics/Colliders/CharacterController.cpp @@ -220,7 +220,7 @@ void CharacterController::UpdateBounds() if (actor) _box = P2C(actor->getWorldBounds(boundsScale)); else - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); BoundingSphere::FromBox(_box, _sphere); } @@ -345,7 +345,7 @@ void CharacterController::OnTransformChanged() } else if (!_controller) { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); BoundingSphere::FromBox(_box, _sphere); } } diff --git a/Source/Engine/Physics/Colliders/SplineCollider.cpp b/Source/Engine/Physics/Colliders/SplineCollider.cpp index e44d986cc..7bff077e0 100644 --- a/Source/Engine/Physics/Colliders/SplineCollider.cpp +++ b/Source/Engine/Physics/Colliders/SplineCollider.cpp @@ -64,7 +64,7 @@ void SplineCollider::OnSplineUpdated() { if (!_spline || !IsActiveInHierarchy() || _spline->GetSplinePointsCount() < 2 || !CollisionData || !CollisionData->IsLoaded()) { - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); BoundingSphere::FromBox(_box, _sphere); return; } @@ -178,7 +178,7 @@ void SplineCollider::UpdateBounds() void SplineCollider::GetGeometry(PxGeometryHolder& geometry) { // Reset bounds - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); BoundingSphere::FromBox(_box, _sphere); // Skip if sth is missing diff --git a/Source/Engine/Physics/Joints/Joint.cpp b/Source/Engine/Physics/Joints/Joint.cpp index 56c5c1b32..2a8cc57ca 100644 --- a/Source/Engine/Physics/Joints/Joint.cpp +++ b/Source/Engine/Physics/Joints/Joint.cpp @@ -327,7 +327,7 @@ void Joint::OnTransformChanged() // TODO: this could track only local transform changed - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); if (_joint) diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp index e87de12a3..502b5c4a5 100644 --- a/Source/Engine/Terrain/Terrain.cpp +++ b/Source/Engine/Terrain/Terrain.cpp @@ -37,7 +37,7 @@ Terrain::~Terrain() void Terrain::UpdateBounds() { PROFILE_CPU(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); for (int32 i = 0; i < _patches.Count(); i++) { auto patch = _patches[i]; diff --git a/Source/Engine/UI/TextRender.cpp b/Source/Engine/UI/TextRender.cpp index a26d3d169..df75bbb87 100644 --- a/Source/Engine/UI/TextRender.cpp +++ b/Source/Engine/UI/TextRender.cpp @@ -31,7 +31,7 @@ TextRender::TextRender(const SpawnParams& params) { _world = Matrix::Identity; _color = Color::White; - _localBox = BoundingBox(Vector3::Zero, Vector3::Zero); + _localBox = BoundingBox(Vector3::Zero); _layoutOptions.Bounds = Rectangle(-100, -100, 200, 200); _layoutOptions.HorizontalAlignment = TextAlignment::Center; _layoutOptions.VerticalAlignment = TextAlignment::Center; @@ -92,7 +92,7 @@ void TextRender::UpdateLayout() _vb0.Clear(); _vb1.Clear(); _vb2.Clear(); - _localBox = BoundingBox(Vector3::Zero, Vector3::Zero); + _localBox = BoundingBox(Vector3::Zero); BoundingBox::Transform(_localBox, _world, _box); BoundingSphere::FromBox(_box, _sphere); #if USE_PRECISE_MESH_INTERSECTS @@ -291,7 +291,7 @@ void TextRender::UpdateLayout() if (_ib.Data.IsEmpty()) { // Empty - box = BoundingBox(_transform.Translation, _transform.Translation); + box = BoundingBox(_transform.Translation); } _localBox = box; BoundingBox::Transform(_localBox, _world, _box); diff --git a/Source/Engine/UI/UICanvas.cpp b/Source/Engine/UI/UICanvas.cpp index ab1841acc..c21281c67 100644 --- a/Source/Engine/UI/UICanvas.cpp +++ b/Source/Engine/UI/UICanvas.cpp @@ -164,6 +164,6 @@ void UICanvas::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); } diff --git a/Source/Engine/UI/UIControl.cpp b/Source/Engine/UI/UIControl.cpp index 6c24be02f..b9fef02f8 100644 --- a/Source/Engine/UI/UIControl.cpp +++ b/Source/Engine/UI/UIControl.cpp @@ -163,7 +163,7 @@ void UIControl::OnTransformChanged() // Base Actor::OnTransformChanged(); - _box = BoundingBox(_transform.Translation, _transform.Translation); + _box = BoundingBox(_transform.Translation); _sphere = BoundingSphere(_transform.Translation, 0.0f); UICONTROL_INVOKE(TransformChanged);