Remove barely used utility classes

PolyhedralDev · Dec 21, 2023 · 8b50528 · 8b50528
1 parent 8399738
commit 8b50528
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 76 deletions.
diff --git a/src/main/java/net/worldsynth/glpreview/buffered/BufferedGLPanel.java b/src/main/java/net/worldsynth/glpreview/buffered/BufferedGLPanel.java
@@ -16,7 +16,6 @@
 import net.worldsynth.glpreview.Commons;
 import net.worldsynth.glpreview.buffered.Shader.ShaderType;
 import net.worldsynth.glpreview.model.AbstractModel;
-import net.worldsynth.util.math.MathHelperScalar;
 
 import javax.swing.SwingUtilities;
 import java.awt.event.MouseEvent;
@@ -279,7 +278,7 @@ public void mouseDragged(MouseEvent e) {
             display();
         } else if(SwingUtilities.isMiddleMouseButton(e)) {
             yLookatHeight += (y - lastMouseY) * -zoom * 0.2f;
-            yLookatHeight = MathHelperScalar.clamp(yLookatHeight, minYLookatHeight, maxYLookatHeight);
+            yLookatHeight = Math.min(Math.max(yLookatHeight, minYLookatHeight), maxYLookatHeight);
             display();
         } else if(SwingUtilities.isRightMouseButton(e)) {
             float lightDist = 5000;

diff --git a/src/main/java/net/worldsynth/glpreview/heightmap/Heightmap3DGLPreviewBufferedGL.java b/src/main/java/net/worldsynth/glpreview/heightmap/Heightmap3DGLPreviewBufferedGL.java
@@ -9,8 +9,6 @@
 import com.jogamp.opengl.GLCapabilities;
 import com.jogamp.opengl.GLProfile;
 import net.worldsynth.glpreview.buffered.BufferedGLPanel;
-import net.worldsynth.util.Arrays;
-import net.worldsynth.util.math.MathHelperScalar;
 
 
 public class Heightmap3DGLPreviewBufferedGL extends BufferedGLPanel {
@@ -49,7 +47,17 @@ public void setHeightmap(float[][] heightmap, double size, float normalizedHeigh
     }
 
     public void setHeightmap(double[][] heightmap, double size, float normalizedHeight) {
-        setHeightmap(Arrays.cast2f(heightmap), size, normalizedHeight);
+        setHeightmap(cast2f(heightmap), size, normalizedHeight);
+    }
+
+    private float[][] cast2f(double[][] array2d) {
+        float[][] array2f = new float[array2d.length][array2d[0].length];
+        for(int i = 0, width = array2d.length; i < width; i++) {
+            for(int j = 0, length = array2d[0].length; j < length; j++) {
+                array2f[i][j] = (float) array2d[i][j];
+            }
+        }
+        return array2f;
     }
 
     public void setColorscale(float[][] colorscale) {
@@ -71,7 +79,7 @@ private float[][][] colormapFromHeightmap(float[][] heightmap, float normalizedH
     }
 
     private float[] heightToColor(float height, float normalizedHeight) {
-        height = MathHelperScalar.clamp(height, 0.0f, normalizedHeight) / normalizedHeight;
+        height = Math.min(Math.max(height, 0.0f), normalizedHeight) / normalizedHeight;
 
         float[] lowRange = colorscale[0];
         float[] highRange = colorscale[1];

diff --git a/src/main/java/net/worldsynth/util/Arrays.java b/src/main/java/net/worldsynth/util/Arrays.java
diff --git a/src/main/java/net/worldsynth/util/math/MathHelperScalar.java b/src/main/java/net/worldsynth/util/math/MathHelperScalar.java