mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-27 17:45:40 -05:00
Merge branch 'feature/team-colors'
Conflicts: app/lib/world/world.coffee app/models/ThangType.coffee
This commit is contained in:
Scott Erickson
commit
c5b9b103c5
14 changed files with 180 additions and 112 deletions
|
|
@ -4,6 +4,7 @@ AudioPlayer = require 'lib/AudioPlayer'
|
|||
LevelSession = require 'models/LevelSession'
|
||||
ThangType = require 'models/ThangType'
|
||||
app = require 'application'
|
||||
World = require 'lib/world/world'
|
||||
|
||||
# This is an initial stab at unifying loading and setup into a single place which can
|
||||
# monitor everything and keep a LoadingScreen visible overall progress.
|
||||
|
|
@ -70,17 +71,17 @@ module.exports = class LevelLoader extends CocoClass
|
|||
|
||||
onSupermodelLoadedOne: (e) =>
|
||||
@notifyProgress()
|
||||
if e.model.type() is 'ThangType'
|
||||
thangType = e.model
|
||||
options = {async: true}
|
||||
if thangType.get('name') is 'Wizard'
|
||||
options.colorConfig = me.get('wizard')?.colorConfig or {}
|
||||
building = thangType.buildSpriteSheet options
|
||||
if building
|
||||
@spriteSheetsToBuild += 1
|
||||
thangType.on 'build-complete', =>
|
||||
@spriteSheetsBuilt += 1
|
||||
@notifyProgress()
|
||||
# if e.model.type() is 'ThangType'
|
||||
# thangType = e.model
|
||||
# options = {async: true}
|
||||
# if thangType.get('name') is 'Wizard'
|
||||
# options.colorConfig = me.get('wizard')?.colorConfig or {}
|
||||
# building = thangType.buildSpriteSheet options
|
||||
# if building
|
||||
# @spriteSheetsToBuild += 1
|
||||
# thangType.on 'build-complete', =>
|
||||
# @spriteSheetsBuilt += 1
|
||||
# @notifyProgress()
|
||||
|
||||
onSupermodelLoadedAll: =>
|
||||
@trigger 'loaded-supermodel'
|
||||
|
|
@ -111,7 +112,50 @@ module.exports = class LevelLoader extends CocoClass
|
|||
tempSession = new LevelSession _id: @session.id
|
||||
tempSession.save(patch, {patch: true})
|
||||
@sessionDenormalized = true
|
||||
|
||||
# World init
|
||||
|
||||
initWorld: ->
|
||||
return if @world
|
||||
@world = new World @level.get('name')
|
||||
serializedLevel = @level.serialize(@supermodel)
|
||||
@world.loadFromLevel serializedLevel, false
|
||||
# @setTeam @world.teamForPlayer 1 # We don't know which player we are; this will go away--temp TODO
|
||||
@buildSpriteSheets()
|
||||
|
||||
buildSpriteSheets: ->
|
||||
thangTypes = {}
|
||||
thangTypes[tt.get('name')] = tt for tt in @supermodel.getModels(ThangType)
|
||||
|
||||
colorConfigs = @world.getTeamColors()
|
||||
|
||||
thangsProduced = {}
|
||||
baseOptions = {resolutionFactor: 4, async: true}
|
||||
|
||||
for thang in @world.thangs
|
||||
continue unless thang.spriteName
|
||||
thangType = thangTypes[thang.spriteName]
|
||||
options = thang.getSpriteOptions(colorConfigs)
|
||||
options.async = true
|
||||
thangsProduced[thang.spriteName] = true
|
||||
@buildSpriteSheet(thangType, options)
|
||||
|
||||
for thangName, thangType of thangTypes
|
||||
continue if thangsProduced[thangName]
|
||||
thangType.spriteOptions = {resolutionFactor: 4, async: true}
|
||||
@buildSpriteSheet(thangType, thangType.spriteOptions)
|
||||
|
||||
buildSpriteSheet: (thangType, options) ->
|
||||
if thangType.get('name') is 'Wizard'
|
||||
options.colorConfig = me.get('wizard')?.colorConfig or {}
|
||||
building = thangType.buildSpriteSheet options
|
||||
return unless building
|
||||
console.log 'Building:', thangType.get('name'), options
|
||||
@spriteSheetsToBuild += 1
|
||||
thangType.on 'build-complete', =>
|
||||
@spriteSheetsBuilt += 1
|
||||
@notifyProgress()
|
||||
|
||||
# Initial Sound Loading
|
||||
|
||||
loadAudio: ->
|
||||
|
|
@ -159,7 +203,9 @@ module.exports = class LevelLoader extends CocoClass
|
|||
|
||||
notifyProgress: ->
|
||||
Backbone.Mediator.publish 'level-loader:progress-changed', progress: @progress()
|
||||
@trigger 'ready-to-init-world' if @allDone()
|
||||
@initWorld() if @allDone()
|
||||
# @trigger 'ready-to-init-world' if @allDone()
|
||||
@trigger 'loaded-all' if @progress() is 1
|
||||
|
||||
destroy: ->
|
||||
@supermodel.off 'loaded-one', @onSupermodelLoadedOne
|
||||
|
|
|
|||
|
|
@ -72,10 +72,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
|
|||
|
||||
toString: -> "<CocoSprite: #{@thang?.id}>"
|
||||
|
||||
spriteSheetKey: ->
|
||||
"#{@thangType.get('name')} - #{@options.resolutionFactor}"
|
||||
|
||||
buildSpriteSheet: -> @thangType.getSpriteSheet @options
|
||||
buildSpriteSheet: ->
|
||||
options = @thang?.getSpriteOptions() or {}
|
||||
options.colorConfig = @options.colorConfig if @options.colorConfig
|
||||
options.async = false
|
||||
@thangType.getSpriteSheet options
|
||||
|
||||
buildFromSpriteSheet: (spriteSheet) ->
|
||||
if spriteSheet
|
||||
|
|
|
|||
|
|
@ -115,10 +115,9 @@ module.exports = class Mark extends CocoClass
|
|||
|
||||
buildSprite: ->
|
||||
#console.log "building", @name, "with thangtype", @thangType
|
||||
options = resolutionFactor: 4
|
||||
CocoSprite = require './CocoSprite'
|
||||
markSprite = new CocoSprite @thangType, options
|
||||
markSprite.queueAction "idle"
|
||||
markSprite = new CocoSprite @thangType, @thangType.spriteOptions
|
||||
markSprite.queueAction 'idle'
|
||||
@mark = markSprite.displayObject
|
||||
|
||||
update: (pos=null) ->
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ module.exports = class SpriteBoss extends CocoClass
|
|||
@selectionMark = new Mark name: 'selection', camera: @camera, layer: @spriteLayers["Ground"], thangType: @thangTypeFor("Selection")
|
||||
|
||||
createSpriteOptions: (options) ->
|
||||
_.extend options, camera: @camera, resolutionFactor: 4, groundLayer: @spriteLayers["Ground"], textLayer: @surfaceTextLayer, floatingLayer: @spriteLayers["Floating"], markThangTypes: @markThangTypes(), spriteSheetCache: @spriteSheetCache, showInvisible: @options.showInvisible
|
||||
_.extend options, camera: @camera, resolutionFactor: 4, groundLayer: @spriteLayers["Ground"], textLayer: @surfaceTextLayer, floatingLayer: @spriteLayers["Floating"], markThangTypes: @markThangTypes(), spriteSheetCache: @spriteSheetCache, showInvisible: @options.showInvisible, world: @world
|
||||
|
||||
createIndieSprites: (indieSprites, withWizards) ->
|
||||
unless @indieSprites
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ module.exports = class Thang
|
|||
Thang.lastIDNums[spriteName] = if Thang.lastIDNums[spriteName]? then Thang.lastIDNums[spriteName] + 1 else 0
|
||||
id = spriteName + (Thang.lastIDNums[spriteName] or '')
|
||||
id
|
||||
|
||||
|
||||
@resetThangIDs: -> Thang.lastIDNums = {}
|
||||
|
||||
constructor: (@world, @spriteName, @id) ->
|
||||
|
|
@ -156,4 +156,11 @@ module.exports = class Thang
|
|||
for prop, val of o.finalState
|
||||
# TODO: take some (but not all) of deserialize logic from ThangState to handle other types
|
||||
t[prop] = val
|
||||
t
|
||||
t
|
||||
|
||||
getSpriteOptions: ->
|
||||
colorConfigs = @world?.getTeamColors() or {}
|
||||
options = {}
|
||||
if @team and colorConfigs[@team]
|
||||
options.colorConfig = {team: colorConfigs[@team]}
|
||||
options
|
||||
|
|
|
|||
|
|
@ -252,9 +252,8 @@ module.exports = class World
|
|||
# Code hotspot; optimize it
|
||||
if @frames.length < @totalFrames then worldShouldBeOverBeforeSerialization
|
||||
[transferableObjects, nontransferableObjects] = [0, 0]
|
||||
o = {name: @name, totalFrames: @totalFrames, maxTotalFrames: @maxTotalFrames, frameRate: @frameRate, dt: @dt, victory: @victory, userCodeMap: {}}
|
||||
|
||||
o[prop] = @[prop] for prop in @trackedProperties or []
|
||||
o = {name: @name, totalFrames: @totalFrames, maxTotalFrames: @maxTotalFrames, frameRate: @frameRate, dt: @dt, victory: @victory, userCodeMap: {}, trackedProperties: {}}
|
||||
o.trackedProperties[prop] = @[prop] for prop in @trackedProperties or []
|
||||
|
||||
for thangID, methods of @userCodeMap
|
||||
serializedMethods = o.userCodeMap[thangID] = {}
|
||||
|
|
@ -348,7 +347,8 @@ module.exports = class World
|
|||
perf.t0 = now()
|
||||
w = new World o.name, o.userCodeMap, classMap
|
||||
[w.totalFrames, w.maxTotalFrames, w.frameRate, w.dt, w.scriptNotes, w.victory] = [o.totalFrames, o.maxTotalFrames, o.frameRate, o.dt, o.scriptNotes ? [], o.victory]
|
||||
[w.showCoordinates, w.showGrid, w.showPaths, w.indieSprites] = [o.showCoordinates, o.showGrid, o.showPaths, o.indieSprites]
|
||||
w[prop] = val for prop, val of o.trackedProperties
|
||||
|
||||
perf.t1 = now()
|
||||
w.thangs = (Thang.deserialize(thang, w, classMap) for thang in o.thangs)
|
||||
w.setThang thang for thang in w.thangs
|
||||
|
|
@ -457,3 +457,9 @@ module.exports = class World
|
|||
lastAction = action
|
||||
@actionsForThangCache[cacheKey] = actions
|
||||
return actions
|
||||
|
||||
getTeamColors: ->
|
||||
teamConfigs = @teamConfigs or {}
|
||||
colorConfigs = {}
|
||||
colorConfigs[teamName] = config.color for teamName, config of teamConfigs
|
||||
colorConfigs
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ SpriteBuilder = require 'lib/sprites/SpriteBuilder'
|
|||
module.exports = class ThangType extends CocoModel
|
||||
@className: "ThangType"
|
||||
urlRoot: "/db/thang.type"
|
||||
building: 0
|
||||
building: {}
|
||||
|
||||
initialize: ->
|
||||
super()
|
||||
@building = {}
|
||||
@setDefaults()
|
||||
@on 'sync', @setDefaults
|
||||
@spriteSheets = {}
|
||||
|
|
@ -47,15 +48,18 @@ module.exports = class ThangType extends CocoModel
|
|||
options
|
||||
|
||||
buildSpriteSheet: (options) ->
|
||||
@options = @fillOptions options
|
||||
key = @spriteSheetKey(@options)
|
||||
return if @building[key]
|
||||
@initBuild(options)
|
||||
# @options.portraitOnly = true
|
||||
@addGeneralFrames() unless @options.portraitOnly
|
||||
@addPortrait()
|
||||
@finishBuild()
|
||||
@building[key] = true
|
||||
result = @finishBuild()
|
||||
return result
|
||||
|
||||
initBuild: (options) ->
|
||||
@buildActions() if not @actions
|
||||
@options = @fillOptions options
|
||||
@vectorParser = new SpriteBuilder(@, options)
|
||||
@builder = new createjs.SpriteSheetBuilder()
|
||||
@builder.padding = 2
|
||||
|
|
@ -131,8 +135,7 @@ module.exports = class ThangType extends CocoModel
|
|||
@builder.buildAsync()
|
||||
@builder.on 'complete', @onBuildSpriteSheetComplete, @, true, key
|
||||
return true
|
||||
|
||||
console.warn 'Building', @get('name'), 'and blocking the main thread. LevelLoader should have it built asynchronously instead.'
|
||||
console.warn 'Building', @get('name'), 'and blocking the main thread.'
|
||||
spriteSheet = @builder.build()
|
||||
@spriteSheets[key] = spriteSheet
|
||||
spriteSheet
|
||||
|
|
|
|||
|
|
@ -35,22 +35,41 @@
|
|||
font-size: 12px
|
||||
|
||||
#wizard-settings-tab-view
|
||||
.form-horizontal
|
||||
#color-settings
|
||||
float: left
|
||||
width: 400px
|
||||
margin-left: 50px
|
||||
width: 600px
|
||||
margin-left: 30px
|
||||
|
||||
canvas
|
||||
float: left
|
||||
border: 2px solid black
|
||||
margin: 20px
|
||||
|
||||
.selector
|
||||
position: relative
|
||||
top: 10px
|
||||
left: 10px
|
||||
|
||||
h2 input
|
||||
margin-left: 10px
|
||||
|
||||
.form-horizontal .control-group
|
||||
.color-group
|
||||
clear: both
|
||||
padding-bottom: 10px
|
||||
margin-bottom: 10px
|
||||
border-bottom: 1px solid gray
|
||||
|
||||
.name-cell
|
||||
float: left
|
||||
width: 100px
|
||||
padding-top: 2px
|
||||
|
||||
input
|
||||
margin-right: 10px
|
||||
position: relative
|
||||
top: -3px
|
||||
|
||||
.checkbox-cell
|
||||
float: left
|
||||
width: 40px
|
||||
|
||||
.slider-cell
|
||||
margin-bottom: 10px
|
||||
float: left
|
||||
width: 120px
|
||||
|
||||
.selector
|
||||
width: 100px
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +1,12 @@
|
|||
@import "bootstrap/variables"
|
||||
#editor-level-view
|
||||
.images
|
||||
margin: 30px 0
|
||||
text-align: center
|
||||
div
|
||||
float: left
|
||||
width: 25%
|
||||
padding: 10px 40px
|
||||
box-sizing: border-box
|
||||
img
|
||||
width: 100%
|
||||
|
||||
#image-modal
|
||||
.modal-body
|
||||
max-height: 100%
|
||||
|
||||
height: 80%
|
||||
width: 80%
|
||||
margin-left: -40%
|
||||
|
||||
img
|
||||
display: block
|
||||
margin: 0 auto
|
||||
max-height: 80%
|
||||
|
||||
#after-images
|
||||
clear: both
|
||||
|
||||
ul#prereqs
|
||||
margin: 20px 40px
|
||||
.editor-column
|
||||
width: 33%
|
||||
box-sizing: border-box
|
||||
padding-right: 20px
|
||||
float: left
|
||||
h3
|
||||
text-decoration: underline
|
||||
margin-bottom: 2px
|
||||
|
||||
#editor-links .btn
|
||||
margin-right: 20px
|
||||
margin-bottom: 30px
|
||||
|
||||
//.screencast-wrapper
|
||||
// text-align: center
|
||||
// background: $gray
|
||||
// object
|
||||
// display: inline-block
|
||||
|
||||
|
|
@ -1,21 +1,22 @@
|
|||
canvas#tinting-display(width=200, height=200).img-rounded
|
||||
|
||||
.form-horizontal
|
||||
#color-settings
|
||||
for group in colorGroups
|
||||
.color-group(data-name=group.name)
|
||||
h2
|
||||
span(data-i18n=group.dasherized)= group.humanized
|
||||
div.name-cell
|
||||
input(type='checkbox', checked=group.exists).color-group-checkbox
|
||||
.sliders
|
||||
.control-group
|
||||
label.control-label(for=group.humanized+"_hue", data-i18n="hue") Hue
|
||||
span(data-i18n=group.dasherized)= group.humanized
|
||||
div.sliders
|
||||
div.slider-cell
|
||||
label(for=group.humanized+"_hue", data-i18n="hue") Hue
|
||||
.controls
|
||||
.selector(id=group.humanized+"_hue", name=group.name+'.hue', data-key='hue')
|
||||
.control-group
|
||||
label.control-label(for=group.humanized+"_saturation", data-i18n="saturation") Saturation
|
||||
div.slider-cell
|
||||
label(for=group.humanized+"_saturation", data-i18n="saturation") Saturation
|
||||
.controls
|
||||
.selector(id=group.humanized+"_saturation", name=group.name+'.saturation', data-key='saturation')
|
||||
.control-group
|
||||
label.control-label(for=group.humanized+"_lightness", data-i18n="lightness") Lightness
|
||||
div.slider-cell
|
||||
label(for=group.humanized+"_lightness", data-i18n="lightness") Lightness
|
||||
.controls
|
||||
.selector(id=group.humanized+"_lightness", name=group.name+'.lightness', data-key='lightness')
|
||||
.selector(id=group.humanized+"_lightness", name=group.name+'.lightness', data-key='lightness')
|
||||
div.clearfix
|
||||
|
|
@ -49,7 +49,7 @@ module.exports = class WizardSettingsTabView extends RootView
|
|||
|
||||
@$el.find('.selector').each (i, slider) =>
|
||||
[groupName, prop] = $(slider).attr('name').split('.')
|
||||
value = 100 * (wizardSettings.colorConfig[groupName]?[prop] or 0)
|
||||
value = 100 * (wizardSettings.colorConfig[groupName]?[prop] ? 0.5)
|
||||
@initSlider $(slider), value, @onSliderChanged
|
||||
|
||||
@$el.find('.color-group').each (i, colorGroup) =>
|
||||
|
|
@ -82,7 +82,9 @@ module.exports = class WizardSettingsTabView extends RootView
|
|||
initStage: ->
|
||||
@stage = new createjs.Stage(@$el.find('canvas')[0])
|
||||
@updateMovieClip()
|
||||
|
||||
createjs.Ticker.setFPS 20
|
||||
createjs.Ticker.addEventListener("tick", @stage)
|
||||
|
||||
updateMovieClip: ->
|
||||
return unless @wizardThangType.loaded
|
||||
wizardSettings = me.get('wizard') or {}
|
||||
|
|
@ -92,13 +94,16 @@ module.exports = class WizardSettingsTabView extends RootView
|
|||
options = {colorConfig: wizardSettings.colorConfig}
|
||||
@spriteBuilder.setOptions options
|
||||
@spriteBuilder.buildColorMaps()
|
||||
portraitAction = @wizardThangType.get('actions')?.portrait
|
||||
return unless portraitAction?.animation
|
||||
@movieClip = @spriteBuilder.buildMovieClip portraitAction.animation
|
||||
@movieClip.scaleY = @movieClip.scaleX = 2 * (portraitAction.scale or 1)
|
||||
reg = portraitAction.positions?.registration
|
||||
castAction = @wizardThangType.get('actions')?.cast
|
||||
return unless castAction?.animation
|
||||
@movieClip = @spriteBuilder.buildMovieClip castAction.animation
|
||||
@movieClip.scaleY = @movieClip.scaleX = 1.7 * (castAction.scale or 1)
|
||||
reg = castAction.positions?.registration
|
||||
if reg
|
||||
@movieClip.regX = reg.x
|
||||
@movieClip.regY = reg.y
|
||||
@stage.addChild @movieClip
|
||||
@stage.update()
|
||||
@stage.update()
|
||||
|
||||
destroy: ->
|
||||
@stage?.removeAllEventListeners()
|
||||
|
|
@ -78,7 +78,7 @@ module.exports = class HUDView extends View
|
|||
if not @thang
|
||||
@hintNextSelectionTimeout = _.delay((=> @$el.find('.no-selection-message').slideDown('slow')), 10000)
|
||||
return
|
||||
@createAvatar thangType
|
||||
@createAvatar thangType, @thang
|
||||
@createProperties()
|
||||
@createActions()
|
||||
@update()
|
||||
|
|
@ -88,7 +88,7 @@ module.exports = class HUDView extends View
|
|||
return if speakerSprite is @speakerSprite
|
||||
@speakerSprite = speakerSprite
|
||||
@speaker = @speakerSprite.thang.id
|
||||
@createAvatar @speakerSprite.thangType
|
||||
@createAvatar @speakerSprite.thangType, @speakerSprite.thang
|
||||
@$el.removeClass 'no-selection'
|
||||
@switchToDialogueElements()
|
||||
|
||||
|
|
@ -102,8 +102,10 @@ module.exports = class HUDView extends View
|
|||
@bubble = null
|
||||
@update()
|
||||
|
||||
createAvatar: (thangType) ->
|
||||
stage = thangType.getPortraitStage()
|
||||
createAvatar: (thangType, thang) ->
|
||||
options = thang.getSpriteOptions() or {}
|
||||
options.async = false
|
||||
stage = thangType.getPortraitStage options
|
||||
wrapper = @$el.find '.thang-canvas-wrapper'
|
||||
newCanvas = $(stage.canvas).addClass('thang-canvas')
|
||||
wrapper.empty().append(newCanvas)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@ module.exports = class ThangAvatarView extends View
|
|||
thangs = @supermodel.getModels(ThangType)
|
||||
thangs = (t for t in thangs when t.get('name') is @thang.spriteName)
|
||||
thang = thangs[0]
|
||||
context.avatarURL = thang.getPortraitSource()
|
||||
options = @thang?.getSpriteOptions() or {}
|
||||
options.async = false
|
||||
context.avatarURL = thang.getPortraitSource(options)
|
||||
context.includeName = @includeName
|
||||
context
|
||||
|
||||
|
|
|
|||
|
|
@ -71,19 +71,24 @@ module.exports = class PlayLevelView extends View
|
|||
window.tracker?.trackEvent 'Hour of Code Begin', {}
|
||||
|
||||
@isEditorPreview = @getQueryVariable "dev"
|
||||
sessionID = @getQueryVariable "session"
|
||||
@levelLoader = new LevelLoader(@levelID, @supermodel, sessionID)
|
||||
@levelLoader.once 'ready-to-init-world', @onReadyToInitWorld
|
||||
@sessionID = @getQueryVariable "session"
|
||||
|
||||
$(window).on('resize', @onWindowResize)
|
||||
@supermodel.once 'error', =>
|
||||
msg = $.i18n.t('play_level.level_load_error', defaultValue: "Level could not be loaded.")
|
||||
@$el.html('<div class="alert">' + msg + '</div>')
|
||||
@saveScreenshot = _.throttle @saveScreenshot, 30000
|
||||
|
||||
@load() unless @isEditorPreview
|
||||
|
||||
setLevel: (@level, @supermodel) ->
|
||||
@god?.level = @level.serialize @supermodel
|
||||
@initWorld()
|
||||
@load()
|
||||
|
||||
load: ->
|
||||
@levelLoader = new LevelLoader(@levelID, @supermodel, @sessionID)
|
||||
@levelLoader.once 'ready-to-init-world', @onReadyToInitWorld
|
||||
@levelLoader.once 'loaded-all', @onLevelLoaderLoaded
|
||||
|
||||
getRenderData: ->
|
||||
c = super()
|
||||
|
|
@ -96,11 +101,12 @@ module.exports = class PlayLevelView extends View
|
|||
@loadingScreen.show()
|
||||
super()
|
||||
|
||||
onReadyToInitWorld: =>
|
||||
onLevelLoaderLoaded: =>
|
||||
@session = @levelLoader.session
|
||||
@level = @levelLoader.level
|
||||
@world = @levelLoader.world
|
||||
@loadingScreen.destroy()
|
||||
@initWorld()
|
||||
# @initWorld()
|
||||
@initSurface()
|
||||
@initGod()
|
||||
@initGoalManager()
|
||||
|
|
|
|||
Loading…
Reference in a new issue