codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-27 06:23:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make resources as static class to avoid loading multiple times.

Browse source 
Clean debug message.
This commit is contained in:
Ting-Kuan 2014-04-10 16:59:08 -04:00
parent 3ea4d1677c
commit a5e6496a7c
8 changed files with 50 additions and 160 deletions

9
app/lib/LevelLoader.coffee
View file

@ -59,14 +59,16 @@ module.exports = class LevelLoader extends CocoClass
# Unless you specify cache:false, sometimes the browser will use a cached session
# and players will 'lose' code
@session.fetch({cache:false})
@listenToOnce(@session, 'sync', @onSessionLoaded)
session_res = @supermodel.addModelResource(@session, @session.url, {cache:false})
session_res.load()
if @opponentSessionID
@opponentSession = new LevelSession()
@opponentSession.url = "/db/level_session/#{@opponentSessionID}"
@opponentSession.fetch()
@listenToOnce(@opponentSession, 'sync', @onSessionLoaded)
opponentSession_res = @supermodel.addModelResource(@opponentSession, @opponentSession.url)
opponentSession_res.load()
sessionsLoaded: ->
return true if @headless
@ -217,7 +219,7 @@ module.exports = class LevelLoader extends CocoClass
progress: ->
return 0 unless @level.loaded
overallProgress = 0
supermodelProgress = @supermodel.progress()
supermodelProgress = @supermodel.getProgress()
overallProgress += supermodelProgress * 0.7
overallProgress += 0.1 if @sessionsLoaded()
if @headless
@ -226,6 +228,7 @@ module.exports = class LevelLoader extends CocoClass
spriteMapProgress = if supermodelProgress is 1 then 0.2 else 0
spriteMapProgress *= @spriteSheetsBuilt / @spriteSheetsToBuild if @spriteSheetsToBuild
overallProgress += spriteMapProgress
return overallProgress
notifyProgress: ->

1
app/models/CocoModel.coffee
View file

@ -4,7 +4,6 @@ class CocoSchema extends Backbone.Model
constructor: (path, args...) ->
super(args...)
@urlRoot = path + '/schema'
console.debug 'gintau', 'schema-urlRoot', @urlRoot
window.CocoSchema = CocoSchema

88
app/models/SuperModel.coffee
View file

