codeninjasllc/codecombat
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for point/region choosers destroying AudioPlayer's camera. Fix for DOM highlight arrow covering up level info on iPad.

Browse source
This commit is contained in:
Nick Winter 2014-10-24 13:03:10 -07:00
parent 8cc5c4d873
commit 42b81fd55e
3 changed files with 3 additions and 2 deletions

2
app/lib/AudioPlayer.coffee
View file

@ -93,7 +93,7 @@ class AudioPlayer extends CocoClass
filename = if _.string.startsWith(name, '/file/') then name else '/file/' + name filename = if _.string.startsWith(name, '/file/') then name else '/file/' + name
unless @hasLoadedSound filename unless @hasLoadedSound filename
@soundsToPlayWhenLoaded[name] = audioOptions.volume @soundsToPlayWhenLoaded[name] = audioOptions.volume
audioOptions = @applyPanning audioOptions, pos if @camera and pos audioOptions = @applyPanning audioOptions, pos if @camera and not @camera.destroyed and pos
instance = createjs.Sound.play name, audioOptions instance = createjs.Sound.play name, audioOptions
# For some reason, individual sound volume control doesn't work any more. # For some reason, individual sound volume control doesn't work any more.
# I tried updating to SoundJS NEXT on 2014-09-10, but couldn't get any sounds to play with that one. # I tried updating to SoundJS NEXT on 2014-09-10, but couldn't get any sounds to play with that one.

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

@ -99,7 +99,7 @@ module.exports = Surface = class Surface extends CocoClass
@normalStage = new createjs.Stage(@normalCanvas[0]) @normalStage = new createjs.Stage(@normalCanvas[0])
@webGLStage = new createjs.SpriteStage(@webGLCanvas[0]) @webGLStage = new createjs.SpriteStage(@webGLCanvas[0])
@normalStage.nextStage = @webGLStage @normalStage.nextStage = @webGLStage
@camera = AudioPlayer.camera = new Camera @webGLCanvas @camera = AudioPlayer.camera = new Camera @webGLCanvas unless @options.choosing
@normalLayers.push @surfaceTextLayer = new Layer name: 'Surface Text', layerPriority: 1, transform: Layer.TRANSFORM_SURFACE_TEXT, camera: @camera @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 @gridLayer = new Layer name: 'Grid', layerPriority: 2, transform: Layer.TRANSFORM_SURFACE, camera: @camera

1
app/views/play/WorldMapView.coffee
View file

@ -128,6 +128,7 @@ module.exports = class WorldMapView extends RootView
levelID = $(e.target).parents('.level').data('level-id') levelID = $(e.target).parents('.level').data('level-id')
@$levelInfo = @$el.find(".level-info-container[data-level-id=#{levelID}]").show() @$levelInfo = @$el.find(".level-info-container[data-level-id=#{levelID}]").show()
@adjustLevelInfoPosition e @adjustLevelInfoPosition e
@endHighlight()
else else
levelElement = $(e.target).parents('.level') levelElement = $(e.target).parents('.level')
levelID = levelElement.data('level-id') levelID = levelElement.data('level-id')