Merge branch 'master' of https://github.com/ma1069/matter-js into ma1…

…069-master
liabru · Feb 7, 2016 · c99e6af · c99e6af
2 parents 8fcb893 + 5b755a1
commit c99e6af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/body/Body.js b/src/body/Body.js
@@ -71,6 +71,7 @@ var Axes = require('../geometry/Axes');
             timeScale: 1,
             render: {
                 visible: true,
+                opacity: 1,
                 sprite: {
                     xScale: 1,
                     yScale: 1,

diff --git a/src/render/Render.js b/src/render/Render.js
@@ -445,6 +445,10 @@ var Vector = require('../geometry/Vector');
                     if (options.showSleeping && body.isSleeping) 
                         c.globalAlpha = 0.5;
 
+                    if (part.render.opacity !== 1)
+                        c.globalAlpha = part.render.opacity;
+
+
                     c.translate(part.position.x, part.position.y); 
                     c.rotate(part.angle);
 
@@ -460,7 +464,7 @@ var Vector = require('../geometry/Vector');
                     c.rotate(-part.angle);
                     c.translate(-part.position.x, -part.position.y); 
 
-                    if (options.showSleeping && body.isSleeping) 
+                    if ((options.showSleeping && body.isSleeping) || part.render.opacity !== 1) 
                         c.globalAlpha = 1;
                 } else {
                     // part polygon