Skip to content

Commit 8164e6a

Browse files
committed
KirinoConfig
1 parent c4cb569 commit 8164e6a

File tree

4 files changed

+30
-13
lines changed

4 files changed

+30
-13
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.cleanroommc.kirino;
2+
3+
public final class KirinoConfig {
4+
KirinoConfig() {
5+
}
6+
7+
public boolean enableRenderDelegate = true;
8+
public boolean enableHDR = true;
9+
public boolean enablePostProcessing = true;
10+
}

src/main/java/com/cleanroommc/kirino/KirinoCore.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,17 @@
4242
import java.util.concurrent.TimeUnit;
4343
import java.util.function.Function;
4444

45-
public class KirinoCore {
45+
public final class KirinoCore {
4646
private static final Minecraft MINECRAFT = Minecraft.getMinecraft();
4747
public static final Logger LOGGER = LogManager.getLogger("Kirino Core");
4848
public static final EventBus KIRINO_EVENT_BUS = new EventBus();
49+
public static final KirinoConfig KIRINO_CONFIG = new KirinoConfig();
4950
private static CleanECSRuntime ECS_RUNTIME;
5051
private static KirinoEngine KIRINO_ENGINE;
51-
52-
private static boolean unsupported = false;
53-
private final static boolean ENABLE_RENDER_DELEGATE = true;
52+
private static boolean UNSUPPORTED = false;
5453

5554
public static boolean isEnableRenderDelegate() {
56-
return ENABLE_RENDER_DELEGATE && !unsupported;
55+
return KIRINO_CONFIG.enableRenderDelegate && !UNSUPPORTED;
5756
}
5857

5958
private static MethodHandle setupCameraTransform;
@@ -399,14 +398,16 @@ public static void init() {
399398
rawGLVersion = "";
400399
}
401400

401+
LOGGER.info("OpenGL version: " + rawGLVersion);
402+
402403
if (rawGLVersion.isEmpty() || majorGLVersion == -1 || minorGLVersion == -1) {
403-
unsupported = true;
404-
LOGGER.warn("OpenGL 4.6 not supported. Aborting Kirino initialization.");
404+
UNSUPPORTED = true;
405+
LOGGER.warn("Failed to parse OpenGL version. Aborting Kirino initialization.");
405406
return;
406407
}
407408

408409
if (!(majorGLVersion == 4 && minorGLVersion == 6)) {
409-
unsupported = true;
410+
UNSUPPORTED = true;
410411
LOGGER.warn("OpenGL 4.6 not supported. Aborting Kirino initialization.");
411412
return;
412413
}
@@ -471,9 +472,14 @@ public static void init() {
471472
stopWatch = StopWatch.createStarted();
472473

473474
try {
474-
Constructor<KirinoEngine> ctor = KirinoEngine.class.getDeclaredConstructor(EventBus.class, Logger.class, CleanECSRuntime.class);
475+
Constructor<KirinoEngine> ctor = KirinoEngine.class.getDeclaredConstructor(
476+
EventBus.class,
477+
Logger.class,
478+
CleanECSRuntime.class,
479+
boolean.class,
480+
boolean.class);
475481
ctor.setAccessible(true);
476-
KIRINO_ENGINE = ctor.newInstance(KIRINO_EVENT_BUS, LOGGER, ECS_RUNTIME);
482+
KIRINO_ENGINE = ctor.newInstance(KIRINO_EVENT_BUS, LOGGER, ECS_RUNTIME, KIRINO_CONFIG.enableHDR, KIRINO_CONFIG.enablePostProcessing);
477483
} catch (Throwable throwable) {
478484
throw new RuntimeException("Kirino Engine failed to initialize.", throwable);
479485
}

src/main/java/com/cleanroommc/kirino/engine/KirinoEngine.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
public class KirinoEngine {
99
public final RenderingCoordinator renderingCoordinator;
1010

11-
private KirinoEngine(EventBus eventBus, Logger logger, CleanECSRuntime ecsRuntime) {
12-
renderingCoordinator = new RenderingCoordinator(eventBus, logger, ecsRuntime, true, true);
11+
private KirinoEngine(EventBus eventBus, Logger logger, CleanECSRuntime ecsRuntime,
12+
boolean enableHDR, boolean enablePostProcessing) {
13+
renderingCoordinator = new RenderingCoordinator(eventBus, logger, ecsRuntime, enableHDR, enablePostProcessing);
1314
}
1415
}

src/main/resources/assets/forge/shaders/pp_tone_mapping.frag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ void main()
3232
color = ACESFilm(color);
3333
color = pow(color, vec3(1.0 / 2.2));
3434

35-
FragColor = vec4(color, 1.f);
35+
FragColor = vec4(color, 1.0);
3636
}

0 commit comments

Comments
 (0)