Move several Api Enums back into Core
This commit is contained in:
+1
-1
@@ -24,7 +24,7 @@ package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
* USE_SKY_COLOR, <br>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2022-6-2
|
||||
* @version 2022-6-9
|
||||
*/
|
||||
public enum DhApiFogColorMode
|
||||
{
|
||||
|
||||
+5
-1
@@ -22,10 +22,14 @@ package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
/**
|
||||
*
|
||||
* @author Leonardo Amato
|
||||
* @version 2022-3-26
|
||||
* @version 2022-6-9
|
||||
*/
|
||||
public enum DhApiVerticalQuality
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items: up the API minor version
|
||||
// when removing items: up the API major version
|
||||
|
||||
LOW,
|
||||
MEDIUM,
|
||||
HIGH,
|
||||
|
||||
Vendored
+4
-4
@@ -1,10 +1,10 @@
|
||||
package com.seibel.lod.core.api.external.config.client.graphics;
|
||||
|
||||
import com.seibel.lod.core.enums.rendering.FogColorMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.api.external.apiObjects.objects.DhApiConfig_v1;
|
||||
import com.seibel.lod.core.config.Config.Client.Graphics.FogQuality;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
|
||||
/**
|
||||
* Any graphics settings related to fog.
|
||||
@@ -16,11 +16,11 @@ public class DhApiGraphicsFog
|
||||
{
|
||||
|
||||
/** Returns the config related to when fog is rendered. */
|
||||
public static DhApiConfig_v1<DhApiFogDistance> getFogDistanceConfig_v1()
|
||||
public static DhApiConfig_v1<FogDistance> getFogDistanceConfig_v1()
|
||||
{ return new DhApiConfig_v1<>(FogQuality.fogDistance); }
|
||||
|
||||
/** Returns the config related to when fog is rendered. */
|
||||
public static DhApiConfig_v1<DhApiFogDrawMode> getFogRenderConfig_v1()
|
||||
public static DhApiConfig_v1<FogDrawMode> getFogRenderConfig_v1()
|
||||
{ return new DhApiConfig_v1<>(FogQuality.fogDrawMode); }
|
||||
|
||||
/** Returns the config related to the fog draw type. */
|
||||
|
||||
Vendored
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.seibel.lod.core.api.external.config.client.graphics;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.objects.DhApiConfig_v1;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.config.Config.Client.Graphics.Quality;
|
||||
import com.seibel.lod.core.config.Config.Client.Advanced.Debugging;
|
||||
|
||||
@@ -22,7 +22,7 @@ public class DhApiGraphicsGeneral
|
||||
{ return new DhApiConfig_v1<>(Quality.lodChunkRenderDistance); }
|
||||
|
||||
/** Returns the config related to how Distant Horizons is set to render. */
|
||||
public static DhApiConfig_v1<DhApiRendererType> getRenderingTypeConfig_v1()
|
||||
public static DhApiConfig_v1<RendererType> getRenderingTypeConfig_v1()
|
||||
{ return new DhApiConfig_v1<>(Debugging.rendererType); }
|
||||
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.logging.ConfigBasedLogger;
|
||||
import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
|
||||
import com.seibel.lod.core.objects.DHChunkPos;
|
||||
@@ -264,7 +264,7 @@ public class ClientApi
|
||||
|
||||
|
||||
|
||||
if (CONFIG.client().advanced().debugging().getRendererType() == DhApiRendererType.DEFAULT)
|
||||
if (CONFIG.client().advanced().debugging().getRendererType() == RendererType.DEFAULT)
|
||||
{
|
||||
// Note to self:
|
||||
// if "unspecified" shows up in the pie chart, it is
|
||||
@@ -290,7 +290,7 @@ public class ClientApi
|
||||
}
|
||||
profiler.pop(); // end LOD
|
||||
profiler.push("terrain"); // go back into "terrain"
|
||||
} else if (CONFIG.client().advanced().debugging().getRendererType() == DhApiRendererType.DEBUG) {
|
||||
} else if (CONFIG.client().advanced().debugging().getRendererType() == RendererType.DEBUG) {
|
||||
IProfilerWrapper profiler = MC.getProfiler();
|
||||
profiler.pop(); // get out of "terrain"
|
||||
profiler.push("LODTestRendering");
|
||||
@@ -359,7 +359,7 @@ public class ClientApi
|
||||
if (glfwKey == GLFW.GLFW_KEY_F6)
|
||||
{
|
||||
CONFIG.client().advanced().debugging()
|
||||
.setRendererType(DhApiRendererType.next(CONFIG.client().advanced().debugging().getRendererType()));
|
||||
.setRendererType(RendererType.next(CONFIG.client().advanced().debugging().getRendererType()));
|
||||
MC.sendChatMessage("F6: Set rendering to " + CONFIG.client().advanced().debugging().getRendererType());
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ package com.seibel.lod.core.api.internal.a7;
|
||||
import com.seibel.lod.core.config.Config;
|
||||
import com.seibel.lod.core.ModInfo;
|
||||
import com.seibel.lod.core.enums.rendering.DebugMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
|
||||
import com.seibel.lod.core.logging.ConfigBasedLogger;
|
||||
import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
|
||||
@@ -211,7 +211,7 @@ public class ClientApi
|
||||
level.asyncTick();
|
||||
}
|
||||
|
||||
if (Config.Client.Advanced.Debugging.rendererType.get() == DhApiRendererType.DEFAULT) {
|
||||
if (Config.Client.Advanced.Debugging.rendererType.get() == RendererType.DEFAULT) {
|
||||
if (MC_RENDER.playerHasBlindnessEffect()) {
|
||||
// if the player is blind, don't render LODs,
|
||||
// and don't change minecraft's fog
|
||||
@@ -237,7 +237,7 @@ public class ClientApi
|
||||
}
|
||||
}
|
||||
profiler.pop(); // "Render-Lods"
|
||||
} else if (Config.Client.Advanced.Debugging.rendererType.get() == DhApiRendererType.DEBUG) {
|
||||
} else if (Config.Client.Advanced.Debugging.rendererType.get() == RendererType.DEBUG) {
|
||||
profiler.push("Render-Test");
|
||||
try {
|
||||
ClientApi.testRenderer.render();
|
||||
@@ -293,7 +293,7 @@ public class ClientApi
|
||||
}
|
||||
if (glfwKey == GLFW.GLFW_KEY_F6)
|
||||
{
|
||||
Config.Client.Advanced.Debugging.rendererType.set(DhApiRendererType.next(Config.Client.Advanced.Debugging.rendererType.get()));
|
||||
Config.Client.Advanced.Debugging.rendererType.set(RendererType.next(Config.Client.Advanced.Debugging.rendererType.get()));
|
||||
MC.sendChatMessage("F6: Set rendering to " + Config.Client.Advanced.Debugging.rendererType.get());
|
||||
}
|
||||
if (glfwKey == GLFW.GLFW_KEY_P)
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
package com.seibel.lod.core.config;
|
||||
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogColorMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.config.types.*;
|
||||
|
||||
import com.seibel.lod.core.enums.config.*;
|
||||
@@ -171,23 +171,23 @@ public class Config
|
||||
|
||||
public static class FogQuality
|
||||
{
|
||||
public static ConfigEntry<DhApiFogDistance> fogDistance = new ConfigEntry.Builder<DhApiFogDistance>()
|
||||
.set(DhApiFogDistance.FAR)
|
||||
public static ConfigEntry<FogDistance> fogDistance = new ConfigEntry.Builder<FogDistance>()
|
||||
.set(FogDistance.FAR)
|
||||
.comment(""
|
||||
+ "At what distance should Fog be drawn on the fake chunks? \n"
|
||||
+ "\n"
|
||||
+ "This setting shouldn't affect performance.")
|
||||
.build();
|
||||
|
||||
public static ConfigEntry<DhApiFogDrawMode> fogDrawMode = new ConfigEntry.Builder<DhApiFogDrawMode>()
|
||||
.set(DhApiFogDrawMode.FOG_ENABLED)
|
||||
public static ConfigEntry<FogDrawMode> fogDrawMode = new ConfigEntry.Builder<FogDrawMode>()
|
||||
.set(FogDrawMode.FOG_ENABLED)
|
||||
.comment(""
|
||||
+ "When should fog be drawn? \n"
|
||||
+ "\n"
|
||||
+ DhApiFogDrawMode.USE_OPTIFINE_SETTING + ": Use whatever Fog setting Optifine is using.\n"
|
||||
+ "If Optifine isn't installed this defaults to " + DhApiFogDrawMode.FOG_ENABLED + ". \n"
|
||||
+ DhApiFogDrawMode.FOG_ENABLED + ": Never draw fog on the LODs \n"
|
||||
+ DhApiFogDrawMode.FOG_DISABLED + ": Always draw fast fog on the LODs \n"
|
||||
+ FogDrawMode.USE_OPTIFINE_SETTING + ": Use whatever Fog setting Optifine is using.\n"
|
||||
+ "If Optifine isn't installed this defaults to " + FogDrawMode.FOG_ENABLED + ". \n"
|
||||
+ FogDrawMode.FOG_ENABLED + ": Never draw fog on the LODs \n"
|
||||
+ FogDrawMode.FOG_DISABLED + ": Always draw fast fog on the LODs \n"
|
||||
+ "\n"
|
||||
+ "Disabling fog will improve GPU performance.")
|
||||
.build();
|
||||
@@ -730,14 +730,14 @@ public class Config
|
||||
|
||||
public static class Debugging
|
||||
{
|
||||
public static ConfigEntry<DhApiRendererType> rendererType = new ConfigEntry.Builder<DhApiRendererType>()
|
||||
.set(DhApiRendererType.DEFAULT)
|
||||
public static ConfigEntry<RendererType> rendererType = new ConfigEntry.Builder<RendererType>()
|
||||
.set(RendererType.DEFAULT)
|
||||
.comment(""
|
||||
+ "What renderer is active? \n"
|
||||
+ "\n"
|
||||
+ DhApiRendererType.DEFAULT + ": Default lod renderer \n"
|
||||
+ DhApiRendererType.DEBUG + ": Debug testing renderer \n"
|
||||
+ DhApiRendererType.DISABLED + ": Disable rendering")
|
||||
+ RendererType.DEFAULT + ": Default lod renderer \n"
|
||||
+ RendererType.DEBUG + ": Debug testing renderer \n"
|
||||
+ RendererType.DISABLED + ": Disable rendering")
|
||||
.build();
|
||||
|
||||
public static ConfigEntry<DebugMode> debugMode = new ConfigEntry.Builder<DebugMode>()
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
package com.seibel.lod.core.enums.rendering;
|
||||
|
||||
/**
|
||||
* NEAR, FAR, or NEAR_AND_FAR.
|
||||
@@ -25,7 +25,7 @@ package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
* @author James Seibel
|
||||
* @version 2022-6-2
|
||||
*/
|
||||
public enum DhApiFogDistance
|
||||
public enum FogDistance
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
package com.seibel.lod.core.enums.rendering;
|
||||
|
||||
/**
|
||||
* USE_OPTIFINE_FOG_SETTING, <br>
|
||||
@@ -27,7 +27,7 @@ package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
* @author James Seibel
|
||||
* @version 2022-6-2
|
||||
*/
|
||||
public enum DhApiFogDrawMode
|
||||
public enum FogDrawMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
+4
-4
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
package com.seibel.lod.core.enums.rendering;
|
||||
|
||||
/**
|
||||
* Default
|
||||
@@ -26,7 +26,7 @@ package com.seibel.lod.core.api.external.apiObjects.enums;
|
||||
*
|
||||
* @version 2022-6-2
|
||||
*/
|
||||
public enum DhApiRendererType
|
||||
public enum RendererType
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
@@ -38,7 +38,7 @@ public enum DhApiRendererType
|
||||
|
||||
|
||||
/** Used by the config GUI to cycle through the available rendering options */
|
||||
public static DhApiRendererType next(DhApiRendererType type)
|
||||
public static RendererType next(RendererType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
@@ -49,7 +49,7 @@ public enum DhApiRendererType
|
||||
}
|
||||
|
||||
/** Used by the config GUI to cycle through the available rendering options */
|
||||
public static DhApiRendererType previous(DhApiRendererType type)
|
||||
public static RendererType previous(RendererType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
package com.seibel.lod.core.handlers;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
|
||||
|
||||
/**
|
||||
@@ -40,7 +40,7 @@ import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
|
||||
public interface IReflectionHandler extends IBindable
|
||||
{
|
||||
/** @return Whether Optifine is set to render fog or not. */
|
||||
DhApiFogDrawMode getFogDrawMode();
|
||||
FogDrawMode getFogDrawMode();
|
||||
|
||||
/** @return if Vivecraft is present. Attempts to find the "VRRenderer" class. */
|
||||
boolean vivecraftPresent();
|
||||
|
||||
@@ -27,7 +27,7 @@ import com.seibel.lod.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
|
||||
/**
|
||||
* A singleton used to get variables from methods
|
||||
@@ -109,14 +109,14 @@ public class ReflectionHandler implements IReflectionHandler
|
||||
* @return the fog quality
|
||||
*/
|
||||
@Override
|
||||
public DhApiFogDrawMode getFogDrawMode()
|
||||
public FogDrawMode getFogDrawMode()
|
||||
{
|
||||
if (ofFogField == null)
|
||||
{
|
||||
// either optifine isn't installed,
|
||||
// the variable name was changed, or
|
||||
// the setup method wasn't called yet.
|
||||
return DhApiFogDrawMode.FOG_ENABLED;
|
||||
return FogDrawMode.FOG_ENABLED;
|
||||
}
|
||||
|
||||
int returnNum = 0;
|
||||
@@ -140,9 +140,9 @@ public class ReflectionHandler implements IReflectionHandler
|
||||
// normal options
|
||||
case 1: // fast
|
||||
case 2: // fancy
|
||||
return DhApiFogDrawMode.FOG_ENABLED;
|
||||
return FogDrawMode.FOG_ENABLED;
|
||||
case 3: // off
|
||||
return DhApiFogDrawMode.FOG_DISABLED;
|
||||
return FogDrawMode.FOG_DISABLED;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
package com.seibel.lod.core.render;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.*;
|
||||
import com.seibel.lod.core.handlers.IReflectionHandler;
|
||||
import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
|
||||
@@ -62,26 +62,26 @@ public class LodFogConfig
|
||||
|
||||
public static LodFogConfig generateFogConfig()
|
||||
{
|
||||
DhApiFogDrawMode fogMode = CONFIG.client().graphics().fogQuality().getFogDrawMode();
|
||||
if (fogMode == DhApiFogDrawMode.USE_OPTIFINE_SETTING)
|
||||
FogDrawMode fogMode = CONFIG.client().graphics().fogQuality().getFogDrawMode();
|
||||
if (fogMode == FogDrawMode.USE_OPTIFINE_SETTING)
|
||||
fogMode = REFLECTION_HANDLER.getFogDrawMode();
|
||||
|
||||
return new LodFogConfig(fogMode);
|
||||
}
|
||||
|
||||
/** sets all fog options from the config */
|
||||
private LodFogConfig(DhApiFogDrawMode fogDrawMode)
|
||||
private LodFogConfig(FogDrawMode fogDrawMode)
|
||||
{
|
||||
earthCurveRatio = CONFIG.client().graphics().advancedGraphics().getEarthCurveRatio(); //FIXME: Move this out of here
|
||||
|
||||
if (fogDrawMode != DhApiFogDrawMode.FOG_DISABLED)
|
||||
if (fogDrawMode != FogDrawMode.FOG_DISABLED)
|
||||
{
|
||||
ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality fogSettings = CONFIG.client().graphics().fogQuality();
|
||||
|
||||
DhApiFogDistance fogDistance = fogSettings.getFogDistance();
|
||||
drawNearFog = (fogDistance == DhApiFogDistance.NEAR || fogDistance == DhApiFogDistance.NEAR_AND_FAR);
|
||||
FogDistance fogDistance = fogSettings.getFogDistance();
|
||||
drawNearFog = (fogDistance == FogDistance.NEAR || fogDistance == FogDistance.NEAR_AND_FAR);
|
||||
|
||||
if (fogDistance == DhApiFogDistance.FAR || fogDistance == DhApiFogDistance.NEAR_AND_FAR)
|
||||
if (fogDistance == FogDistance.FAR || fogDistance == FogDistance.NEAR_AND_FAR)
|
||||
{
|
||||
// far fog should be drawn
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ import org.lwjgl.opengl.GL32;
|
||||
import com.seibel.lod.core.builders.lodBuilding.bufferBuilding.LodBufferBuilderFactory;
|
||||
import com.seibel.lod.core.enums.rendering.DebugMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogColorMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
|
||||
import com.seibel.lod.core.objects.lod.LodDimension;
|
||||
import com.seibel.lod.core.objects.math.Mat4f;
|
||||
@@ -118,7 +118,7 @@ public class LodRenderer
|
||||
|
||||
|
||||
/** This is used to determine if the LODs should be regenerated */
|
||||
private DhApiFogDistance prevFogDistance = DhApiFogDistance.NEAR_AND_FAR;
|
||||
private FogDistance prevFogDistance = FogDistance.NEAR_AND_FAR;
|
||||
|
||||
/**
|
||||
* if this is true the LOD buffers should be regenerated,
|
||||
|
||||
+9
-9
@@ -19,10 +19,10 @@
|
||||
|
||||
package com.seibel.lod.core.wrapperInterfaces.config;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogColorMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.enums.config.*;
|
||||
import com.seibel.lod.core.enums.rendering.*;
|
||||
import com.seibel.lod.core.handlers.dependencyInjection.IBindable;
|
||||
@@ -93,11 +93,11 @@ public interface ILodConfigWrapperSingleton extends IBindable
|
||||
@Deprecated
|
||||
interface IFogQuality
|
||||
{
|
||||
DhApiFogDistance getFogDistance();
|
||||
void setFogDistance(DhApiFogDistance newFogDistance);
|
||||
FogDistance getFogDistance();
|
||||
void setFogDistance(FogDistance newFogDistance);
|
||||
|
||||
DhApiFogDrawMode getFogDrawMode();
|
||||
void setFogDrawMode(DhApiFogDrawMode newFogDrawMode);
|
||||
FogDrawMode getFogDrawMode();
|
||||
void setFogDrawMode(FogDrawMode newFogDrawMode);
|
||||
|
||||
FogColorMode getFogColorMode();
|
||||
void setFogColorMode(FogColorMode newFogColorMode);
|
||||
@@ -309,8 +309,8 @@ public interface ILodConfigWrapperSingleton extends IBindable
|
||||
@Deprecated
|
||||
interface IDebugging
|
||||
{
|
||||
DhApiRendererType getRendererType();
|
||||
void setRendererType(DhApiRendererType newRendererType);
|
||||
RendererType getRendererType();
|
||||
void setRendererType(RendererType newRendererType);
|
||||
|
||||
DebugMode getDebugMode();
|
||||
void setDebugMode(DebugMode newDebugMode);
|
||||
|
||||
+9
-9
@@ -1,9 +1,9 @@
|
||||
package com.seibel.lod.core.wrapperInterfaces.config;
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogColorMode;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDistance;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiRendererType;
|
||||
import com.seibel.lod.core.enums.rendering.FogDistance;
|
||||
import com.seibel.lod.core.enums.rendering.RendererType;
|
||||
import com.seibel.lod.core.config.Config;
|
||||
import com.seibel.lod.core.enums.config.*;
|
||||
import com.seibel.lod.core.enums.rendering.*;
|
||||
@@ -210,25 +210,25 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
|
||||
}
|
||||
|
||||
@Override
|
||||
public DhApiFogDistance getFogDistance()
|
||||
public FogDistance getFogDistance()
|
||||
{
|
||||
return Config.Client.Graphics.FogQuality.fogDistance.get();
|
||||
}
|
||||
@Override
|
||||
public void setFogDistance(DhApiFogDistance newFogDistance)
|
||||
public void setFogDistance(FogDistance newFogDistance)
|
||||
{
|
||||
Config.Client.Graphics.FogQuality.fogDistance.set(newFogDistance);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public DhApiFogDrawMode getFogDrawMode()
|
||||
public FogDrawMode getFogDrawMode()
|
||||
{
|
||||
return Config.Client.Graphics.FogQuality.fogDrawMode.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFogDrawMode(DhApiFogDrawMode setFogDrawMode)
|
||||
public void setFogDrawMode(FogDrawMode setFogDrawMode)
|
||||
{
|
||||
Config.Client.Graphics.FogQuality.fogDrawMode.set(setFogDrawMode);
|
||||
}
|
||||
@@ -729,11 +729,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
|
||||
* DISABLED
|
||||
* */
|
||||
@Override
|
||||
public DhApiRendererType getRendererType() {
|
||||
public RendererType getRendererType() {
|
||||
return Config.Client.Advanced.Debugging.rendererType.get();
|
||||
}
|
||||
@Override
|
||||
public void setRendererType(DhApiRendererType newRenderType) {
|
||||
public void setRendererType(RendererType newRenderType) {
|
||||
Config.Client.Advanced.Debugging.rendererType.set(newRenderType);
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
*/
|
||||
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiEnumAssembly;
|
||||
import com.seibel.lod.core.api.external.apiObjects.enums.DhApiFogDrawMode;
|
||||
import com.seibel.lod.core.enums.rendering.FogDrawMode;
|
||||
import com.seibel.lod.core.enums.CoreEnumAssembly;
|
||||
import com.seibel.lod.core.enums.config.VerticalQuality;
|
||||
import com.seibel.lod.core.util.EnumUtil;
|
||||
@@ -56,7 +56,7 @@ public class ApiEnumSyncTests
|
||||
// this should always succeed (comparing an enum to itself)
|
||||
AssertEnumsValuesAreEqual(EnumUtil.compareEnumClassesByValues(VerticalQuality.class, VerticalQuality.class), true);
|
||||
// this should always fail (two completely different enums)
|
||||
AssertEnumsValuesAreEqual(EnumUtil.compareEnumClassesByValues(VerticalQuality.class, DhApiFogDrawMode.class), false);
|
||||
AssertEnumsValuesAreEqual(EnumUtil.compareEnumClassesByValues(VerticalQuality.class, FogDrawMode.class), false);
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user