Skip to content

Commit

Permalink
v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
schteppe committed Mar 29, 2015
1 parent 22be57c commit 9fd65db
Show file tree
Hide file tree
Showing 106 changed files with 30,362 additions and 56,673 deletions.
2,988 changes: 1,274 additions & 1,714 deletions build/p2.js

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions build/p2.min.js

Large diffs are not rendered by default.

25 changes: 17 additions & 8 deletions build/p2.renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16083,9 +16083,11 @@ p2.Renderer = Renderer;
* @constructor
* @param {object} scenes One or more scene definitions. See setScene.
*/
function Renderer(scenes){
function Renderer(scenes, options){
p2.EventEmitter.call(this);

options = options || {};

// Expose globally
window.app = this;

Expand Down Expand Up @@ -16189,6 +16191,13 @@ function Renderer(scenes){
this.setUpKeyboard();
this.setupGUI();

if(typeof(options.hideGUI) === 'undefined'){
options.hideGUI = 'auto';
}
if((options.hideGUI === 'auto' && window.innerWidth < 600) || options.hideGUI === true){
this.gui.close();
}

this.printConsoleMessage();

// Set first scene
Expand Down Expand Up @@ -16945,14 +16954,14 @@ var Renderer = p2.Renderer;
* @class WebGLRenderer
* @constructor
* @extends Renderer
* @param {World} world The world to render.
* @param {World} scenes
* @param {Object} [options]
* @param {Number} options.lineWidth
* @param {Number} options.scrollFactor
* @param {Number} options.width Num pixels in horizontal direction
* @param {Number} options.height Num pixels in vertical direction
* @param {Number} [options.lineWidth=0.01]
* @param {Number} [options.scrollFactor=0.1]
* @param {Number} [options.width] Num pixels in horizontal direction
* @param {Number} [options.height] Num pixels in vertical direction
*/
function WebGLRenderer(world,options){
function WebGLRenderer(scenes, options){
options = options || {};

var that = this;
Expand Down Expand Up @@ -16982,7 +16991,7 @@ function WebGLRenderer(world,options){
this.springSprites = [];
this.debugPolygons = false;

Renderer.call(this,world);
Renderer.call(this,scenes,options);

for(var key in settings){
this.settings[key] = settings[key];
Expand Down
4 changes: 2 additions & 2 deletions build/p2.renderer.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions docs/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ YUI.add("yuidoc-meta", function(Y) {
"Particle",
"Plane",
"PrismaticConstraint",
"Ray",
"RaycastResult",
"Rectangle",
"RevoluteConstraint",
"RotationalLockEquation",
Expand Down
Binary file modified docs/assets/css/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ code, kbd, pre, samp {
line-height: 1.35;
}

p code, p kbd, p samp {
p code, p kbd, p samp, li code {
background: #FCFBFA;
border: 1px solid #EFEEED;
padding: 0 3px;
Expand Down
Binary file added docs/assets/favicon.ico
Binary file not shown.
Binary file removed docs/assets/favicon.png
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/assets/js/apidocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ pjax.handleClasses = function (req, res, next) {
var status = res.ioResponse.status;

// Handles success and local filesystem XHRs.
if (!status || (status >= 200 && status < 300)) {
if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
pjax.initClassTabView();
}

Expand All @@ -295,7 +295,7 @@ pjax.handleFiles = function (req, res, next) {
var status = res.ioResponse.status;

// Handles success and local filesystem XHRs.
if (!status || (status >= 200 && status < 300)) {
if (res.ioResponse.readyState === 4 && (!status || (status >= 200 && status < 300))) {
pjax.initLineNumbers();
}

Expand Down
Loading

0 comments on commit 9fd65db

Please sign in to comment.