From 3846c9b7b040aef574360cac505ba7d1886d6c1e Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 31 Jul 2020 21:54:02 -0700 Subject: [PATCH] feat(JOML): Migrate BackdropProvider and Skysphere --- .../org/terasology/rendering/backdrop/BackdropProvider.java | 3 ++- .../java/org/terasology/rendering/backdrop/Skysphere.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java index fdfeab19608..4f20f06a83e 100644 --- a/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java +++ b/engine/src/main/java/org/terasology/rendering/backdrop/BackdropProvider.java @@ -15,7 +15,8 @@ */ package org.terasology.rendering.backdrop; -import org.terasology.math.geom.Vector3f; + +import org.joml.Vector3f; /** * Implementations of this interface provide read and/or write access to the backdrop, diff --git a/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java b/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java index b7672c87757..69eef9e298b 100644 --- a/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java +++ b/engine/src/main/java/org/terasology/rendering/backdrop/Skysphere.java @@ -15,12 +15,12 @@ */ package org.terasology.rendering.backdrop; +import org.joml.Vector3f; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.Sphere; import org.terasology.context.Context; import org.terasology.utilities.Assets; import org.terasology.math.TeraMath; -import org.terasology.math.geom.Vector3f; import org.terasology.rendering.assets.material.Material; import org.terasology.rendering.cameras.Camera; import org.terasology.rendering.nui.properties.Range; @@ -130,7 +130,7 @@ public Vector3f getSunDirection(boolean moonlightFlip) { // Moonlight flip if (moonlightFlip && sunDirection.y < 0.0f) { - sunDirection.scale(-1.0f); + sunDirection.mul(-1.0f); } return sunDirection;