@ -3,19 +3,13 @@ module.exports = class SuperModel extends Backbone.Model
@models = {}
@collections = {}
@schemas = {}
@num = 0
@denom = 0
@showing = false
@progress = 0
populateModel: (model) ->
console.debug 'gintau', 'SuperModel-populateModel', model
@mustPopulate = model
model.saveBackups = @shouldSaveBackups(model)
# model.fetch() unless model.loaded or model.loading
@listenToOnce(model, 'sync', @modelLoaded) unless model.loaded
@listenToOnce(model, 'error', @modelErrored) unless model.loaded
# @listenToOnce(model, 'sync', @modelLoaded) unless model.loaded
# @listenToOnce(model, 'error', @modelErrored) unless model.loaded
url = model.url()
@models[url] = model unless @models[url]?
@modelLoaded(model) if model.loaded
@ -38,35 +32,8 @@ module.exports = class SuperModel extends Backbone.Model
@trigger 'error'
@removeEventsFromModel(model)
modelLoaded: (model) ->
###
model.loadSchema()
schema = model.schema()
# Load schema first.
unless schema.loaded
@schemas[schema.urlRoot] = schema
return schema.once('sync', => @modelLoaded(model))
refs = model.getReferencedModels(model.attributes, schema.attributes, '/', @shouldLoadProjection)
refs = [] unless @mustPopulate is model or @shouldPopulate(model)
# console.debug 'gintau', 'superModel-refs', model, refs
# load references.
for ref, i in refs when @shouldLoadReference ref
ref.saveBackups = @shouldSaveBackups(ref)
refURL = ref.url()
continue if @models[refURL]
@models[refURL] = ref
ref.fetch()
@listenToOnce(ref, 'sync', @modelLoaded)
###
modelLoaded: (model) ->
@trigger 'loaded-one', model: model
# @trigger 'loaded-all' if @finished()
@removeEventsFromModel(model)
removeEventsFromModel: (model) ->
@ -119,26 +86,8 @@ module.exports = class SuperModel extends Backbone.Model
@addModel(model)
collection
###
progress: ->
total = 0
loaded = 0
for model in _.values @models
total += 1
loaded += 1 if model.loaded
for schema in _.values @schemas
total += 1
loaded += 1 if schema.loaded
return 1.0 unless total
return loaded / total
###
finished: ->
console.debug 'gintau', 'trigger-loaded-all' if @progress == 1.0
return @progress == 1.0
return ResourceManager.progress == 1.0 or Object.keys(ResourceManager.resources).length == 0
addModelResource: (modelOrCollection, name, fetchOptions, value=1)->
@ -169,24 +118,24 @@ module.exports = class SuperModel extends Backbone.Model
ResourceManager.resources[name] = resource
@listenToOnce(resource, 'resource:loaded', @onResourceLoaded)
@listenToOnce(resource, 'resource:failed', @onResourceFailed)
@denom += value
ResourceManager.denom += value
loadResources: ()->
for name, res of ResourceManager.resources
res.load()
onResourceLoaded: (r)=>
@modelLoaded(r.model)
# Check if the model has references
console.debug 'gintau', 'updateProgress', r.constructor.name
if r.constructor.name == 'ModelResource'
model = r.model
@addModelRefencesToLoad(model)
@updateProgress(r)
else
console.debug 'gintau', 'updateProgressWithoutAddReferences'
@updateProgress(r)
onResourceFailed: (r)=>
@modelErrored(r.model)
addModelRefencesToLoad: (model)->
schema = model.schema?()
@ -195,7 +144,6 @@ module.exports = class SuperModel extends Backbone.Model
refs = model.getReferencedModels(model.attributes, schema.attributes, '/', @shouldLoadProjection)
refs = [] unless @mustPopulate is model or @shouldPopulate(model)
console.debug 'gintau', 'superModel-refs', model, refs
for ref, i in refs when @shouldLoadReference ref
ref.saveBackups = @shouldSaveBackups(ref)
refURL = ref.url()
@ -207,18 +155,24 @@ module.exports = class SuperModel extends Backbone.Model
res.load()
updateProgress: (r)=>
@num += r.value
@progress = @num / @denom
ResourceManager.num += r.value
ResourceManager.progress = ResourceManager.num / ResourceManager.denom
console.debug 'gintau', 'updateProgress', @num, @denom, @progress
@trigger('superModel:updateProgress', @progress)
@trigger('superModel:updateProgress', ResourceManager.progress)
@trigger 'loaded-all' if @finished()
getResource: (name)->
return ResourceManager.resources[name]
getProgress: ()-> return ResourceManager.progress
# Both SuperModel and Resource access this class.
# Set resources as static so no need to load resources multiple times when more than one view is used.
class ResourceManager
@num = 0
@denom = 0
@showing = false
@progress = 0
@resources: {}
class Resource extends Backbone.Model
@ -239,13 +193,11 @@ class Resource extends Backbone.Model
@dependencies.push(name)
markLoaded: ()->
console.debug 'gintau', 'markLoaded', @model
@trigger('resource:loaded', @) if not @isLoaded
@isLoaded = true
@isLoading = false
markFailed: ()->
console.debug 'gintau', 'markLoaded', @model
@trigger('resource:failed', @) if not @isLoaded
@isLoaded = false
@isLoading = false
@ -262,7 +214,6 @@ class ModelResource extends Resource
load: ()->
return @loadDeferred.promise() if @isLoading or @isLoaded
console.debug 'gintau', 'startLoading', @model
@isLoading = true
@loadDeferred = $.Deferred()
@ -274,19 +225,15 @@ class ModelResource extends Resource
loadDependencies: ()->
promises = []
console.debug 'gintau', 'loadDependencies-Dependencies', @name, @dependencies
for resName in @dependencies
dep = ResourceManager.resources[resName]
console.debug 'gintau', 'loadDependencies-name', resName, @name
continue if not dep.isReadyForLoad()
promises.push(dep.load())
console.debug 'gintau', 'loadDependencies-promises', promises, @name
return promises
onLoadDependenciesSuccess: ()=>
console.debug 'gintau', 'onLoadDependenciesSuccess', 'startFetch', @model
@model.fetch(@fetchOptions)
@listenToOnce(@model, 'sync', ()=>
@ -300,7 +247,6 @@ class ModelResource extends Resource
)
onLoadDependenciesFailed: ()=>
console.debug 'gintau', 'onLoadDependenciesFailed', model
@markFailed()
@loadDeferred.reject(@)

