Merge PR #4026

Author: Cervator

engine/src/main/java/org/terasology/rendering/logic/MeshRenderer.java

@@ -15,13 +15,13 @@
  */
 package org.terasology.rendering.logic;
 
-import org.terasology.math.JomlUtil;
-import org.terasology.math.Transform;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
-import java.nio.FloatBuffer;
-import java.util.Arrays;
-import java.util.Set;
+import org.joml.Matrix3f;
+import org.joml.Matrix4f;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.joml.Vector3fc;
 import org.lwjgl.BufferUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,10 +38,8 @@
 import org.terasology.logic.location.LocationComponent;
 import org.terasology.logic.players.LocalPlayer;
 import org.terasology.math.AABB;
-import org.terasology.math.MatrixUtils;
-import org.terasology.math.geom.Matrix4f;
-import org.terasology.math.geom.Quat4f;
-import org.terasology.math.geom.Vector3f;
+import org.terasology.math.JomlUtil;
+import org.terasology.math.Transform;
 import org.terasology.network.ClientComponent;
 import org.terasology.network.NetworkSystem;
 import org.terasology.registry.In;
@@ -50,6 +48,10 @@
 import org.terasology.rendering.world.WorldRenderer;
 import org.terasology.world.WorldProvider;
 
+import java.nio.FloatBuffer;
+import java.util.Arrays;
+import java.util.Set;
+
 /**
  * TODO: This should be made generic (no explicit shader or mesh) and ported directly into WorldRenderer? Later note: some GelCube functionality moved to a module
  */
@@ -167,10 +169,13 @@ private void renderEntities(Iterable<EntityRef> entityRefs) {
     }
 
     private void renderEntitiesByMaterial(SetMultimap<Material, EntityRef> meshByMaterial) {
-        Vector3f cameraPosition = JomlUtil.from(worldRenderer.getActiveCamera().getPosition());
+        Vector3f cameraPosition = worldRenderer.getActiveCamera().getPosition();
 
-        Quat4f worldRot = new Quat4f();
+        Quaternionf worldRot = new Quaternionf();
         Vector3f worldPos = new Vector3f();
+        Matrix3f normalMatrix = new Matrix3f();
+        Matrix4f matrixCameraSpace = new Matrix4f();
+        Matrix4f modelViewMatrix = new Matrix4f();
 
         FloatBuffer tempMatrixBuffer44 = BufferUtils.createFloatBuffer(16);
         FloatBuffer tempMatrixBuffer33 = BufferUtils.createFloatBuffer(12);
@@ -190,23 +195,23 @@ private void renderEntitiesByMaterial(SetMultimap<Material, EntityRef> meshByMat
                     MeshComponent meshComp = entity.getComponent(MeshComponent.class);
                     LocationComponent location = entity.getComponent(LocationComponent.class);
 
-                    if (isHidden(entity, meshComp) || location == null || Float.isNaN(location.getWorldPosition().x)|| meshComp.mesh == null || !isRelevant(entity, location.getWorldPosition())) {
+                    if (isHidden(entity, meshComp) || location == null || Float.isNaN(location.getWorldPosition().x) || meshComp.mesh == null || !isRelevant(entity, JomlUtil.from(location.getWorldPosition()))) {
                         continue;
                     }
                     if (meshComp.mesh.isDisposed()) {
                         logger.error("Attempted to render disposed mesh");
                         continue;
                     }
 
-                    location.getWorldRotation(worldRot);
-                    location.getWorldPosition(worldPos);
+                    worldRot.set(JomlUtil.from(location.getWorldRotation()));
+                    worldPos.set(JomlUtil.from(location.getWorldPosition()));
                     float worldScale = location.getWorldScale();
 
-                    Transform toWorldSpace = new Transform(worldPos, worldRot, worldScale);
+                    Transform toWorldSpace = new Transform(JomlUtil.from(worldPos), JomlUtil.from(worldRot), worldScale);
+
+                    Vector3f offsetFromCamera = worldPos.sub(cameraPosition, new Vector3f());
+                    matrixCameraSpace.translationRotateScale(offsetFromCamera, worldRot, worldScale);
 
-                    Vector3f offsetFromCamera = new Vector3f();
-                    offsetFromCamera.sub(worldPos, cameraPosition);
-                    Matrix4f matrixCameraSpace = new Matrix4f(worldRot, offsetFromCamera, worldScale);
 
                     AABB aabb = meshComp.mesh.getAABB().transform(toWorldSpace);
                     if (worldRenderer.getActiveCamera().hasInSight(aabb)) {
@@ -218,17 +223,17 @@ private void renderEntitiesByMaterial(SetMultimap<Material, EntityRef> meshByMat
                             lastMesh.preRender();
                         }
 
-                        Matrix4f modelViewMatrix = MatrixUtils.calcModelViewMatrix(worldRenderer.getActiveCamera().getViewMatrix(), matrixCameraSpace);
-                        MatrixUtils.matrixToFloatBuffer(modelViewMatrix, tempMatrixBuffer44);
-                        MatrixUtils.matrixToFloatBuffer(MatrixUtils.calcNormalMatrix(modelViewMatrix), tempMatrixBuffer33);
+                        modelViewMatrix.set(worldRenderer.getActiveCamera().getViewMatrix()).mul(matrixCameraSpace);
+                        modelViewMatrix.get(tempMatrixBuffer44);
+                        modelViewMatrix.normal(normalMatrix).get(tempMatrixBuffer33);
 
                         material.setMatrix4("projectionMatrix", worldRenderer.getActiveCamera().getProjectionMatrix(), true);
                         material.setMatrix4("worldViewMatrix", tempMatrixBuffer44, true);
                         material.setMatrix3("normalMatrix", tempMatrixBuffer33, true);
 
                         material.setFloat3("colorOffset", meshComp.color.rf(), meshComp.color.gf(), meshComp.color.bf(), true);
-                        material.setFloat("sunlight", worldRenderer.getMainLightIntensityAt(worldPos), true);
-                        material.setFloat("blockLight", Math.max(worldRenderer.getBlockLightIntensityAt(worldPos), meshComp.selfLuminance), true);
+                        material.setFloat("sunlight", worldRenderer.getMainLightIntensityAt(JomlUtil.from(worldPos)), true);
+                        material.setFloat("blockLight", Math.max(worldRenderer.getBlockLightIntensityAt(JomlUtil.from(worldPos)), meshComp.selfLuminance), true);
 
                         lastMesh.doRender();
                     }
@@ -251,7 +256,7 @@ private void renderEntitiesByMaterial(SetMultimap<Material, EntityRef> meshByMat
      * @param position the world position the entity is located
      * @return true if the entity itself or the block at the given position are relevant, false otherwise.
      */
-    private boolean isRelevant(EntityRef entity, Vector3f position) {
+    private boolean isRelevant(EntityRef entity, Vector3fc position) {
         return worldProvider.isBlockRelevant(position) || entity.isAlwaysRelevant();
     }