AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 02:45:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some particle async bugs

Browse Source
This commit is contained in:
Bixilon 2021-09-26 23:32:42 +02:00
parent 7c33e3c2be
commit d3f53e3b8f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
View File

@ -26,7 +26,9 @@ import de.bixilon.minosoft.modding.event.invoker.CallbackEventInvoker
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates.Companion.disconnected import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates.Companion.disconnected
import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
import de.bixilon.minosoft.util.KUtil.toSynchronizedSet import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels
import de.bixilon.minosoft.util.logging.LogMessageType
import de.bixilon.minosoft.util.task.time.TimeWorker import de.bixilon.minosoft.util.task.time.TimeWorker
import de.bixilon.minosoft.util.task.time.TimeWorkerTask import de.bixilon.minosoft.util.task.time.TimeWorkerTask
import glm_.mat4x4.Mat4 import glm_.mat4x4.Mat4
@ -77,8 +79,10 @@ class ParticleRenderer(
connection.world.particleRenderer = this connection.world.particleRenderer = this
particleTask = TimeWorker.addTask(TimeWorkerTask(ProtocolDefinition.TICK_TIME, maxDelayTime = ProtocolDefinition.TICK_TIME / 2) { particleTask = TimeWorker.addTask(TimeWorkerTask(ProtocolDefinition.TICK_TIME, maxDelayTime = ProtocolDefinition.TICK_TIME / 2) {
for (particle in particles.toSynchronizedSet()) { synchronized(particles) {
particle.tryTick() for (particle in particles) {
particle.tryTick()
}
} }
}) })
@ -92,7 +96,10 @@ class ParticleRenderer(
fun add(particle: Particle) { fun add(particle: Particle) {
val particleCount = particles.size + particleQueue.size val particleCount = particles.size + particleQueue.size
check(particleCount < RenderConstants.MAXIMUM_PARTICLE_AMOUNT) { "Can not add particle: Limit reached (${particleCount} > ${RenderConstants.MAXIMUM_PARTICLE_AMOUNT}" } if (particleCount >= RenderConstants.MAXIMUM_PARTICLE_AMOUNT) {
Log.log(LogMessageType.RENDERING_GENERAL, LogLevels.WARN) { "Can not add particle: Limit reached (${particleCount} > ${RenderConstants.MAXIMUM_PARTICLE_AMOUNT}" }
return
}
synchronized(particleQueue) { synchronized(particleQueue) {
particleQueue += particle particleQueue += particle
} }
@ -109,22 +116,24 @@ class ParticleRenderer(
val toRemove: MutableSet<Particle> = mutableSetOf() val toRemove: MutableSet<Particle> = mutableSetOf()
synchronized(particleQueue) { particleMesh = ParticleMesh(renderWindow, particles.size + particleQueue.size)
particles += particleQueue
particleQueue.clear()
}
particleMesh = ParticleMesh(renderWindow, particles.size)
transparentParticleMesh = ParticleMesh(renderWindow, 500) transparentParticleMesh = ParticleMesh(renderWindow, 500)
for (particle in particles) { synchronized(particles) {
if (particle.dead) { synchronized(particleQueue) {
toRemove += particle particles += particleQueue
continue particleQueue.clear()
} }
particle.addVertex(transparentParticleMesh, particleMesh)
for (particle in particles) {
if (particle.dead) {
toRemove += particle
continue
}
particle.addVertex(transparentParticleMesh, particleMesh)
}
particles -= toRemove
} }
particles -= toRemove
particleMesh.load() particleMesh.load()
transparentParticleMesh.load() transparentParticleMesh.load()