spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vivecraft update

Browse Source
This commit is contained in:
mcrcortex
2025-10-19 11:07:45 +10:00
parent 2c62c876fa
commit a54b97d04b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -133,7 +133,7 @@ dependencies {
//modImplementation('io.github.douira:glsl-transformer:2.0.1') //modImplementation('io.github.douira:glsl-transformer:2.0.1')
modCompileOnly("maven.modrinth:vivecraft:1.21.8-1.2.5-b6-fabric") modCompileOnly("maven.modrinth:vivecraft:1.21.9-1.3.2-fabric")
modCompileOnly("maven.modrinth:flashback:rNCr1Rbs") modCompileOnly("maven.modrinth:flashback:rNCr1Rbs")
} }

11
src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java
View File

@@ -2,7 +2,7 @@ package me.cortex.voxy.client.core.rendering;
import me.cortex.voxy.client.core.util.IrisUtil; import me.cortex.voxy.client.core.util.IrisUtil;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import org.vivecraft.client_vr.ClientDataHolderVR; import org.vivecraft.api.client.VRRenderingAPI;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -13,7 +13,7 @@ public class ViewportSelector <T extends Viewport<?>> {
private final Supplier<T> creator; private final Supplier<T> creator;
private final T defaultViewport; private final T defaultViewport;
private final Map<Object, T> extraViewports = new HashMap<>(); private final Map<Object, T> extraViewports = new HashMap<>();//TODO should maybe be a weak hashmap with value cleanup queue thing?
public ViewportSelector(Supplier<T> viewportCreator) { public ViewportSelector(Supplier<T> viewportCreator) {
this.creator = viewportCreator; this.creator = viewportCreator;
@@ -25,8 +25,11 @@ public class ViewportSelector <T extends Viewport<?>> {
} }
private T getVivecraftViewport() { private T getVivecraftViewport() {
var cdh = ClientDataHolderVR.getInstance(); var rApi = VRRenderingAPI.instance();
var pass = cdh.currentPass; if (rApi == null) {
return this.defaultViewport;
}
var pass = rApi.getCurrentRenderPass();
if (pass == null) { if (pass == null) {
return this.defaultViewport; return this.defaultViewport;
} }