2
app/views/editor/level/edit.coffee
View file

@ -58,7 +58,7 @@ module.exports = class EditorLevelView extends View
onLevelLoaded: ->
@files = new DocumentFiles(@level)
@files.fetch()
@supermodel.addModelResource(@files, @files.url).load()
onAllLoaded: ->
@level.unset('nextLevel') if _.isString(@level.get('nextLevel'))

10
app/views/editor/thang/edit.coffee
View file

@ -56,11 +56,11 @@ module.exports = class ThangTypeEditView extends View
@insertSubView(new ErrorView())
)
@addResourceToLoad(@thangType.schema(), 'thang_type_schema')
@addResourceToLoad(@thangType, 'thang_type')
thang_res = @supermodel.addModelResource(@thangType, 'thang_type')
thang_schema_res = @supermodel.addModelResource(@thangType.schema(), 'thang_type_schema')
thang_res.addDependency('thang_type_schema')
@thangType.fetch()
@thangType.loadSchema()
thang_res.load()
@listenToOnce(@thangType.schema(), 'sync', @onThangTypeSync)
@listenToOnce(@thangType, 'sync', @onThangTypeSync)
@ -70,7 +70,7 @@ module.exports = class ThangTypeEditView extends View
return unless @thangType.loaded and ThangType.hasSchema()
@startsLoading = false
@files = new DocumentFiles(@thangType)
@files.fetch()
@supermodel.addModelResource(@files, @files.url).load()
@render()
getRenderData: (context={}) ->

92
app/views/kinds/CocoView.coffee
View file

