AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fluid physics: reduce allocations

Browse Source
This commit is contained in:
Moritz Zwerger 2025-03-27 20:04:09 +01:00
parent 6fd062d19d
commit c0bf5efe7b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt
View File

@ -24,6 +24,7 @@ import de.bixilon.minosoft.data.world.chunk.chunk.Chunk
import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.data.world.positions.BlockPosition
import de.bixilon.minosoft.gui.rendering.models.fluid.FluidModel import de.bixilon.minosoft.gui.rendering.models.fluid.FluidModel
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY_INSTANCE
import de.bixilon.minosoft.physics.entities.living.LivingEntityPhysics import de.bixilon.minosoft.physics.entities.living.LivingEntityPhysics
import de.bixilon.minosoft.physics.input.MovementInput import de.bixilon.minosoft.physics.input.MovementInput
import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.network.session.play.PlaySession
@ -72,7 +73,7 @@ abstract class Fluid(override val identifier: ResourceLocation) : RegistryItem()
// ToDo: Falling fluid // ToDo: Falling fluid
if (velocity == Vec3d.EMPTY) { if (velocity == Vec3d.EMPTY_INSTANCE) {
return velocity return velocity
} }

6
src/main/java/de/bixilon/minosoft/data/world/iterator/BlockPair.kt
View File

@ -18,7 +18,7 @@ import de.bixilon.minosoft.data.world.chunk.chunk.Chunk
import de.bixilon.minosoft.data.world.positions.BlockPosition import de.bixilon.minosoft.data.world.positions.BlockPosition
data class BlockPair( data class BlockPair(
val position: BlockPosition, var position: BlockPosition,
val state: BlockState, var state: BlockState,
val chunk: Chunk, var chunk: Chunk,
) )

11
src/main/java/de/bixilon/minosoft/data/world/iterator/WorldIterator.kt
View File

@ -31,6 +31,7 @@ class WorldIterator(
private val world: World, private val world: World,
private var chunk: Chunk? = null, private var chunk: Chunk? = null,
) : Iterator<BlockPair> { ) : Iterator<BlockPair> {
private var pair: BlockPair? = null
private var next: BlockPair? = null private var next: BlockPair? = null
private var revision = -1 private var revision = -1
@ -61,7 +62,15 @@ class WorldIterator(
} }
val state = chunk[position.inChunkPosition] ?: continue val state = chunk[position.inChunkPosition] ?: continue
this.next = BlockPair(position, state, chunk)
val pair = pair ?: BlockPair(position, state, chunk)
this.pair = pair
pair.position = position
pair.state = state
pair.chunk = chunk
this.next = pair
return true return true
} }

3
src/main/java/de/bixilon/minosoft/gui/rendering/util/vec/vec3/Vec3dUtil.kt
View File

@ -29,6 +29,9 @@ import kotlin.math.abs
object Vec3dUtil { object Vec3dUtil {
const val MARGIN = 0.003 const val MARGIN = 0.003
private val empty = Vec3d()
val Vec3d.Companion.EMPTY_INSTANCE get() = empty
val Vec3d.Companion.MIN: Vec3d val Vec3d.Companion.MIN: Vec3d
get() = Vec3d(Double.MIN_VALUE, Double.MIN_VALUE, Double.MIN_VALUE) get() = Vec3d(Double.MIN_VALUE, Double.MIN_VALUE, Double.MIN_VALUE)