Skip to content

Commit

Permalink
up and down click events work
Browse files Browse the repository at this point in the history
  • Loading branch information
danielribeiro committed Jul 29, 2013
1 parent 228658b commit d7b2281
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
1 change: 0 additions & 1 deletion lib/camera.coffee
Expand Up @@ -67,7 +67,6 @@ class @Controls
e = event.originalEvent
x = e.movementX or e.mozMovementX or e.webkitMovementX
y = e.movementY or e.mozMovementY or e.webkitMovementY
puts x, y
@setDelta x, y
return

Expand Down
18 changes: 11 additions & 7 deletions lib/minecraft.coffee
Expand Up @@ -342,9 +342,12 @@ class Game
for key in "wasd".split('').concat('space', 'up', 'down', 'left', 'right')
bindit key
$(document).bind 'keydown', 'p', => @togglePause()
$(document).mousedown (e) => @onMouseDown e
$(@canvas).mousedown (e) => @onMouseDown e
$(document).mouseup (e) => @onMouseUp e
$(@canvas).mouseup (e) => @onMouseUp e
$(@canvas).mousemove (e) => @onMouseMove e
$(document).mousemove (e) => @onMouseMove e
$(@canvas).mousemove (e) => @onMouseUp e

togglePause: ->
@pause = !@pause
Expand All @@ -356,18 +359,19 @@ class Game

onMouseUp: (e) ->
if not @moved and MouseEvent.isLeftButton event
@toDelete = @relativePosition(e.pageX, e.pageY)
@toDelete = @_targetPosition(e)
@moved = false

onMouseMove: (event) -> @moved = true

onMouseDown: (e) ->
@moved = false
return unless MouseEvent.isRightButton event
@castRay = if @fullscreen
@relativePosition(e.pageX, e.pageY)
else
@relativePosition(e.pageX, e.pageY)
return unless MouseEvent.isRightButton e
@castRay = @_targetPosition(e)

_targetPosition: (e) ->
return @relativePosition(@width() / 2, @height() / 2) if @fullscreen
@relativePosition(e.pageX, e.pageY)

deleteBlock: ->
return unless @toDelete?
Expand Down

0 comments on commit d7b2281

Please sign in to comment.