matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Amélioration du test pour les collisions

This commit is contained in:
Mattéo Delabre 2016-03-15 21:59:30 +01:00
parent e8c4f9df17
commit 6a34c31ae9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -7,10 +7,8 @@
int main() { int main() {
Engine engine; Engine engine;
Ball ball1(5 * Constants::GRID, 1 * Constants::GRID); Ball ball(3 * Constants::GRID, 1 * Constants::GRID);
Ball ball2(7 * Constants::GRID, 1 * Constants::GRID); Block block1(3 * Constants::GRID, 6 * Constants::GRID);
Block block1(2 * Constants::GRID, 7 * Constants::GRID);
Block block2(3 * Constants::GRID, 7 * Constants::GRID); Block block2(3 * Constants::GRID, 7 * Constants::GRID);
Block block3(4 * Constants::GRID, 7 * Constants::GRID); Block block3(4 * Constants::GRID, 7 * Constants::GRID);
Block block4(5 * 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 block6(7 * Constants::GRID, 7 * Constants::GRID);
Block block7(8 * Constants::GRID, 7 * Constants::GRID); Block block7(8 * Constants::GRID, 7 * Constants::GRID);
Block block8(9 * 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); ball.setCharge(-2.f);
ball2.setCharge(-2.f);
block5.setCharge(16.f); block5.setCharge(16.f);
engine.addObject(ball1);
engine.addObject(ball2);
engine.addObject(block1); engine.addObject(block1);
engine.addObject(block2); engine.addObject(block2);
engine.addObject(block3); engine.addObject(block3);
@ -35,6 +30,7 @@ int main() {
engine.addObject(block7); engine.addObject(block7);
engine.addObject(block8); engine.addObject(block8);
engine.addObject(block9); engine.addObject(block9);
engine.addObject(ball);
engine.start(); engine.start();
return 0; return 0;