From 4c19e0dc52cf9f53973c7c972f17c7c6b2cb32dd Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 27 Jan 2021 13:23:10 -0600 Subject: [PATCH] Rename FogType and FogMode FogType -> FogQuality FogMode -> FogDistanceMode --- .../java/backsun/lod/renderer/LodRenderer.java | 16 ++++++++-------- src/main/java/backsun/lod/util/OfConfig.java | 17 ++++++++--------- .../backsun/lod/util/fog/FogDistanceMode.java | 17 +++++++++++++++++ src/main/java/backsun/lod/util/fog/FogMode.java | 12 ------------ .../util/fog/{FogType.java => FogQuality.java} | 6 ++++-- 5 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 src/main/java/backsun/lod/util/fog/FogDistanceMode.java delete mode 100644 src/main/java/backsun/lod/util/fog/FogMode.java rename src/main/java/backsun/lod/util/fog/{FogType.java => FogQuality.java} (54%) diff --git a/src/main/java/backsun/lod/renderer/LodRenderer.java b/src/main/java/backsun/lod/renderer/LodRenderer.java index c882426d3..297ccc122 100644 --- a/src/main/java/backsun/lod/renderer/LodRenderer.java +++ b/src/main/java/backsun/lod/renderer/LodRenderer.java @@ -10,8 +10,8 @@ import backsun.lod.objects.LodChunk; import backsun.lod.util.OfConfig; import backsun.lod.util.enums.ColorDirection; import backsun.lod.util.enums.LodLocation; -import backsun.lod.util.fog.FogMode; -import backsun.lod.util.fog.FogType; +import backsun.lod.util.fog.FogDistanceMode; +import backsun.lod.util.fog.FogQuality; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; @@ -379,7 +379,7 @@ public class LodRenderer colorIndex++; } - setupFog(FogMode.NEAR, ofConfig.getFogType()); + setupFog(FogDistanceMode.NEAR, ofConfig.getFogType()); mc.world.profiler.endStartSection("LOD draw"); @@ -387,16 +387,16 @@ public class LodRenderer tessellator.draw(); } - private void setupFog(FogMode fogMode, FogType fogType) + private void setupFog(FogDistanceMode fogMode, FogQuality fogQuality) { - if(fogMode == FogMode.NONE || fogType == FogType.OFF) + if(fogQuality == FogQuality.OFF) { GlStateManager.disableFog(); return; } - if(fogMode == FogMode.NEAR) + if(fogMode == FogDistanceMode.NEAR) { // the multipliers are percentages // of the normal view distance. @@ -406,7 +406,7 @@ public class LodRenderer // it is normally used, with it hiding near objects // instead of far objects. - if (fogType == FogType.FANCY || fogType == FogType.UNKNOWN) + if (fogQuality == FogQuality.FANCY || fogQuality == FogQuality.UNKNOWN) { GlStateManager.setFogEnd(farPlaneDistance * 2.0f); GlStateManager.setFogStart(farPlaneDistance * 2.25f); @@ -422,7 +422,7 @@ public class LodRenderer // the multipliers are percentages of // the LOD view distance. - if (fogType == FogType.FANCY || fogType == FogType.UNKNOWN) + if (fogQuality == FogQuality.FANCY || fogQuality == FogQuality.UNKNOWN) { GlStateManager.setFogStart(farPlaneDistance * 0.5f * VIEW_DISTANCE_MULTIPLIER / 2.0f); GlStateManager.setFogEnd(farPlaneDistance * 1.0f * VIEW_DISTANCE_MULTIPLIER / 2.0f); diff --git a/src/main/java/backsun/lod/util/OfConfig.java b/src/main/java/backsun/lod/util/OfConfig.java index 92573743a..4c782f1b4 100644 --- a/src/main/java/backsun/lod/util/OfConfig.java +++ b/src/main/java/backsun/lod/util/OfConfig.java @@ -5,7 +5,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Parameter; -import backsun.lod.util.fog.FogType; +import backsun.lod.util.fog.FogQuality; import net.minecraft.client.Minecraft; /** @@ -123,14 +123,14 @@ public class OfConfig - public FogType getFogType() + public FogQuality getFogType() { if (ofFogField == null) { // either optifine isn't installed, // the variable name was changed, // or the setup method wasn't called yet. - return FogType.UNKNOWN; + return FogQuality.UNKNOWN; } @@ -146,20 +146,19 @@ public class OfConfig System.out.println(e); } - switch (returnNum) { case 0: - return FogType.UNKNOWN; + return FogQuality.UNKNOWN; case 1: - return FogType.FAST; + return FogQuality.FAST; case 2: - return FogType.FANCY; + return FogQuality.FANCY; case 3: - return FogType.OFF; + return FogQuality.OFF; default: - return FogType.UNKNOWN; + return FogQuality.UNKNOWN; } } diff --git a/src/main/java/backsun/lod/util/fog/FogDistanceMode.java b/src/main/java/backsun/lod/util/fog/FogDistanceMode.java new file mode 100644 index 000000000..e023fc016 --- /dev/null +++ b/src/main/java/backsun/lod/util/fog/FogDistanceMode.java @@ -0,0 +1,17 @@ +package backsun.lod.util.fog; + +/** + * Near, far, or both. + * + * @author James Seibel + * @version 01-27-2021 + */ +public enum FogDistanceMode +{ + /** valid for both fast and fancy qualities. */ + NEAR, + /** valid for both fast and fancy qualities. */ + FAR, + /** only valid if the quality is set to Fancy. */ + BOTH; +} \ No newline at end of file diff --git a/src/main/java/backsun/lod/util/fog/FogMode.java b/src/main/java/backsun/lod/util/fog/FogMode.java deleted file mode 100644 index e334f9ca3..000000000 --- a/src/main/java/backsun/lod/util/fog/FogMode.java +++ /dev/null @@ -1,12 +0,0 @@ -package backsun.lod.util.fog; - -/** - * @author James Seibel - * @version 09-21-2020 - */ -public enum FogMode -{ - NEAR, - FAR, - NONE -} \ No newline at end of file diff --git a/src/main/java/backsun/lod/util/fog/FogType.java b/src/main/java/backsun/lod/util/fog/FogQuality.java similarity index 54% rename from src/main/java/backsun/lod/util/fog/FogType.java rename to src/main/java/backsun/lod/util/fog/FogQuality.java index 2b13ccb27..af4edc834 100644 --- a/src/main/java/backsun/lod/util/fog/FogType.java +++ b/src/main/java/backsun/lod/util/fog/FogQuality.java @@ -1,10 +1,12 @@ package backsun.lod.util.fog; /** + * Unknown, fast, fancy, or off + * * @author James Seibel - * @version 09-21-2020 + * @version 01-27-2021 */ -public enum FogType +public enum FogQuality { UNKNOWN, FAST,