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

Working on orientation

Browse source
This commit is contained in:
Pete DiSalvo 2014-08-01 00:14:54 -04:00
parent 8f6d162542
commit dc7529344c
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/lib/surface/CoordinateDisplay.coffee
View file

@ -72,28 +72,48 @@ module.exports = class CoordinateDisplay extends createjs.Container
contentWidth = @label.getMeasuredWidth() + (2 * margin) contentWidth = @label.getMeasuredWidth() + (2 * margin)
contentHeight = @label.getMeasuredHeight() + (2 * margin) contentHeight = @label.getMeasuredHeight() + (2 * margin)
# Shift all contents up so marker is at pointer (affects container cache position) # Shift pointmarker up so it centers at pointer (affects container cache position)
@label.regY = @background.regY = @pointMarker.regY = contentHeight @pointMarker.regY = contentHeight
pointMarkerStroke = 2 pointMarkerStroke = 2
pointMarkerLength = 8 pointMarkerLength = 8
fullPointMarkerLength = pointMarkerLength + (pointMarkerStroke / 2)
contributionsToTotalSize = [] contributionsToTotalSize = []
contributionsToTotalSize = contributionsToTotalSize.concat @updateCoordinates contentWidth, contentHeight, pointMarkerLength contributionsToTotalSize = contributionsToTotalSize.concat @updateCoordinates contentWidth, contentHeight, fullPointMarkerLength
contributionsToTotalSize = contributionsToTotalSize.concat @updatePointMarker 0, contentHeight, pointMarkerLength, pointMarkerStroke contributionsToTotalSize = contributionsToTotalSize.concat @updatePointMarker 0, contentHeight, pointMarkerLength, pointMarkerStroke
totalWidth = contentWidth + contributionsToTotalSize.reduce (a, b) -> a + b totalWidth = contentWidth + contributionsToTotalSize.reduce (a, b) -> a + b
totalHeight = contentHeight + contributionsToTotalSize.reduce (a, b) -> a + b totalHeight = contentHeight + contributionsToTotalSize.reduce (a, b) -> a + b
# All below is orientation dependent...
# Effected by orientation:
# background and label: regY and regX
# Caching position
# Crosshair stays in same place
# let e := edge
# if the :e: edge of coordinate display is outside camera :e: view, then show :e: edge orientation
orientationVerticalModifier = 1
cacheY = fullPointMarkerLength
if true # near top edge
orientationVerticalModifier = -orientationVerticalModifier
cacheY = cacheY * orientationVerticalModifier
else
cacheY = -totalHeight + cacheY
@containerOverlay.graphics @containerOverlay.graphics
.clear() .clear()
.beginFill('rgba(255,0,0,0.4)') # Actual position .beginFill('rgba(255,0,0,0.4)') # Actual position
.drawRect(0, 0, totalWidth, totalHeight) .drawRect(0, 0, totalWidth, totalHeight)
.endFill() .endFill()
.beginFill('rgba(0,0,255,0.4)') # Cache position .beginFill('rgba(0,0,255,0.4)') # Cache position
.drawRect(-pointMarkerLength, -totalHeight + pointMarkerLength, totalWidth, totalHeight) .drawRect(-fullPointMarkerLength, cacheY, totalWidth, totalHeight)
.endFill() .endFill()
@cache -pointMarkerLength, -totalHeight + pointMarkerLength, totalWidth, totalHeight @label.regY = @background.regY = (totalHeight - contentHeight) * orientationVerticalModifier
#@cache -fullPointMarkerLength, -totalHeight + fullPointMarkerLength, totalWidth, totalHeight
updateCoordinates: (contentWidth, contentHeight, initialXYOffset) -> updateCoordinates: (contentWidth, contentHeight, initialXYOffset) ->
offsetForPointMarker = initialXYOffset offsetForPointMarker = initialXYOffset
@ -135,5 +155,5 @@ module.exports = class CoordinateDisplay extends createjs.Container
@addChild @label @addChild @label
@addChild @pointMarker @addChild @pointMarker
@addChild @containerOverlay # FOR TESTING - REMOVE BEFORE COMMIT @addChild @containerOverlay # FOR TESTING - REMOVE BEFORE COMMIT
@updateCache() #@updateCache()
Backbone.Mediator.publish 'surface:coordinates-shown', {} Backbone.Mediator.publish 'surface:coordinates-shown', {}