curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 11:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

more efficient particles

Browse Source 
Former-commit-id: 56dad88ecd715ad6e357e33b903851a47a358dcd
Former-commit-id: c85c0b759a447c0461563d98156f59879fa95db2
This commit is contained in:
Song Minjae
2017-01-22 04:13:45 +09:00
parent 4acc797fee
commit 54b52b1b6e
22 changed files with 135 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/net/torvald/terrarum/StateInGame.kt
View File

@@ -55,8 +55,10 @@ constructor() : BasicGameState() {
* list of Actors that is sorted by Actors' referenceID
*/
val ACTORCONTAINER_INITIAL_SIZE = 128
val PARTICLES_MAX = 768
val actorContainer = ArrayList<Actor>(ACTORCONTAINER_INITIAL_SIZE)
val actorContainerInactive = ArrayList<Actor>(ACTORCONTAINER_INITIAL_SIZE)
val particlesContainer = CircularArray<ParticleBase>(PARTICLES_MAX)
val uiContainer = ArrayList<UIHandler>()
private val actorsRenderBehind = ArrayList<ActorVisible>(ACTORCONTAINER_INITIAL_SIZE)
@@ -224,6 +226,7 @@ constructor() : BasicGameState() {
// determine whether the actor should keep being activated or be dormant
KillOrKnockdownActors()
updateActors(gc, delta)
particlesContainer.forEach { it.update(gc, delta) }
// TODO thread pool(?)
CollisionSolver.process()
}
@@ -232,7 +235,7 @@ constructor() : BasicGameState() {
////////////////////////
// ui-related updates //
////////////////////////
uiContainer.forEach { ui -> ui.update(gc, delta) }
uiContainer.forEach { it.update(gc, delta) }
consoleHandler.update(gc, delta)
debugWindow.update(gc, delta)
notifier.update(gc, delta)
@@ -320,17 +323,19 @@ constructor() : BasicGameState() {
// draw map related stuffs //
/////////////////////////////
TilesDrawer.renderWall(worldG)
actorsRenderBehind.forEach { actor -> actor.drawBody(worldG) }
actorsRenderBehind.forEach { actor -> actor.drawGlow(worldG) }
actorsRenderBehind.forEach { it.drawBody(worldG) }
actorsRenderBehind.forEach { it.drawGlow(worldG) }
particlesContainer.forEach { it.drawBody(worldG) }
particlesContainer.forEach { it.drawGlow(worldG) }
TilesDrawer.renderTerrain(worldG)
/////////////////
// draw actors //
/////////////////
actorsRenderMiddle.forEach { actor -> actor.drawBody(worldG) }
actorsRenderMidTop.forEach { actor -> actor.drawBody(worldG) }
actorsRenderMiddle.forEach { it.drawBody(worldG) }
actorsRenderMidTop.forEach { it.drawBody(worldG) }
player.drawBody(worldG)
actorsRenderFront.forEach { actor -> actor.drawBody(worldG) }
actorsRenderFront.forEach { it.drawBody(worldG) }
// --> Change of blend mode <-- introduced by ActorVisible //
@@ -354,10 +359,10 @@ constructor() : BasicGameState() {
//////////////////////
// draw actor glows //
//////////////////////
actorsRenderMiddle.forEach { actor -> actor.drawGlow(worldG) }
actorsRenderMidTop.forEach { actor -> actor.drawGlow(worldG) }
actorsRenderMiddle.forEach { it.drawGlow(worldG) }
actorsRenderMidTop.forEach { it.drawGlow(worldG) }
player.drawGlow(worldG)
actorsRenderFront.forEach { actor -> actor.drawGlow(worldG) }
actorsRenderFront.forEach { it.drawGlow(worldG) }
// --> blendLightenOnly() <-- introduced by ActorVisible //
@@ -396,7 +401,7 @@ constructor() : BasicGameState() {
//////////////
// draw UIs //
//////////////
uiContainer.forEach { ui -> ui.render(gc, sbg, uiG) }
uiContainer.forEach { it.render(gc, sbg, uiG) }
debugWindow.render(gc, sbg, uiG)
consoleHandler.render(gc, sbg, uiG)
notifier.render(gc, sbg, uiG)
@@ -684,6 +689,10 @@ constructor() : BasicGameState() {
}
}
fun addParticle(particle: ParticleBase) {
particlesContainer.add(particle)
}
/**
* Whether the game should display actorContainer elem number when F3 is on
*/