From b7bf5d664322ee685973e3fd41d450e307842e4a Mon Sep 17 00:00:00 2001
From: liabru <liabru@brm.io>
Date: Sat, 31 Jan 2015 23:57:31 +0000
Subject: [PATCH] added Demo.compound

---
 demo/dev.html   |  2 +-
 demo/js/Demo.js | 44 ++++++++++----------------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/demo/dev.html b/demo/dev.html
index 5531339d..c2c43a60 100644
--- a/demo/dev.html
+++ b/demo/dev.html
@@ -30,8 +30,8 @@ <h1>Matter.js Demo (Dev. Build)</h1>
             <div class="controls-container">
                 <select id="demo-select">
                     <option value="mixed">Mixed Shapes</option>
-                    <option value="concave">Concave Shapes</option>
                     <option value="mixedSolid">Solid Rendering</option>
+                    <option value="compound">Compound Bodies</option>
                     <option value="newtonsCradle">Newton's Cradle</option>
                     <option value="wreckingBall">Wrecking Ball</option>
                     <option value="slingshot">Slingshot Game</option>
diff --git a/demo/js/Demo.js b/demo/js/Demo.js
index d78dc0f8..248409bb 100644
--- a/demo/js/Demo.js
+++ b/demo/js/Demo.js
@@ -117,52 +117,28 @@
         var renderOptions = _engine.render.options;
     };
 
-    Demo.concave = function() {
+    Demo.compound = function() {
         var _world = _engine.world;
 
         Demo.reset();
 
-        var s = 50;
-        //var vertices = [{ x: 0, y: 0 }, { x: 0, y: 2 * s }, 
-        //                { x: 1 * s, y: 2 * s }, { x: 1 * s, y: 1 * s },
-        //                { x: 2 * s, y: 1 * s }, { x: 2 * s, y: 0 }];
+        var partA = Bodies.rectangle(200, 200, 200, 40),
+            partB = Bodies.rectangle(200, 200, 40, 200);
 
-        //var vertices = Matter.Vertices.fromPath('-5 78,70 126,57 195,114 139,191 201,161 136,217 83,151 83,122 -1,82 85');
-
-        var partA = Bodies.rectangle(200, 200, 200, 20);
-        var partB = Bodies.rectangle(200, 200, 20, 200);
-        var middle = Bodies.rectangle(200, 200, 20, 20);
-        //var parent = Bodies.rectangle(200, 200, 200, 200);
-
-        var vertices = Matter.Vertices.create(partA.vertices.concat(partB.vertices.concat(middle.vertices)), true);
-        Matter.Vertices.clockwiseSort(vertices);
-
-        //debugger;
-
-        var hull = Matter.Vertices.hull(vertices);
-
-        console.log(vertices);
-        console.log(hull);
-
-        var parent = Body.create({
-            position: { x: 200, y: 200 },
-            vertices: hull
+        var compound = Body.create({
+            parts: [partA, partB]
         });
 
-        //debugger;
+        World.add(_world, compound);
 
-        partA.parent = parent;
-        partB.parent = parent;
-
-        parent.parts = [parent, partA, partB];
-
-        World.add(_world, parent);
-
-        _world.gravity.y = 0;
+        _world.gravity.y = 1;
         
         var renderOptions = _engine.render.options;
         renderOptions.showCollisions = true;
         renderOptions.showBounds = true;
+        renderOptions.showAxes = true;
+        renderOptions.showPositions = true;
+        renderOptions.showConvexHulls = true;
     };
 
     Demo.slingshot = function() {