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

Improved performance of the non-webgl stage.

Browse source
This commit is contained in:
Scott Erickson 2014-09-29 10:18:27 -07:00
parent 326057a816
commit ce9a7e2ed4
2 changed files with 7 additions and 4 deletions

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

@ -100,6 +100,8 @@ module.exports = class Label extends CocoClass
label.shadow = new createjs.Shadow o.shadowColor, 1, 1, 0 if o.shadow
label.layerPriority = o.layerPriority
label.name = "Sprite Label - #{@style}"
bounds = label.getBounds()
label.cache(bounds.x, bounds.y, bounds.width, bounds.height)
o.textHeight = label.getMeasuredHeight()
o.label = label
label
@ -170,6 +172,7 @@ module.exports = class Label extends CocoClass
o.label.regX = background.regX - o.marginX
o.label.regY = background.regY - o.marginY
background.cache(0, 0, w, h)
g.endStroke()
g.endFill()

8
app/lib/surface/Surface.coffee
View file

@ -103,8 +103,8 @@ module.exports = Surface = class Surface extends CocoClass
@normalLayers.push @surfaceTextLayer = new Layer name: 'Surface Text', layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera
@normalLayers.push @gridLayer = new Layer name: 'Grid', layerPriority: 2, transform: Layer.TRANSFORM_SURFACE, camera: @camera
@normalLayers.push @screenLayer = new Layer name: 'Screen', layerPriority: 3, transform: Layer.TRANSFORM_SCREEN, camera: @camera
@normalLayers.push @cameraBorderLayer = new Layer name: 'Camera Border', layerPriority: 4, transform: Layer.TRANSFORM_SURFACE, camera: @camera
@cameraBorderLayer.addChild @cameraBorder = new CameraBorder(bounds: @camera.bounds)
# @normalLayers.push @cameraBorderLayer = new Layer name: 'Camera Border', layerPriority: 4, transform: Layer.TRANSFORM_SURFACE, camera: @camera
# @cameraBorderLayer.addChild @cameraBorder = new CameraBorder(bounds: @camera.bounds)
@normalStage.addChild (layer.container for layer in @normalLayers)...
canvasWidth = parseInt @normalCanvas.attr('width'), 10
@ -236,7 +236,7 @@ module.exports = Surface = class Surface extends CocoClass
drawCurrentFrame: (e) ->
++@totalFramesDrawn
@normalStage.update e
@normalStage.update e if @totalFramesDrawn % 2 is 0
@webGLStage.update e
@ -371,7 +371,7 @@ module.exports = Surface = class Surface extends CocoClass
else
target = null
@camera.setBounds e.bounds if e.bounds
@cameraBorder.updateBounds @camera.bounds
# @cameraBorder.updateBounds @camera.bounds
@camera.zoomTo target, e.zoom, e.duration # TODO: SurfaceScriptModule perhaps shouldn't assign e.zoom if not set
onZoomUpdated: (e) ->