diff --git a/app/application.coffee b/app/application.coffee index ec6580b65..4252c87c6 100644 --- a/app/application.coffee +++ b/app/application.coffee @@ -8,6 +8,9 @@ CocoView = require 'views/kinds/CocoView' marked.setOptions {gfm: true, sanitize: true, smartLists: true, breaks: false} +# TODO, add C-style macro constants like this? +window.SPRITE_RESOLUTION_FACTOR = 4 + # Prevent Ctrl/Cmd + [ / ], P, S ctrlDefaultPrevented = [219, 221, 80, 83] preventBackspace = (event) -> diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee index 18fa8e841..bb04340f2 100644 --- a/app/lib/LevelLoader.coffee +++ b/app/lib/LevelLoader.coffee @@ -201,7 +201,7 @@ module.exports = class LevelLoader extends CocoClass # queue.loadFile('/file/'+f) @grabThangTypeTeams() unless @thangTypeTeams for team in @thangTypeTeams[thangType.get('original')] ? [null] - spriteOptions = {resolutionFactor: 4, async: false} + spriteOptions = {resolutionFactor: SPRITE_RESOLUTION_FACTOR, async: false} if thangType.get('kind') is 'Floor' spriteOptions.resolutionFactor = 2 if team and color = @teamConfigs[team]?.color diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee index f640ead63..a6cdcc741 100644 --- a/app/lib/surface/CocoSprite.coffee +++ b/app/lib/surface/CocoSprite.coffee @@ -24,7 +24,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass ranges: null options: - resolutionFactor: 4 + resolutionFactor: SPRITE_RESOLUTION_FACTOR groundLayer: null textLayer: null floatingLayer: null diff --git a/app/lib/surface/SpriteBoss.coffee b/app/lib/surface/SpriteBoss.coffee index c9484c7f4..1d174b46b 100644 --- a/app/lib/surface/SpriteBoss.coffee +++ b/app/lib/surface/SpriteBoss.coffee @@ -150,7 +150,7 @@ module.exports = class SpriteBoss extends CocoClass thangType ?= _.find @options.thangTypes, (m) -> return m.get('name') is thang.spriteName options = @createSpriteOptions thang: thang - options.resolutionFactor = if thangType.get('kind') is 'Floor' then 2 else 4 + options.resolutionFactor = if thangType.get('kind') is 'Floor' then 2 else SPRITE_RESOLUTION_FACTOR sprite = new CocoSprite thangType, options @addSprite sprite, null, layer sprite.setDebug @debug @@ -213,8 +213,9 @@ module.exports = class SpriteBoss extends CocoClass @spriteLayers["Obstacle"].uncache() if @spriteLayers["Obstacle"].cacheID # might have changed sizes @spriteLayers["Obstacle"].cache() # test performance of doing land layer, too, to see if it's faster - #@spriteLayers["Land"].uncache() if @spriteLayers["Land"].cacheID # might have changed sizes - #@spriteLayers["Land"].cache() +# @spriteLayers["Land"].uncache() if @spriteLayers["Land"].cacheID # might have changed sizes +# @spriteLayers["Land"].cache() + # I don't notice much difference - Scott @cached = true spriteFor: (thangID) -> @sprites[thangID] diff --git a/app/models/ThangType.coffee b/app/models/ThangType.coffee index d240b670e..ba49132cf 100644 --- a/app/models/ThangType.coffee +++ b/app/models/ThangType.coffee @@ -53,7 +53,7 @@ module.exports = class ThangType extends CocoModel fillOptions: (options) -> options ?= {} options = _.clone options - options.resolutionFactor ?= 4 + options.resolutionFactor ?= SPRITE_RESOLUTION_FACTOR options.async ?= false options