vertex operations: improve performance

src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleMesh.kt

@@ -30,19 +30,16 @@ class ParticleMesh(renderWindow: RenderWindow, data: DirectArrayFloatList) : Mes
     fun addVertex(position: Vec3d, scale: Float, texture: AbstractTexture, tintColor: RGBColor, uvMin: Vec2 = Vec2(0.0f, 0.0f), uvMax: Vec2 = Vec2(1.0f, 1.0f)) {
         val minTransformedUV = texture.renderData?.transformUV(uvMin) ?: uvMin
         val maxTransformedUV = texture.renderData?.transformUV(uvMax) ?: uvMax
-        data.addAll(
+        data.add(position.x.toFloat())
-            floatArrayOf(
+        data.add(position.y.toFloat())
-                position.x.toFloat(), // ToDo: Use doubles
+        data.add(position.z.toFloat())
-                position.y.toFloat(),
+        data.add(minTransformedUV.x)
-                position.z.toFloat(),
+        data.add(minTransformedUV.y)
-                minTransformedUV.x,
+        data.add(maxTransformedUV.x)
-                minTransformedUV.y,
+        data.add(maxTransformedUV.y)
-                maxTransformedUV.x,
+        data.add(Float.fromBits(texture.renderData?.shaderTextureId ?: RenderConstants.DEBUG_TEXTURE_ID))
-                maxTransformedUV.y,
+        data.add(scale)
-                Float.fromBits(texture.renderData?.shaderTextureId ?: RenderConstants.DEBUG_TEXTURE_ID),
+        data.add(Float.fromBits(tintColor.rgba))
-                scale,
-                Float.fromBits(tintColor.rgba),
-            ))
     }
 
 

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

@@ -143,9 +143,7 @@ class ParticleRenderer(
         particlesLock.unlock()
     }
 
-    operator fun plusAssign(particle: Particle) {
+    operator fun plusAssign(particle: Particle) = add(particle)
-        add(particle)
-    }
 
     override fun prepareDraw() {
         transparentMesh.unload()
@@ -153,7 +151,6 @@ class ParticleRenderer(
 
         val toRemove: MutableSet<Particle> = mutableSetOf()
 
-
         transparentMesh.data.clear()
         translucentMesh.data.clear()
         transparentMesh = ParticleMesh(renderWindow, transparentMesh.data)
@@ -171,6 +168,7 @@ class ParticleRenderer(
             particle.addVertex(transparentMesh, translucentMesh, time)
         }
         particlesLock.release()
+
         if (toRemove.isNotEmpty()) {
             particlesLock.lock()
             particles -= toRemove

src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/Particle.kt

@@ -76,7 +76,6 @@ abstract class Particle(
             }
             field = value
 
-
             val x = ((aabb.min.x + aabb.max.x) - spacing.x) / 2.0
             val z = ((aabb.min.z + aabb.max.z) - spacing.z) / 2.0
 

src/main/java/de/bixilon/minosoft/gui/rendering/util/VecUtil.kt

@@ -369,10 +369,12 @@ object VecUtil {
             delta <= 0.0 -> return start
             delta >= 1.0 -> return end
         }
+        val startArray = start.array
+        val endArray = end.array
         return Vec3d(
-            lerp(delta, start.x, end.x),
+            lerp(delta, startArray[0], endArray[0]),
-            lerp(delta, start.y, end.y),
+            lerp(delta, startArray[1], endArray[1]),
-            lerp(delta, start.z, end.z),
+            lerp(delta, startArray[2], endArray[2]),
         )
     }
 

src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/Mesh.kt

@@ -32,7 +32,7 @@ abstract class Mesh(
     val reversedOrder = order.reversedArray()
     private var _data: DirectArrayFloatList? = data ?: DirectArrayFloatList(initialCacheSize)
     var data: DirectArrayFloatList
-        get() = _data!!
+        get() = _data as DirectArrayFloatList
         set(value) {
             _data = value
         }

src/main/java/de/bixilon/minosoft/gui/rendering/world/mesh/SingleWorldMesh.kt

@@ -26,15 +26,13 @@ class SingleWorldMesh(renderWindow: RenderWindow, initialCacheSize: Int) : Mesh(
 
     fun addVertex(position: FloatArray, uv: Vec2, texture: AbstractTexture, tintColor: Int, light: Int) {
         val transformedUV = texture.renderData?.transformUV(uv) ?: uv
-        data.addAll(floatArrayOf(
+        data.add(position[0])
-            position[0],
+        data.add(position[1])
-            position[1],
+        data.add(position[2])
-            position[2],
+        data.add(transformedUV.x)
-            transformedUV.x,
+        data.add(transformedUV.y)
-            transformedUV.y,
+        data.add(Float.fromBits(texture.renderData?.shaderTextureId ?: RenderConstants.DEBUG_TEXTURE_ID))
-            Float.fromBits(texture.renderData?.shaderTextureId ?: RenderConstants.DEBUG_TEXTURE_ID),
+        data.add(Float.fromBits(tintColor or (light shl 24)))
-            Float.fromBits(tintColor or (light shl 24)),
-        ))
     }
 
 

src/main/java/de/bixilon/minosoft/util/collections/floats/DirectArrayFloatList.kt

@@ -24,8 +24,8 @@ class DirectArrayFloatList(
 ) : AbstractFloatList() {
     var buffer: FloatBuffer = memAllocFloat(initialSize)
         private set
-    override val limit: Int
+    override var limit: Int = buffer.limit()
-        get() = buffer.capacity()
+        private set
     override val size: Int
         get() = buffer.position()
     override val isEmpty: Boolean
@@ -58,6 +58,7 @@ class DirectArrayFloatList(
         }
         val oldBuffer = buffer
         buffer = memAllocFloat(newSize)
+        limit = newSize
         if (FLOAT_PUT_METHOD == null) { // Java < 16
             for (i in 0 until oldBuffer.position()) {
                 buffer.put(oldBuffer.get(i))
@@ -139,6 +140,7 @@ class DirectArrayFloatList(
         finished = true
         val oldBuffer = buffer
         buffer = memAllocFloat(oldBuffer.position())
+        limit = buffer.limit()
         if (FLOAT_PUT_METHOD == null) { // Java < 16
             for (i in 0 until oldBuffer.position()) {
                 buffer.put(oldBuffer.get(i))