Skip to content

Commit

Permalink
Merge branch 'master' into topic/addBounds
Browse files Browse the repository at this point in the history
  • Loading branch information
mrspeaker committed Jun 13, 2014
2 parents e263ecb + c6a9414 commit a461fc7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
7 changes: 7 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
node_modules
npm-debug.log
doc
matter-doc-theme
build/matter-dev.js
build/matter-dev.min.js
demo/js/lib/matter-dev.js
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,14 @@ Download [matter-0.8.0.js](https:/liabru/matter-js/releases/download

For the latest features try the [edge version (master)](https://raw.github.com/liabru/matter-js/master/build/matter.js), but it may not be fully stable.

#### Or install using [Bower](http://bower.io/)
#### Install using [Bower](http://bower.io/)

bower install matter-js

#### Install using [NPM](https://www.npmjs.org/)

npm install matter-js

### Usage

See [Demo.js](https:/liabru/matter-js/blob/master/demo/js/Demo.js) and [DemoMobile.js](https:/liabru/matter-js/blob/master/demo/js/DemoMobile.js) for many usage examples.
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "Matter",
"name": "matter-js",
"version": "0.8.0",
"license": "MIT",
"homepage": "http://brm.io/matter-js/",
"author": "Liam Brummitt <[email protected]> (http://brm.io/)",
"description": "a 2D rigid body physics engine for the web",
"main": "build/matter-0.8.0.min.js",
"repository":{
"type" : "git",
"url" : "https:/liabru/matter-js.git"
"repository": {
"type": "git",
"url": "https:/liabru/matter-js.git"
},
"keywords": [
"javascript",
Expand All @@ -32,5 +32,6 @@
"scripts": {
"dev": "npm install && grunt dev",
"test": "grunt test"
}
},
"dependencies": {}
}
5 changes: 3 additions & 2 deletions src/render/RenderPixi.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ var RenderPixi = {};
}
};

var render = Common.extend(defaults, options);
var render = Common.extend(defaults, options),
transparent = !render.options.wireframes && render.options.background === 'transparent';

// init pixi
render.context = new PIXI.WebGLRenderer(render.options.width, render.options.height, render.canvas, false, true);
render.context = new PIXI.WebGLRenderer(render.options.width, render.options.height, render.canvas, transparent, true);
render.canvas = render.context.view;
render.container = new PIXI.DisplayObjectContainer();
render.stage = new PIXI.Stage();
Expand Down

0 comments on commit a461fc7

Please sign in to comment.