codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-26 14:03:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Several fixes for level editor update speed--should be faster for making changes on complex levels

Browse source
This commit is contained in:
Nick Winter 2016-05-31 15:32:32 -07:00
parent ebc94e6e4b
commit e7f79ab721
2 changed files with 22 additions and 15 deletions
app
models
Level.coffee
views/editor/level/thangs
ThangsTabView.coffee

35
app/models/Level.coffee
View file

@ -59,11 +59,13 @@ module.exports = class Level extends CocoModel
denormalize: (supermodel, session, otherSession) ->
o = $.extend true, {}, @attributes
if o.thangs and @get('type', true) in ['hero', 'hero-ladder', 'hero-coop', 'course', 'course-ladder']
thangTypesWithComponents = (tt for tt in supermodel.getModels(ThangType) when tt.get('components')?)
thangTypesByOriginal = _.indexBy thangTypesWithComponents, (tt) -> tt.get('original') # Optimization
for levelThang in o.thangs
@denormalizeThang(levelThang, supermodel, session, otherSession)
@denormalizeThang(levelThang, supermodel, session, otherSession, thangTypesByOriginal)
o
denormalizeThang: (levelThang, supermodel, session, otherSession) ->
denormalizeThang: (levelThang, supermodel, session, otherSession, thangTypesByOriginal) ->
levelThang.components ?= []
isHero = /Hero Placeholder/.test(levelThang.id) and @get('type', true) in ['hero', 'hero-ladder', 'hero-coop']
if isHero and otherSession
@ -79,7 +81,7 @@ module.exports = class Level extends CocoModel
if isHero
placeholders = {}
placeholdersUsed = {}
placeholderThangType = supermodel.getModelByOriginal(ThangType, levelThang.thangType)
placeholderThangType = thangTypesByOriginal[levelThang.thangType]
unless placeholderThangType
console.error "Couldn't find placeholder ThangType for the hero!"
isHero = false
@ -92,7 +94,7 @@ module.exports = class Level extends CocoModel
heroThangType = session?.get('heroConfig')?.thangType
levelThang.thangType = heroThangType if heroThangType
thangType = supermodel.getModelByOriginal(ThangType, levelThang.thangType, (m) -> m.get('components')?)
thangType = thangTypesByOriginal[levelThang.thangType]
configs = {}
for thangComponent in levelThang.components
@ -168,11 +170,16 @@ module.exports = class Level extends CocoModel
# Decision? Just special case the sort logic in here until we have more examples than these two and decide how best to handle most of the cases then, since we don't really know the whole of the problem yet.
# TODO: anything that depends on Programmable will break right now.
originalsToComponents = _.indexBy levelComponents, 'original' # Optimization for speed
alliedComponent = _.find levelComponents, name: 'Allied'
actsComponent = _.find levelComponents, name: 'Acts'
for thang in thangs ? []
originalsToThangComponents = _.indexBy thang.components, 'original'
sorted = []
visit = (c, namesToIgnore) ->
return if c in sorted
lc = _.find levelComponents, {original: c.original}
lc = originalsToComponents[c.original]
console.error thang.id or thang.name, 'couldn\'t find lc for', c, 'of', levelComponents unless lc
return unless lc
return if namesToIgnore and lc.name in namesToIgnore
@ -184,20 +191,18 @@ module.exports = class Level extends CocoModel
visit c2, [lc.name] for c2 in thang.components
else
for d in lc.dependencies or []
c2 = _.find thang.components, {original: d.original}
c2 = originalsToThangComponents[d.original]
unless c2
dependent = _.find levelComponents, {original: d.original}
dependent = originalsToComponents[d.original]
dependent = dependent?.name or d.original
console.error parentType, thang.id or thang.name, 'does not have dependent Component', dependent, 'from', lc.name
visit c2 if c2
if lc.name is 'Collides'
if allied = _.find levelComponents, {name: 'Allied'}
allied = _.find(thang.components, {original: allied.original})
visit allied if allied
if lc.name is 'Moves'
if acts = _.find levelComponents, {name: 'Acts'}
acts = _.find(thang.components, {original: acts.original})
visit acts if acts
if lc.name is 'Collides' and alliedComponent
if allied = originalsToThangComponents[alliedComponent.original]
visit allied
if lc.name is 'Moves' and actsComponent
if acts = originalsToThangComponents[actsComponent.original]
visit acts
#console.log thang.id, 'sorted comps adding', lc.name
sorted.push c
for comp in thang.components

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

@ -90,6 +90,8 @@ module.exports = class ThangsTabView extends CocoView
getRenderData: (context={}) ->
context = super(context)
return context unless @supermodel.finished()
for thangType in @thangTypes.models
thangType.notInLevel = true
thangTypes = (thangType.attributes for thangType in @supermodel.getModels(ThangType))
thangTypes = _.uniq thangTypes, false, 'original'
thangTypes = _.reject thangTypes, (tt) -> tt.kind in ['Mark', undefined]