sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation

This commit is contained in:
Jérôme Leclercq 2018-08-31 17:33:51 +02:00
parent e42ff5b18a
commit 5e6204fad4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Particles/main.cpp
View File

@ -97,8 +97,8 @@ int main()
particleCountGfx.Attach(shared.particleCount, 1); particleCountGfx.Attach(shared.particleCount, 1);
Nz::Boxf fpsCountBox = fpsGfx.GetBoundingVolume().aabb; Nz::Boxf fpsCountBox = fpsGfx.GetAABB();
Nz::Boxf particleCountBox = particleCountGfx.GetBoundingVolume().aabb; Nz::Boxf particleCountBox = particleCountGfx.GetAABB();
Nz::Vector2ui windowSize = window.GetSize(); Nz::Vector2ui windowSize = window.GetSize();
demoNameNode.SetPosition(5.f, 5.f); demoNameNode.SetPosition(5.f, 5.f);

10
tests/SDK/NDK/Systems/RenderSystem.cpp
View File

@ -76,7 +76,7 @@ SCENARIO("RenderSystem", "[NDK][RenderSystem]")
{ {
CHECK(nodeComponent.GetPosition() == position + velocity); CHECK(nodeComponent.GetPosition() == position + velocity);
CHECK(physicsComponent2D.GetAABB() == aabb.Translate(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.GetAngularVelocity() == Approx(angularSpeed));
CHECK(physicsComponent2D.GetRotation() == Approx(angularSpeed)); CHECK(physicsComponent2D.GetRotation() == Approx(angularSpeed));
CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(1.f, 4.f, 2.f, 1.f)); 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); world.Update(1.f);
CHECK(physicsComponent2D.GetRotation() == Approx(2.f * angularSpeed)); CHECK(physicsComponent2D.GetRotation() == Approx(2.f * angularSpeed));
CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(2.f, 2.f, 1.f, 2.f)); 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); world.Update(1.f);
CHECK(physicsComponent2D.GetRotation() == Approx(3.f * angularSpeed)); CHECK(physicsComponent2D.GetRotation() == Approx(3.f * angularSpeed));
CHECK(physicsComponent2D.GetAABB() == Nz::Rectf(3.f, 3.f, 2.f, 1.f)); 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); world.Update(1.f);
CHECK(physicsComponent2D.GetRotation() == Approx(4.f * angularSpeed)); 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.y == Approx(box.y));
CHECK(aabb.width == Approx(box.width)); CHECK(aabb.width == Approx(box.width));
CHECK(aabb.height == Approx(box.height)); CHECK(aabb.height == Approx(box.height));
} }