Skip to content

Commit ca4d465

Browse files
author
Julien
committed
style(SDK): remove useless SDK viewer code
1 parent 5572feb commit ca4d465

File tree

1 file changed

+17
-78
lines changed
  • engine/core/src/main/resources/view/core

1 file changed

+17
-78
lines changed

engine/core/src/main/resources/view/core/Drawer.js

Lines changed: 17 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {assets} from '../assets.js'
1+
import { assets } from '../assets.js'
22
import * as config from '../config.js'
3-
import {unlerp, fitAspectRatio} from './utils.js'
4-
import {WIDTH, HEIGHT, BASE_FRAME_DURATION} from './constants.js'
5-
import {ErrorLog} from './ErrorLog.js'
6-
import {demo as defaultDemo} from '../demo.js'
7-
import {setRenderer, destroyFlagged, flagForDestructionOnReinit} from './rendering.js'
8-
import {ModuleError} from './ModuleError.js'
3+
import { unlerp, fitAspectRatio } from './utils.js'
4+
import { WIDTH, HEIGHT, BASE_FRAME_DURATION } from './constants.js'
5+
import { ErrorLog } from './ErrorLog.js'
6+
import { demo as defaultDemo } from '../demo.js'
7+
import { setRenderer, destroyFlagged } from './rendering.js'
8+
import { ModuleError } from './ModuleError.js'
99
/* global PIXI requestAnimationFrame $ */
1010

