Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'dperit/develop' into physics-examples
Conflicts:
	gladius-core.min.js
  • Loading branch information
Alan Kligman committed Jun 10, 2012
2 parents 27f4073 + de50a8e commit 456cc9f
Show file tree
Hide file tree
Showing 5 changed files with 87,893 additions and 87,799 deletions.
14 changes: 7 additions & 7 deletions examples/cube-impulse/cube-impulse.js
Expand Up @@ -30,14 +30,8 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
}
};

var box2dOptions = {
resolver: {
gravity: [0,-1]
}
};

engine.registerExtension( cubicvrExtension, cubicvrOptions );
engine.registerExtension( box2dExtension, box2dOptions);
engine.registerExtension( box2dExtension );

var resources = {};

Expand Down Expand Up @@ -92,6 +86,12 @@ document.addEventListener( "DOMContentLoaded", function( e ) {
]
));

space.add(new engine.Entity( "gravity",
[
new box2d.Force({force:[0,-1], forceType:box2d.Force.ForceTypes.GLOBAL})
]
));

var xCoord, yCoord, zCoord;
for (xCoord = -11; xCoord < 11; xCoord = xCoord + 2){
for (yCoord = -11; yCoord < 11; yCoord = yCoord + 2){
Expand Down

0 comments on commit 456cc9f

Please sign in to comment.