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

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Scott Erickson 2014-04-16 08:40:11 -07:00
commit d5b0a83186
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/lib/surface/Mark.coffee
View file

@ -93,6 +93,7 @@ module.exports = class Mark extends CocoClass
@lastHeight = @sprite.thang.height @lastHeight = @sprite.thang.height
buildShadow: -> buildShadow: ->
alpha = @sprite.thang?.alpha ? 1
width = (@sprite.thang?.width ? 0) + 0.5 width = (@sprite.thang?.width ? 0) + 0.5
height = (@sprite.thang?.height ? 0) + 0.5 height = (@sprite.thang?.height ? 0) + 0.5
longest = Math.max width, height longest = Math.max width, height
@ -103,7 +104,7 @@ module.exports = class Mark extends CocoClass
height *= Camera.PPM * @camera.y2x # TODO: doesn't work with rotation height *= Camera.PPM * @camera.y2x # TODO: doesn't work with rotation
@mark = new createjs.Shape() @mark = new createjs.Shape()
@mark.mouseEnabled = false @mark.mouseEnabled = false
@mark.graphics.beginFill "black" @mark.graphics.beginFill "rgba(0, 0, 0, #{alpha})"
if @sprite.thang.shape in ['ellipsoid', 'disc'] if @sprite.thang.shape in ['ellipsoid', 'disc']
@mark.graphics.drawEllipse 0, 0, width, height @mark.graphics.drawEllipse 0, 0, width, height
else else