@ -26,12 +26,6 @@ module.exports = class CocoView extends Backbone.View
# load progress properties
loadProgress:
num: 0
denom: 0
showing: false
resources: [] # models and collections
requests: [] # jqxhr's
somethings: [] # everything else
progress: 0
# Setup, Teardown
@ -48,6 +42,10 @@ module.exports = class CocoView extends Backbone.View
@listenToShortcuts()
@updateProgressBar = _.debounce @updateProgressBar, 100
# Backbone.Mediator handles subscription setup/teardown automatically
@listenToOnce(@supermodel, 'loaded-all', ()=>@onLoaded)
@listenToOnce(@supermodel, 'superModel:updateProgress', @updateProgress)
super options
destroy: ->
@ -87,8 +85,13 @@ module.exports = class CocoView extends Backbone.View
super()
return @template if _.isString(@template)
@$el.html @template(@getRenderData())
if not @supermodel.finished()
@showLoading()
else
@hideLoading()
@afterRender()
@showLoading() if @loading()
@$el.i18n()
@
@ -103,81 +106,18 @@ module.exports = class CocoView extends Backbone.View
context
afterRender: ->
# Resource and request loading management for any given view
addResourceToLoad: (modelOrCollection, name, value=1) ->
res = {resource:modelOrCollection, value:value, name:name, loaded: modelOrCollection.loaded}
@hideLoading()
@loadProgress.resources.push res
@loadProgress.denom += value
@listenToOnce modelOrCollection, 'sync', ()=>
# Sprite builder only works after rendering, if callback creates sprite, we need to update progress first.
res.loaded = true
@updateProgress(res)
@listenTo modelOrCollection, 'error', @onResourceLoadFailed
@updateProgress(res)
addRequestToLoad: (jqxhr, name, retryFunc, value=1) ->
res = {request:jqxhr, value:value, name: name, retryFunc: retryFunc, loaded:false}
@loadProgress.requests.push res
@loadProgress.denom += value
jqxhr.done ()=>
res.loaded = true
@updateProgress(res)
jqxhr.fail ()=>
@onRequestLoadFailed(jqxhr)
addSomethingToLoad: (name, value=1) ->
res = {name: name, value: value, loaded: false}
@loadProgress.somethings.push res
@loadProgress.denom += value
@updateProgress(res)
somethingLoaded: (name) ->
r = _.find @loadProgress.somethings, {name: name}
return console.error 'Could not find something called', name if not r
r.loaded = true
@updateProgress(r)
loading: ->
return false if @loaded
for r in @loadProgress.resources
return true if not r.resource.loaded
for r in @loadProgress.requests
return true if not r.request.status
for r in @loadProgress.somethings
return true if not r.loaded
return false
updateProgress: (r)=>
console.debug 'Loaded', r.name, r.loaded
denom = @loadProgress.denom
@loadProgress.num += r.value if r.loaded
num = @loadProgress.num
progress = if denom then num / denom else 0
# sometimes the denominator isn't known from the outset, so make sure the overall progress only goes up
updateProgress: (progress)=>
@loadProgress.progress = progress if progress > @loadProgress.progress
@updateProgressBar()
if num is denom
@onLoaded()
@updateProgressBar(progress)
updateProgressBar: =>
prog = "#{parseInt(@loadProgress.progress*100)}%"
updateProgressBar: (progress) =>
prog = "#{parseInt(progress*100)}%"
@$el.find('.loading-screen .progress-bar').css('width', prog)
onLoaded: ->
@render()
#@render()
# Error handling for loading

3
app/views/play/level/level_loading_view.coffee
View file

@ -15,6 +15,7 @@ module.exports = class LevelLoadingView extends View
tip = _.sample(tips)
$(tip).removeClass('to-remove')
@$el.find('.to-remove').remove()
@hideLoading()
onLevelLoaderProgressChanged: (e) ->
@progress = e.progress
@ -33,7 +34,7 @@ module.exports = class LevelLoadingView extends View
_.delay @reallyUnveil, 1000
reallyUnveil: =>
return if @destroyed
return if @destroyed or @progress < 1
loadingDetails = @$el.find('.loading-details')
duration = parseFloat loadingDetails.css 'transition-duration'
loadingDetails.css 'top', -loadingDetails.outerHeight(true)

5
app/views/play/level_view.coffee
View file

@ -86,6 +86,7 @@ module.exports = class PlayLevelView extends View
@listenToOnce(@supermodel, 'error', @onLevelLoadError)
@saveScreenshot = _.throttle @saveScreenshot, 30000
@insertSubView @loadingView = new LoadingView {}
if @isEditorPreview
f = =>
@supermodel.shouldSaveBackups = (model) ->
@ -361,11 +362,11 @@ module.exports = class PlayLevelView extends View
.css('transform', "rotate(#{@pointerRotation}rad) translate(-3px, #{@pointerRadialDistance}px)")
.css('top', target_top - 50)
.css('left', target_left - 50)
setTimeout((=>
setTimeout(()=>
@animatePointer()
clearInterval(@pointerInterval)
@pointerInterval = setInterval(@animatePointer, 1200)
), 1)
, 1)
animatePointer: ->