diff --git a/app/lib/surface/WizardSprite.coffee b/app/lib/surface/WizardSprite.coffee index 1ec5ad812..236d2d77d 100644 --- a/app/lib/surface/WizardSprite.coffee +++ b/app/lib/surface/WizardSprite.coffee @@ -231,7 +231,8 @@ module.exports = class WizardSprite extends IndieSprite super() if @displayObject.visible # not if we hid the wiz moveWizard : (x, y) => + interval = 250 position = {x: @targetPos.x+x, y: @targetPos.y+y} - @setTarget(position, 500, true) + @setTarget(position, interval, true) @updatePosition() - Backbone.Mediator.publish 'camera-zoom-to', position, 500 \ No newline at end of file + Backbone.Mediator.publish 'camera-zoom-to', position, interval \ No newline at end of file diff --git a/app/views/play/level/playback_view.coffee b/app/views/play/level/playback_view.coffee index 4a3b8cadb..c9d11c9f0 100644 --- a/app/views/play/level/playback_view.coffee +++ b/app/views/play/level/playback_view.coffee @@ -36,10 +36,10 @@ module.exports = class PlaybackView extends View '⌘+p, p, ctrl+p': 'onTogglePlay' '⌘+[, ctrl+[': 'onScrubBack' '⌘+], ctrl+]': 'onScrubForward' - 'w, up': 'onMoveUpKey' - 's, down': 'onMoveDownKey' - 'a, left': 'onMoveLeftKey' - 'd, right': 'onMoveRightKey' + 'up': 'onMoveKey' + 'down': 'onMoveKey' + 'left': 'onMoveKey' + 'right': 'onMoveKey' constructor: -> super(arguments...) @@ -220,14 +220,13 @@ module.exports = class PlaybackView extends View @onWindowResize = null super() - onMoveUpKey: -> - Backbone.Mediator.publish 'self-wizard:move', 0, 1 - - onMoveDownKey: -> - Backbone.Mediator.publish 'self-wizard:move', 0, -1 - - onMoveLeftKey: -> - Backbone.Mediator.publish 'self-wizard:move', -1, 0 - - onMoveRightKey: -> - Backbone.Mediator.publish 'self-wizard:move', 1, 0 + onMoveKey: (e) -> + e?.preventDefault() + x = 0 + y = 0 + y = 1 if key.isPressed('up') + y = -1 if key.isPressed('down') + x = 1 if key.isPressed('right') + x = -1 if key.isPressed('left') + console.log 'onMoveKey', x, y + Backbone.Mediator.publish 'self-wizard:move', x, y