From 5e6204fad441bb6e7caabdb5a5c57ad1ec0a270a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 31 Aug 2018 17:33:51 +0200 Subject: [PATCH] Fix compilation --- examples/Particles/main.cpp | 4 ++-- tests/SDK/NDK/Systems/RenderSystem.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/Particles/main.cpp b/examples/Particles/main.cpp index 084c33da8..e4940c63d 100644 --- a/examples/Particles/main.cpp +++ b/examples/Particles/main.cpp @@ -97,8 +97,8 @@ int main() particleCountGfx.Attach(shared.particleCount, 1); - Nz::Boxf fpsCountBox = fpsGfx.GetBoundingVolume().aabb; - Nz::Boxf particleCountBox = particleCountGfx.GetBoundingVolume().aabb; + Nz::Boxf fpsCountBox = fpsGfx.GetAABB(); + Nz::Boxf particleCountBox = particleCountGfx.GetAABB(); Nz::Vector2ui windowSize = window.GetSize(); demoNameNode.SetPosition(5.f, 5.f); diff --git a/tests/SDK/NDK/Systems/RenderSystem.cpp b/tests/SDK/NDK/Systems/RenderSystem.cpp index ec22d6e57..a94109b9d 100644 --- a/tests/SDK/NDK/Systems/RenderSystem.cpp +++ b/tests/SDK/NDK/Systems/RenderSystem.cpp @@ -76,7 +76,7 @@ SCENARIO("RenderSystem", "[NDK][RenderSystem]") { CHECK(nodeComponent.GetPosition() == position + velocity); CHECK(physicsComponent2D.GetAABB() == aabb.Translate(position + velocity)); - CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetBoundingVolume()); + CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetAABB()); } } @@ -91,17 +91,17 @@ SCENARIO("RenderSystem", "[NDK][RenderSystem]") CHECK(physicsComponent2D.GetAngularVelocity() == Approx(angularSpeed)); CHECK(physicsComponent2D.GetRotation() == Approx(angularSpeed)); CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(1.f, 4.f, 2.f, 1.f)); - CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetBoundingVolume()); + CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetAABB()); world.Update(1.f); CHECK(physicsComponent2D.GetRotation() == Approx(2.f * angularSpeed)); CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(2.f, 2.f, 1.f, 2.f)); - CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetBoundingVolume()); + CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetAABB()); world.Update(1.f); CHECK(physicsComponent2D.GetRotation() == Approx(3.f * angularSpeed)); CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(3.f, 3.f, 2.f, 1.f)); - CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetBoundingVolume()); + CompareAABB(physicsComponent2D.GetAABB(), graphicsComponent.GetAABB()); world.Update(1.f); CHECK(physicsComponent2D.GetRotation() == Approx(4.f * angularSpeed)); @@ -117,4 +117,4 @@ void CompareAABB(const Nz::Rectf& aabb, const Nz::BoundingVolumef& boundingVolum CHECK(aabb.y == Approx(box.y)); CHECK(aabb.width == Approx(box.width)); CHECK(aabb.height == Approx(box.height)); -} \ No newline at end of file +}