From 53e8c9141c1576c1e7f6e83426569b353987d9f0 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 4 Jan 2021 13:04:00 -0500 Subject: [PATCH] Simplify parallax --- .../engine/EngineParallaxManager.java | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 1b0c5d0f2..55bdd40be 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -74,16 +74,6 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer default void insertParallax(int x, int z, Hunk data) { - insertParallax(x, z, data, 5); - } - - default void insertParallax(int x, int z, Hunk data, int tries) - { - if(tries <= 0) - { - return; - } - try { PrecisionStopwatch p = PrecisionStopwatch.start(); @@ -111,11 +101,6 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer return; } - int min = Math.max(meta.getMinObject(), 0); - int max = meta.getMaxObject(); - max = max < 0 ? 255 : max; - boolean placed = false; - for(int i = x; i < x+ data.getWidth(); i++) { for(int j= z; j < z + data.getDepth(); j++) @@ -127,24 +112,11 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer if(d != null) { data.set(i - x, k, j - z, d); - placed = true; } } } } - if(!placed) - { - J.sleep(150); - - if(tries < 4) - { - generateParallaxLayer(x, z, true); - } - - insertParallax(x, z, data, tries-1); - } - getEngine().getMetrics().getParallaxInsert().put(p.getMilliseconds()); }