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

Respecting coordinates setting.

Browse source
This commit is contained in:
Nick Winter 2014-09-23 18:39:52 -07:00
parent e493855578
commit 019f634d9f
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ module.exports = Surface = class Surface extends CocoClass
grid: false grid: false
navigateToSelection: true navigateToSelection: true
choosing: false # 'point', 'region', 'ratio-region' choosing: false # 'point', 'region', 'ratio-region'
coords: true coords: null # use world defaults, or set to false/true to overrid
playJingle: false playJingle: false
showInvisible: false showInvisible: false
frameRate: 30 # Best as a divisor of 60, like 15, 30, 60, with RAF_SYNCHED timing. frameRate: 30 # Best as a divisor of 60, like 15, 30, 60, with RAF_SYNCHED timing.
@ -123,7 +123,8 @@ module.exports = Surface = class Surface extends CocoClass
initCoordinates: -> initCoordinates: ->
@coordinateGrid ?= new CoordinateGrid {camera: @camera, layer: @gridLayer, textLayer: @surfaceTextLayer}, @world.size() @coordinateGrid ?= new CoordinateGrid {camera: @camera, layer: @gridLayer, textLayer: @surfaceTextLayer}, @world.size()
@coordinateGrid.showGrid() if @world.showGrid or @options.grid @coordinateGrid.showGrid() if @world.showGrid or @options.grid
@coordinateDisplay ?= new CoordinateDisplay camera: @camera, layer: @surfaceTextLayer if @world.showCoordinates or @options.coords showCoordinates = if @options.coords? then @options.coords else @world.showCoordinates
@coordinateDisplay ?= new CoordinateDisplay camera: @camera, layer: @surfaceTextLayer if showCoordinates
hookUpChooseControls: -> hookUpChooseControls: ->
chooserOptions = stage: @stage, surfaceLayer: @surfaceLayer, camera: @camera, restrictRatio: @options.choosing is 'ratio-region' chooserOptions = stage: @stage, surfaceLayer: @surfaceLayer, camera: @camera, restrictRatio: @options.choosing is 'ratio-region'

2
app/views/editor/level/modals/WorldSelectModal.coffee
View file

@ -50,7 +50,7 @@ module.exports = class WorldSelectModal extends ModalView
grid: true grid: true
navigateToSelection: false navigateToSelection: false
choosing: @dataType choosing: @dataType
coords: false coords: true
thangTypes: @supermodel.getModels(ThangType) thangTypes: @supermodel.getModels(ThangType)
showInvisible: true showInvisible: true
} }

1
app/views/editor/level/thangs/ThangsTabView.coffee
View file

@ -188,6 +188,7 @@ module.exports = class ThangsTabView extends CocoView
@surface = new Surface @world, surfaceCanvas, { @surface = new Surface @world, surfaceCanvas, {
wizards: false wizards: false
paths: false paths: false
coords: true
grid: true grid: true
navigateToSelection: false navigateToSelection: false
thangTypes: @supermodel.getModels(ThangType) thangTypes: @supermodel.getModels(ThangType)