Skip to content

Commit 8e61bcf

Browse files
committed
fix zoom (more precision)
1 parent f06f330 commit 8e61bcf

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

parallax/Parallax.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ class Parallax
138138

139139
camera.onZoom(delta);
140140

141-
this.zoomOffsetX = zoomOffsetX;
142-
this.zoomOffsetY = zoomOffsetY;
141+
this.zoomOffsetX = (zoomOffsetX + camera.x) / camera.preZoom;
142+
this.zoomOffsetY = (zoomOffsetY + camera.y) / camera.preZoom;
143143

144144
applyZoom();
145145

@@ -155,7 +155,7 @@ class Parallax
155155

156156
var offsetX = zoomOffsetX * camera.preZoom - zoomOffsetX * camera.zoom;
157157
var offsetY = zoomOffsetY * camera.preZoom - zoomOffsetY * camera.zoom;
158-
158+
159159
camera.x -= offsetX;
160160
camera.y -= offsetY;
161161
}

sample/OpenflSample.hx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@ class OpenflSample extends Sprite
6969
OpenflHelper.setWorldBounds(parallax, layer, spr);
7070
}
7171
}
72-
72+
#if (gs || gs2)
73+
parallax.setZoomBounds(1080);
74+
#else
7375
parallax.setZoomBounds(stage.stageHeight);
76+
#end
7477

7578
stage.addEventListener(MouseEvent.MOUSE_WHEEL, onWheel);
7679
stage.addEventListener(MouseEvent.MOUSE_DOWN, onDragStart);
@@ -82,8 +85,11 @@ class OpenflSample extends Sprite
8285
{
8386
parallax.camera.width = stage.stageWidth;
8487
parallax.camera.height = stage.stageHeight;
85-
88+
#if (gs || gs2)
89+
parallax.setZoomBounds(1080);
90+
#else
8691
parallax.setZoomBounds(stage.stageHeight);
92+
#end
8793
}
8894

8995
function onReset(e:MouseEvent):Void
@@ -141,7 +147,7 @@ class OpenflSample extends Sprite
141147

142148
function onWheel(e:MouseEvent):Void
143149
{
144-
parallax.onZoom(e.delta / 100, e.stageX + parallax.camera.x, e.stageY + parallax.camera.y);
150+
parallax.onZoom(e.delta / 100, e.stageX, e.stageY);
145151

146152
for (i in 0...containers.length)
147153
{

0 commit comments

Comments
 (0)