diff --git a/app/lib/surface/Camera.coffee b/app/lib/surface/Camera.coffee index 9e4701868..76323e5e8 100644 --- a/app/lib/surface/Camera.coffee +++ b/app/lib/surface/Camera.coffee @@ -42,6 +42,7 @@ module.exports = class Camera extends CocoClass 'level:restarted': 'onLevelRestarted' 'sprite:mouse-down': 'onMouseDown' 'sprite:dragged': 'onMouseDragged' + 'camera-zoom-to': 'onZoomTo' # TODO: Fix tests to not use mainLayer constructor: (@canvasWidth, @canvasHeight, angle=Math.asin(0.75), hFOV=d2r(30)) -> @@ -308,3 +309,6 @@ module.exports = class Camera extends CocoClass createjs.Tween.removeTweens @ @finishTween = null super() + + onZoomTo: (pos, time) -> + @zoomTo(@worldToSurface(pos), @zoom, time) diff --git a/app/lib/surface/WizardSprite.coffee b/app/lib/surface/WizardSprite.coffee index 7b57b7b87..1ec5ad812 100644 --- a/app/lib/surface/WizardSprite.coffee +++ b/app/lib/surface/WizardSprite.coffee @@ -231,7 +231,7 @@ module.exports = class WizardSprite extends IndieSprite super() if @displayObject.visible # not if we hid the wiz moveWizard : (x, y) => - console.log x, y position = {x: @targetPos.x+x, y: @targetPos.y+y} @setTarget(position, 500, true) @updatePosition() + Backbone.Mediator.publish 'camera-zoom-to', position, 500 \ No newline at end of file