Skip to content

Commit 98eb2e3

Browse files
committed
Renderers now using the Origin property.
1 parent 91bb3c8 commit 98eb2e3

5 files changed

Lines changed: 19 additions & 14 deletions

File tree

v3/src/gameobjects/image/Image.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ var Image = new Class({
1010
Components.Alpha,
1111
Components.BlendMode,
1212
Components.GetBounds,
13+
Components.Origin,
1314
Components.ScaleMode,
1415
Components.Size,
1516
Components.Texture,
@@ -26,6 +27,7 @@ var Image = new Class({
2627

2728
this.setTexture(texture, frame);
2829
this.setPosition(x, y);
30+
this.setOriginToCenter();
2931
}
3032

3133
});

v3/src/gameobjects/image/ImageWebGLRenderer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var ImageWebGLRenderer = function (renderer, src, interpolationPercentage, camer
1313
var frame = src.frame;
1414
var alpha = 16777216;
1515
var spriteBatch = renderer.spriteBatch;
16-
var anchorX = src.anchorX;
17-
var anchorY = src.anchorY;
16+
// var anchorX = src.anchorX;
17+
// var anchorY = src.anchorY;
1818
//var vertexColor = src.color._glTint;
1919
var vertexDataBuffer = spriteBatch.vertexDataBuffer;
2020
var vertexBufferF32 = vertexDataBuffer.floatView;
@@ -35,8 +35,8 @@ var ImageWebGLRenderer = function (renderer, src, interpolationPercentage, camer
3535
var d = cameraMatrix[3];
3636
var e = cameraMatrix[4];
3737
var f = cameraMatrix[5];
38-
var x = width * -anchorX + frame.x;
39-
var y = height * -anchorY + frame.y;
38+
var x = -src.originX + frame.x;
39+
var y = -src.originY + frame.y;
4040
var xw = x + width;
4141
var yh = y + height;
4242
var tx = x * a + y * c + e;

v3/src/gameobjects/sprite/Sprite.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ var SpriteRender = require('./SpriteRender');
77
var Sprite = new Class({
88

99
Mixins: [
10-
Components.Transform,
11-
Components.Texture,
12-
Components.Size,
1310
Components.Alpha,
1411
Components.BlendMode,
12+
Components.GetBounds,
13+
Components.Origin,
1514
Components.ScaleMode,
15+
Components.Size,
16+
Components.Texture,
17+
Components.Transform,
1618
Components.Visible,
1719
SpriteRender
1820
],
@@ -23,8 +25,9 @@ var Sprite = new Class({
2325
{
2426
GameObject.call(this, state);
2527

26-
this.setPosition(x, y);
2728
this.setTexture(texture, frame);
29+
this.setPosition(x, y);
30+
this.setOriginToCenter();
2831
}
2932

3033
});

v3/src/gameobjects/sprite/SpriteWebGLRenderer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var SpriteWebGLRenderer = function (renderer, src, interpolationPercentage, came
1313
var frame = src.frame;
1414
var alpha = 16777216;
1515
var spriteBatch = renderer.spriteBatch;
16-
var anchorX = src.anchorX;
17-
var anchorY = src.anchorY;
16+
// var anchorX = src.anchorX;
17+
// var anchorY = src.anchorY;
1818
//var vertexColor = src.color._glTint;
1919
var vertexDataBuffer = spriteBatch.vertexDataBuffer;
2020
var vertexBufferF32 = vertexDataBuffer.floatView;
@@ -35,8 +35,8 @@ var SpriteWebGLRenderer = function (renderer, src, interpolationPercentage, came
3535
var d = cameraMatrix[3];
3636
var e = cameraMatrix[4];
3737
var f = cameraMatrix[5];
38-
var x = width * -anchorX + frame.x;
39-
var y = height * -anchorY + frame.y;
38+
var x = -src.originX + frame.x;
39+
var y = -src.originY + frame.y;
4040
var xw = x + width;
4141
var yh = y + height;
4242
var tx = x * a + y * c + e;

v3/src/renderer/canvas/utils/DrawImage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ var DrawImage = function (src, camera)
2929
// ctx[this.smoothProperty] = (source.scaleMode === ScaleModes.LINEAR);
3030
}
3131

32-
var dx = frame.x - (src.anchorX * frame.width) - camera.scrollX;
33-
var dy = frame.y - (src.anchorY * frame.height) - camera.scrollY;
32+
var dx = frame.x - src.originX - camera.scrollX;
33+
var dy = frame.y - src.originY - camera.scrollY;
3434

3535
ctx.save();
3636
ctx.translate(src.x, src.y);

0 commit comments

Comments
 (0)