Skip to content

Commit 667b4fd

Browse files
committed
refactor(endscreen): remove forceLato
1 parent c1703ba commit 667b4fd

File tree

1 file changed

+13
-22
lines changed

1 file changed

+13
-22
lines changed

engine/modules/endscreen/src/main/resources/view/endscreen-module/EndScreenModule.js

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -120,23 +120,16 @@ export class EndScreenModule {
120120
}
121121
}
122122

123-
generateText (text, size, align, color, forceLato) {
123+
generateText (text, size, align, color) {
124124
var textEl
125-
if (!forceLato) {
126-
textEl = new PIXI.extras.BitmapText(text, {
127-
font: size + 'px 04b',
128-
tint: color
129-
})
130-
textEl.lineHeight = size
131-
} else {
132-
textEl = new PIXI.Text(text, {
133-
fontSize: Math.round(size / 1.2) + 'px',
134-
fontFamily: 'Lato',
135-
fontWeight: 'bold',
136-
fill: color
137-
})
138-
textEl.lineHeight = Math.round(size / 1.2)
139-
}
125+
126+
textEl = new PIXI.Text(text, {
127+
fontSize: Math.round(size / 1.2) + 'px',
128+
fontFamily: 'Lato',
129+
fontWeight: 'bold',
130+
fill: color
131+
})
132+
textEl.lineHeight = Math.round(size / 1.2)
140133
flagForDestructionOnReinit(textEl)
141134
if (align === 'right') {
142135
textEl.anchor.x = 1
@@ -169,13 +162,13 @@ export class EndScreenModule {
169162
var avatar = new PIXI.Sprite(finisher.player.avatar)
170163
avatar.width = avatar.height = 120
171164

172-
var rank = this.generateText(finisher.rank.toString(), 76, 'center', finisher.player.color, true)
165+
var rank = this.generateText(finisher.rank.toString(), 76, 'center', finisher.player.color)
173166
rank.anchor.y = 0.5
174167
rank.position.x = 160
175168
rank.position.y = 56
176169
avatarContainer.addChild(rank)
177170

178-
var rankLetter = this.generateText(finisher.rank === 1 ? 'ST' : 'ND'.toString(), 34, 'left', finisher.player.color, true)
171+
var rankLetter = this.generateText(finisher.rank === 1 ? 'ST' : 'ND'.toString(), 34, 'left', finisher.player.color)
179172
rankLetter.position.x = 184
180173
rankLetter.position.y = 32
181174
avatarContainer.addChild(rankLetter)
@@ -185,10 +178,8 @@ export class EndScreenModule {
185178

186179
avatarContainer.addChild(hudAvatar)
187180

188-
/** ************************************* */
189-
190-
var name = this.generateText(finisher.player.name.toUpperCase(), 50, 'left', finisher.player.color, true)
191-
var scoreLabel = this.generateText(((finisher.score >= 0) ? finisher.score.toString() + ' points' : '-'), 64, 'left', finisher.player.color, true)
181+
var name = this.generateText(finisher.player.name.toUpperCase(), 50, 'left', finisher.player.color)
182+
var scoreLabel = this.generateText(((finisher.score >= 0) ? finisher.score.toString() + ' points' : '-'), 64, 'left', finisher.player.color)
192183

193184
name.x = 330
194185
name.y = -4

0 commit comments

Comments
 (0)