codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-03 17:33:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ThangTypes with empty portraits now upload them with blank images, to overwrite extant portraits.

Browse source
This commit is contained in:
Scott Erickson 2014-11-25 13:28:15 -08:00
parent c2f77470a0
commit 0f29e098cc
1 changed files with 3 additions and 3 deletions

6
app/models/ThangType.coffee
View file

@ -232,7 +232,9 @@ module.exports = class ThangType extends CocoModel
stage?.toDataURL() stage?.toDataURL()
getPortraitStage: (spriteOptionsOrKey, size=100) -> getPortraitStage: (spriteOptionsOrKey, size=100) ->
return unless @isFullyLoaded() canvas = $("<canvas width='#{size}' height='#{size}'></canvas>")
stage = new createjs.Stage(canvas[0])
return stage unless @isFullyLoaded()
key = spriteOptionsOrKey key = spriteOptionsOrKey
key = if _.isString(key) then key else @spriteSheetKey(@fillOptions(key)) key = if _.isString(key) then key else @spriteSheetKey(@fillOptions(key))
spriteSheet = @spriteSheets[key] spriteSheet = @spriteSheets[key]
@ -242,8 +244,6 @@ module.exports = class ThangType extends CocoModel
spriteSheet = @buildSpriteSheet(options) spriteSheet = @buildSpriteSheet(options)
return if _.isString spriteSheet return if _.isString spriteSheet
return unless spriteSheet return unless spriteSheet
canvas = $("<canvas width='#{size}' height='#{size}'></canvas>")
stage = new createjs.Stage(canvas[0])
sprite = new createjs.Sprite(spriteSheet) sprite = new createjs.Sprite(spriteSheet)
pt = @actions.portrait?.positions?.registration pt = @actions.portrait?.positions?.registration
sprite.regX = pt?.x or 0 sprite.regX = pt?.x or 0