Skip to content

Commit

Permalink
Merge branch 'pr/440'
Browse files Browse the repository at this point in the history 
* pr/440:
  Do not warn on missing render.element if the canvas is already parented (because it was passed in at construction).
  • Loading branch information
@liabru
liabru committed Nov 25, 2017
2 parents fca0994 + a529ec9 commit 2dc7a0b
Showing 1 changed file with 37 additions and 37 deletions.
74 changes: 37 additions & 37 deletions src/render/Render.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ var Vector = require('../geometry/Vector');
var Mouse = require('../core/Mouse');

(function() {

var _requestAnimationFrame,
_cancelAnimationFrame;

if (typeof window !== 'undefined') {
_requestAnimationFrame = window.requestAnimationFrame || window.webkitRequestAnimationFrame
|| window.mozRequestAnimationFrame || window.msRequestAnimationFrame
|| window.mozRequestAnimationFrame || window.msRequestAnimationFrame
|| function(callback){ window.setTimeout(function() { callback(Common.now()); }, 1000 / 60); };
_cancelAnimationFrame = window.cancelAnimationFrame || window.mozCancelAnimationFrame

_cancelAnimationFrame = window.cancelAnimationFrame || window.mozCancelAnimationFrame
|| window.webkitCancelAnimationFrame || window.msCancelAnimationFrame;
}

Expand Down Expand Up @@ -89,12 +89,12 @@ var Mouse = require('../core/Mouse');
render.context = render.canvas.getContext('2d');
render.textures = {};

render.bounds = render.bounds || {
min: {
render.bounds = render.bounds || {
min: {
x: 0,
y: 0
},
max: {
},
max: {
x: render.canvas.width,
y: render.canvas.height
}
Expand All @@ -106,7 +106,7 @@ var Mouse = require('../core/Mouse');

if (Common.isElement(render.element)) {
render.element.appendChild(render.canvas);
} else {
} else if (!render.canvas.parentNode) {
Common.log('Render.create: options.element was undefined, render.canvas was created but not appended', 'warn');
}

Expand Down Expand Up @@ -188,19 +188,19 @@ var Mouse = require('../core/Mouse');
for (var i = 0; i < objects.length; i += 1) {
var object = objects[i],
min = object.bounds ? object.bounds.min : (object.min || object.position || object),
max = object.bounds ? object.bounds.max : (object.max || object.position || object);
max = object.bounds ? object.bounds.max : (object.max || object.position || object);

if (min && max) {
if (min.x < bounds.min.x)
if (min && max) {
if (min.x < bounds.min.x)
bounds.min.x = min.x;
if (max.x > bounds.max.x)

if (max.x > bounds.max.x)
bounds.max.x = max.x;

if (min.y < bounds.min.y)
if (min.y < bounds.min.y)
bounds.min.y = min.y;

if (max.y > bounds.max.y)
if (max.y > bounds.max.y)
bounds.max.y = max.y;
}
}
Expand Down Expand Up @@ -375,7 +375,7 @@ var Mouse = require('../core/Mouse');

if (options.showAxes || options.showAngleIndicator)
Render.bodyAxes(render, bodies, context);

if (options.showPositions)
Render.bodyPositions(render, bodies, context);

Expand Down Expand Up @@ -456,7 +456,7 @@ var Mouse = require('../core/Mouse');
text += "mid: " + metrics.midEff + space;
text += "narrow: " + metrics.narrowEff + space;
}
// @endif
// @endif

render.debugString = text;
render.debugTimestamp = engine.timing.timestamp;
Expand Down Expand Up @@ -555,7 +555,7 @@ var Mouse = require('../core/Mouse');
}
}
};

/**
* Description
* @private
Expand Down Expand Up @@ -647,20 +647,20 @@ var Mouse = require('../core/Mouse');
var sprite = part.render.sprite,
texture = _getTexture(render, sprite.texture);

c.translate(part.position.x, part.position.y);
c.translate(part.position.x, part.position.y);
c.rotate(part.angle);

c.drawImage(
texture,
texture.width * -sprite.xOffset * sprite.xScale,
texture.height * -sprite.yOffset * sprite.yScale,
texture.width * sprite.xScale,
texture.width * -sprite.xOffset * sprite.xScale,
texture.height * -sprite.yOffset * sprite.yScale,
texture.width * sprite.xScale,
texture.height * sprite.yScale
);

// revert translation, hopefully faster than save / restore
c.rotate(-part.angle);
c.translate(-part.position.x, -part.position.y);
c.translate(-part.position.x, -part.position.y);
} else {
// part polygon
if (part.circleRadius) {
Expand All @@ -681,7 +681,7 @@ var Mouse = require('../core/Mouse');
c.moveTo(part.vertices[(j + 1) % part.vertices.length].x, part.vertices[(j + 1) % part.vertices.length].y);
}
}

c.lineTo(part.vertices[0].x, part.vertices[0].y);
c.closePath();
}
Expand Down Expand Up @@ -751,7 +751,7 @@ var Mouse = require('../core/Mouse');
c.moveTo(part.vertices[(j + 1) % part.vertices.length].x, part.vertices[(j + 1) % part.vertices.length].y);
}
}

c.lineTo(part.vertices[0].x, part.vertices[0].y);
}
}
Expand Down Expand Up @@ -791,7 +791,7 @@ var Mouse = require('../core/Mouse');
for (j = 1; j < body.vertices.length; j++) {
c.lineTo(body.vertices[j].x, body.vertices[j].y);
}

c.lineTo(body.vertices[0].x, body.vertices[0].y);
}

Expand Down Expand Up @@ -919,7 +919,7 @@ var Mouse = require('../core/Mouse');
for (k = 0; k < part.axes.length; k++) {
// render a single axis indicator
c.moveTo(part.position.x, part.position.y);
c.lineTo((part.vertices[0].x + part.vertices[part.vertices.length-1].x) / 2,
c.lineTo((part.vertices[0].x + part.vertices[part.vertices.length-1].x) / 2,
(part.vertices[0].y + part.vertices[part.vertices.length-1].y) / 2);
}
}
Expand Down Expand Up @@ -1094,7 +1094,7 @@ var Mouse = require('../core/Mouse');
c.fill();

c.beginPath();

// render collision normals
for (i = 0; i < pairs.length; i++) {
pair = pairs[i];
Expand All @@ -1112,7 +1112,7 @@ var Mouse = require('../core/Mouse');
normalPosX = (pair.activeContacts[0].vertex.x + pair.activeContacts[1].vertex.x) / 2;
normalPosY = (pair.activeContacts[0].vertex.y + pair.activeContacts[1].vertex.y) / 2;
}

if (collision.bodyB === collision.supports[0].body || collision.bodyA.isStatic === true) {
c.moveTo(normalPosX - collision.normal.x * 8, normalPosY - collision.normal.y * 8);
} else {
Expand Down Expand Up @@ -1219,9 +1219,9 @@ var Mouse = require('../core/Mouse');
continue;

var region = bucketId.split(/C|R/);
c.rect(0.5 + parseInt(region[1], 10) * grid.bucketWidth,
0.5 + parseInt(region[2], 10) * grid.bucketHeight,
grid.bucketWidth,
c.rect(0.5 + parseInt(region[1], 10) * grid.bucketWidth,
0.5 + parseInt(region[2], 10) * grid.bucketHeight,
grid.bucketWidth,
grid.bucketHeight);
}

Expand All @@ -1248,7 +1248,7 @@ var Mouse = require('../core/Mouse');
boundsHeight = render.bounds.max.y - render.bounds.min.y,
boundsScaleX = boundsWidth / render.options.width,
boundsScaleY = boundsHeight / render.options.height;

context.scale(1 / boundsScaleX, 1 / boundsScaleY);
context.translate(-render.bounds.min.x, -render.bounds.min.y);
}
Expand All @@ -1268,7 +1268,7 @@ var Mouse = require('../core/Mouse');
// render body selections
bounds = item.bounds;
context.beginPath();
context.rect(Math.floor(bounds.min.x - 3), Math.floor(bounds.min.y - 3),
context.rect(Math.floor(bounds.min.x - 3), Math.floor(bounds.min.y - 3),
Math.floor(bounds.max.x - bounds.min.x + 6), Math.floor(bounds.max.y - bounds.min.y + 6));
context.closePath();
context.stroke();
Expand Down Expand Up @@ -1302,7 +1302,7 @@ var Mouse = require('../core/Mouse');
context.fillStyle = 'rgba(255,165,0,0.1)';
bounds = inspector.selectBounds;
context.beginPath();
context.rect(Math.floor(bounds.min.x), Math.floor(bounds.min.y),
context.rect(Math.floor(bounds.min.x), Math.floor(bounds.min.y),
Math.floor(bounds.max.x - bounds.min.x), Math.floor(bounds.max.y - bounds.min.y));
context.closePath();
context.stroke();
Expand Down Expand Up @@ -1480,7 +1480,7 @@ var Mouse = require('../core/Mouse');
*/

/**
* A `Bounds` object that specifies the drawing view region.
* A `Bounds` object that specifies the drawing view region.
* Rendering will be automatically transformed and scaled to fit within the canvas size (`render.options.width` and `render.options.height`).
* This allows for creating views that can pan or zoom around the scene.
* You must also set `render.options.hasBounds` to `true` to enable bounded rendering.
Expand Down

0 comments on commit 2dc7a0b

Please sign in to comment.