From 6a34c31ae91451d87b89088f8c693fa953d89ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Tue, 15 Mar 2016 21:59:30 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20du=20test=20pour=20les=20co?= =?UTF-8?q?llisions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8308508..c44d3da 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,10 +7,8 @@ int main() { Engine engine; - Ball ball1(5 * Constants::GRID, 1 * Constants::GRID); - Ball ball2(7 * Constants::GRID, 1 * Constants::GRID); - - Block block1(2 * Constants::GRID, 7 * Constants::GRID); + Ball ball(3 * Constants::GRID, 1 * Constants::GRID); + Block block1(3 * Constants::GRID, 6 * Constants::GRID); Block block2(3 * Constants::GRID, 7 * Constants::GRID); Block block3(4 * Constants::GRID, 7 * Constants::GRID); Block block4(5 * Constants::GRID, 7 * Constants::GRID); @@ -18,14 +16,11 @@ int main() { Block block6(7 * Constants::GRID, 7 * Constants::GRID); Block block7(8 * Constants::GRID, 7 * Constants::GRID); Block block8(9 * Constants::GRID, 7 * Constants::GRID); - Block block9(10 * Constants::GRID, 7 * Constants::GRID); + Block block9(9 * Constants::GRID, 6 * Constants::GRID); - ball1.setCharge(-2.f); - ball2.setCharge(-2.f); + ball.setCharge(-2.f); block5.setCharge(16.f); - engine.addObject(ball1); - engine.addObject(ball2); engine.addObject(block1); engine.addObject(block2); engine.addObject(block3); @@ -35,6 +30,7 @@ int main() { engine.addObject(block7); engine.addObject(block8); engine.addObject(block9); + engine.addObject(ball); engine.start(); return 0;