codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-27 17:45:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open.

Browse source
This commit is contained in:
Nick Winter 2014-09-11 11:23:58 -07:00
parent 11a734b001
commit d5542ffbbc
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/editor/level/modals/GenerateTerrainModal.coffee
View file

@ -234,7 +234,7 @@ module.exports = class GenerateTerrainModal extends ModalView
template: template
plain: true
modalWidthPercent: 90
events:
'click .choose-option': 'onGenerate'

10
app/views/editor/level/thangs/ThangsTabView.coffee
View file

@ -237,11 +237,15 @@ module.exports = class ThangsTabView extends CocoView
@dragged = true
@surface.camera.dragDisabled = true
{stageX, stageY} = e.originalEvent
wop = @surface.camera.screenToWorld x: stageX, y: stageY
cap = @surface.camera.screenToCanvas x: stageX, y: stageY
wop = @surface.camera.canvasToWorld cap
wop.z = @selectedExtantThang.depth / 2
@adjustThangPos @selectedExtantSprite, @selectedExtantThang, wop
[w, h] = [@surface.camera.canvasWidth, @surface.camera.canvasHeight]
@calculateMovement(stageX / w, stageY / h, w / h)
sidebarWidths = ((if @$el.find(id).hasClass('hide') then 0 else (@$el.find(id).outerWidth() / @surface.camera.canvasScaleFactorX)) for id in ['#all-thangs', '#add-thangs-view'])
w -= sidebarWidth for sidebarWidth in sidebarWidths
cap.x -= sidebarWidths[0]
@calculateMovement(cap.x / w, cap.y / h, w / h)
onSpriteMouseUp: (e) ->
clearTimeout @backgroundAddClickTimeout
@ -384,7 +388,7 @@ module.exports = class ThangsTabView extends CocoView
return unless @addThangSprite
wop = @surface.camera.screenToWorld x: e.x, y: e.y
wop.z = 0.5
@adjustThangPos @addThangSprite, @addThangSprite.thang, wop # TODO: this and onSpriteDragged both conflictin'
@adjustThangPos @addThangSprite, @addThangSprite.thang, wop
null
onSurfaceMouseOver: (e) ->