1111
export class Drawer {
@@ -124,7 +124,7 @@ export class Drawer {
124124
getOptions () {
125125
// Return an array of copies
126126
if (config.options) {
127-
return config.options.map(v => ({...v}))
127+
return config.options.map(v => ({ ...v }))
128128
}
129129
return []
130130
}
@@ -185,7 +185,6 @@ export class Drawer {
185185
var scene = new PIXI.Container()
186186

187187
scope.drawer = this
188-
scope.renderables = []
189188
scope.time = 0
190189

191190
if (this.demo) {
@@ -276,7 +275,7 @@ export class Drawer {
276275
} catch (err) {
277276
data = {}
278277
}
279-
return {...data, key: header[0] === 'KEY_FRAME'}
278+
return { ...data, key: header[0] === 'KEY_FRAME' }
280279
}).filter(x => x.key)
281280

282281
this.parseGlobalData(this._frames[0].global)
@@ -406,9 +405,6 @@ export class Drawer {
406405
scope.canvasHeight = canvasHeight
407406
scope.canvasWidth = canvasWidth
408407

409-
scope.renderables = []
410-
scope.updatables = []
411-
412408
scope.time = 0
413409
scope.endTime = 0
414410

@@ -444,10 +440,6 @@ export class Drawer {
444440
scope.currentProgress = progress
445441
scope.reason = reason
446442

447-
for (var i = 0; i < scope.updatables.length; ++i) {
448-
scope.updatables[i].update(frameNumber, progress, parsedFrame, scope)
449-
}
450-
451443
for (let moduleName in this.modules) {
452444
const module = this.modules[moduleName]
453445
if (parsedFrame.data.hasOwnProperty(moduleName)) {
@@ -483,18 +475,6 @@ export class Drawer {
483475
}
484476
}
485477

486-
renderRenderables (step, scope) {
487-
var next = []
488-
for (var i = 0; i < scope.renderables.length; ++i) {
489-
var updatable = scope.renderables[i]
490-
var remove = updatable.render(step, scope)
491-
if (!remove) {
492-
next.push(updatable)
493-
}
494-
}
495-
scope.renderables = next
496-
}
497-
498478
renderScene (scope, question, frames, frameNumber, progress, speed, reason, step) {
499479
/** ************************************* */
500480
/* ASYNCHRONOUS */
@@ -512,8 +492,6 @@ export class Drawer {
512492
scope.endTime = 0
513493
}
514494

515-
this.renderRenderables(step, scope)
516-
517495
for (let moduleName in this.modules) {
518496
const module = this.modules[moduleName]
519497
if (typeof module.animateScene === 'function') {
@@ -655,7 +633,7 @@ export class Drawer {
655633
} catch (err) {
656634
data = {}
657635
}
658-
return {...data, key: header[0] === 'KEY_FRAME'}
636+
return { ...data, key: header[0] === 'KEY_FRAME' }
659637
})
660638

661639
this.parseGlobalData(this._frames[0].global)
@@ -700,7 +678,7 @@ export class Drawer {
700678
avatar: null
701679
}
702680

703-
loader.add('avatar' + index, agent.avatar, {loadType: 2, crossOrigin: true}, function (event) {
681+
loader.add('avatar' + index, agent.avatar, { loadType: 2, crossOrigin: true }, function (event) {
704682
agentData.avatar = event.texture
705683
PIXI.Texture.addToCache(event.texture, '$' + agentData.index)
706684
})
@@ -796,25 +774,25 @@ export class Drawer {
796774
setRenderer(this.renderer)
797775
var loader = new PIXI.loaders.Loader(resources.baseUrl)
798776
for (key in resources.images) {
799-
loader.add(key, resources.images[key], {crossOrigin: true})
777+
loader.add(key, resources.images[key], { crossOrigin: true })
800778
}
801779
var i
802780
for (i = 0; i < resources.sprites.length; ++i) {
803-
loader.add(resources.sprites[i], {crossOrigin: true})
781+
loader.add(resources.sprites[i], { crossOrigin: true })
804782
}
805783
for (i = 0; i < resources.fonts.length; ++i) {
806-
loader.add(resources.fonts[i], {crossOrigin: true})
784+
loader.add(resources.fonts[i], { crossOrigin: true })
807785
}
808786
for (key in resources.spines) {
809-
loader.add(key, resources.spines[key], {crossOrigin: true})
787+
loader.add(key, resources.spines[key], { crossOrigin: true })
810788
}
811789
for (i = 0; i < resources.others.length; ++i) {
812-
loader.add(resources.others[i], {crossOrigin: true})
790+
loader.add(resources.others[i], { crossOrigin: true })
813791
}
814792

815793
if (this.demo) {
816794
this.demo.agents.forEach(agent => {
817-
loader.add('avatar' + agent.index, agent.avatar, {loadType: 2, crossOrigin: true}, function (event) {
795+
loader.add('avatar' + agent.index, agent.avatar, { loadType: 2, crossOrigin: true }, function (event) {
818796
agent.avatarTexture = event.texture
819797
PIXI.Texture.addToCache(event.texture, '$' + agent.index)
820798
})
@@ -877,45 +855,6 @@ export class Drawer {
877855
})
878856
}
879857

880-
/**
881-
* Turns a graphic into a texture, saves the texture for later destruction
882-
*/
883-
generateTexture (graphics) {
884-
var tex = graphics.generateTexture()
885-
flagForDestructionOnReinit(tex)
886-
return tex
887-
}
888-
889-
/**
890-
* Creates a Text and keeps the texture for later destruction
891-
*/
892-
generateText (text, size, color, align) {
893-
var bitmap = size * this.scope.canvasWidth / this.oversampling >= 30 * 960
894-
// var bitmap = size * this.scope.canvasWidth / 1 >= 30 * 960;
895-
var textEl
896-
if (bitmap) {
897-
textEl = new PIXI.extras.BitmapText(text, {
898-
font: size + 'px agency_80',
899-
tint: color
900-
})
901-
textEl.lineHeight = size
902-
} else {
903-
textEl = new PIXI.Text(text, {
904-
fontSize: Math.round(size / 1.2) + 'px',
905-
fontFamily: 'Lato',
906-
fontWeight: 'bold',
907-
fill: color
908-
})
909-
textEl.lineHeight = Math.round(size / 1.2)
910-
}
911-
if (align === 'right') {
912-
textEl.anchor.x = 1
913-
} else if (align === 'center') {
914-
textEl.anchor.x = 0.5
915-
}
916-
flagForDestructionOnReinit(textEl)
917-
return textEl
918-
}
919858
isReady () {
920859
return this.loaded >= 1
921860
}

0 commit comments

Comments
 (0)