mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-18 11:29:08 +00:00
Compare commits
31
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c8991d810c | ||
|
|
e3b02642ac | ||
|
|
2759dd6689 | ||
|
|
996dbaef2c | ||
|
|
72ca675c93 | ||
|
|
e6e230e270 | ||
|
|
43d7282ba5 | ||
|
|
4b2d57a32d | ||
|
|
06bf71126f | ||
|
|
4c0f2f2685 | ||
|
|
78334717e7 | ||
|
|
a77765a2c9 | ||
|
|
1a9fe45ee9 | ||
|
|
21ef5905c8 | ||
|
|
5b67eaa474 | ||
|
|
c9d59c3b90 | ||
|
|
fa7ff74fec | ||
|
|
a34a3ebd39 | ||
|
|
2e7476d287 | ||
|
|
3244071012 | ||
|
|
7035dbde02 | ||
|
|
97ae04c2fa | ||
|
|
e7fa7f62d0 | ||
|
|
ea39712749 | ||
|
|
66dd3eaa94 | ||
|
|
270697cd10 | ||
|
|
2b53a851ef | ||
|
|
34b6efde7b | ||
|
|
86edb721da | ||
|
|
39c5f4bf7b | ||
|
|
5dc54bb1da |
No files matched your search
@@ -15,7 +15,7 @@
|
||||
|
||||
# Required Dependencies
|
||||
* [UniMixins](https://github.com/LegacyModdingMC/UniMixins/releases) >= 0.1.19
|
||||
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.6.20
|
||||
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.7.0
|
||||
* NOTE: Some mods are not required, but a specific version is required if present - see: `Permanent Incompatibilities` below.
|
||||
|
||||
# Known (temporary) Incompatibilities
|
||||
|
||||
+10
-9
@@ -49,19 +49,16 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.107")
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.11")
|
||||
|
||||
compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7") { transitive = false }
|
||||
|
||||
compileOnly("org.projectlombok:lombok:1.18.34") { transitive = false }
|
||||
annotationProcessor("org.projectlombok:lombok:1.18.34")
|
||||
|
||||
// Use modern models+textures to inject QuadProviders
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:TX-Loader:1.8.5:dev')
|
||||
|
||||
// Iris Shaders
|
||||
compileOnly('org.jetbrains:annotations:26.0.2')
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.8.0:dev")
|
||||
shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0
|
||||
shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") {
|
||||
exclude module: "antlr4" // we only want to shadow the runtime module
|
||||
@@ -70,18 +67,18 @@ dependencies {
|
||||
compileOnly "org.apache.ant:ant:1.8.2"
|
||||
|
||||
// Because who doesn't want NEI
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.31-GTNH:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')
|
||||
|
||||
// Notfine Deps
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
|
||||
devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH:dev")
|
||||
devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev")
|
||||
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.13:dev") { transitive = false }
|
||||
compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
|
||||
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.6-GTNH:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Natura:2.8.9:dev")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.8:dev")
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.8.4:dev")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.3:dev") { transitive = false }
|
||||
|
||||
@@ -96,11 +93,15 @@ dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.10:dev") // Mixin Version
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version
|
||||
|
||||
compileOnly(rfg.deobf("curse.maven:ntm-space-1121235:6974420"))
|
||||
|
||||
compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675"))
|
||||
compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684"))
|
||||
compileOnly(rfg.deobf("curse.maven:security-craft-64760:2818228"))
|
||||
|
||||
runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))
|
||||
// For testing alternative splash screens, can be sourced from https://github.com/MalTeeez/ModernSplash/releases
|
||||
//runtimeOnly(rfg.deobf(files("dependencies/modernsplash-1.7.10-1.2.2-dev.jar")))
|
||||
|
||||
// Hodgepodge
|
||||
transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
|
||||
|
||||
+9
-1
@@ -96,7 +96,9 @@ usesMixinDebug = false
|
||||
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||
mixinPlugin =
|
||||
|
||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
||||
# Specify the package that contains all of your Mixins. The package must exist or
|
||||
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||
# it must match with this or the build will fail.
|
||||
mixinsPackage = mixins
|
||||
|
||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||
@@ -172,6 +174,12 @@ curseForgeRelations = requiredDependency\:gtnhlib
|
||||
# projects. New projects should not use this parameter.
|
||||
# customArchiveBaseName =
|
||||
|
||||
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
|
||||
# runClientWorkingDirectory = run/client
|
||||
|
||||
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
|
||||
# runServerWorkingDirectory = run/server
|
||||
|
||||
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
||||
# The check is ONLY performed if the version is a git tag.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
+1
-1
@@ -16,5 +16,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.gtnewhorizons.angelica;
|
||||
|
||||
import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID;
|
||||
|
||||
import com.gtnewhorizons.angelica.common.BlockError;
|
||||
import com.gtnewhorizons.angelica.compat.ModStatus;
|
||||
import com.gtnewhorizons.angelica.proxy.CommonProxy;
|
||||
@@ -12,7 +14,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
@Mod(
|
||||
modid = "angelica",
|
||||
modid = MOD_ID,
|
||||
name = "Angelica",
|
||||
version = Tags.VERSION,
|
||||
dependencies = """
|
||||
@@ -26,6 +28,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
acceptableRemoteVersions = "*",
|
||||
guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory")
|
||||
public class AngelicaMod {
|
||||
public static final String MOD_ID = "angelica";
|
||||
|
||||
@SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet;
|
||||
import com.gtnewhorizons.angelica.config.FontConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
|
||||
import cpw.mods.fml.client.SplashProgress;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import net.coderbot.iris.gl.program.Program;
|
||||
import net.coderbot.iris.gl.program.ProgramBuilder;
|
||||
@@ -50,7 +51,8 @@ public class BatchingFontRenderer {
|
||||
private final int texBoundAttrLocation;
|
||||
private final int fontShaderId;
|
||||
|
||||
private final boolean isSGA;
|
||||
final boolean isSGA;
|
||||
final boolean isSplash;
|
||||
|
||||
private static class FontAAShader {
|
||||
|
||||
@@ -85,6 +87,7 @@ public class BatchingFontRenderer {
|
||||
}
|
||||
|
||||
this.isSGA = Objects.equals(this.locationFontTexture.getResourcePath(), "textures/font/ascii_sga.png");
|
||||
this.isSplash = FontStrategist.isSplashFontRendererActive(underlying);
|
||||
|
||||
FontProviderMC.get(this.isSGA).charWidth = this.charWidth;
|
||||
FontProviderMC.get(this.isSGA).locationFontTexture = this.locationFontTexture;
|
||||
@@ -114,6 +117,9 @@ public class BatchingFontRenderer {
|
||||
private final ObjectArrayList<FontDrawCmd> batchCommands = ObjectArrayList.wrap(new FontDrawCmd[64], 0);
|
||||
private final ObjectArrayList<FontDrawCmd> batchCommandPool = ObjectArrayList.wrap(new FontDrawCmd[64], 0);
|
||||
|
||||
private int blendSrcRGB = GL11.GL_SRC_ALPHA;
|
||||
private int blendDstRGB = GL11.GL_ONE_MINUS_SRC_ALPHA;
|
||||
|
||||
/** */
|
||||
private void pushVtx(float x, float y, int rgba, float u, float v, float uMin, float uMax, float vMin, float vMax) {
|
||||
final int oldCap = batchVtxPositions.capacity() / 2;
|
||||
@@ -258,6 +264,7 @@ public class BatchingFontRenderer {
|
||||
}
|
||||
}
|
||||
|
||||
int lastActiveProgram;
|
||||
int fontAAModeLast = -1;
|
||||
int fontAAStrengthLast = -1;
|
||||
private void flushBatch() {
|
||||
@@ -272,13 +279,14 @@ public class BatchingFontRenderer {
|
||||
GLStateManager.enableTexture();
|
||||
GLStateManager.enableAlphaTest();
|
||||
GLStateManager.enableBlend();
|
||||
GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
|
||||
GLStateManager.tryBlendFuncSeparate(blendSrcRGB, blendDstRGB, GL11.GL_ONE, GL11.GL_ZERO);
|
||||
GLStateManager.glShadeModel(GL11.GL_FLAT);
|
||||
|
||||
if (FontConfig.fontAAMode != 0) {
|
||||
GL20.glVertexAttribPointer(texBoundAttrLocation, 4, false, 0, batchVtxTexBounds);
|
||||
GL20.glEnableVertexAttribArray(texBoundAttrLocation);
|
||||
GL20.glUseProgram(fontShaderId);
|
||||
lastActiveProgram = GLStateManager.getActiveProgram();
|
||||
GLStateManager.glUseProgram(fontShaderId);
|
||||
if (FontConfig.fontAAMode != fontAAModeLast) {
|
||||
fontAAModeLast = FontConfig.fontAAMode;
|
||||
GL20.glUniform1i(AAMode, FontConfig.fontAAMode);
|
||||
@@ -319,7 +327,7 @@ public class BatchingFontRenderer {
|
||||
GL11.glDrawElements(GL11.GL_TRIANGLES, batchIndices);
|
||||
}
|
||||
if (FontConfig.fontAAMode != 0) {
|
||||
GL20.glUseProgram(0);
|
||||
GLStateManager.glUseProgram(lastActiveProgram);
|
||||
GL20.glDisableVertexAttribArray(texBoundAttrLocation);
|
||||
}
|
||||
|
||||
@@ -349,24 +357,28 @@ public class BatchingFontRenderer {
|
||||
return (what >= fromInclusive) && (what <= toInclusive);
|
||||
}
|
||||
|
||||
public boolean forceDefaults() {
|
||||
return this.isSGA || this.isSplash;
|
||||
}
|
||||
|
||||
public float getGlyphScaleX() {
|
||||
return this.isSGA ? 1 : (float) (FontConfig.glyphScale * Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1);
|
||||
return forceDefaults() ? 1 : (float) (FontConfig.glyphScale * Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1);
|
||||
}
|
||||
|
||||
public float getGlyphScaleY() {
|
||||
return this.isSGA ? 1 : (float) (FontConfig.glyphScale / Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1);
|
||||
return forceDefaults() ? 1 : (float) (FontConfig.glyphScale / Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1);
|
||||
}
|
||||
|
||||
public float getGlyphSpacing() {
|
||||
return (this.isSGA ? 1 : FontConfig.glyphSpacing);
|
||||
return forceDefaults() ? 0 : FontConfig.glyphSpacing;
|
||||
}
|
||||
|
||||
public float getWhitespaceScale() {
|
||||
return (this.isSGA ? 1 : FontConfig.whitespaceScale);
|
||||
return forceDefaults() ? 1 : FontConfig.whitespaceScale;
|
||||
}
|
||||
|
||||
public float getShadowOffset() {
|
||||
return (this.isSGA ? 1 : FontConfig.fontShadowOffset);
|
||||
return forceDefaults() ? 1 : FontConfig.fontShadowOffset;
|
||||
}
|
||||
|
||||
private static final char FORMATTING_CHAR = 167; // §
|
||||
@@ -481,7 +493,7 @@ public class BatchingFontRenderer {
|
||||
chr = FontProviderMC.get(this.isSGA).getRandomReplacement(chr);
|
||||
}
|
||||
|
||||
FontProvider fontProvider = FontStrategist.getFontProvider(chr, this.isSGA, FontConfig.enableCustomFont, unicodeFlag);
|
||||
FontProvider fontProvider = FontStrategist.getFontProvider(this, chr, FontConfig.enableCustomFont, unicodeFlag);
|
||||
|
||||
// Check ASCII space, NBSP, NNBSP
|
||||
if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') {
|
||||
@@ -574,8 +586,18 @@ public class BatchingFontRenderer {
|
||||
return 4 * this.getWhitespaceScale();
|
||||
}
|
||||
|
||||
FontProvider fp = FontStrategist.getFontProvider(chr, isSGA, FontConfig.enableCustomFont, underlying.getUnicodeFlag());
|
||||
FontProvider fp = FontStrategist.getFontProvider(this, chr, FontConfig.enableCustomFont, underlying.getUnicodeFlag());
|
||||
|
||||
return fp.getXAdvance(chr) * this.getGlyphScaleX();
|
||||
}
|
||||
|
||||
public void overrideBlendFunc(int srcRgb, int dstRgb) {
|
||||
blendSrcRGB = srcRgb;
|
||||
blendDstRGB = dstRgb;
|
||||
}
|
||||
|
||||
public void resetBlendFunc() {
|
||||
blendSrcRGB = GL11.GL_SRC_ALPHA;
|
||||
blendDstRGB = GL11.GL_ONE_MINUS_SRC_ALPHA;
|
||||
}
|
||||
}
|
||||
@@ -16,7 +16,6 @@ import javax.imageio.ImageIO;
|
||||
import java.awt.Font;
|
||||
import java.awt.FontMetrics;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.GraphicsEnvironment;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
@@ -40,7 +39,7 @@ public final class FontProviderCustom implements FontProvider {
|
||||
|
||||
private FontProviderCustom(byte id) {
|
||||
this.id = id;
|
||||
Font[] availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
|
||||
Font[] availableFonts = FontStrategist.getAvailableFonts();
|
||||
if (availableFonts.length == 0) {
|
||||
LOGGER.fatal("There seem to be no fonts available on this system! Disabling custom font and throwing an exception in an attempt to restore the session.");
|
||||
FontConfig.enableCustomFont = false;
|
||||
@@ -79,8 +78,7 @@ public final class FontProviderCustom implements FontProvider {
|
||||
|
||||
public void reloadFont(int fontID) {
|
||||
currentFontQuality = FontConfig.customFontQuality;
|
||||
GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
|
||||
font = ge.getAllFonts()[fontID].deriveFont(currentFontQuality);
|
||||
font = FontStrategist.getAvailableFonts()[fontID].deriveFont(currentFontQuality);
|
||||
|
||||
File[] files = new File(getFontDir()).listFiles();
|
||||
if (files != null) {
|
||||
|
||||
@@ -1,20 +1,63 @@
|
||||
package com.gtnewhorizons.angelica.client.font;
|
||||
|
||||
import com.google.common.collect.HashMultiset;
|
||||
import com.gtnewhorizons.angelica.config.FontConfig;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ResourceAccessor;
|
||||
import cpw.mods.fml.client.SplashProgress;
|
||||
import lombok.Getter;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.resources.DefaultResourcePack;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.GraphicsEnvironment;
|
||||
import java.io.File;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
public class FontStrategist {
|
||||
|
||||
@Getter
|
||||
private static final Font[] availableFonts;
|
||||
public static final Logger LOGGER = LogManager.getLogger("Angelica");
|
||||
public static boolean customFontInUse;
|
||||
|
||||
static {
|
||||
// get available fonts without duplicates (250 copies of dialog.plain need not apply)
|
||||
Font[] availableFontsDirty = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
|
||||
HashMap<String, Font> fontSet = new HashMap<>();
|
||||
HashMultiset<String> duplicates = HashMultiset.create(); // for debugging
|
||||
|
||||
for (Font font : availableFontsDirty) {
|
||||
String fontName = font.getFontName();
|
||||
if (fontSet.containsKey(fontName)) {
|
||||
duplicates.add(fontName);
|
||||
} else {
|
||||
fontSet.put(fontName, font);
|
||||
}
|
||||
}
|
||||
|
||||
if (!duplicates.isEmpty()) {
|
||||
StringBuilder sb = new StringBuilder(duplicates.size() + " duplicate font(s) found in the list reported by Java: ");
|
||||
for (Iterator<String> iter = duplicates.stream().distinct().iterator(); iter.hasNext(); ) {
|
||||
String dupe = iter.next();
|
||||
sb.append(duplicates.count(dupe)).append("x ").append(dupe);
|
||||
if (iter.hasNext()) {
|
||||
sb.append(", ");
|
||||
}
|
||||
}
|
||||
sb.append(". Some fonts may be missing from the font selection menu.");
|
||||
LOGGER.warn(sb.toString());
|
||||
}
|
||||
|
||||
availableFonts = fontSet.values().stream().sorted(Comparator.comparing(Font::getFontName)).toArray(Font[]::new);
|
||||
|
||||
// create and add the resource pack that provides fonts
|
||||
HashMap<String, File> packMap = new HashMap<>();
|
||||
for (int i = 0; i < FontProviderCustom.ATLAS_COUNT; i++) {
|
||||
packMap.put(FontProviderCustom.getPrimary().getAtlasResourceName(i), new File(FontProviderCustom.getPrimary().getAtlasFullPath(i)));
|
||||
@@ -26,7 +69,7 @@ public class FontStrategist {
|
||||
defaultResourcePacks.add(fontResourcePack);
|
||||
Minecraft.getMinecraft().refreshResources();
|
||||
|
||||
Font[] availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
|
||||
// determine if a custom font is in use based on config values
|
||||
boolean primaryFontFound = false;
|
||||
boolean fallbackFontFound = false;
|
||||
for (Font availableFont : availableFonts) {
|
||||
@@ -42,17 +85,15 @@ public class FontStrategist {
|
||||
customFontInUse = (FontConfig.enableCustomFont && (primaryFontFound || fallbackFontFound));
|
||||
}
|
||||
|
||||
public static boolean customFontInUse;
|
||||
|
||||
/**
|
||||
Lets you get a FontProvider per char while respecting font priority and fallbacks, the unicode flag, whether or not
|
||||
SGA is on, if a font can even display a character in the first place, etc.
|
||||
SGA is on, if we're in a splash screen, if a font can even display a character in the first place, etc.
|
||||
*/
|
||||
public static FontProvider getFontProvider(char chr, boolean isSGA, boolean customFontEnabled, boolean forceUnicode) {
|
||||
if (isSGA && FontProviderMC.get(true).isGlyphAvailable(chr)) {
|
||||
public static FontProvider getFontProvider(BatchingFontRenderer me, char chr, boolean customFontEnabled, boolean forceUnicode) {
|
||||
if (me.isSGA && FontProviderMC.get(true).isGlyphAvailable(chr)) {
|
||||
return FontProviderMC.get(true);
|
||||
}
|
||||
if (customFontEnabled) {
|
||||
if (customFontEnabled && !me.isSplash) {
|
||||
FontProvider fp;
|
||||
fp = FontProviderCustom.getPrimary();
|
||||
if (fp.isGlyphAvailable(chr)) { return fp; }
|
||||
@@ -69,7 +110,6 @@ public class FontStrategist {
|
||||
}
|
||||
|
||||
public static void reloadCustomFontProviders() {
|
||||
Font[] availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
|
||||
FontProviderCustom.getPrimary().setFont(null);
|
||||
FontProviderCustom.getFallback().setFont(null);
|
||||
boolean primaryFontFound = false;
|
||||
@@ -87,4 +127,17 @@ public class FontStrategist {
|
||||
}
|
||||
customFontInUse = (FontConfig.enableCustomFont && (primaryFontFound || fallbackFontFound));
|
||||
}
|
||||
|
||||
public static boolean isSplashFontRendererActive(FontRenderer fontRenderer) {
|
||||
// noinspection deprecation
|
||||
boolean active = fontRenderer instanceof SplashProgress.SplashFontRenderer;
|
||||
|
||||
try {
|
||||
Class<?> customSplashClass = Class.forName("gkappa.modernsplash.CustomSplash$SplashFontRenderer");
|
||||
active = active || customSplashClass.isInstance(fontRenderer);
|
||||
} catch (ClassNotFoundException ignored) {
|
||||
}
|
||||
|
||||
return active;
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,6 @@ import net.minecraft.client.resources.I18n;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import java.awt.Font;
|
||||
import java.awt.GraphicsEnvironment;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -23,10 +22,10 @@ import java.util.stream.Collectors;
|
||||
|
||||
public class FontConfigScreen extends GuiScreen {
|
||||
|
||||
private static final Font[] availableFonts = FontStrategist.getAvailableFonts();
|
||||
private final GuiScreen parent;
|
||||
private final String title;
|
||||
private final String searchPrompt;
|
||||
private final Font[] availableFonts;
|
||||
private String currentPrimaryFontName;
|
||||
private String currentFallbackFontName;
|
||||
private FontList fontList;
|
||||
@@ -41,7 +40,6 @@ public class FontConfigScreen extends GuiScreen {
|
||||
this.parent = parent;
|
||||
this.currentPrimaryFontName = FontConfig.customFontNamePrimary;
|
||||
this.currentFallbackFontName = FontConfig.customFontNameFallback;
|
||||
this.availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
|
||||
this.displayedFonts = new ArrayList<>(Arrays.asList(availableFonts));
|
||||
for (int i = 0; i < availableFonts.length; i++) {
|
||||
if (Objects.equals(this.currentPrimaryFontName, availableFonts[i].getFontName())) {
|
||||
|
||||
@@ -1,34 +1,20 @@
|
||||
package com.gtnewhorizons.angelica.common;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadProvider;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.DirectionUtil;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ModeledBlock;
|
||||
import com.gtnewhorizons.angelica.utils.AssetLoader;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import static com.gtnewhorizon.gtnhlib.client.model.ModelISBRH.JSON_ISBRH_ID;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import static com.gtnewhorizons.angelica.models.VanillaModels.LECTERN;
|
||||
|
||||
public class BlockTest extends Block implements ModeledBlock {
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
private QuadProvider model;
|
||||
/// Unline {@link BlockError}, this *is* registered on both sides. It's intended to test functionality in a SP
|
||||
/// development environment.
|
||||
public class BlockTest extends Block {
|
||||
|
||||
public BlockTest() {
|
||||
|
||||
super(Material.rock);
|
||||
this.setBlockTextureName("missingno");
|
||||
this.setModel((world, pos, block, meta, dir, random, color, quadPool) -> {
|
||||
if (meta < 2 || meta > 5) meta = 2;
|
||||
return LECTERN.models[meta - 2].getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
});
|
||||
super(Material.wood);
|
||||
setHardness(0.7f);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -36,13 +22,6 @@ public class BlockTest extends Block implements ModeledBlock {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister reg) {
|
||||
for (String s : AssetLoader.testTexs) {
|
||||
reg.registerIcon(s);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when a block is placed using its ItemBlock. Args: World, X, Y, Z, side, hitX, hitY, hitZ, block metadata
|
||||
*/
|
||||
@@ -50,11 +29,16 @@ public class BlockTest extends Block implements ModeledBlock {
|
||||
public int onBlockPlaced(@NotNull World worldIn, int x, int y, int z, int side, float subX, float subY, float subZ, int meta) {
|
||||
|
||||
// Face NORTH if placed up or down
|
||||
final ForgeDirection s = DirectionUtil.ALL_DIRECTIONS[side];
|
||||
final var s = ForgeDirection.getOrientation(side);
|
||||
if (s == ForgeDirection.UP || s == ForgeDirection.DOWN)
|
||||
return 2;
|
||||
|
||||
// Face the placed side
|
||||
return side;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType() {
|
||||
return JSON_ISBRH_ID;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.gtnewhorizons.angelica.compat.iris;
|
||||
|
||||
/**
|
||||
* Interface implemented by BiomeGenBase via mixin to cache biome category.
|
||||
* This avoids recomputing the category every frame for shader uniforms.
|
||||
*/
|
||||
public interface BiomeCategoryCache {
|
||||
/**
|
||||
* Gets the cached biome category ordinal, or -1 if not yet computed.
|
||||
*/
|
||||
int iris$getCachedCategory();
|
||||
|
||||
/**
|
||||
* Sets the cached biome category ordinal.
|
||||
*/
|
||||
void iris$setCachedCategory(int category);
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package com.gtnewhorizons.angelica.compat.iris;
|
||||
|
||||
import net.coderbot.iris.parsing.BiomeCategories;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Detects and categorizes biomes from popular modded biome mods using cached class checks.
|
||||
* Currently supports: BiomesOPlenty (BOP), Realistic World Gen (RWG)
|
||||
*/
|
||||
public class ModdedBiomeDetector {
|
||||
private static boolean initialized = false;
|
||||
|
||||
// BiomesOPlenty (BOP) cache - dimension-specific base classes
|
||||
// BOP 1.7.10 hierarchy: BOPBiome -> BOPEndBiome/BOPNetherBiome/BOPOverworldBiome -> specific biomes
|
||||
private static Class<?> bopEndBiomeClass = null;
|
||||
private static Class<?> bopNetherBiomeClass = null;
|
||||
private static Class<?> bopOceanBiomeClass = null;
|
||||
|
||||
// Realistic World Gen (RWG) cache - base biome classes that extend BiomeGenBase
|
||||
// LinkedHashMap maintains insertion order for deterministic behavior
|
||||
private static final Map<Class<?>, BiomeCategories> rwgClassMap = new LinkedHashMap<>();
|
||||
|
||||
private static synchronized void initialize() {
|
||||
if (initialized) return;
|
||||
initialized = true;
|
||||
|
||||
initializeBOP();
|
||||
initializeRWG();
|
||||
}
|
||||
|
||||
private static void initializeBOP() {
|
||||
try {
|
||||
bopEndBiomeClass = Class.forName("biomesoplenty.common.biome.BOPEndBiome");
|
||||
bopNetherBiomeClass = Class.forName("biomesoplenty.common.biome.BOPNetherBiome");
|
||||
bopOceanBiomeClass = Class.forName("biomesoplenty.common.biome.BOPOceanBiome");
|
||||
} catch (ClassNotFoundException ignored) {
|
||||
// BOP not installed
|
||||
}
|
||||
}
|
||||
|
||||
private static void initializeRWG() {
|
||||
// RWG adds actual BiomeGenBase subclasses in rwg.biomes.base package
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeOcean", BiomeCategories.OCEAN);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeRiver", BiomeCategories.RIVER);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomePlains", BiomeCategories.PLAINS);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeColdPlains", BiomeCategories.PLAINS);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeHotPlains", BiomeCategories.PLAINS);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeHotDesert", BiomeCategories.DESERT);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeSnowDesert", BiomeCategories.DESERT); // Cold desert, but still desert
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeJungle", BiomeCategories.JUNGLE);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeTropicalIsland", BiomeCategories.JUNGLE); // Tropical islands are jungle-like
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeRedwood", BiomeCategories.FOREST); // Redwood/Sequoia forests
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeTemperateForest", BiomeCategories.FOREST);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeColdForest", BiomeCategories.TAIGA); // Cold forests are taiga-like
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeHotForest", BiomeCategories.FOREST);
|
||||
tryAddRWGClass("rwg.biomes.base.BaseBiomeSnowForest", BiomeCategories.TAIGA); // Snow forests are taiga
|
||||
}
|
||||
|
||||
private static void tryAddRWGClass(String className, BiomeCategories category) {
|
||||
try {
|
||||
final Class<?> clazz = Class.forName(className);
|
||||
rwgClassMap.put(clazz, category);
|
||||
} catch (ClassNotFoundException ignored) {
|
||||
// Class not available, RWG not installed or different version
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Attempts to detect the biome category for modded biomes.
|
||||
* Returns null if no modded biome detection applies.
|
||||
*/
|
||||
public static BiomeCategories detectModdedBiome(BiomeGenBase biome) {
|
||||
if (!initialized) {
|
||||
initialize();
|
||||
}
|
||||
|
||||
// BiomesOPlenty detection - dimension-specific classes give us clear categories
|
||||
if (bopEndBiomeClass != null && bopEndBiomeClass.isInstance(biome)) {
|
||||
return BiomeCategories.THE_END;
|
||||
}
|
||||
if (bopNetherBiomeClass != null && bopNetherBiomeClass.isInstance(biome)) {
|
||||
return BiomeCategories.NETHER;
|
||||
}
|
||||
if (bopOceanBiomeClass != null && bopOceanBiomeClass.isInstance(biome)) {
|
||||
return BiomeCategories.OCEAN;
|
||||
}
|
||||
// For other BOP overworld biomes (e.g., Alps, Arctic, BambooForest),
|
||||
// fall through to name/property-based detection
|
||||
|
||||
// Realistic World Gen detection
|
||||
for (Map.Entry<Class<?>, BiomeCategories> entry : rwgClassMap.entrySet()) {
|
||||
if (entry.getKey().isInstance(biome)) {
|
||||
return entry.getValue();
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -9,35 +9,62 @@ import net.minecraft.util.MathHelper;
|
||||
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Vector3d;
|
||||
import org.joml.Vector4f;
|
||||
import org.joml.Vector3f;
|
||||
|
||||
/**
|
||||
* Singleton camera instance that tracks the current camera position and orientation.
|
||||
*/
|
||||
@Getter
|
||||
public class Camera {
|
||||
final Vector3d pos = new Vector3d();
|
||||
final BlockPos blockPos = new BlockPos();
|
||||
float pitch;
|
||||
float yaw;
|
||||
EntityLivingBase entity;
|
||||
boolean thirdPerson;
|
||||
final float partialTicks;
|
||||
public static final Camera INSTANCE = new Camera();
|
||||
|
||||
public Camera(EntityLivingBase entity, float partialTicks) {
|
||||
private final Vector3d pos = new Vector3d();
|
||||
private final BlockPos blockPos = new BlockPos();
|
||||
private final Vector3f offset = new Vector3f();
|
||||
private final Matrix4f inverseModelView = new Matrix4f();
|
||||
|
||||
private float pitch;
|
||||
private float yaw;
|
||||
private EntityLivingBase entity;
|
||||
private boolean thirdPerson;
|
||||
private float partialTicks;
|
||||
|
||||
private Camera() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the camera position and orientation based on the current entity and partial ticks.
|
||||
*
|
||||
* @param entity The entity to track (usually the render view entity)
|
||||
* @param partialTicks The partial tick time for interpolation
|
||||
*/
|
||||
public void update(EntityLivingBase entity, float partialTicks) {
|
||||
this.partialTicks = partialTicks;
|
||||
final Vector4f offset = new Vector4f(); // third person offset
|
||||
final Matrix4f inverseModelView = new Matrix4f(RenderingState.INSTANCE.getModelViewMatrix()).invert();
|
||||
inverseModelView.transform(offset);
|
||||
|
||||
final double camX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks + offset.x;
|
||||
final double camY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks + offset.y;
|
||||
final double camZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks + offset.z;
|
||||
this.entity = entity;
|
||||
|
||||
// Entity position (interpolated, at feet level)
|
||||
final double entityX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * partialTicks;
|
||||
final double entityY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks;
|
||||
final double entityZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks;
|
||||
final double eyeHeight = entity.getEyeHeight();
|
||||
|
||||
thirdPerson = Minecraft.getMinecraft().gameSettings.thirdPersonView > 0;
|
||||
|
||||
final double camX, camY, camZ;
|
||||
offset.set(0, 0, 0);
|
||||
|
||||
if (thirdPerson) {
|
||||
// Third person: use inverse modelview to find camera offset
|
||||
inverseModelView.set(RenderingState.INSTANCE.getModelViewMatrix()).invert();
|
||||
inverseModelView.transformPosition(offset);
|
||||
}
|
||||
camX = entityX + offset.x;
|
||||
camY = entityY + eyeHeight + offset.y;
|
||||
camZ = entityZ + offset.z;
|
||||
|
||||
pos.set(camX, camY, camZ);
|
||||
blockPos.set(MathHelper.floor_double(camX), MathHelper.floor_double(camY), MathHelper.floor_double(camZ));
|
||||
pitch = entity.cameraPitch;
|
||||
yaw = entity.rotationYaw;
|
||||
thirdPerson = Minecraft.getMinecraft().gameSettings.thirdPersonView == 1;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.gtnewhorizons.angelica.compat.mojang;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.PlayerControllerMP;
|
||||
|
||||
public final class GameModeUtil {
|
||||
private GameModeUtil() {
|
||||
}
|
||||
|
||||
public static boolean isSpectator() {
|
||||
final PlayerControllerMP controller = Minecraft.getMinecraft().playerController;
|
||||
if (controller == null) {
|
||||
return false;
|
||||
}
|
||||
return controller.currentGameType.getID() == 3;
|
||||
}
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.nio.ShortBuffer;
|
||||
|
||||
public class BufferWriter {
|
||||
// Adapted from Neodymium
|
||||
|
||||
private final ByteBuffer buf;
|
||||
|
||||
private final FloatBuffer floatBuffer;
|
||||
private final ShortBuffer shortBuffer;
|
||||
private final IntBuffer intBuffer;
|
||||
|
||||
public BufferWriter(ByteBuffer buf) {
|
||||
this.buf = buf;
|
||||
this.floatBuffer = buf.asFloatBuffer();
|
||||
this.shortBuffer = buf.asShortBuffer();
|
||||
this.intBuffer = buf.asIntBuffer();
|
||||
}
|
||||
|
||||
private void incrementPosition(int add) {
|
||||
buf.position(buf.position() + add);
|
||||
floatBuffer.position(buf.position() / 4);
|
||||
shortBuffer.position(buf.position() / 2);
|
||||
intBuffer.position(buf.position() / 4);
|
||||
}
|
||||
|
||||
public void writeFloat(float x) {
|
||||
try {
|
||||
floatBuffer.put(x);
|
||||
|
||||
incrementPosition(4);
|
||||
} catch(Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public void writeInt(int x) {
|
||||
intBuffer.put(x);
|
||||
|
||||
incrementPosition(4);
|
||||
}
|
||||
|
||||
public void writeByte(byte x) {
|
||||
buf.put(x); // this increments the buffer position by 1
|
||||
|
||||
incrementPosition(0);
|
||||
}
|
||||
|
||||
public int position() {
|
||||
return buf.position();
|
||||
}
|
||||
|
||||
public void writeShort(short s) {
|
||||
shortBuffer.put(s);
|
||||
|
||||
incrementPosition(2);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd.writers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class ItemVBOQuadWriter implements IWriteQuads {
|
||||
private boolean direct;
|
||||
|
||||
public ItemVBOQuadWriter() {
|
||||
init(false);
|
||||
}
|
||||
|
||||
public void init(boolean direct) {
|
||||
// This would need to be re-initialized if the direct vs indirect changes
|
||||
this.direct = direct;
|
||||
}
|
||||
@Override
|
||||
public void writeQuad(QuadView quad, ByteBuffer buf) {
|
||||
if(direct) {
|
||||
writeQuadDirect(quad, buf);
|
||||
} else {
|
||||
writeQuadIndirect(quad, buf);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeQuadDirect(QuadView quad, ByteBuffer buf) {
|
||||
throw new UnsupportedOperationException("Direct mode not supported yet");
|
||||
}
|
||||
|
||||
protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
|
||||
for(int idx = 0; idx < 4; ++idx) {
|
||||
// Position
|
||||
buf.putFloat(quad.getX(idx));
|
||||
buf.putFloat(quad.getY(idx));
|
||||
buf.putFloat(quad.getZ(idx));
|
||||
|
||||
// Texture
|
||||
buf.putFloat(quad.getTexU(idx));
|
||||
buf.putFloat(quad.getTexV(idx));
|
||||
|
||||
// Normals + Padding
|
||||
buf.putInt(quad.getNormal(idx));
|
||||
}
|
||||
}
|
||||
}
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd.writers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class PositionColorTextureQuadWriter implements IWriteQuads {
|
||||
private boolean direct;
|
||||
|
||||
public PositionColorTextureQuadWriter() {
|
||||
init(false);
|
||||
}
|
||||
|
||||
public void init(boolean direct) {
|
||||
// This would need to be re-initialized if the direct vs indirect changes
|
||||
this.direct = direct;
|
||||
}
|
||||
@Override
|
||||
public void writeQuad(QuadView quad, ByteBuffer buf) {
|
||||
if(direct) {
|
||||
writeQuadDirect(quad, buf);
|
||||
} else {
|
||||
writeQuadIndirect(quad, buf);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeQuadDirect(QuadView quad, ByteBuffer buf) {
|
||||
throw new UnsupportedOperationException("Direct mode not supported yet");
|
||||
}
|
||||
|
||||
protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
|
||||
for(int idx = 0; idx < 4; ++idx) {
|
||||
// Position
|
||||
buf.putFloat(quad.getX(idx));
|
||||
buf.putFloat(quad.getY(idx));
|
||||
buf.putFloat(quad.getZ(idx));
|
||||
|
||||
// Color
|
||||
buf.putInt(quad.getColor(idx));
|
||||
|
||||
// Texture
|
||||
buf.putFloat(quad.getTexU(idx));
|
||||
buf.putFloat(quad.getTexV(idx));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd.writers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class PositionQuadWriter implements IWriteQuads {
|
||||
private boolean direct;
|
||||
|
||||
public PositionQuadWriter() {
|
||||
init(false);
|
||||
}
|
||||
|
||||
public void init(boolean direct) {
|
||||
// This would need to be re-initialized if the direct vs indirect changes
|
||||
this.direct = direct;
|
||||
}
|
||||
@Override
|
||||
public void writeQuad(QuadView quad, ByteBuffer buf) {
|
||||
if(direct) {
|
||||
writeQuadDirect(quad, buf);
|
||||
} else {
|
||||
writeQuadIndirect(quad, buf);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeQuadDirect(QuadView quad, ByteBuffer buf) {
|
||||
throw new UnsupportedOperationException("Direct mode not supported yet");
|
||||
}
|
||||
|
||||
protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
|
||||
for(int idx = 0; idx < 4; ++idx) {
|
||||
// Position
|
||||
buf.putFloat(quad.getX(idx));
|
||||
buf.putFloat(quad.getY(idx));
|
||||
buf.putFloat(quad.getZ(idx));
|
||||
}
|
||||
}
|
||||
}
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd.writers;
|
||||
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class PositionTextureColorQuadWriter implements IWriteQuads {
|
||||
private boolean direct;
|
||||
|
||||
public PositionTextureColorQuadWriter() {
|
||||
init(false);
|
||||
}
|
||||
|
||||
public void init(boolean direct) {
|
||||
// This would need to be re-initialized if the direct vs indirect changes
|
||||
this.direct = direct;
|
||||
}
|
||||
@Override
|
||||
public void writeQuad(QuadView quad, ByteBuffer buf) {
|
||||
if(direct) {
|
||||
writeQuadDirect(quad, buf);
|
||||
} else {
|
||||
writeQuadIndirect(quad, buf);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeQuadDirect(QuadView quad, ByteBuffer buf) {
|
||||
throw new UnsupportedOperationException("Direct mode not supported yet");
|
||||
}
|
||||
|
||||
protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
|
||||
for(int idx = 0; idx < 4; ++idx) {
|
||||
// Position
|
||||
buf.putFloat(quad.getX(idx));
|
||||
buf.putFloat(quad.getY(idx));
|
||||
buf.putFloat(quad.getZ(idx));
|
||||
|
||||
// Texture
|
||||
buf.putFloat(quad.getTexU(idx));
|
||||
buf.putFloat(quad.getTexV(idx));
|
||||
|
||||
// Color
|
||||
buf.putInt(quad.getColor(idx));
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
-44
@@ -1,44 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.compat.nd.writers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.writers.IWriteQuads;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class PositionTextureQuadWriter implements IWriteQuads {
|
||||
private boolean direct;
|
||||
|
||||
public PositionTextureQuadWriter() {
|
||||
init(false);
|
||||
}
|
||||
|
||||
public void init(boolean direct) {
|
||||
// This would need to be re-initialized if the direct vs indirect changes
|
||||
this.direct = direct;
|
||||
}
|
||||
@Override
|
||||
public void writeQuad(QuadView quad, ByteBuffer buf) {
|
||||
if(direct) {
|
||||
writeQuadDirect(quad, buf);
|
||||
} else {
|
||||
writeQuadIndirect(quad, buf);
|
||||
}
|
||||
}
|
||||
|
||||
protected void writeQuadDirect(QuadView quad, ByteBuffer buf) {
|
||||
throw new UnsupportedOperationException("Direct mode not supported yet");
|
||||
}
|
||||
|
||||
protected void writeQuadIndirect(QuadView quad, ByteBuffer buf) {
|
||||
for(int idx = 0; idx < 4; ++idx) {
|
||||
// Position
|
||||
buf.putFloat(quad.getX(idx));
|
||||
buf.putFloat(quad.getY(idx));
|
||||
buf.putFloat(quad.getZ(idx));
|
||||
|
||||
// Texture
|
||||
buf.putFloat(quad.getTexU(idx));
|
||||
buf.putFloat(quad.getTexV(idx));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean enableSodiumFluidRendering;
|
||||
|
||||
@Config.Comment("Inject QuadProvider rendering into some vanilla blocks")
|
||||
@Config.Comment("Inject BakedModel rendering into some vanilla blocks")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean injectQPRendering;
|
||||
@@ -166,4 +166,42 @@ public class AngelicaConfig {
|
||||
@Config.Comment("Allows unicode languages to use an odd gui scale")
|
||||
@Config.DefaultBoolean(true)
|
||||
public static boolean removeUnicodeEvenScaling;
|
||||
|
||||
@Config.Comment({"Block corners and edges between chunks might have \"cracks\" (various lines/dots) in them.",
|
||||
"While using \"Compact Vertex Format\" makes the situation even worse.",
|
||||
"This option fixes it.",
|
||||
"Requires texture reloading (F3 + T) after changing this option to take effect"})
|
||||
@Config.DefaultBoolean(true)
|
||||
public static boolean fixBlockCrack;
|
||||
|
||||
@Config.Comment({
|
||||
"The \"epsilon\" value for the fixBlockCrack option. ",
|
||||
"Set this a bit higher if you can still see lines/dots between solid blocks in dark areas.",
|
||||
"May cause intense flickering (z-fighting) between blocks if the value is too high"
|
||||
})
|
||||
@Config.RangeDouble(min = 0, max = 0.005)
|
||||
@Config.DefaultDouble(0.001)
|
||||
public static double blockCrackFixEpsilon;
|
||||
|
||||
@Config.Comment("Block classes that have bugs when rendering with the fixBlockCrack can be put here to avoid manipulating them")
|
||||
@Config.DefaultStringList({
|
||||
"net.minecraft.block.BlockCauldron",
|
||||
"net.minecraft.block.BlockStairs"
|
||||
})
|
||||
public static String[] blockCrackFixBlacklist;
|
||||
|
||||
@Config.Comment({"Block classes that have render pass other than 0 but still need to be manipulated.",
|
||||
"Add a block class here if you see flickering (z-fighting) with fixBlockCrack enabled"
|
||||
})
|
||||
@Config.DefaultStringList({
|
||||
"gregtech.common.blocks.BlockOres",
|
||||
"shukaro.artifice.block.world.BlockOre",
|
||||
"bartworks.system.material.BWMetaGeneratedOres",
|
||||
"gtPlusPlus.core.block.base.BlockBaseOre",
|
||||
})
|
||||
public static String[] blockCrackFixRenderPassWhitelist;
|
||||
|
||||
@Config.Comment("Register HardcodedCustomUniforms in Iris Shaders. May help with compatibility in certain shader packs")
|
||||
@Config.DefaultBoolean(false)
|
||||
public static boolean enableHardcodedCustomUniforms;
|
||||
}
|
||||
@@ -11,6 +11,7 @@ public class AngelicaGuiConfig extends SimpleGuiConfig {
|
||||
"Angelica",
|
||||
true,
|
||||
AngelicaConfig.class,
|
||||
CompatConfig.class,
|
||||
FontConfig.class
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.gtnewhorizons.angelica.config;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.config.Config;
|
||||
|
||||
@Config(modid = "angelica", filename = "angelica-compat")
|
||||
@Config(modid = "angelica", filename = "angelica-compat", category = "compat")
|
||||
public class CompatConfig {
|
||||
|
||||
@Config.Comment("Apply fixes to the LOTR mod")
|
||||
@@ -44,4 +44,24 @@ public class CompatConfig {
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean fixSecurityCraft;
|
||||
|
||||
@Config.Comment("Apply tweaks to NTM:Space")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean tweakNTMSpace;
|
||||
|
||||
@Config.Comment("Apply fixes to NTM:Space")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean fixNTMSpace;
|
||||
|
||||
@Config.Comment("Disables rendering of the planet below the player at high altitudes [Requires tweakNTMSpace]")
|
||||
@Config.DefaultEnum("ShadersOnly")
|
||||
public static altitudePlanetRendererState NTMSpace_disableAltitudePlanetRenderer;
|
||||
public enum altitudePlanetRendererState {
|
||||
Always,
|
||||
ShadersOnly,
|
||||
Never
|
||||
}
|
||||
|
||||
}
|
||||
@@ -52,7 +52,7 @@ public class FontConfig {
|
||||
public static int fontAAMode;
|
||||
|
||||
@Config.Comment("Affects font antialiasing sample spacing. Higher values increase blur.")
|
||||
@Config.DefaultInt(5)
|
||||
@Config.DefaultInt(7)
|
||||
@Config.RangeInt(min = 1, max = 24)
|
||||
public static int fontAAStrength;
|
||||
}
|
||||
@@ -43,6 +43,20 @@ public class Feature {
|
||||
}
|
||||
|
||||
private static final Map<Integer, Set<IStateStack<?>>> attribToFeatures = new HashMap<>();
|
||||
|
||||
/**
|
||||
* Helper method to add all texture gen states (S, T, R, Q) for all texture units to a collection.
|
||||
* Used by both GL_ENABLE_BIT and GL_TEXTURE_BIT.
|
||||
*/
|
||||
private static void addTextureGenStates(Set<IStateStack<?>> collection) {
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
collection.add(GLStateManager.textures.getTexGenSStates(i));
|
||||
collection.add(GLStateManager.textures.getTexGenTStates(i));
|
||||
collection.add(GLStateManager.textures.getTexGenRStates(i));
|
||||
collection.add(GLStateManager.textures.getTexGenQStates(i));
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
attribToFeatures.put(GL11.GL_COLOR_BUFFER_BIT, ImmutableSet.of(
|
||||
GLStateManager.alphaTest // GL_ALPHA_TEST enable bit
|
||||
@@ -51,10 +65,10 @@ public class Feature {
|
||||
, GLStateManager.blendState // Blending source and destination functions
|
||||
// Constant blend color
|
||||
// Blending equation
|
||||
// GL_DITHER enable bit
|
||||
// GL_DRAW_BUFFER setting
|
||||
// GL_COLOR_LOGIC_OP enable bit
|
||||
// GL_INDEX_LOGIC_OP enable bit
|
||||
, GLStateManager.colorLogicOpState // GL_COLOR_LOGIC_OP enable bit
|
||||
, GLStateManager.ditherState // GL_DITHER enable bit
|
||||
, GLStateManager.drawBuffer // GL_DRAW_BUFFER setting
|
||||
, GLStateManager.indexLogicOpState // GL_INDEX_LOGIC_OP enable bit
|
||||
// Logic op function
|
||||
, GLStateManager.colorMask // Color-mode and index-mode writemasks
|
||||
, GLStateManager.clearColor // Color-mode and index-mode clear values
|
||||
@@ -80,14 +94,15 @@ public class Feature {
|
||||
|
||||
final HashSet<IStateStack<?>> enableBits = new HashSet<>(ImmutableSet.of(
|
||||
GLStateManager.alphaTest // GL_ALPHA_TEST flag
|
||||
// GL_AUTO_NORMAL flag
|
||||
, GLStateManager.autoNormalState // GL_AUTO_NORMAL flag
|
||||
, GLStateManager.blendMode // GL_BLEND flag
|
||||
// Enable bits for the user-definable clipping planes
|
||||
, GLStateManager.colorLogicOpState // GL_COLOR_LOGIC_OP flag
|
||||
, GLStateManager.colorMaterial // GL_COLOR_MATERIAL
|
||||
, GLStateManager.cullState // GL_CULL_FACE flag
|
||||
, GLStateManager.depthTest // GL_DEPTH_TEST flag
|
||||
// GL_DITHER flag
|
||||
, GLStateManager.ditherState // GL_DITHER flag
|
||||
, GLStateManager.fogMode // GL_FOG flag
|
||||
, GLStateManager.indexLogicOpState // GL_INDEX_LOGIC_OP flag
|
||||
, GLStateManager.lightStates[0] // GL_LIGHT0
|
||||
, GLStateManager.lightStates[1] // GL_LIGHT1
|
||||
, GLStateManager.lightStates[2] // GL_LIGHT2
|
||||
@@ -97,36 +112,57 @@ public class Feature {
|
||||
, GLStateManager.lightStates[6] // GL_LIGHT6
|
||||
, GLStateManager.lightStates[7] // GL_LIGHT7
|
||||
, GLStateManager.lightingState // GL_LIGHTING flag
|
||||
// GL_LINE_SMOOTH flag
|
||||
// GL_LINE_STIPPLE flag
|
||||
// GL_INDEX_LOGIC_OP flag
|
||||
// GL_COLOR_LOGIC_OP flag
|
||||
// GL_MAP1_x where x is a map type
|
||||
// GL_MAP2_x where x is a map type
|
||||
// GL_MULTISAMPLE flag
|
||||
// GL_NORMALIZE flag
|
||||
// GL_POINT_SMOOTH flag
|
||||
// GL_POLYGON_OFFSET_LINE flag
|
||||
// GL_POLYGON_OFFSET_FILL flag
|
||||
// GL_POLYGON_OFFSET_POINT flag
|
||||
// GL_POLYGON_SMOOTH flag
|
||||
// GL_POLYGON_STIPPLE flag
|
||||
// GL_SAMPLE_ALPHA_TO_COVERAGE flag
|
||||
// GL_SAMPLE_ALPHA_TO_ONE flag
|
||||
// GL_SAMPLE_COVERAGE flag
|
||||
, GLStateManager.lineSmoothState // GL_LINE_SMOOTH flag
|
||||
, GLStateManager.lineStippleState // GL_LINE_STIPPLE flag
|
||||
, GLStateManager.map1Color4State // GL_MAP1_COLOR_4
|
||||
, GLStateManager.map1IndexState // GL_MAP1_INDEX
|
||||
, GLStateManager.map1NormalState // GL_MAP1_NORMAL
|
||||
, GLStateManager.map1TextureCoord1State // GL_MAP1_TEXTURE_COORD_1
|
||||
, GLStateManager.map1TextureCoord2State // GL_MAP1_TEXTURE_COORD_2
|
||||
, GLStateManager.map1TextureCoord3State // GL_MAP1_TEXTURE_COORD_3
|
||||
, GLStateManager.map1TextureCoord4State // GL_MAP1_TEXTURE_COORD_4
|
||||
, GLStateManager.map1Vertex3State // GL_MAP1_VERTEX_3
|
||||
, GLStateManager.map1Vertex4State // GL_MAP1_VERTEX_4
|
||||
, GLStateManager.map2Color4State // GL_MAP2_COLOR_4
|
||||
, GLStateManager.map2IndexState // GL_MAP2_INDEX
|
||||
, GLStateManager.map2NormalState // GL_MAP2_NORMAL
|
||||
, GLStateManager.map2TextureCoord1State // GL_MAP2_TEXTURE_COORD_1
|
||||
, GLStateManager.map2TextureCoord2State // GL_MAP2_TEXTURE_COORD_2
|
||||
, GLStateManager.map2TextureCoord3State // GL_MAP2_TEXTURE_COORD_3
|
||||
, GLStateManager.map2TextureCoord4State // GL_MAP2_TEXTURE_COORD_4
|
||||
, GLStateManager.map2Vertex3State // GL_MAP2_VERTEX_3
|
||||
, GLStateManager.map2Vertex4State // GL_MAP2_VERTEX_4
|
||||
, GLStateManager.multisampleState // GL_MULTISAMPLE flag
|
||||
, GLStateManager.normalizeState // GL_NORMALIZE flag
|
||||
, GLStateManager.pointSmoothState // GL_POINT_SMOOTH flag
|
||||
, GLStateManager.polygonOffsetPointState // GL_POLYGON_OFFSET_POINT flag
|
||||
, GLStateManager.polygonOffsetLineState // GL_POLYGON_OFFSET_LINE flag
|
||||
, GLStateManager.polygonOffsetFillState // GL_POLYGON_OFFSET_FILL flag
|
||||
, GLStateManager.polygonSmoothState // GL_POLYGON_SMOOTH flag
|
||||
, GLStateManager.polygonStippleState // GL_POLYGON_STIPPLE flag
|
||||
, GLStateManager.rescaleNormalState // GL_RESCALE_NORMAL flag
|
||||
, GLStateManager.sampleAlphaToCoverageState // GL_SAMPLE_ALPHA_TO_COVERAGE flag
|
||||
, GLStateManager.sampleAlphaToOneState // GL_SAMPLE_ALPHA_TO_ONE flag
|
||||
, GLStateManager.sampleCoverageState // GL_SAMPLE_COVERAGE flag
|
||||
, GLStateManager.scissorTest // GL_SCISSOR_TEST flag
|
||||
// GL_STENCIL_TEST flag
|
||||
// GL_TEXTURE_1D flag
|
||||
// GL_TEXTURE_2D flag - Below
|
||||
// GL_TEXTURE_3D flag
|
||||
// Flags GL_TEXTURE_GEN_x where x is S, T, R, or Q
|
||||
, GLStateManager.stencilTest // GL_STENCIL_TEST flag
|
||||
));
|
||||
|
||||
// GL_TEXTURE_2D flag
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
enableBits.add(GLStateManager.textures.getTextureUnitStates(i));
|
||||
// Enable bits for the user-definable clipping planes
|
||||
for(int i = 0; i < GLStateManager.clipPlaneStates.length; i++) {
|
||||
enableBits.add(GLStateManager.clipPlaneStates[i]);
|
||||
}
|
||||
|
||||
// GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D flags
|
||||
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
enableBits.add(GLStateManager.textures.getTexture1DStates(i));
|
||||
enableBits.add(GLStateManager.textures.getTextureUnitStates(i));
|
||||
enableBits.add(GLStateManager.textures.getTexture3DStates(i));
|
||||
}
|
||||
|
||||
// Flags GL_TEXTURE_GEN_x where x is S, T, R, or Q
|
||||
addTextureGenStates(enableBits);
|
||||
|
||||
attribToFeatures.put(GL11.GL_ENABLE_BIT, enableBits);
|
||||
attribToFeatures.put(GL11.GL_EVAL_BIT, ImmutableSet.of(
|
||||
// GL_MAP1_x enable bits, where x is a map type
|
||||
@@ -268,13 +304,16 @@ public class Feature {
|
||||
// textureAttribs.add(GLStateManager.textures.getInfo(i))
|
||||
}
|
||||
|
||||
// Enable bits GL_TEXTURE_GEN_x where x is S, T, R, or Q
|
||||
addTextureGenStates(textureAttribs);
|
||||
|
||||
attribToFeatures.put(GL11.GL_TEXTURE_BIT, textureAttribs);
|
||||
|
||||
attribToFeatures.put(GL11.GL_TRANSFORM_BIT, ImmutableSet.of(
|
||||
// Coefficients of the six clipping planes
|
||||
// Enable bits for the user-definable clipping planes
|
||||
GLStateManager.matrixMode
|
||||
// GL_NORMALIZE flag
|
||||
, GLStateManager.normalizeState // GL_NORMALIZE flag
|
||||
, GLStateManager.rescaleNormalState // GL_RESCALE_NORMAL flag
|
||||
));
|
||||
attribToFeatures.put(GL11.GL_VIEWPORT_BIT, ImmutableSet.of(
|
||||
|
||||
@@ -81,8 +81,23 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.function.IntSupplier;
|
||||
|
||||
import static com.gtnewhorizons.angelica.glsm.Vendor.AMD;
|
||||
import static com.gtnewhorizons.angelica.glsm.Vendor.INTEL;
|
||||
import static com.gtnewhorizons.angelica.glsm.Vendor.MESA;
|
||||
import static com.gtnewhorizons.angelica.glsm.Vendor.NVIDIA;
|
||||
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
|
||||
|
||||
/**
|
||||
* OpenGL State Manager - Provides cached state tracking and management for OpenGL operations.
|
||||
*
|
||||
* <p><b>IMPORTANT INITIALIZATION ORDER:</b></p>
|
||||
* <ul>
|
||||
* <li>This class performs GL queries in static initializers (MAX_CLIP_PLANES, MAX_TEXTURE_UNITS, etc.)</li>
|
||||
* <li>The class MUST NOT be loaded until after the GL context has been created and made current</li>
|
||||
* <li>Violating this requirement will cause crashes with "No current context" or return invalid values</li>
|
||||
* <li>Call {@link #preInit()} after GL context creation to initialize runtime state</li>
|
||||
* </ul>
|
||||
*/
|
||||
@SuppressWarnings("unused") // Used in ASM
|
||||
public class GLStateManager {
|
||||
public static ContextCapabilities capabilities;
|
||||
@@ -94,13 +109,14 @@ public class GLStateManager {
|
||||
public static final int MAX_PROJECTION_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_PROJECTION_STACK_DEPTH);
|
||||
public static final int MAX_TEXTURE_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_TEXTURE_STACK_DEPTH);
|
||||
public static final int MAX_TEXTURE_UNITS = GL11.glGetInteger(GL20.GL_MAX_TEXTURE_IMAGE_UNITS);
|
||||
public static final int MAX_CLIP_PLANES = GL11.glGetInteger(GL11.GL_MAX_CLIP_PLANES);
|
||||
|
||||
public static final GLFeatureSet HAS_MULTIPLE_SET = new GLFeatureSet();
|
||||
|
||||
@Getter protected static boolean NVIDIA;
|
||||
@Getter protected static boolean AMD;
|
||||
@Getter protected static boolean INTEL;
|
||||
@Getter protected static boolean MESA;
|
||||
@Getter private static Vendor VENDOR;
|
||||
|
||||
// This setting varies depending on driver, so it gets queried at runtime
|
||||
public static final int DEFAULT_DRAW_BUFFER = GL11.glGetInteger(GL11.GL_DRAW_BUFFER);
|
||||
|
||||
// GLStateManager State Trackers
|
||||
private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
|
||||
@@ -119,12 +135,58 @@ public class GLStateManager {
|
||||
@Getter protected static final Color4Stack color = new Color4Stack();
|
||||
@Getter protected static final Color4Stack clearColor = new Color4Stack(new Color4(0.0F, 0.0F, 0.0F, 0.0F));
|
||||
@Getter protected static final ColorMaskStack colorMask = new ColorMaskStack();
|
||||
@Getter protected static final IntegerStateStack drawBuffer = new IntegerStateStack(DEFAULT_DRAW_BUFFER);
|
||||
@Getter protected static final BooleanStateStack cullState = new BooleanStateStack(GL11.GL_CULL_FACE);
|
||||
@Getter protected static final AlphaStateStack alphaState = new AlphaStateStack();
|
||||
@Getter protected static final BooleanStateStack alphaTest = new BooleanStateStack(GL11.GL_ALPHA_TEST);
|
||||
|
||||
@Getter protected static final BooleanStateStack lightingState = new BooleanStateStack(GL11.GL_LIGHTING);
|
||||
@Getter protected static final BooleanStateStack rescaleNormalState = new BooleanStateStack(GL12.GL_RESCALE_NORMAL);
|
||||
@Getter protected static final BooleanStateStack normalizeState = new BooleanStateStack(GL11.GL_NORMALIZE);
|
||||
|
||||
// Additional enable bit states tracked by GL_ENABLE_BIT
|
||||
@Getter protected static final BooleanStateStack ditherState = new BooleanStateStack(GL11.GL_DITHER, true); // Defaults to true per OpenGL spec
|
||||
@Getter protected static final BooleanStateStack stencilTest = new BooleanStateStack(GL11.GL_STENCIL_TEST);
|
||||
@Getter protected static final BooleanStateStack lineSmoothState = new BooleanStateStack(GL11.GL_LINE_SMOOTH);
|
||||
@Getter protected static final BooleanStateStack lineStippleState = new BooleanStateStack(GL11.GL_LINE_STIPPLE);
|
||||
@Getter protected static final BooleanStateStack pointSmoothState = new BooleanStateStack(GL11.GL_POINT_SMOOTH);
|
||||
@Getter protected static final BooleanStateStack polygonSmoothState = new BooleanStateStack(GL11.GL_POLYGON_SMOOTH);
|
||||
@Getter protected static final BooleanStateStack polygonStippleState = new BooleanStateStack(GL11.GL_POLYGON_STIPPLE);
|
||||
@Getter protected static final BooleanStateStack multisampleState = new BooleanStateStack(GL13.GL_MULTISAMPLE, true); // Defaults to true per OpenGL spec
|
||||
@Getter protected static final BooleanStateStack sampleAlphaToCoverageState = new BooleanStateStack(GL13.GL_SAMPLE_ALPHA_TO_COVERAGE);
|
||||
@Getter protected static final BooleanStateStack sampleAlphaToOneState = new BooleanStateStack(GL13.GL_SAMPLE_ALPHA_TO_ONE);
|
||||
@Getter protected static final BooleanStateStack sampleCoverageState = new BooleanStateStack(GL13.GL_SAMPLE_COVERAGE);
|
||||
@Getter protected static final BooleanStateStack colorLogicOpState = new BooleanStateStack(GL11.GL_COLOR_LOGIC_OP);
|
||||
@Getter protected static final BooleanStateStack indexLogicOpState = new BooleanStateStack(GL11.GL_INDEX_LOGIC_OP);
|
||||
|
||||
// Polygon offset states
|
||||
@Getter protected static final BooleanStateStack polygonOffsetPointState = new BooleanStateStack(GL11.GL_POLYGON_OFFSET_POINT);
|
||||
@Getter protected static final BooleanStateStack polygonOffsetLineState = new BooleanStateStack(GL11.GL_POLYGON_OFFSET_LINE);
|
||||
@Getter protected static final BooleanStateStack polygonOffsetFillState = new BooleanStateStack(GL11.GL_POLYGON_OFFSET_FILL);
|
||||
|
||||
// Evaluator states
|
||||
@Getter protected static final BooleanStateStack autoNormalState = new BooleanStateStack(GL11.GL_AUTO_NORMAL);
|
||||
@Getter protected static final BooleanStateStack map1Color4State = new BooleanStateStack(GL11.GL_MAP1_COLOR_4);
|
||||
@Getter protected static final BooleanStateStack map1IndexState = new BooleanStateStack(GL11.GL_MAP1_INDEX);
|
||||
@Getter protected static final BooleanStateStack map1NormalState = new BooleanStateStack(GL11.GL_MAP1_NORMAL);
|
||||
@Getter protected static final BooleanStateStack map1TextureCoord1State = new BooleanStateStack(GL11.GL_MAP1_TEXTURE_COORD_1);
|
||||
@Getter protected static final BooleanStateStack map1TextureCoord2State = new BooleanStateStack(GL11.GL_MAP1_TEXTURE_COORD_2);
|
||||
@Getter protected static final BooleanStateStack map1TextureCoord3State = new BooleanStateStack(GL11.GL_MAP1_TEXTURE_COORD_3);
|
||||
@Getter protected static final BooleanStateStack map1TextureCoord4State = new BooleanStateStack(GL11.GL_MAP1_TEXTURE_COORD_4);
|
||||
@Getter protected static final BooleanStateStack map1Vertex3State = new BooleanStateStack(GL11.GL_MAP1_VERTEX_3);
|
||||
@Getter protected static final BooleanStateStack map1Vertex4State = new BooleanStateStack(GL11.GL_MAP1_VERTEX_4);
|
||||
@Getter protected static final BooleanStateStack map2Color4State = new BooleanStateStack(GL11.GL_MAP2_COLOR_4);
|
||||
@Getter protected static final BooleanStateStack map2IndexState = new BooleanStateStack(GL11.GL_MAP2_INDEX);
|
||||
@Getter protected static final BooleanStateStack map2NormalState = new BooleanStateStack(GL11.GL_MAP2_NORMAL);
|
||||
@Getter protected static final BooleanStateStack map2TextureCoord1State = new BooleanStateStack(GL11.GL_MAP2_TEXTURE_COORD_1);
|
||||
@Getter protected static final BooleanStateStack map2TextureCoord2State = new BooleanStateStack(GL11.GL_MAP2_TEXTURE_COORD_2);
|
||||
@Getter protected static final BooleanStateStack map2TextureCoord3State = new BooleanStateStack(GL11.GL_MAP2_TEXTURE_COORD_3);
|
||||
@Getter protected static final BooleanStateStack map2TextureCoord4State = new BooleanStateStack(GL11.GL_MAP2_TEXTURE_COORD_4);
|
||||
@Getter protected static final BooleanStateStack map2Vertex3State = new BooleanStateStack(GL11.GL_MAP2_VERTEX_3);
|
||||
@Getter protected static final BooleanStateStack map2Vertex4State = new BooleanStateStack(GL11.GL_MAP2_VERTEX_4);
|
||||
|
||||
// Clip plane states
|
||||
@Getter protected static final BooleanStateStack[] clipPlaneStates = new BooleanStateStack[MAX_CLIP_PLANES];
|
||||
|
||||
@Getter protected static final MatrixModeStack matrixMode = new MatrixModeStack();
|
||||
@Getter protected static final Matrix4fStack modelViewMatrix = new Matrix4fStack(MAX_MODELVIEW_STACK_DEPTH);
|
||||
@@ -148,8 +210,12 @@ public class GLStateManager {
|
||||
lightDataStates[i] = new LightStateStack(GL11.GL_LIGHT0 + i);
|
||||
}
|
||||
|
||||
for (int i = 0; i < MAX_CLIP_PLANES; i++) {
|
||||
clipPlaneStates[i] = new BooleanStateStack(GL11.GL_CLIP_PLANE0 + i);
|
||||
}
|
||||
|
||||
try {
|
||||
Field curr = ReflectionHelper.findField(Matrix4fStack.class, "curr");
|
||||
final Field curr = ReflectionHelper.findField(Matrix4fStack.class, "curr");
|
||||
curr.setAccessible(true);
|
||||
MAT4_STACK_CURR_DEPTH = MethodHandles.lookup().unreflectGetter(curr);
|
||||
} catch (IllegalAccessException e) {
|
||||
@@ -167,11 +233,11 @@ public class GLStateManager {
|
||||
attribs.popInt();
|
||||
}
|
||||
|
||||
List<IStateStack<?>> stacks = Feature.maskToFeatures(GL11.GL_ALL_ATTRIB_BITS);
|
||||
int size = stacks.size();
|
||||
final List<IStateStack<?>> stacks = Feature.maskToFeatures(GL11.GL_ALL_ATTRIB_BITS);
|
||||
final int size = stacks.size();
|
||||
|
||||
for(int i = 0; i < size; i++) {
|
||||
IStateStack<?> stack = stacks.get(i);
|
||||
final IStateStack<?> stack = stacks.get(i);
|
||||
|
||||
while(!stack.isEmpty()) {
|
||||
stack.pop();
|
||||
@@ -245,16 +311,12 @@ public class GLStateManager {
|
||||
.addFeature(GL11.GL_VIEWPORT);
|
||||
|
||||
String glVendor = GL11.glGetString(GL11.GL_VENDOR);
|
||||
NVIDIA = glVendor.toLowerCase().contains("nvidia");
|
||||
AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd");
|
||||
INTEL = glVendor.toLowerCase().contains("intel");
|
||||
MESA = glVendor.toLowerCase().contains("mesa");
|
||||
VENDOR = Vendor.getVendor(glVendor.toLowerCase());
|
||||
|
||||
if(AMD) {
|
||||
if (vendorIsAMD()) {
|
||||
// AMD Drivers seem to default to 0 for the matrix mode, so we need to set it to the default
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
@@ -300,12 +362,23 @@ public class GLStateManager {
|
||||
|
||||
// LWJGL Overrides
|
||||
public static void glEnable(int cap) {
|
||||
// Handle clip planes dynamically (supports up to MAX_CLIP_PLANES)
|
||||
if (cap >= GL11.GL_CLIP_PLANE0 && cap < GL11.GL_CLIP_PLANE0 + MAX_CLIP_PLANES) {
|
||||
clipPlaneStates[cap - GL11.GL_CLIP_PLANE0].enable();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (cap) {
|
||||
case GL11.GL_ALPHA_TEST -> enableAlphaTest();
|
||||
case GL11.GL_AUTO_NORMAL -> autoNormalState.enable();
|
||||
case GL11.GL_BLEND -> enableBlend();
|
||||
case GL11.GL_COLOR_MATERIAL -> enableColorMaterial();
|
||||
case GL11.GL_COLOR_LOGIC_OP -> colorLogicOpState.enable();
|
||||
case GL11.GL_CULL_FACE -> enableCull();
|
||||
case GL11.GL_DEPTH_TEST -> enableDepthTest();
|
||||
case GL11.GL_DITHER -> ditherState.enable();
|
||||
case GL11.GL_FOG -> enableFog();
|
||||
case GL11.GL_INDEX_LOGIC_OP -> indexLogicOpState.enable();
|
||||
case GL11.GL_LIGHTING -> enableLighting();
|
||||
case GL11.GL_LIGHT0 -> enableLight(0);
|
||||
case GL11.GL_LIGHT1 -> enableLight(1);
|
||||
@@ -315,21 +388,69 @@ public class GLStateManager {
|
||||
case GL11.GL_LIGHT5 -> enableLight(5);
|
||||
case GL11.GL_LIGHT6 -> enableLight(6);
|
||||
case GL11.GL_LIGHT7 -> enableLight(7);
|
||||
case GL11.GL_COLOR_MATERIAL -> enableColorMaterial();
|
||||
case GL11.GL_SCISSOR_TEST -> enableScissorTest();
|
||||
case GL11.GL_TEXTURE_2D -> enableTexture();
|
||||
case GL11.GL_LINE_SMOOTH -> lineSmoothState.enable();
|
||||
case GL11.GL_LINE_STIPPLE -> lineStippleState.enable();
|
||||
case GL11.GL_MAP1_COLOR_4 -> map1Color4State.enable();
|
||||
case GL11.GL_MAP1_INDEX -> map1IndexState.enable();
|
||||
case GL11.GL_MAP1_NORMAL -> map1NormalState.enable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_1 -> map1TextureCoord1State.enable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_2 -> map1TextureCoord2State.enable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_3 -> map1TextureCoord3State.enable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_4 -> map1TextureCoord4State.enable();
|
||||
case GL11.GL_MAP1_VERTEX_3 -> map1Vertex3State.enable();
|
||||
case GL11.GL_MAP1_VERTEX_4 -> map1Vertex4State.enable();
|
||||
case GL11.GL_MAP2_COLOR_4 -> map2Color4State.enable();
|
||||
case GL11.GL_MAP2_INDEX -> map2IndexState.enable();
|
||||
case GL11.GL_MAP2_NORMAL -> map2NormalState.enable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_1 -> map2TextureCoord1State.enable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_2 -> map2TextureCoord2State.enable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_3 -> map2TextureCoord3State.enable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_4 -> map2TextureCoord4State.enable();
|
||||
case GL11.GL_MAP2_VERTEX_3 -> map2Vertex3State.enable();
|
||||
case GL11.GL_MAP2_VERTEX_4 -> map2Vertex4State.enable();
|
||||
case GL13.GL_MULTISAMPLE -> multisampleState.enable();
|
||||
case GL11.GL_NORMALIZE -> normalizeState.enable();
|
||||
case GL11.GL_POINT_SMOOTH -> pointSmoothState.enable();
|
||||
case GL11.GL_POLYGON_OFFSET_POINT -> polygonOffsetPointState.enable();
|
||||
case GL11.GL_POLYGON_OFFSET_LINE -> polygonOffsetLineState.enable();
|
||||
case GL11.GL_POLYGON_OFFSET_FILL -> polygonOffsetFillState.enable();
|
||||
case GL11.GL_POLYGON_SMOOTH -> polygonSmoothState.enable();
|
||||
case GL11.GL_POLYGON_STIPPLE -> polygonStippleState.enable();
|
||||
case GL12.GL_RESCALE_NORMAL -> enableRescaleNormal();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_COVERAGE -> sampleAlphaToCoverageState.enable();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_ONE -> sampleAlphaToOneState.enable();
|
||||
case GL13.GL_SAMPLE_COVERAGE -> sampleCoverageState.enable();
|
||||
case GL11.GL_SCISSOR_TEST -> enableScissorTest();
|
||||
case GL11.GL_STENCIL_TEST -> stencilTest.enable();
|
||||
case GL11.GL_TEXTURE_1D -> textures.getTexture1DStates(activeTextureUnit.getValue()).enable();
|
||||
case GL11.GL_TEXTURE_2D -> enableTexture();
|
||||
case GL12.GL_TEXTURE_3D -> textures.getTexture3DStates(activeTextureUnit.getValue()).enable();
|
||||
case GL11.GL_TEXTURE_GEN_S -> textures.getTexGenSStates(activeTextureUnit.getValue()).enable();
|
||||
case GL11.GL_TEXTURE_GEN_T -> textures.getTexGenTStates(activeTextureUnit.getValue()).enable();
|
||||
case GL11.GL_TEXTURE_GEN_R -> textures.getTexGenRStates(activeTextureUnit.getValue()).enable();
|
||||
case GL11.GL_TEXTURE_GEN_Q -> textures.getTexGenQStates(activeTextureUnit.getValue()).enable();
|
||||
default -> GL11.glEnable(cap);
|
||||
}
|
||||
}
|
||||
|
||||
public static void glDisable(int cap) {
|
||||
// Handle clip planes dynamically (supports up to MAX_CLIP_PLANES)
|
||||
if (cap >= GL11.GL_CLIP_PLANE0 && cap < GL11.GL_CLIP_PLANE0 + MAX_CLIP_PLANES) {
|
||||
clipPlaneStates[cap - GL11.GL_CLIP_PLANE0].disable();
|
||||
return;
|
||||
}
|
||||
|
||||
switch (cap) {
|
||||
case GL11.GL_ALPHA_TEST -> disableAlphaTest();
|
||||
case GL11.GL_AUTO_NORMAL -> autoNormalState.disable();
|
||||
case GL11.GL_BLEND -> disableBlend();
|
||||
case GL11.GL_COLOR_MATERIAL -> disableColorMaterial();
|
||||
case GL11.GL_COLOR_LOGIC_OP -> colorLogicOpState.disable();
|
||||
case GL11.GL_CULL_FACE -> disableCull();
|
||||
case GL11.GL_DEPTH_TEST -> disableDepthTest();
|
||||
case GL11.GL_DITHER -> ditherState.disable();
|
||||
case GL11.GL_FOG -> disableFog();
|
||||
case GL11.GL_INDEX_LOGIC_OP -> indexLogicOpState.disable();
|
||||
case GL11.GL_LIGHTING -> disableLighting();
|
||||
case GL11.GL_LIGHT0 -> disableLight(0);
|
||||
case GL11.GL_LIGHT1 -> disableLight(1);
|
||||
@@ -339,10 +460,47 @@ public class GLStateManager {
|
||||
case GL11.GL_LIGHT5 -> disableLight(5);
|
||||
case GL11.GL_LIGHT6 -> disableLight(6);
|
||||
case GL11.GL_LIGHT7 -> disableLight(7);
|
||||
case GL11.GL_COLOR_MATERIAL -> disableColorMaterial();
|
||||
case GL11.GL_SCISSOR_TEST -> disableScissorTest();
|
||||
case GL11.GL_TEXTURE_2D -> disableTexture();
|
||||
case GL11.GL_LINE_SMOOTH -> lineSmoothState.disable();
|
||||
case GL11.GL_LINE_STIPPLE -> lineStippleState.disable();
|
||||
case GL11.GL_MAP1_COLOR_4 -> map1Color4State.disable();
|
||||
case GL11.GL_MAP1_INDEX -> map1IndexState.disable();
|
||||
case GL11.GL_MAP1_NORMAL -> map1NormalState.disable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_1 -> map1TextureCoord1State.disable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_2 -> map1TextureCoord2State.disable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_3 -> map1TextureCoord3State.disable();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_4 -> map1TextureCoord4State.disable();
|
||||
case GL11.GL_MAP1_VERTEX_3 -> map1Vertex3State.disable();
|
||||
case GL11.GL_MAP1_VERTEX_4 -> map1Vertex4State.disable();
|
||||
case GL11.GL_MAP2_COLOR_4 -> map2Color4State.disable();
|
||||
case GL11.GL_MAP2_INDEX -> map2IndexState.disable();
|
||||
case GL11.GL_MAP2_NORMAL -> map2NormalState.disable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_1 -> map2TextureCoord1State.disable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_2 -> map2TextureCoord2State.disable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_3 -> map2TextureCoord3State.disable();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_4 -> map2TextureCoord4State.disable();
|
||||
case GL11.GL_MAP2_VERTEX_3 -> map2Vertex3State.disable();
|
||||
case GL11.GL_MAP2_VERTEX_4 -> map2Vertex4State.disable();
|
||||
case GL13.GL_MULTISAMPLE -> multisampleState.disable();
|
||||
case GL11.GL_NORMALIZE -> normalizeState.disable();
|
||||
case GL11.GL_POINT_SMOOTH -> pointSmoothState.disable();
|
||||
case GL11.GL_POLYGON_OFFSET_POINT -> polygonOffsetPointState.disable();
|
||||
case GL11.GL_POLYGON_OFFSET_LINE -> polygonOffsetLineState.disable();
|
||||
case GL11.GL_POLYGON_OFFSET_FILL -> polygonOffsetFillState.disable();
|
||||
case GL11.GL_POLYGON_SMOOTH -> polygonSmoothState.disable();
|
||||
case GL11.GL_POLYGON_STIPPLE -> polygonStippleState.disable();
|
||||
case GL12.GL_RESCALE_NORMAL -> disableRescaleNormal();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_COVERAGE -> sampleAlphaToCoverageState.disable();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_ONE -> sampleAlphaToOneState.disable();
|
||||
case GL13.GL_SAMPLE_COVERAGE -> sampleCoverageState.disable();
|
||||
case GL11.GL_SCISSOR_TEST -> disableScissorTest();
|
||||
case GL11.GL_STENCIL_TEST -> stencilTest.disable();
|
||||
case GL11.GL_TEXTURE_1D -> textures.getTexture1DStates(activeTextureUnit.getValue()).disable();
|
||||
case GL11.GL_TEXTURE_2D -> disableTexture();
|
||||
case GL12.GL_TEXTURE_3D -> textures.getTexture3DStates(activeTextureUnit.getValue()).disable();
|
||||
case GL11.GL_TEXTURE_GEN_S -> textures.getTexGenSStates(activeTextureUnit.getValue()).disable();
|
||||
case GL11.GL_TEXTURE_GEN_T -> textures.getTexGenTStates(activeTextureUnit.getValue()).disable();
|
||||
case GL11.GL_TEXTURE_GEN_R -> textures.getTexGenRStates(activeTextureUnit.getValue()).disable();
|
||||
case GL11.GL_TEXTURE_GEN_Q -> textures.getTexGenQStates(activeTextureUnit.getValue()).disable();
|
||||
default -> GL11.glDisable(cap);
|
||||
}
|
||||
}
|
||||
@@ -351,12 +509,22 @@ public class GLStateManager {
|
||||
if(shouldBypassCache()) {
|
||||
return GL11.glIsEnabled(cap);
|
||||
}
|
||||
// Handle clip planes dynamically (supports up to MAX_CLIP_PLANES)
|
||||
if (cap >= GL11.GL_CLIP_PLANE0 && cap < GL11.GL_CLIP_PLANE0 + MAX_CLIP_PLANES) {
|
||||
return clipPlaneStates[cap - GL11.GL_CLIP_PLANE0].isEnabled();
|
||||
}
|
||||
|
||||
return switch (cap) {
|
||||
case GL11.GL_ALPHA_TEST -> alphaTest.isEnabled();
|
||||
case GL11.GL_AUTO_NORMAL -> autoNormalState.isEnabled();
|
||||
case GL11.GL_BLEND -> blendMode.isEnabled();
|
||||
case GL11.GL_COLOR_MATERIAL -> colorMaterial.isEnabled();
|
||||
case GL11.GL_COLOR_LOGIC_OP -> colorLogicOpState.isEnabled();
|
||||
case GL11.GL_CULL_FACE -> cullState.isEnabled();
|
||||
case GL11.GL_DEPTH_TEST -> depthTest.isEnabled();
|
||||
case GL11.GL_DITHER -> ditherState.isEnabled();
|
||||
case GL11.GL_FOG -> fogMode.isEnabled();
|
||||
case GL11.GL_INDEX_LOGIC_OP -> indexLogicOpState.isEnabled();
|
||||
case GL11.GL_LIGHTING -> lightingState.isEnabled();
|
||||
case GL11.GL_LIGHT0 -> lightStates[0].isEnabled();
|
||||
case GL11.GL_LIGHT1 -> lightStates[1].isEnabled();
|
||||
@@ -366,10 +534,47 @@ public class GLStateManager {
|
||||
case GL11.GL_LIGHT5 -> lightStates[5].isEnabled();
|
||||
case GL11.GL_LIGHT6 -> lightStates[6].isEnabled();
|
||||
case GL11.GL_LIGHT7 -> lightStates[7].isEnabled();
|
||||
case GL11.GL_COLOR_MATERIAL -> colorMaterial.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_LINE_SMOOTH -> lineSmoothState.isEnabled();
|
||||
case GL11.GL_LINE_STIPPLE -> lineStippleState.isEnabled();
|
||||
case GL11.GL_MAP1_COLOR_4 -> map1Color4State.isEnabled();
|
||||
case GL11.GL_MAP1_INDEX -> map1IndexState.isEnabled();
|
||||
case GL11.GL_MAP1_NORMAL -> map1NormalState.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_1 -> map1TextureCoord1State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_2 -> map1TextureCoord2State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_3 -> map1TextureCoord3State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_4 -> map1TextureCoord4State.isEnabled();
|
||||
case GL11.GL_MAP1_VERTEX_3 -> map1Vertex3State.isEnabled();
|
||||
case GL11.GL_MAP1_VERTEX_4 -> map1Vertex4State.isEnabled();
|
||||
case GL11.GL_MAP2_COLOR_4 -> map2Color4State.isEnabled();
|
||||
case GL11.GL_MAP2_INDEX -> map2IndexState.isEnabled();
|
||||
case GL11.GL_MAP2_NORMAL -> map2NormalState.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_1 -> map2TextureCoord1State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_2 -> map2TextureCoord2State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_3 -> map2TextureCoord3State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_4 -> map2TextureCoord4State.isEnabled();
|
||||
case GL11.GL_MAP2_VERTEX_3 -> map2Vertex3State.isEnabled();
|
||||
case GL11.GL_MAP2_VERTEX_4 -> map2Vertex4State.isEnabled();
|
||||
case GL13.GL_MULTISAMPLE -> multisampleState.isEnabled();
|
||||
case GL11.GL_NORMALIZE -> normalizeState.isEnabled();
|
||||
case GL11.GL_POINT_SMOOTH -> pointSmoothState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_POINT -> polygonOffsetPointState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_LINE -> polygonOffsetLineState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_FILL -> polygonOffsetFillState.isEnabled();
|
||||
case GL11.GL_POLYGON_SMOOTH -> polygonSmoothState.isEnabled();
|
||||
case GL11.GL_POLYGON_STIPPLE -> polygonStippleState.isEnabled();
|
||||
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_COVERAGE -> sampleAlphaToCoverageState.isEnabled();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_ONE -> sampleAlphaToOneState.isEnabled();
|
||||
case GL13.GL_SAMPLE_COVERAGE -> sampleCoverageState.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_STENCIL_TEST -> stencilTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_1D -> textures.getTexture1DStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL12.GL_TEXTURE_3D -> textures.getTexture3DStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_S -> textures.getTexGenSStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_T -> textures.getTexGenTStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_R -> textures.getTexGenRStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_Q -> textures.getTexGenQStates(activeTextureUnit.getValue()).isEnabled();
|
||||
default -> GL11.glIsEnabled(cap);
|
||||
};
|
||||
}
|
||||
@@ -378,13 +583,23 @@ public class GLStateManager {
|
||||
if(shouldBypassCache()) {
|
||||
return GL11.glGetBoolean(pname);
|
||||
}
|
||||
// Handle clip planes dynamically (supports up to MAX_CLIP_PLANES)
|
||||
if (pname >= GL11.GL_CLIP_PLANE0 && pname < GL11.GL_CLIP_PLANE0 + MAX_CLIP_PLANES) {
|
||||
return clipPlaneStates[pname - GL11.GL_CLIP_PLANE0].isEnabled();
|
||||
}
|
||||
|
||||
return switch (pname) {
|
||||
case GL11.GL_ALPHA_TEST -> alphaTest.isEnabled();
|
||||
case GL11.GL_AUTO_NORMAL -> autoNormalState.isEnabled();
|
||||
case GL11.GL_BLEND -> blendMode.isEnabled();
|
||||
case GL11.GL_COLOR_MATERIAL -> colorMaterial.isEnabled();
|
||||
case GL11.GL_COLOR_LOGIC_OP -> colorLogicOpState.isEnabled();
|
||||
case GL11.GL_CULL_FACE -> cullState.isEnabled();
|
||||
case GL11.GL_DEPTH_TEST -> depthTest.isEnabled();
|
||||
case GL11.GL_DEPTH_WRITEMASK -> depthState.isEnabled();
|
||||
case GL11.GL_DITHER -> ditherState.isEnabled();
|
||||
case GL11.GL_FOG -> fogMode.isEnabled();
|
||||
case GL11.GL_INDEX_LOGIC_OP -> indexLogicOpState.isEnabled();
|
||||
case GL11.GL_LIGHTING -> lightingState.isEnabled();
|
||||
case GL11.GL_LIGHT0 -> lightStates[0].isEnabled();
|
||||
case GL11.GL_LIGHT1 -> lightStates[1].isEnabled();
|
||||
@@ -394,10 +609,47 @@ public class GLStateManager {
|
||||
case GL11.GL_LIGHT5 -> lightStates[5].isEnabled();
|
||||
case GL11.GL_LIGHT6 -> lightStates[6].isEnabled();
|
||||
case GL11.GL_LIGHT7 -> lightStates[7].isEnabled();
|
||||
case GL11.GL_COLOR_MATERIAL -> colorMaterial.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_LINE_SMOOTH -> lineSmoothState.isEnabled();
|
||||
case GL11.GL_LINE_STIPPLE -> lineStippleState.isEnabled();
|
||||
case GL11.GL_MAP1_COLOR_4 -> map1Color4State.isEnabled();
|
||||
case GL11.GL_MAP1_INDEX -> map1IndexState.isEnabled();
|
||||
case GL11.GL_MAP1_NORMAL -> map1NormalState.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_1 -> map1TextureCoord1State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_2 -> map1TextureCoord2State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_3 -> map1TextureCoord3State.isEnabled();
|
||||
case GL11.GL_MAP1_TEXTURE_COORD_4 -> map1TextureCoord4State.isEnabled();
|
||||
case GL11.GL_MAP1_VERTEX_3 -> map1Vertex3State.isEnabled();
|
||||
case GL11.GL_MAP1_VERTEX_4 -> map1Vertex4State.isEnabled();
|
||||
case GL11.GL_MAP2_COLOR_4 -> map2Color4State.isEnabled();
|
||||
case GL11.GL_MAP2_INDEX -> map2IndexState.isEnabled();
|
||||
case GL11.GL_MAP2_NORMAL -> map2NormalState.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_1 -> map2TextureCoord1State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_2 -> map2TextureCoord2State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_3 -> map2TextureCoord3State.isEnabled();
|
||||
case GL11.GL_MAP2_TEXTURE_COORD_4 -> map2TextureCoord4State.isEnabled();
|
||||
case GL11.GL_MAP2_VERTEX_3 -> map2Vertex3State.isEnabled();
|
||||
case GL11.GL_MAP2_VERTEX_4 -> map2Vertex4State.isEnabled();
|
||||
case GL13.GL_MULTISAMPLE -> multisampleState.isEnabled();
|
||||
case GL11.GL_NORMALIZE -> normalizeState.isEnabled();
|
||||
case GL11.GL_POINT_SMOOTH -> pointSmoothState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_POINT -> polygonOffsetPointState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_LINE -> polygonOffsetLineState.isEnabled();
|
||||
case GL11.GL_POLYGON_OFFSET_FILL -> polygonOffsetFillState.isEnabled();
|
||||
case GL11.GL_POLYGON_SMOOTH -> polygonSmoothState.isEnabled();
|
||||
case GL11.GL_POLYGON_STIPPLE -> polygonStippleState.isEnabled();
|
||||
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_COVERAGE -> sampleAlphaToCoverageState.isEnabled();
|
||||
case GL13.GL_SAMPLE_ALPHA_TO_ONE -> sampleAlphaToOneState.isEnabled();
|
||||
case GL13.GL_SAMPLE_COVERAGE -> sampleCoverageState.isEnabled();
|
||||
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
|
||||
case GL11.GL_STENCIL_TEST -> stencilTest.isEnabled();
|
||||
case GL11.GL_TEXTURE_1D -> textures.getTexture1DStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL12.GL_TEXTURE_3D -> textures.getTexture3DStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_S -> textures.getTexGenSStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_T -> textures.getTexGenTStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_R -> textures.getTexGenRStates(activeTextureUnit.getValue()).isEnabled();
|
||||
case GL11.GL_TEXTURE_GEN_Q -> textures.getTexGenQStates(activeTextureUnit.getValue()).isEnabled();
|
||||
default -> GL11.glGetBoolean(pname);
|
||||
};
|
||||
}
|
||||
@@ -997,7 +1249,7 @@ public class GLStateManager {
|
||||
i = mipmap ? GL11.GL_LINEAR_MIPMAP_LINEAR : GL11.GL_LINEAR;
|
||||
j = GL11.GL_LINEAR;
|
||||
} else {
|
||||
i = mipmap ? GL11.GL_NEAREST_MIPMAP_LINEAR : GL11.GL_NEAREST;
|
||||
i = mipmap ? GL11.GL_LINEAR_MIPMAP_LINEAR : GL11.GL_NEAREST;
|
||||
j = GL11.GL_NEAREST;
|
||||
}
|
||||
glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, i);
|
||||
@@ -1885,6 +2137,20 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean vendorIsAMD() {
|
||||
return VENDOR == AMD;
|
||||
}
|
||||
|
||||
public static boolean vendorIsIntel() {
|
||||
return VENDOR == INTEL;
|
||||
}
|
||||
|
||||
public static boolean vendorIsMesa() {
|
||||
return VENDOR == MESA;
|
||||
}
|
||||
|
||||
public static boolean vendorIsNVIDIA() {
|
||||
return VENDOR == NVIDIA;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
/// Matches
|
||||
public enum Vendor {
|
||||
AMD("amd"),
|
||||
INTEL("intel"),
|
||||
MESA("mesa"),
|
||||
NVIDIA("nvidia"),
|
||||
UNKNOWN("");
|
||||
|
||||
final String[] names;
|
||||
|
||||
Vendor(String... names) {
|
||||
this.names = names;
|
||||
}
|
||||
|
||||
public static Vendor getVendor(String vendorString) {
|
||||
for (var v : values()) {
|
||||
for (var name : v.names) {
|
||||
if (vendorString.contains(name)) return v;
|
||||
}
|
||||
}
|
||||
|
||||
// Shouldn't be needed as "" matches everything, but sanity checks good.
|
||||
return UNKNOWN;
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,20 @@ public class BooleanStateStack extends BooleanState implements IStateStack<Boole
|
||||
protected int pointer;
|
||||
|
||||
public BooleanStateStack(int glCap) {
|
||||
// Most booleans default to false
|
||||
this(glCap, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a BooleanStateStack with a custom initial state.
|
||||
* Useful for GL states that default to true (e.g., GL_DITHER, GL_MULTISAMPLE).
|
||||
*
|
||||
* @param glCap GL capability constant
|
||||
* @param initialState initial enabled state
|
||||
*/
|
||||
public BooleanStateStack(int glCap, boolean initialState) {
|
||||
super(glCap);
|
||||
this.enabled = initialState;
|
||||
stack = new BooleanState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
|
||||
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
|
||||
stack[i] = new BooleanState(glCap);
|
||||
@@ -34,7 +47,7 @@ public class BooleanStateStack extends BooleanState implements IStateStack<Boole
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
if (GLStateManager.isAMD() && glCap == GL11.GL_BLEND) {
|
||||
if (GLStateManager.vendorIsAMD() && glCap == GL11.GL_BLEND) {
|
||||
setEnabled(enabled);
|
||||
}
|
||||
return this;
|
||||
|
||||
@@ -22,7 +22,7 @@ public class BooleanState implements ISettableState<BooleanState> {
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.isAMD() && GLStateManager.isPoppingAttributes())) {
|
||||
if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.vendorIsAMD() && GLStateManager.isPoppingAttributes())) {
|
||||
this.enabled = enabled;
|
||||
if (enabled) {
|
||||
GL11.glEnable(this.glCap);
|
||||
|
||||
@@ -124,7 +124,7 @@ public class MaterialState implements ISettableState<MaterialState> {
|
||||
// glMaterial specifically for GL_COLOR_INDEXES. Other drivers do not do this.
|
||||
// This probably breaks things but who knows, GLSM is setup to track to what the
|
||||
// driver is doing for it right now.
|
||||
if (GLStateManager.isNVIDIA()) {
|
||||
if (GLStateManager.vendorIsNVIDIA()) {
|
||||
vector3f.set(newBuffer.get(0), newBuffer.get(2), newBuffer.get(1));
|
||||
} else {
|
||||
vector3f.set(newBuffer);
|
||||
|
||||
@@ -6,21 +6,40 @@ import com.gtnewhorizons.angelica.glsm.stacks.TextureBindingStack;
|
||||
import lombok.Getter;
|
||||
import org.joml.Matrix4fStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
public class TextureUnitArray {
|
||||
private final TextureBindingStack[] bindings;
|
||||
private final BooleanStateStack[] states;
|
||||
private final BooleanStateStack[] texture1DStates;
|
||||
private final BooleanStateStack[] texture3DStates;
|
||||
private final BooleanStateStack[] texGenSStates;
|
||||
private final BooleanStateStack[] texGenTStates;
|
||||
private final BooleanStateStack[] texGenRStates;
|
||||
private final BooleanStateStack[] texGenQStates;
|
||||
@Getter
|
||||
public final Matrix4fStack[] textureMatricies;
|
||||
|
||||
public TextureUnitArray() {
|
||||
bindings = new TextureBindingStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
states = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texture1DStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texture3DStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texGenSStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texGenTStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texGenRStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
texGenQStates = new BooleanStateStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
textureMatricies = new Matrix4fStack[GLStateManager.MAX_TEXTURE_UNITS];
|
||||
|
||||
for (int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
bindings[i] = new TextureBindingStack();
|
||||
states[i] = new BooleanStateStack(GL11.GL_TEXTURE_2D);
|
||||
texture1DStates[i] = new BooleanStateStack(GL11.GL_TEXTURE_1D);
|
||||
texture3DStates[i] = new BooleanStateStack(GL12.GL_TEXTURE_3D);
|
||||
texGenSStates[i] = new BooleanStateStack(GL11.GL_TEXTURE_GEN_S);
|
||||
texGenTStates[i] = new BooleanStateStack(GL11.GL_TEXTURE_GEN_T);
|
||||
texGenRStates[i] = new BooleanStateStack(GL11.GL_TEXTURE_GEN_R);
|
||||
texGenQStates[i] = new BooleanStateStack(GL11.GL_TEXTURE_GEN_Q);
|
||||
textureMatricies[i] = new Matrix4fStack(GLStateManager.MAX_TEXTURE_STACK_DEPTH);
|
||||
}
|
||||
}
|
||||
@@ -33,6 +52,30 @@ public class TextureUnitArray {
|
||||
return states[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexture1DStates(int index) {
|
||||
return texture1DStates[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexture3DStates(int index) {
|
||||
return texture3DStates[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexGenSStates(int index) {
|
||||
return texGenSStates[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexGenTStates(int index) {
|
||||
return texGenTStates[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexGenRStates(int index) {
|
||||
return texGenRStates[index];
|
||||
}
|
||||
|
||||
public BooleanStateStack getTexGenQStates(int index) {
|
||||
return texGenQStates[index];
|
||||
}
|
||||
|
||||
public Matrix4fStack getTextureUnitMatrix(int index) {
|
||||
return textureMatricies[index];
|
||||
}
|
||||
@@ -44,6 +87,12 @@ public class TextureUnitArray {
|
||||
for (int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
|
||||
if (!bindings[i].sameAs(textureUnitArray.bindings[i])) return false;
|
||||
if (!states[i].sameAs(textureUnitArray.states[i])) return false;
|
||||
if (!texture1DStates[i].sameAs(textureUnitArray.texture1DStates[i])) return false;
|
||||
if (!texture3DStates[i].sameAs(textureUnitArray.texture3DStates[i])) return false;
|
||||
if (!texGenSStates[i].sameAs(textureUnitArray.texGenSStates[i])) return false;
|
||||
if (!texGenTStates[i].sameAs(textureUnitArray.texGenTStates[i])) return false;
|
||||
if (!texGenRStates[i].sameAs(textureUnitArray.texGenRStates[i])) return false;
|
||||
if (!texGenQStates[i].sameAs(textureUnitArray.texGenQStates[i])) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ public class TextureInfo {
|
||||
protected int width = -1;
|
||||
protected int height = -1;
|
||||
|
||||
@Getter @Setter protected int minFilter = GL11.GL_NEAREST_MIPMAP_LINEAR;
|
||||
@Getter @Setter protected int minFilter = GL11.GL_LINEAR_MIPMAP_LINEAR;
|
||||
@Getter @Setter protected int magFilter = GL11.GL_LINEAR;
|
||||
@Getter @Setter protected int wrapS = GL11.GL_REPEAT;
|
||||
@Getter @Setter protected int wrapT = GL11.GL_REPEAT;
|
||||
|
||||
@@ -125,9 +125,9 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
|
||||
if (!rfbLoaded) {
|
||||
tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.AngelicaLateTweaker");
|
||||
}
|
||||
if (AngelicaConfig.enableSodium) {
|
||||
tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.SodiumLateTweaker");
|
||||
if (AngelicaConfig.enableSodium) {
|
||||
tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.SodiumLateTweaker");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ public class AngelicaRedirectorTransformer implements IClassTransformer {
|
||||
private final String[] exclusions;
|
||||
|
||||
public AngelicaRedirectorTransformer() {
|
||||
inner = new AngelicaRedirector(AngelicaTweaker.isObfEnv());
|
||||
inner = new AngelicaRedirector();
|
||||
exclusions = inner.getTransformerExclusions();
|
||||
}
|
||||
|
||||
|
||||
+24
-18
@@ -1,26 +1,24 @@
|
||||
package com.gtnewhorizons.angelica.loading.fml.transformers;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
|
||||
import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector;
|
||||
import com.gtnewhorizons.angelica.loading.shared.transformers.SodiumBlockTransform;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SodiumBlockTransformer implements IClassTransformer {
|
||||
|
||||
private static final List<Pair<String, String>> BlockBoundsFields = ImmutableList.of(
|
||||
Pair.of("minX", "field_149759_B"),
|
||||
Pair.of("minY", "field_149760_C"),
|
||||
Pair.of("minZ", "field_149754_D"),
|
||||
Pair.of("maxX", "field_149755_E"),
|
||||
Pair.of("maxY", "field_149756_F"),
|
||||
Pair.of("maxZ", "field_149757_G")
|
||||
);
|
||||
private final SodiumBlockTransform inner;
|
||||
private final String[] exclusions;
|
||||
|
||||
public SodiumBlockTransformer() {
|
||||
this.inner = new SodiumBlockTransform(AngelicaTweaker.isObfEnv());
|
||||
this.exclusions = inner.getTransformerExclusions();
|
||||
this.inner.setSodiumSetting();
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete the global vanilla bounding box fields off the Block object. {@link AngelicaRedirector}
|
||||
@@ -29,12 +27,20 @@ public class SodiumBlockTransformer implements IClassTransformer {
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if (basicClass == null) return null;
|
||||
if ("net.minecraft.block.Block".equals(transformedName)) {
|
||||
final ClassReader cr = new ClassReader(basicClass);
|
||||
final ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
cn.fields.removeIf(field -> BlockBoundsFields.stream().anyMatch(pair -> field.name.equals(pair.getLeft()) || field.name.equals(pair.getRight())));
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
for (String exclusion : exclusions) {
|
||||
if (transformedName.startsWith(exclusion)) return basicClass;
|
||||
}
|
||||
|
||||
if (!inner.shouldTransform(basicClass)) {
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
final ClassReader cr = new ClassReader(basicClass);
|
||||
final ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
final boolean changed = inner.transformClassNode(transformedName, cn);
|
||||
if (changed) {
|
||||
final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.loading.rfb;
|
||||
|
||||
import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBAngelicaRedirector;
|
||||
import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBSodiumBlockTransformer;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.PluginContext;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RetroFuturaBootstrap;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
|
||||
@@ -25,7 +26,8 @@ public class AngelicaRfbPlugin implements RfbPlugin {
|
||||
|
||||
final boolean isObf = RetroFuturaBootstrap.API.launchClassLoader().findClassMetadata("net.minecraft.world.World") == null;
|
||||
return new RfbClassTransformer[] {
|
||||
new RFBAngelicaRedirector(isObf)
|
||||
new RFBAngelicaRedirector(),
|
||||
new RFBSodiumBlockTransformer(isObf)
|
||||
};
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -16,8 +16,8 @@ public class RFBAngelicaRedirector implements RfbClassTransformer {
|
||||
|
||||
private final AngelicaRedirector inner;
|
||||
|
||||
public RFBAngelicaRedirector(boolean isObf) {
|
||||
inner = new AngelicaRedirector(isObf);
|
||||
public RFBAngelicaRedirector() {
|
||||
inner = new AngelicaRedirector();
|
||||
}
|
||||
|
||||
@Pattern("[a-z0-9-]+")
|
||||
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
package com.gtnewhorizons.angelica.loading.rfb.transformers;
|
||||
|
||||
import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump;
|
||||
import com.gtnewhorizons.angelica.loading.shared.transformers.SodiumBlockTransform;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
|
||||
import org.intellij.lang.annotations.Pattern;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.jar.Manifest;
|
||||
|
||||
public class RFBSodiumBlockTransformer implements RfbClassTransformer {
|
||||
|
||||
private final SodiumBlockTransform inner;
|
||||
|
||||
public RFBSodiumBlockTransformer(boolean isObf) {
|
||||
inner = new SodiumBlockTransform(isObf);
|
||||
}
|
||||
|
||||
@Pattern("[a-z0-9-]+")
|
||||
@Override
|
||||
public @NotNull String id() {
|
||||
return "sodiumblocktransform";
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] sortAfter() {
|
||||
return new String[]{"*", "mixin:mixin"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] sortBefore() {
|
||||
return new String[]{"lwjgl3ify:redirect"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] additionalExclusions() {
|
||||
return inner.getTransformerExclusions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
|
||||
@NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className,
|
||||
@NotNull ClassNodeHandle classNode) {
|
||||
if (!classNode.isPresent()) {
|
||||
return false;
|
||||
}
|
||||
if (!classNode.isOriginal()) {
|
||||
// If a class is already a transformed ClassNode, conservatively continue processing.
|
||||
return true;
|
||||
}
|
||||
return inner.shouldTransform(classNode.getOriginalBytes());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
|
||||
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
|
||||
final boolean changed = inner.transformClassNode(className, classNode.getNode());
|
||||
if (changed) {
|
||||
classNode.computeMaxs();
|
||||
AngelicaClassDump.dumpRFBClass(className, classNode, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-135
@@ -26,7 +26,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* This transformer redirects many GL calls to our custom GLStateManager
|
||||
@@ -35,16 +34,6 @@ import java.util.stream.Collectors;
|
||||
* IT SHOULD NOT CALL ANY CODE FROM THE MAIN MOD
|
||||
*/
|
||||
public final class AngelicaRedirector {
|
||||
// TODO(Alexdoru) properly split this class in two because currently this class is doing
|
||||
// two very different things :
|
||||
// - redirect the GL calls to our GL manager class
|
||||
// - replace the block fields with a thread safe replacement (only if Sodium is enabled)
|
||||
|
||||
public AngelicaRedirector(boolean isObf) {
|
||||
IS_OBF = isObf;
|
||||
}
|
||||
|
||||
private final boolean IS_OBF;
|
||||
|
||||
private static final boolean ASSERT_MAIN_THREAD = Boolean.getBoolean("angelica.assertMainThread");
|
||||
private static final boolean LOG_SPAM = Boolean.getBoolean("angelica.redirectorLogspam");
|
||||
@@ -56,48 +45,20 @@ public final class AngelicaRedirector {
|
||||
private static final String GL14 = "org/lwjgl/opengl/GL14";
|
||||
private static final String GL20 = "org/lwjgl/opengl/GL20";
|
||||
private static final String Project = "org/lwjgl/util/glu/Project";
|
||||
|
||||
private static final String BlockClass = "net/minecraft/block/Block";
|
||||
private static final String BlockPackage = "net/minecraft/block/Block";
|
||||
|
||||
private static final String OpenGlHelper = "net/minecraft/client/renderer/OpenGlHelper";
|
||||
private static final String EXTBlendFunc = "org/lwjgl/opengl/EXTBlendFuncSeparate";
|
||||
private static final String ARBMultiTexture = "org/lwjgl/opengl/ARBMultitexture";
|
||||
private static final String MinecraftClient = "net.minecraft.client";
|
||||
private static final String SplashProgress = "cpw.mods.fml.client.SplashProgress";
|
||||
private static final String ThreadedBlockData = "com/gtnewhorizons/angelica/glsm/ThreadedBlockData";
|
||||
private static final Set<String> ExcludedMinecraftMainThreadChecks = ImmutableSet.of(
|
||||
"startGame", "func_71384_a",
|
||||
"initializeTextures", "func_77474_a"
|
||||
);
|
||||
private static final List<Pair<String, String>> BlockBoundsFields = ImmutableList.of(
|
||||
Pair.of("minX", "field_149759_B"),
|
||||
Pair.of("minY", "field_149760_C"),
|
||||
Pair.of("minZ", "field_149754_D"),
|
||||
Pair.of("maxX", "field_149755_E"),
|
||||
Pair.of("maxY", "field_149756_F"),
|
||||
Pair.of("maxZ", "field_149757_G")
|
||||
);
|
||||
/** All classes in <tt>net.minecraft.block.*</tt> are the block subclasses save for these. */
|
||||
private static final String[] VanillaBlockExclusions = {
|
||||
"net/minecraft/block/IGrowable",
|
||||
"net/minecraft/block/ITileEntityProvider",
|
||||
"net/minecraft/block/BlockEventData",
|
||||
"net/minecraft/block/BlockSourceImpl",
|
||||
"net/minecraft/block/material/"
|
||||
};
|
||||
|
||||
private static final ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(GL11, GL13, GL14, OpenGlHelper, EXTBlendFunc, ARBMultiTexture, BlockPackage, Project);
|
||||
private static final ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(GL11, GL13, GL14, GL20, OpenGlHelper, EXTBlendFunc, ARBMultiTexture, Project);
|
||||
private static final Map<String, Map<String, String>> methodRedirects = new HashMap<>();
|
||||
private static final Map<Integer, String> glCapRedirects = new HashMap<>();
|
||||
|
||||
private static final Set<String> moddedBlockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
// Block owners we *shouldn't* redirect because they shadow one of our fields
|
||||
private static final Set<String> blockOwnerExclusions = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
|
||||
// Needed because the config is loaded in LaunchClassLoader, but we need to access it in the parent system loader.
|
||||
private static final MethodHandle angelicaConfigSodiumEnabledGetter;
|
||||
|
||||
static {
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_ALPHA_TEST, "AlphaTest");
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_BLEND, "Blend");
|
||||
@@ -220,41 +181,6 @@ public final class AngelicaRedirector {
|
||||
methodRedirects.put(EXTBlendFunc, RedirectMap.newMap().add("glBlendFuncSeparateEXT", "tryBlendFuncSeparate"));
|
||||
methodRedirects.put(ARBMultiTexture, RedirectMap.newMap().add("glActiveTextureARB"));
|
||||
methodRedirects.put(Project, RedirectMap.newMap().add("gluPerspective"));
|
||||
|
||||
try {
|
||||
final Class<?> angelicaConfig = Class.forName("com.gtnewhorizons.angelica.config.AngelicaConfig", true, Launch.classLoader);
|
||||
angelicaConfigSodiumEnabledGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableSodium", boolean.class);
|
||||
} catch (ReflectiveOperationException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isSodiumEnabled() {
|
||||
try {
|
||||
return (boolean) angelicaConfigSodiumEnabledGetter.invokeExact();
|
||||
} catch (Throwable e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isVanillaBlockSubclass(String className) {
|
||||
if (className.startsWith(BlockPackage)) {
|
||||
for (String exclusion : VanillaBlockExclusions) {
|
||||
if (className.startsWith(exclusion)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean isBlockSubclass(String className) {
|
||||
return isVanillaBlockSubclass(className) || moddedBlockSubclasses.contains(className);
|
||||
}
|
||||
|
||||
private String getFieldName(Pair<String, String> fieldPair) {
|
||||
return IS_OBF ? fieldPair.getRight() : fieldPair.getLeft();
|
||||
}
|
||||
|
||||
public String[] getTransformerExclusions() {
|
||||
@@ -276,30 +202,6 @@ public final class AngelicaRedirector {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Track subclasses of Block
|
||||
if (!isVanillaBlockSubclass(cn.name) && isBlockSubclass(cn.superName)) {
|
||||
moddedBlockSubclasses.add(cn.name);
|
||||
cstPoolParser.addString(cn.name);
|
||||
}
|
||||
|
||||
// Check if this class shadows any fields of the parent class
|
||||
if (moddedBlockSubclasses.contains(cn.name)) {
|
||||
// If a superclass shadows, then so do we, because JVM will resolve a reference on our class to that
|
||||
// superclass
|
||||
boolean doWeShadow;
|
||||
if (blockOwnerExclusions.contains(cn.superName)) {
|
||||
doWeShadow = true;
|
||||
} else {
|
||||
// Check if we declare any known field names
|
||||
doWeShadow = BlockBoundsFields.stream().anyMatch(pair ->
|
||||
cn.fields.stream().anyMatch(field -> field.name.equals(getFieldName(pair))));
|
||||
}
|
||||
if (doWeShadow) {
|
||||
LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name);
|
||||
blockOwnerExclusions.add(cn.name);
|
||||
}
|
||||
}
|
||||
|
||||
boolean changed = false;
|
||||
for (MethodNode mn : cn.methods) {
|
||||
if (transformedName.equals("net.minecraft.client.renderer.OpenGlHelper") && (mn.name.equals("glBlendFunc") || mn.name.equals("func_148821_a"))) {
|
||||
@@ -360,42 +262,6 @@ public final class AngelicaRedirector {
|
||||
redirectInMethod = true;
|
||||
}
|
||||
}
|
||||
} else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) {
|
||||
if (!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) {
|
||||
Pair<String, String> fieldToRedirect = BlockBoundsFields.stream()
|
||||
.filter(pair -> fNode.name.equals(getFieldName(pair)))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (fieldToRedirect != null) {
|
||||
if (LOG_SPAM) {
|
||||
LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName);
|
||||
}
|
||||
// Perform the redirect
|
||||
fNode.name = fieldToRedirect.getLeft(); // use unobfuscated name
|
||||
fNode.owner = ThreadedBlockData;
|
||||
// Inject getter before the field access, to turn Block -> ThreadedBlockData
|
||||
final MethodInsnNode getter = new MethodInsnNode(Opcodes.INVOKESTATIC, ThreadedBlockData, "get", "(L" + BlockClass + ";)L" + ThreadedBlockData + ";", false);
|
||||
if (node.getOpcode() == Opcodes.GETFIELD) {
|
||||
mn.instructions.insertBefore(fNode, getter);
|
||||
} else if (node.getOpcode() == Opcodes.PUTFIELD) {
|
||||
// FIXME: this code assumes doubles
|
||||
// Stack: Block, double
|
||||
final InsnList beforePut = new InsnList();
|
||||
beforePut.add(new InsnNode(Opcodes.DUP2_X1));
|
||||
// Stack: double, Block, double
|
||||
beforePut.add(new InsnNode(Opcodes.POP2));
|
||||
// Stack: double, Block
|
||||
beforePut.add(getter);
|
||||
// Stack: double, ThreadedBlockData
|
||||
beforePut.add(new InsnNode(Opcodes.DUP_X2));
|
||||
// Stack: ThreadedBlockData, double, ThreadedBlockData
|
||||
beforePut.add(new InsnNode(Opcodes.POP));
|
||||
// Stack: ThreadedBlockData, double
|
||||
mn.instructions.insertBefore(fNode, beforePut);
|
||||
}
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ASSERT_MAIN_THREAD && redirectInMethod && !transformedName.startsWith(SplashProgress) && !(transformedName.startsWith(MinecraftClient) && ExcludedMinecraftMainThreadChecks.contains(mn.name))) {
|
||||
|
||||
+211
@@ -0,0 +1,211 @@
|
||||
package com.gtnewhorizons.angelica.loading.shared.transformers;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.FieldNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class SodiumBlockTransform {
|
||||
|
||||
public SodiumBlockTransform(boolean isObf) {
|
||||
this.IS_OBF = isObf;
|
||||
}
|
||||
|
||||
private final boolean IS_OBF;
|
||||
|
||||
private static final boolean LOG_SPAM = Boolean.getBoolean("angelica.redirectorLogspam");
|
||||
private static final Logger LOGGER = LogManager.getLogger("SodiumBlockTransformer");
|
||||
private static final String BlockClass = "net/minecraft/block/Block";
|
||||
private static final String BlockPackage = "net/minecraft/block/Block";
|
||||
private static final String ThreadedBlockData = "com/gtnewhorizons/angelica/glsm/ThreadedBlockData";
|
||||
private static final List<Pair<String, String>> BlockBoundsFields = ImmutableList.of(
|
||||
Pair.of("minX", "field_149759_B"),
|
||||
Pair.of("minY", "field_149760_C"),
|
||||
Pair.of("minZ", "field_149754_D"),
|
||||
Pair.of("maxX", "field_149755_E"),
|
||||
Pair.of("maxY", "field_149756_F"),
|
||||
Pair.of("maxZ", "field_149757_G")
|
||||
);
|
||||
/** All classes in <tt>net.minecraft.block.*</tt> are the block subclasses save for these. */
|
||||
private static final String[] VanillaBlockExclusions = {
|
||||
"net/minecraft/block/IGrowable",
|
||||
"net/minecraft/block/ITileEntityProvider",
|
||||
"net/minecraft/block/BlockEventData",
|
||||
"net/minecraft/block/BlockSourceImpl",
|
||||
"net/minecraft/block/material/"
|
||||
};
|
||||
|
||||
private static final ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(BlockPackage);
|
||||
private static final Set<String> moddedBlockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
// Block owners we *shouldn't* redirect because they shadow one of our fields
|
||||
private static final Set<String> blockOwnerExclusions = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
// Needed because the config is loaded in LaunchClassLoader, but we need to access it in the parent system loader.
|
||||
private static final MethodHandle angelicaConfigSodiumEnabledGetter;
|
||||
private static boolean isSodiumEnabled;
|
||||
|
||||
static {
|
||||
try {
|
||||
final Class<?> angelicaConfig = Class.forName("com.gtnewhorizons.angelica.config.AngelicaConfig", true, Launch.classLoader);
|
||||
angelicaConfigSodiumEnabledGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableSodium", boolean.class);
|
||||
} catch (ReflectiveOperationException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isSodiumEnabled() {
|
||||
if (isSodiumEnabled) return true;
|
||||
try {
|
||||
return (boolean) angelicaConfigSodiumEnabledGetter.invokeExact();
|
||||
} catch (Throwable e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isVanillaBlockSubclass(String className) {
|
||||
if (className.startsWith(BlockPackage)) {
|
||||
for (String exclusion : VanillaBlockExclusions) {
|
||||
if (className.startsWith(exclusion)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean isBlockSubclass(String className) {
|
||||
return isVanillaBlockSubclass(className) || moddedBlockSubclasses.contains(className);
|
||||
}
|
||||
|
||||
private String getFieldName(Pair<String, String> fieldPair) {
|
||||
return IS_OBF ? fieldPair.getRight() : fieldPair.getLeft();
|
||||
}
|
||||
|
||||
public String[] getTransformerExclusions() {
|
||||
return new String[]{
|
||||
"org.lwjgl",
|
||||
"com.gtnewhorizons.angelica.glsm.",
|
||||
"com.gtnewhorizons.angelica.transform",
|
||||
"me.eigenraven.lwjgl3ify"
|
||||
};
|
||||
}
|
||||
|
||||
public boolean shouldTransform(byte[] basicClass) {
|
||||
return cstPoolParser.find(basicClass, true);
|
||||
}
|
||||
|
||||
/** @return Was the class changed? */
|
||||
public boolean transformClassNode(String transformedName, ClassNode cn) {
|
||||
if (cn == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ("net.minecraft.block.Block".equals(transformedName) && isSodiumEnabled()) {
|
||||
cn.fields.removeIf(field -> BlockBoundsFields.stream().anyMatch(pair -> field.name.equals(pair.getLeft()) || field.name.equals(pair.getRight())));
|
||||
}
|
||||
|
||||
// Track subclasses of Block
|
||||
if (!isVanillaBlockSubclass(cn.name) && isBlockSubclass(cn.superName)) {
|
||||
moddedBlockSubclasses.add(cn.name);
|
||||
cstPoolParser.addString(cn.name);
|
||||
}
|
||||
|
||||
// Check if this class shadows any fields of the parent class
|
||||
if (moddedBlockSubclasses.contains(cn.name)) {
|
||||
// If a superclass shadows, then so do we, because JVM will resolve a reference on our class to that
|
||||
// superclass
|
||||
boolean doWeShadow;
|
||||
if (blockOwnerExclusions.contains(cn.superName)) {
|
||||
doWeShadow = true;
|
||||
} else {
|
||||
// Check if we declare any known field names
|
||||
boolean b = false;
|
||||
for (Pair<String, String> pair : BlockBoundsFields) {
|
||||
boolean result = false;
|
||||
for (FieldNode field : cn.fields) {
|
||||
if (field.name.equals(getFieldName(pair))) {
|
||||
result = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (result) {
|
||||
b = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
doWeShadow = b;
|
||||
}
|
||||
if (doWeShadow) {
|
||||
LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name);
|
||||
blockOwnerExclusions.add(cn.name);
|
||||
}
|
||||
}
|
||||
|
||||
boolean changed = false;
|
||||
for (MethodNode mn : cn.methods) {
|
||||
for (AbstractInsnNode node : mn.instructions.toArray()) {
|
||||
if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) {
|
||||
if (!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) {
|
||||
Pair<String, String> fieldToRedirect = BlockBoundsFields.stream()
|
||||
.filter(pair -> fNode.name.equals(getFieldName(pair)))
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
if (fieldToRedirect != null) {
|
||||
if (LOG_SPAM) {
|
||||
LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName);
|
||||
}
|
||||
// Perform the redirect
|
||||
fNode.name = fieldToRedirect.getLeft(); // use unobfuscated name
|
||||
fNode.owner = ThreadedBlockData;
|
||||
// Inject getter before the field access, to turn Block -> ThreadedBlockData
|
||||
final MethodInsnNode getter = new MethodInsnNode(Opcodes.INVOKESTATIC, ThreadedBlockData, "get", "(L" + BlockClass + ";)L" + ThreadedBlockData + ";", false);
|
||||
if (node.getOpcode() == Opcodes.GETFIELD) {
|
||||
mn.instructions.insertBefore(fNode, getter);
|
||||
} else if (node.getOpcode() == Opcodes.PUTFIELD) {
|
||||
// FIXME: this code assumes doubles
|
||||
// Stack: Block, double
|
||||
final InsnList beforePut = new InsnList();
|
||||
beforePut.add(new InsnNode(Opcodes.DUP2_X1));
|
||||
// Stack: double, Block, double
|
||||
beforePut.add(new InsnNode(Opcodes.POP2));
|
||||
// Stack: double, Block
|
||||
beforePut.add(getter);
|
||||
// Stack: double, ThreadedBlockData
|
||||
beforePut.add(new InsnNode(Opcodes.DUP_X2));
|
||||
// Stack: ThreadedBlockData, double, ThreadedBlockData
|
||||
beforePut.add(new InsnNode(Opcodes.POP));
|
||||
// Stack: ThreadedBlockData, double
|
||||
mn.instructions.insertBefore(fNode, beforePut);
|
||||
}
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
public void setSodiumSetting() {
|
||||
isSodiumEnabled = true;
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,14 @@ public enum Mixins implements IMixins {
|
||||
, "angelica.dynamiclights.MixinItemRenderer"
|
||||
)
|
||||
),
|
||||
|
||||
|
||||
ANGELICA_FIX_BLOCK_CRACK(
|
||||
new MixinBuilder("Block corners and edges between chunks might have \"cracks\" in them. This option fixes it")
|
||||
.setPhase(Phase.EARLY)
|
||||
.addClientMixins("angelica.bugfixes.MixinRenderBlocks_CrackFix")
|
||||
.addExcludedMod(TargetedMod.FALSETWEAKS)
|
||||
.setApplyIf(() -> AngelicaConfig.fixBlockCrack)),
|
||||
|
||||
ANGELICA_FIX_FLUID_RENDERER_CHECKING_BLOCK_AGAIN(
|
||||
new MixinBuilder("Fix RenderBlockFluid reading the block type from the world access multiple times")
|
||||
.setPhase(Phase.EARLY)
|
||||
@@ -276,6 +283,17 @@ public enum Mixins implements IMixins {
|
||||
.addRequiredMod(TargetedMod.MINEFACTORY_RELOADED)
|
||||
.setApplyIf(() -> CompatConfig.fixMinefactoryReloaded)
|
||||
.addClientMixins("client.minefactoryreloaded.MixinRedNetCableRenderer")),
|
||||
|
||||
NTM_SPACE_TWEAKS(new MixinBuilder("Support for 'Disable Horizon' & 'disableAltitudePlanetRenderer' options in NTM:Space")
|
||||
.setPhase(Phase.LATE)
|
||||
.addRequiredMod(TargetedMod.NTM_SPACE)
|
||||
.setApplyIf(() -> CompatConfig.tweakNTMSpace)
|
||||
.addClientMixins("client.ntmSpace.MixinSkyProviderCelestial_Tweaks")),
|
||||
NTM_SPACE_SHADER_COMPAT(new MixinBuilder("Multiple shader fixes for NTM:Space")
|
||||
.setPhase(Phase.LATE)
|
||||
.addRequiredMod(TargetedMod.NTM_SPACE)
|
||||
.setApplyIf(() -> CompatConfig.fixNTMSpace && AngelicaConfig.enableIris)
|
||||
.addClientMixins("client.ntmSpace.MixinSkyProviderCelestial_ShaderCompat")),
|
||||
|
||||
SPEEDUP_CAMPFIRE_BACKPORT_ANIMATIONS(new MixinBuilder("Add animation speedup support to Campfire Backport")
|
||||
.setPhase(Phase.LATE)
|
||||
@@ -575,13 +593,6 @@ public enum Mixins implements IMixins {
|
||||
.addClientMixins("mcpatcherforge.ctm_cc.MixinTextureMap")
|
||||
),
|
||||
//End from NotFine
|
||||
|
||||
QPR(new MixinBuilder("Adds a QuadProvider field to blocks without populating it")
|
||||
.setPhase(Phase.EARLY)
|
||||
.addClientMixins(
|
||||
"angelica.models.MixinBlock",
|
||||
"angelica.models.MixinBlockOldLeaf")),
|
||||
|
||||
;
|
||||
|
||||
private final MixinBuilder builder;
|
||||
|
||||
@@ -14,7 +14,9 @@ public enum TargetedMod implements ITargetMod {
|
||||
DYNAMIC_SURROUNDINGS_MIST("org.blockartistry.mod.DynSurround.mixinplugin.DynamicSurroundingsEarlyMixins", "dsurround"),
|
||||
DYNAMIC_SURROUNDINGS_ORIGINAL("org.blockartistry.mod.DynSurround.asm.TransformLoader", "dsurround"),
|
||||
EXTRAUTILS(null, "ExtraUtilities"),
|
||||
FALSETWEAKS("com.falsepattern.falsetweaks.asm.CoreLoadingPlugin", "falsetweaks"),
|
||||
MINEFACTORY_RELOADED(null, "MineFactoryReloaded"),
|
||||
NTM_SPACE("com.hbm.dim.SolarSystem"),
|
||||
IC2("ic2.core.coremod.IC2core", "IC2"),
|
||||
NATURA(null, "Natura"),
|
||||
SECURITYCRAFT(null, "securitycraft"),
|
||||
@@ -24,7 +26,10 @@ public enum TargetedMod implements ITargetMod {
|
||||
WITCHERY(null, "witchery");
|
||||
|
||||
private final TargetModBuilder builder;
|
||||
|
||||
|
||||
TargetedMod(String targetClass) {
|
||||
this.builder = new TargetModBuilder().setTargetClass(targetClass);
|
||||
}
|
||||
TargetedMod(String coreModClass, String modId) {
|
||||
this.builder = new TargetModBuilder().setCoreModClass(coreModClass).setModId(modId);
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.interfaces;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadProvider;
|
||||
|
||||
public interface ModeledBlock {
|
||||
|
||||
QuadProvider getModel();
|
||||
void setModel(QuadProvider model);
|
||||
}
|
||||
@@ -1,191 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.models;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.ModelLoader;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.Variant;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.json.ModelLocation;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.template.BlockColoredCube;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.template.BlockStaticCube;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.template.Column3Rot;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.template.Model4Rot;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadProvider;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class VanillaModels {
|
||||
|
||||
private static boolean init = false;
|
||||
|
||||
public static final BlockStaticCube STONE = new BlockStaticCube("stone");
|
||||
public static final BlockStaticCube GLASS = new BlockStaticCube("glass");
|
||||
|
||||
public static BlockColoredCube OAK_LEAVES;
|
||||
public static BlockColoredCube SPRUCE_LEAVES;
|
||||
public static BlockColoredCube BIRCH_LEAVES;
|
||||
public static BlockColoredCube JUNGLE_LEAVES;
|
||||
public static QuadProvider OLD_LEAF = new QuadProvider() {
|
||||
@Override
|
||||
public int getColor(IBlockAccess world, IBlockPos pos, Block block, int meta, Random random) {
|
||||
return QuadProvider.getDefaultColor(world, pos, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QuadView> getQuads(IBlockAccess world, IBlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, Supplier<QuadView> quadPool) {
|
||||
return (switch (meta % 4) {
|
||||
case 0 -> OAK_LEAVES;
|
||||
case 1 -> SPRUCE_LEAVES;
|
||||
case 2 -> BIRCH_LEAVES;
|
||||
case 3 -> JUNGLE_LEAVES;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
};
|
||||
|
||||
public static BlockColoredCube ACACIA_LEAVES;
|
||||
public static BlockColoredCube DARK_OAK_LEAVES;
|
||||
public static QuadProvider NEW_LEAF = new QuadProvider() {
|
||||
@Override
|
||||
public int getColor(IBlockAccess world, IBlockPos pos, Block block, int meta, Random random) {
|
||||
return QuadProvider.getDefaultColor(world, pos, block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QuadView> getQuads(IBlockAccess world, IBlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, Supplier<QuadView> quadPool) {
|
||||
return (switch (meta % 2) {
|
||||
case 0 -> ACACIA_LEAVES;
|
||||
case 1 -> DARK_OAK_LEAVES;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
};
|
||||
|
||||
public static Column3Rot OAK_LOG;
|
||||
public static Column3Rot SPRUCE_LOG;
|
||||
public static Column3Rot BIRCH_LOG;
|
||||
public static Column3Rot JUNGLE_LOG;
|
||||
public static BlockStaticCube OAK_WOOD;
|
||||
public static BlockStaticCube BIRCH_WOOD;
|
||||
public static BlockStaticCube SPRUCE_WOOD;
|
||||
public static BlockStaticCube JUNGLE_WOOD;
|
||||
public static QuadProvider OLD_LOG = new QuadProvider() {
|
||||
@Override
|
||||
public List<QuadView> getQuads(IBlockAccess world, IBlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, Supplier<QuadView> quadPool) {
|
||||
|
||||
if (meta > 11) {
|
||||
return (switch (meta) {
|
||||
case 12 -> OAK_WOOD;
|
||||
case 13 -> SPRUCE_WOOD;
|
||||
case 14 -> BIRCH_WOOD;
|
||||
case 15 -> JUNGLE_WOOD;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
|
||||
Column3Rot ret = switch (meta % 4) {
|
||||
case 0 -> OAK_LOG;
|
||||
case 1 -> SPRUCE_LOG;
|
||||
case 2 -> BIRCH_LOG;
|
||||
case 3 -> JUNGLE_LOG;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
};
|
||||
|
||||
return (switch (meta / 4) {
|
||||
case 0 -> ret.updown();
|
||||
case 1 -> ret.eastwest();
|
||||
case 2 -> ret.northsouth();
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
};
|
||||
|
||||
public static Column3Rot ACACIA_LOG;
|
||||
public static Column3Rot DARK_OAK_LOG;
|
||||
public static BlockStaticCube ACACIA_WOOD;
|
||||
public static BlockStaticCube DARK_OAK_WOOD;
|
||||
public static QuadProvider NEW_LOG = new QuadProvider() {
|
||||
@Override
|
||||
public List<QuadView> getQuads(IBlockAccess world, IBlockPos pos, Block block, int meta, ForgeDirection dir, Random random, int color, Supplier<QuadView> quadPool) {
|
||||
|
||||
if (meta > 11) {
|
||||
return (switch (meta) {
|
||||
case 12 -> ACACIA_WOOD;
|
||||
case 13 -> DARK_OAK_WOOD;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
|
||||
Column3Rot ret = switch (meta % 4) {
|
||||
case 0 -> ACACIA_LOG;
|
||||
case 1 -> DARK_OAK_LOG;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
};
|
||||
|
||||
return (switch (meta / 4) {
|
||||
case 0 -> ret.updown();
|
||||
case 1 -> ret.eastwest();
|
||||
case 2 -> ret.northsouth();
|
||||
default -> throw new IllegalStateException("Unexpected value: " + meta);
|
||||
}).getQuads(world, pos, block, meta, dir, random, color, quadPool);
|
||||
}
|
||||
};
|
||||
|
||||
public static final Variant workbench = new Variant(
|
||||
new ModelLocation("block/crafting_table"),
|
||||
0,
|
||||
0,
|
||||
true
|
||||
);
|
||||
public static QuadProvider WORKBENCH;
|
||||
|
||||
public static Model4Rot LECTERN;
|
||||
|
||||
public static void init() {
|
||||
|
||||
if (init) {
|
||||
throw new RuntimeException("Vanilla models were baked twice!");
|
||||
}
|
||||
|
||||
if (AngelicaConfig.injectQPRendering) {
|
||||
|
||||
ACACIA_LEAVES = new BlockColoredCube("leaves_acacia");
|
||||
BIRCH_LEAVES = new BlockColoredCube("leaves_birch");
|
||||
DARK_OAK_LEAVES = new BlockColoredCube("leaves_big_oak");
|
||||
JUNGLE_LEAVES = new BlockColoredCube("leaves_jungle");
|
||||
OAK_LEAVES = new BlockColoredCube("leaves_oak");
|
||||
SPRUCE_LEAVES = new BlockColoredCube("leaves_spruce");
|
||||
|
||||
ACACIA_LOG = new Column3Rot(new ModelLocation("block/acacia_log"));
|
||||
BIRCH_LOG = new Column3Rot(new ModelLocation("block/birch_log"));
|
||||
DARK_OAK_LOG = new Column3Rot(new ModelLocation("block/dark_oak_log"));
|
||||
JUNGLE_LOG = new Column3Rot(new ModelLocation("block/jungle_log"));
|
||||
OAK_LOG = new Column3Rot(new ModelLocation("block/oak_log"));
|
||||
SPRUCE_LOG = new Column3Rot(new ModelLocation("block/spruce_log"));
|
||||
|
||||
ACACIA_WOOD = new BlockStaticCube("log_acacia");
|
||||
BIRCH_WOOD = new BlockStaticCube("log_birch");
|
||||
DARK_OAK_WOOD = new BlockStaticCube("log_big_oak");
|
||||
JUNGLE_WOOD = new BlockStaticCube("log_jungle");
|
||||
OAK_WOOD = new BlockStaticCube("log_oak");
|
||||
SPRUCE_WOOD = new BlockStaticCube("log_spruce");
|
||||
|
||||
ModelLoader.registerModels(VanillaModels::loadModels,
|
||||
workbench);
|
||||
}
|
||||
|
||||
if (AngelicaConfig.enableTestBlocks)
|
||||
LECTERN = new Model4Rot(new ModelLocation("block/lectern"));
|
||||
|
||||
init = true;
|
||||
}
|
||||
|
||||
public static void loadModels() {
|
||||
WORKBENCH = ModelLoader.getModel(workbench);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package com.gtnewhorizons.angelica.proxy;
|
||||
|
||||
import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID;
|
||||
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.gtnewhorizon.gtnhlib.client.model.loading.ModelRegistry;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
|
||||
import com.gtnewhorizons.angelica.compat.ModStatus;
|
||||
@@ -12,15 +14,13 @@ import com.gtnewhorizons.angelica.config.CompatConfig;
|
||||
import com.gtnewhorizons.angelica.debug.F3Direction;
|
||||
import com.gtnewhorizons.angelica.debug.FrametimeGraph;
|
||||
import com.gtnewhorizons.angelica.debug.TPSGraph;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging;
|
||||
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
|
||||
import com.gtnewhorizons.angelica.models.VanillaModels;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
|
||||
import com.gtnewhorizons.angelica.render.CloudRenderer;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
|
||||
import com.gtnewhorizons.angelica.utils.AssetLoader;
|
||||
import com.gtnewhorizons.angelica.zoom.Zoom;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
@@ -76,7 +76,7 @@ public class ClientProxy extends CommonProxy {
|
||||
FMLCommonHandler.instance().bus().register(this);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
|
||||
AssetLoader.load();
|
||||
ModelRegistry.registerModid(MOD_ID);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -139,8 +139,6 @@ public class ClientProxy extends CommonProxy {
|
||||
glsmKeyBinding = new KeyBinding("Print GLSM Debug", Keyboard.KEY_NONE, "Angelica");
|
||||
ClientRegistry.registerKeyBinding(glsmKeyBinding);
|
||||
|
||||
VanillaModels.init();
|
||||
|
||||
if (ModStatus.isBetterCrashesLoaded) {
|
||||
BetterCrashesCompat.init();
|
||||
}
|
||||
|
||||
@@ -27,21 +27,18 @@ package com.gtnewhorizons.angelica.rendering;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vbo.VertexBuffer;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import it.unimi.dsi.fastutil.HashCommon;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
|
||||
import java.nio.ByteBuffer;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemRenderListManager {
|
||||
// Least used element is at position 0. This is in theory slightly faster.
|
||||
private static final Object2ObjectLinkedOpenHashMap<ItemProp, CachedVBO> vboCache = new Object2ObjectLinkedOpenHashMap<>(64);
|
||||
@@ -100,7 +97,7 @@ public class ItemRenderListManager {
|
||||
}
|
||||
|
||||
public static void post(CapturingTessellator tessellator, VertexBuffer vbo) {
|
||||
final List<QuadView> quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
final var quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
final int size = quads.size();
|
||||
|
||||
final int needed = (DefaultVertexFormat.POSITION_TEXTURE_NORMAL.getVertexSize() * size) << 2;
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.utils;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import glowredman.txloader.Asset;
|
||||
import glowredman.txloader.TXLoaderCore;
|
||||
|
||||
public class AssetLoader {
|
||||
|
||||
// Texture paths from modern, starting with "minecraft/textures/"
|
||||
public static final String[] injectTexs = {
|
||||
"block/stone",
|
||||
"block/crafting_table_front",
|
||||
"block/crafting_table_side",
|
||||
"block/crafting_table_top",
|
||||
"block/oak_planks",
|
||||
"block/acacia_log_top",
|
||||
"block/acacia_log",
|
||||
"block/birch_log_top",
|
||||
"block/birch_log",
|
||||
"block/dark_oak_log_top",
|
||||
"block/dark_oak_log",
|
||||
"block/jungle_log_top",
|
||||
"block/jungle_log",
|
||||
"block/oak_log_top",
|
||||
"block/oak_log",
|
||||
"block/spruce_log_top",
|
||||
"block/spruce_log"
|
||||
};
|
||||
|
||||
// Any equivalents from 7.10, starting with "minecraft/"
|
||||
// This can't be automatic because some of them are inconsistent
|
||||
public static final String[] oldInjectTexs = {
|
||||
"blocks/stone",
|
||||
"blocks/crafting_table_front",
|
||||
"blocks/crafting_table_side",
|
||||
"blocks/crafting_table_top",
|
||||
"blocks/planks_oak",
|
||||
"blocks/log_acacia_top",
|
||||
"blocks/log_acacia",
|
||||
"blocks/log_birch_top",
|
||||
"blocks/log_birch",
|
||||
"blocks/log_big_oak_top",
|
||||
"blocks/log_big_oak",
|
||||
"blocks/log_jungle_top",
|
||||
"blocks/log_jungle",
|
||||
"blocks/log_oak_top",
|
||||
"blocks/log_oak",
|
||||
"blocks/log_spruce_top",
|
||||
"blocks/log_spruce"
|
||||
};
|
||||
|
||||
public static final String[] testTexs = {
|
||||
"block/lectern_base",
|
||||
"block/lectern_front",
|
||||
"block/lectern_base",
|
||||
"block/lectern_sides",
|
||||
"block/lectern_top",
|
||||
"block/oak_planks"
|
||||
};
|
||||
|
||||
public static void load() {
|
||||
|
||||
if (AngelicaConfig.injectQPRendering || AngelicaConfig.enableTestBlocks) {
|
||||
addModelAssets(
|
||||
"block/block",
|
||||
"block/cube",
|
||||
"block/cube_all",
|
||||
"block/cube_column"
|
||||
);
|
||||
}
|
||||
|
||||
// For textures, we first clone old assets to their locations in modern, then copy any modern textures we don't
|
||||
// have equivalents for (only the lectern rn). Models are always downloaded, 7.10 doesn't have any.
|
||||
if (AngelicaConfig.injectQPRendering) {
|
||||
addModelAssets(
|
||||
"block/stone",
|
||||
"block/crafting_table",
|
||||
"block/acacia_log",
|
||||
"block/birch_log",
|
||||
"block/dark_oak_log",
|
||||
"block/jungle_log",
|
||||
"block/oak_log",
|
||||
"block/spruce_log");
|
||||
addTexAssets(oldInjectTexs, injectTexs, "1.7.10");
|
||||
}
|
||||
|
||||
if (AngelicaConfig.enableTestBlocks) {
|
||||
addModelAssets("block/lectern");
|
||||
addTexAssets(testTexs, testTexs, "1.20.4");
|
||||
}
|
||||
}
|
||||
|
||||
private static void addModelAssets(String... resourcePaths) {
|
||||
for (String path : resourcePaths) {
|
||||
TXLoaderCore.getAssetBuilder("minecraft/models/" + path + ".json")
|
||||
.setVersion("1.20.4")
|
||||
.setSource(Asset.Source.CLIENT)
|
||||
.add();
|
||||
}
|
||||
}
|
||||
|
||||
private static void addTexAssets(String[] resourcePaths, String[] destPaths, String version) {
|
||||
for (int i = 0; i < resourcePaths.length; ++i) {
|
||||
TXLoaderCore.getAssetBuilder("minecraft/textures/" + resourcePaths[i] + ".png")
|
||||
.setOverride("minecraft/textures/blocks/" + destPaths[i] + ".png")
|
||||
.setVersion(version)
|
||||
.setSource(Asset.Source.CLIENT)
|
||||
.add();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.utils;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ObjectPooler<T> {
|
||||
private final Supplier<T> instanceSupplier;
|
||||
private final ArrayList<T> availableInstances;
|
||||
|
||||
public ObjectPooler(Supplier<T> instanceSupplier) {
|
||||
this.instanceSupplier = instanceSupplier;
|
||||
this.availableInstances = new ArrayList<>();
|
||||
}
|
||||
|
||||
public T getInstance() {
|
||||
if(this.availableInstances.isEmpty()) {
|
||||
return this.instanceSupplier.get();
|
||||
}
|
||||
return this.availableInstances.remove(this.availableInstances.size() - 1);
|
||||
}
|
||||
|
||||
public void releaseInstance(T instance) {
|
||||
this.availableInstances.add(instance);
|
||||
}
|
||||
}
|
||||
@@ -39,8 +39,10 @@ public class Zoom {
|
||||
}
|
||||
|
||||
private static void resetMouseFilters(Minecraft mc) {
|
||||
((IMouseFilterExt) mc.entityRenderer.mouseFilterXAxis).angelica$reset();
|
||||
((IMouseFilterExt) mc.entityRenderer.mouseFilterYAxis).angelica$reset();
|
||||
if (mc.entityRenderer != null) {
|
||||
((IMouseFilterExt) mc.entityRenderer.mouseFilterXAxis).angelica$reset();
|
||||
((IMouseFilterExt) mc.entityRenderer.mouseFilterYAxis).angelica$reset();
|
||||
}
|
||||
}
|
||||
|
||||
public static void resetZoom() {
|
||||
|
||||
@@ -74,7 +74,7 @@ public class MipmapHelper {
|
||||
int mipmaps = useMipmapsForTexture(textureName) ? getMipmapLevels(width, height, 1) : 0;
|
||||
logger.finer("setupTexture(%s) %dx%d %d mipmaps", textureName, width, height, mipmaps);
|
||||
int magFilter = blur ? GL11.GL_LINEAR : GL11.GL_NEAREST;
|
||||
int minFilter = mipmaps > 0 ? GL11.GL_NEAREST_MIPMAP_LINEAR : magFilter;
|
||||
int minFilter = mipmaps > 0 ? GL11.GL_LINEAR_MIPMAP_LINEAR : magFilter;
|
||||
int wrap = clamp ? GL11.GL_CLAMP : GL11.GL_REPEAT;
|
||||
if (mipmaps > 0) {
|
||||
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, mipmaps);
|
||||
|
||||
@@ -311,20 +311,18 @@ public class TexturePackAPI {
|
||||
public static void flushUnusedTextures() {
|
||||
TextureManager textureManager = Minecraft.getMinecraft().getTextureManager();
|
||||
if (textureManager != null) {
|
||||
Set<ResourceLocation> texturesToUnload = new HashSet<>();
|
||||
@SuppressWarnings("unchecked")
|
||||
Set<Map.Entry<ResourceLocation, ITextureObject>> entrySet = textureManager.mapTextureObjects.entrySet();
|
||||
for (Map.Entry<ResourceLocation, ITextureObject> entry : entrySet) {
|
||||
ResourceLocation resource = entry.getKey();
|
||||
Map.Entry<ResourceLocation, ITextureObject>[] arr = (Map.Entry<ResourceLocation, ITextureObject>[])
|
||||
textureManager.mapTextureObjects.entrySet().toArray(new Map.Entry[0]);
|
||||
for (Map.Entry<ResourceLocation, ITextureObject> entry : arr) {
|
||||
ITextureObject texture = entry.getValue();
|
||||
if (texture instanceof SimpleTexture && !(texture instanceof ThreadDownloadImageData)
|
||||
&& !TexturePackAPI.hasResource(resource)) {
|
||||
texturesToUnload.add(resource);
|
||||
if (texture instanceof SimpleTexture && !(texture instanceof ThreadDownloadImageData)) {
|
||||
ResourceLocation resource = entry.getKey();
|
||||
if (!TexturePackAPI.hasResource(resource)) {
|
||||
unloadTexture(resource);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (ResourceLocation resource : texturesToUnload) {
|
||||
unloadTexture(resource);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,6 +60,7 @@ public enum Settings {
|
||||
DynamicLights.ShaderForce = (boolean) this.option.getStore();
|
||||
}
|
||||
},
|
||||
HORIZON_DISABLE(new NotFineOptionTickBox(true, OptionImpact.LOW)),
|
||||
FOG_DISABLE(new NotFineOptionTickBox(false, OptionImpact.LOW)),
|
||||
FOG_NEAR_DISTANCE(new NotFineOptionSliderPercentage(75, 1, 100, 1, OptionImpact.LOW)),
|
||||
GUI_BACKGROUND(new NotFineOptionCycling<>(BackgroundSelect.DEFAULT, null)) {
|
||||
|
||||
@@ -213,6 +213,7 @@ public class NotFineGameOptionPages {
|
||||
.add(Settings.MODE_CLOUD_TRANSLUCENCY.option)
|
||||
.add(Settings.MODE_STARS.option)
|
||||
.add(Settings.TOTAL_STARS.option)
|
||||
.add(Settings.HORIZON_DISABLE.option)
|
||||
.add(Settings.FOG_DISABLE.option)
|
||||
.add(Settings.FOG_NEAR_DISTANCE.option)
|
||||
.build());
|
||||
|
||||
@@ -16,7 +16,8 @@ public abstract class Type {
|
||||
public static final Primitive[] AllPrimitives = {Type.Boolean, Type.Int, Type.Float};
|
||||
|
||||
public static UniformType convert(Type type) {
|
||||
if (type == Type.Int || type == Type.Boolean) return UniformType.INT;
|
||||
if (type == Type.Int) return UniformType.INT;
|
||||
else if (type == Type.Boolean) return UniformType.INT;
|
||||
else if (type == Type.Float) return UniformType.FLOAT;
|
||||
else if (type == VectorType.VEC2) return UniformType.VEC2;
|
||||
else if (type == VectorType.VEC3) return UniformType.VEC3;
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import java.util.function.Consumer;
|
||||
|
||||
public class ScrollBarComponent extends AbstractWidget {
|
||||
|
||||
protected static final int SCROLL_OFFSET = 6;
|
||||
protected static final int SCROLL_OFFSET = 15;
|
||||
|
||||
protected final Dim2i dim;
|
||||
|
||||
|
||||
@@ -89,6 +89,7 @@ public class SodiumGameOptionPages {
|
||||
.add(Settings.MODE_CLOUD_TRANSLUCENCY.option)
|
||||
.add(Settings.MODE_STARS.option)
|
||||
.add(Settings.TOTAL_STARS.option)
|
||||
.add(Settings.HORIZON_DISABLE.option)
|
||||
.add(Settings.FOG_DISABLE.option)
|
||||
.add(Settings.FOG_NEAR_DISTANCE.option)
|
||||
.add(Settings.VOID_FOG.option);
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package me.jellysquid.mods.sodium.client.model.light;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
* Light pipelines allow model quads for any location in the world to be lit using various backends, including fluids
|
||||
@@ -18,5 +18,5 @@ public interface LightPipeline {
|
||||
* @param face The pre-computed facing vector of the quad
|
||||
* @param shade True if the block is shaded by ambient occlusion
|
||||
*/
|
||||
void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ForgeDirection cullFace, ForgeDirection face, boolean shade);
|
||||
void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ModelQuadFacing cullFace, ModelQuadFacing face, boolean shade);
|
||||
}
|
||||
+6
-6
@@ -1,11 +1,11 @@
|
||||
package me.jellysquid.mods.sodium.client.model.light.data;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
|
||||
import me.jellysquid.mods.sodium.client.util.StateUtil;
|
||||
import me.jellysquid.mods.sodium.client.world.WorldSlice;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
* The light data cache is used to make accessing the light data and occlusion properties of blocks cheaper. The data
|
||||
@@ -26,15 +26,15 @@ public abstract class LightDataAccess {
|
||||
public static final ThreadLocal<BlockPos> DynamicLightsPos = ThreadLocal.withInitial(BlockPos::new);
|
||||
protected WorldSlice world;
|
||||
|
||||
public long get(int x, int y, int z, ForgeDirection d1, ForgeDirection d2) {
|
||||
return this.get(x + d1.offsetX + d2.offsetX, y + d1.offsetY + d2.offsetY, z + d1.offsetZ + d2.offsetZ);
|
||||
public long get(int x, int y, int z, ModelQuadFacing d1, ModelQuadFacing d2) {
|
||||
return this.get(x + d1.getStepX() + d2.getStepX(), y + d1.getStepY() + d2.getStepY(), z + d1.getStepZ() + d2.getStepZ());
|
||||
}
|
||||
|
||||
public long get(int x, int y, int z, ForgeDirection dir) {
|
||||
return this.get(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
|
||||
public long get(int x, int y, int z, ModelQuadFacing dir) {
|
||||
return this.get(x + dir.getStepX(), y + dir.getStepY(), z + dir.getStepZ());
|
||||
}
|
||||
|
||||
public long get(BlockPos pos, ForgeDirection dir) {
|
||||
public long get(BlockPos pos, ModelQuadFacing dir) {
|
||||
return this.get(pos.x, pos.y, pos.z, dir);
|
||||
}
|
||||
|
||||
|
||||
+6
-6
@@ -1,17 +1,17 @@
|
||||
package me.jellysquid.mods.sodium.client.model.light.flat;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import java.util.Arrays;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* A light pipeline which implements "classic-style" lighting through simply using the light value of the adjacent
|
||||
* block to a face.
|
||||
@@ -27,7 +27,7 @@ public class FlatLightPipeline implements LightPipeline {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ForgeDirection cullFace, ForgeDirection face, boolean shade) {
|
||||
public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ModelQuadFacing cullFace, ModelQuadFacing face, boolean shade) {
|
||||
int lightmap;
|
||||
|
||||
// To match vanilla behavior, use the cull face if it exists/is available
|
||||
@@ -57,7 +57,7 @@ public class FlatLightPipeline implements LightPipeline {
|
||||
* behind tinted glass. {@link LightDataAccess} cannot efficiently store lightmaps computed with
|
||||
* inconsistent values so this method exists to mirror vanilla behavior as closely as possible.
|
||||
*/
|
||||
private int getOffsetLightmap(BlockPos pos, ForgeDirection face) {
|
||||
private int getOffsetLightmap(BlockPos pos, ModelQuadFacing face) {
|
||||
int lightmap = LightDataAccess.getLightMap(this.lightCache.get(pos, face));
|
||||
// If the block light is not 15 (max)...
|
||||
if ((lightmap & 0xF0) != 0xF0) {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package me.jellysquid.mods.sodium.client.model.light.smooth;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import static me.jellysquid.mods.sodium.client.model.light.cache.ArrayLightDataCache.getLightMap;
|
||||
import static me.jellysquid.mods.sodium.client.model.light.cache.ArrayLightDataCache.unpackAO;
|
||||
import static me.jellysquid.mods.sodium.client.model.light.cache.ArrayLightDataCache.unpackFO;
|
||||
import static me.jellysquid.mods.sodium.client.model.light.cache.ArrayLightDataCache.unpackOP;
|
||||
import static me.jellysquid.mods.sodium.client.model.light.cache.ArrayLightDataCache.getLightMap;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
|
||||
|
||||
class AoFaceData {
|
||||
public final int[] lm = new int[4];
|
||||
@@ -18,7 +18,7 @@ class AoFaceData {
|
||||
|
||||
private int flags;
|
||||
|
||||
public void initLightData(LightDataAccess cache, BlockPos pos, ForgeDirection direction, boolean offset) {
|
||||
public void initLightData(LightDataAccess cache, BlockPos pos, ModelQuadFacing direction, boolean offset) {
|
||||
final int x = pos.x;
|
||||
final int y = pos.y;
|
||||
final int z = pos.z;
|
||||
@@ -28,9 +28,9 @@ class AoFaceData {
|
||||
final int adjZ;
|
||||
|
||||
if (offset) {
|
||||
adjX = x + direction.offsetX;
|
||||
adjY = y + direction.offsetY;
|
||||
adjZ = z + direction.offsetZ;
|
||||
adjX = x + direction.getStepX();
|
||||
adjY = y + direction.getStepY();
|
||||
adjZ = z + direction.getStepZ();
|
||||
} else {
|
||||
adjX = x;
|
||||
adjY = y;
|
||||
@@ -50,7 +50,7 @@ class AoFaceData {
|
||||
|
||||
final float caao = unpackAO(adjWord);
|
||||
|
||||
ForgeDirection[] faces = AoNeighborInfo.get(direction).faces;
|
||||
var faces = AoNeighborInfo.get(direction).faces;
|
||||
|
||||
final long e0 = cache.get(adjX, adjY, adjZ, faces[0]);
|
||||
final int e0lm = getLightMap(e0);
|
||||
|
||||
+67
-59
@@ -1,17 +1,25 @@
|
||||
package me.jellysquid.mods.sodium.client.model.light.smooth;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_X;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_Y;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_Z;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_X;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_Y;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_Z;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* The neighbor information for each face of a block, used when performing smooth lighting in order to calculate
|
||||
* the occlusion of each corner.
|
||||
*/
|
||||
enum AoNeighborInfo {
|
||||
DOWN(new ForgeDirection[] { ForgeDirection.WEST, ForgeDirection.EAST, ForgeDirection.NORTH, ForgeDirection.SOUTH }, 0.5F) {
|
||||
EAST(new ModelQuadFacing[] { NEG_Y, POS_Y, NEG_Z, POS_Z }, 0.6F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = z;
|
||||
final float v = 1.0f - x;
|
||||
final float v = 1.0f - y;
|
||||
|
||||
out[0] = v * u;
|
||||
out[1] = v * (1.0f - u);
|
||||
@@ -21,23 +29,23 @@ enum AoNeighborInfo {
|
||||
|
||||
@Override
|
||||
public void mapCorners(int[] lm0, float[] ao0, int[] lm1, float[] ao1) {
|
||||
lm1[0] = lm0[0];
|
||||
lm1[1] = lm0[1];
|
||||
lm1[2] = lm0[2];
|
||||
lm1[3] = lm0[3];
|
||||
lm1[1] = lm0[0];
|
||||
lm1[2] = lm0[1];
|
||||
lm1[3] = lm0[2];
|
||||
lm1[0] = lm0[3];
|
||||
|
||||
ao1[0] = ao0[0];
|
||||
ao1[1] = ao0[1];
|
||||
ao1[2] = ao0[2];
|
||||
ao1[3] = ao0[3];
|
||||
ao1[1] = ao0[0];
|
||||
ao1[2] = ao0[1];
|
||||
ao1[3] = ao0[2];
|
||||
ao1[0] = ao0[3];
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDepth(float x, float y, float z) {
|
||||
return y;
|
||||
return 1.0f - x;
|
||||
}
|
||||
},
|
||||
UP(new ForgeDirection[] { ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.NORTH, ForgeDirection.SOUTH }, 1.0F) {
|
||||
UP(new ModelQuadFacing[] { POS_X, NEG_X, NEG_Z, POS_Z }, 1.0F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = z;
|
||||
@@ -67,37 +75,7 @@ enum AoNeighborInfo {
|
||||
return 1.0f - y;
|
||||
}
|
||||
},
|
||||
NORTH(new ForgeDirection[] { ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.EAST, ForgeDirection.WEST }, 0.8F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = 1.0f - x;
|
||||
final float v = y;
|
||||
|
||||
out[0] = v * u;
|
||||
out[1] = v * (1.0f - u);
|
||||
out[2] = (1.0f - v) * (1.0f - u);
|
||||
out[3] = (1.0f - v) * u;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mapCorners(int[] lm0, float[] ao0, int[] lm1, float[] ao1) {
|
||||
lm1[3] = lm0[0];
|
||||
lm1[0] = lm0[1];
|
||||
lm1[1] = lm0[2];
|
||||
lm1[2] = lm0[3];
|
||||
|
||||
ao1[3] = ao0[0];
|
||||
ao1[0] = ao0[1];
|
||||
ao1[1] = ao0[2];
|
||||
ao1[2] = ao0[3];
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDepth(float x, float y, float z) {
|
||||
return z;
|
||||
}
|
||||
},
|
||||
SOUTH(new ForgeDirection[] { ForgeDirection.WEST, ForgeDirection.EAST, ForgeDirection.DOWN, ForgeDirection.UP }, 0.8F) {
|
||||
SOUTH(new ModelQuadFacing[] { NEG_X, POS_X, NEG_Y, POS_Y }, 0.8F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = y;
|
||||
@@ -127,7 +105,7 @@ enum AoNeighborInfo {
|
||||
return 1.0f - z;
|
||||
}
|
||||
},
|
||||
WEST(new ForgeDirection[] { ForgeDirection.UP, ForgeDirection.DOWN, ForgeDirection.NORTH, ForgeDirection.SOUTH }, 0.6F) {
|
||||
WEST(new ModelQuadFacing[] { POS_Y, NEG_Y, NEG_Z, POS_Z }, 0.6F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = z;
|
||||
@@ -157,11 +135,11 @@ enum AoNeighborInfo {
|
||||
return x;
|
||||
}
|
||||
},
|
||||
EAST(new ForgeDirection[] { ForgeDirection.DOWN, ForgeDirection.UP, ForgeDirection.NORTH, ForgeDirection.SOUTH }, 0.6F) {
|
||||
DOWN(new ModelQuadFacing[] { NEG_X, POS_X, NEG_Z, POS_Z }, 0.5F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = z;
|
||||
final float v = 1.0f - y;
|
||||
final float v = 1.0f - x;
|
||||
|
||||
out[0] = v * u;
|
||||
out[1] = v * (1.0f - u);
|
||||
@@ -171,20 +149,50 @@ enum AoNeighborInfo {
|
||||
|
||||
@Override
|
||||
public void mapCorners(int[] lm0, float[] ao0, int[] lm1, float[] ao1) {
|
||||
lm1[1] = lm0[0];
|
||||
lm1[2] = lm0[1];
|
||||
lm1[3] = lm0[2];
|
||||
lm1[0] = lm0[3];
|
||||
lm1[0] = lm0[0];
|
||||
lm1[1] = lm0[1];
|
||||
lm1[2] = lm0[2];
|
||||
lm1[3] = lm0[3];
|
||||
|
||||
ao1[1] = ao0[0];
|
||||
ao1[2] = ao0[1];
|
||||
ao1[3] = ao0[2];
|
||||
ao1[0] = ao0[3];
|
||||
ao1[0] = ao0[0];
|
||||
ao1[1] = ao0[1];
|
||||
ao1[2] = ao0[2];
|
||||
ao1[3] = ao0[3];
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDepth(float x, float y, float z) {
|
||||
return 1.0f - x;
|
||||
return y;
|
||||
}
|
||||
},
|
||||
NORTH(new ModelQuadFacing[] { POS_Y, NEG_Y, POS_X, NEG_X }, 0.8F) {
|
||||
@Override
|
||||
public void calculateCornerWeights(float x, float y, float z, float[] out) {
|
||||
final float u = 1.0f - x;
|
||||
final float v = y;
|
||||
|
||||
out[0] = v * u;
|
||||
out[1] = v * (1.0f - u);
|
||||
out[2] = (1.0f - v) * (1.0f - u);
|
||||
out[3] = (1.0f - v) * u;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void mapCorners(int[] lm0, float[] ao0, int[] lm1, float[] ao1) {
|
||||
lm1[3] = lm0[0];
|
||||
lm1[0] = lm0[1];
|
||||
lm1[1] = lm0[2];
|
||||
lm1[2] = lm0[3];
|
||||
|
||||
ao1[3] = ao0[0];
|
||||
ao1[0] = ao0[1];
|
||||
ao1[1] = ao0[2];
|
||||
ao1[2] = ao0[3];
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDepth(float x, float y, float z) {
|
||||
return z;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -192,7 +200,7 @@ enum AoNeighborInfo {
|
||||
* The direction of each corner block from this face, which can be retrieved by offsetting the position of the origin
|
||||
* block by the direction vector.
|
||||
*/
|
||||
public final ForgeDirection[] faces;
|
||||
public final ModelQuadFacing[] faces;
|
||||
|
||||
/**
|
||||
* The constant brightness modifier for this face. This data exists to emulate the results of the OpenGL lighting
|
||||
@@ -200,7 +208,7 @@ enum AoNeighborInfo {
|
||||
*/
|
||||
public final float strength;
|
||||
|
||||
AoNeighborInfo(ForgeDirection[] directions, float strength) {
|
||||
AoNeighborInfo(ModelQuadFacing[] directions, float strength) {
|
||||
this.faces = directions;
|
||||
this.strength = strength;
|
||||
}
|
||||
@@ -243,7 +251,7 @@ enum AoNeighborInfo {
|
||||
/**
|
||||
* @return Returns the {@link AoNeighborInfo} which corresponds with the specified direction
|
||||
*/
|
||||
public static AoNeighborInfo get(ForgeDirection direction) {
|
||||
public static AoNeighborInfo get(@NotNull ModelQuadFacing direction) {
|
||||
return VALUES[direction.ordinal()];
|
||||
}
|
||||
}
|
||||
+13
-13
@@ -2,14 +2,14 @@ package me.jellysquid.mods.sodium.client.model.light.smooth;
|
||||
|
||||
import com.google.common.math.DoubleMath;
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
|
||||
/**
|
||||
@@ -71,7 +71,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ForgeDirection cullFace, ForgeDirection face, boolean shade) {
|
||||
public void calculate(ModelQuadView quad, BlockPos pos, QuadLightData out, ModelQuadFacing cullFace, ModelQuadFacing face, boolean shade) {
|
||||
this.updateCachedData(pos.asLong());
|
||||
|
||||
final int flags = quad.getFlags();
|
||||
@@ -107,7 +107,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
* have two contributing sides.
|
||||
* Flags: IS_ALIGNED, !IS_PARTIAL
|
||||
*/
|
||||
private void applyAlignedFullFace(AoNeighborInfo neighborInfo, BlockPos pos, ForgeDirection dir, QuadLightData out) {
|
||||
private void applyAlignedFullFace(AoNeighborInfo neighborInfo, BlockPos pos, ModelQuadFacing dir, QuadLightData out) {
|
||||
final AoFaceData faceData = this.getCachedFaceData(pos, dir, true);
|
||||
neighborInfo.mapCorners(faceData.lm, faceData.ao, out.lm, out.br);
|
||||
}
|
||||
@@ -116,7 +116,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
* Calculates the light data for a grid-aligned quad that does not cover the entire block volume's face.
|
||||
* Flags: IS_ALIGNED, IS_PARTIAL
|
||||
*/
|
||||
private void applyAlignedPartialFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ForgeDirection dir, QuadLightData out) {
|
||||
private void applyAlignedPartialFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ModelQuadFacing dir, QuadLightData out) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
// Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting
|
||||
final float cx = clamp(quad.getX(i));
|
||||
@@ -130,13 +130,13 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is the same as {@link #applyNonParallelFace(AoNeighborInfo, ModelQuadView, BlockPos, ForgeDirection,
|
||||
* This method is the same as {@link #applyNonParallelFace(AoNeighborInfo, ModelQuadView, BlockPos, ModelQuadFacing,
|
||||
* QuadLightData)} but with the check for a depth of approximately 0 removed. If the quad is parallel but not
|
||||
* aligned, all of its vertices will have the same depth and this depth must be approximately greater than 0,
|
||||
* meaning the check for 0 will always return false.
|
||||
* Flags: !IS_ALIGNED, IS_PARALLEL
|
||||
*/
|
||||
private void applyParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ForgeDirection dir, QuadLightData out) {
|
||||
private void applyParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ModelQuadFacing dir, QuadLightData out) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
// Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting
|
||||
final float cx = clamp(quad.getX(i));
|
||||
@@ -163,7 +163,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
/**
|
||||
* Flags: !IS_ALIGNED, !IS_PARALLEL
|
||||
*/
|
||||
private void applyNonParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ForgeDirection dir, QuadLightData out) {
|
||||
private void applyNonParallelFace(AoNeighborInfo neighborInfo, ModelQuadView quad, BlockPos pos, ModelQuadFacing dir, QuadLightData out) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
// Clamp the vertex positions to the block's boundaries to prevent weird errors in lighting
|
||||
final float cx = clamp(quad.getX(i));
|
||||
@@ -188,7 +188,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
}
|
||||
}
|
||||
|
||||
private void applyAlignedPartialFaceVertex(BlockPos pos, ForgeDirection dir, float[] w, int i, QuadLightData out, boolean offset) {
|
||||
private void applyAlignedPartialFaceVertex(BlockPos pos, ModelQuadFacing dir, float[] w, int i, QuadLightData out, boolean offset) {
|
||||
final AoFaceData faceData = this.getCachedFaceData(pos, dir, offset);
|
||||
|
||||
if (!faceData.hasUnpackedLightData()) {
|
||||
@@ -203,7 +203,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
out.lm[i] = getLightMapCoord(sl, bl);
|
||||
}
|
||||
|
||||
private void applyInsetPartialFaceVertex(BlockPos pos, ForgeDirection dir, float n1d, float n2d, float[] w, int i, QuadLightData out) {
|
||||
private void applyInsetPartialFaceVertex(BlockPos pos, ModelQuadFacing dir, float n1d, float n2d, float[] w, int i, QuadLightData out) {
|
||||
final AoFaceData n1 = this.getCachedFaceData(pos, dir, false);
|
||||
|
||||
if (!n1.hasUnpackedLightData()) {
|
||||
@@ -225,7 +225,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
out.lm[i] = getLightMapCoord(sl, bl);
|
||||
}
|
||||
|
||||
private void applySidedBrightness(QuadLightData out, ForgeDirection face, boolean shade) {
|
||||
private void applySidedBrightness(QuadLightData out, ModelQuadFacing face, boolean shade) {
|
||||
if(AngelicaConfig.enableIris && BlockRenderingSettings.INSTANCE.shouldDisableDirectionalShading()) {
|
||||
return;
|
||||
}
|
||||
@@ -241,7 +241,7 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
/**
|
||||
* Returns the cached data for a given facing or calculates it if it hasn't been cached.
|
||||
*/
|
||||
private AoFaceData getCachedFaceData(BlockPos pos, ForgeDirection face, boolean offset) {
|
||||
private AoFaceData getCachedFaceData(BlockPos pos, ModelQuadFacing face, boolean offset) {
|
||||
|
||||
final AoFaceData data = this.cachedFaceData[offset ? face.ordinal() : face.ordinal() + 6];
|
||||
|
||||
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
package me.jellysquid.mods.sodium.client.model.vertex.formats.glyph.writer;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorABGR;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.fallback.VertexWriterFallback;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.glyph.GlyphVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
|
||||
public class GlyphVertexWriterFallback extends VertexWriterFallback implements GlyphVertexSink {
|
||||
|
||||
-27
@@ -3,35 +3,8 @@ package me.jellysquid.mods.sodium.client.model.vertex.formats.line;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.VertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
public interface LineVertexSink extends VertexSink {
|
||||
VertexFormat VERTEX_FORMAT = DefaultVertexFormat.POSITION_COLOR;
|
||||
|
||||
/**
|
||||
* Writes a line vertex to the sink.
|
||||
*
|
||||
* @param x The x-position of the vertex
|
||||
* @param y The y-position of the vertex
|
||||
* @param z The z-position of the vertex
|
||||
* @param color The ABGR-packed color of the vertex
|
||||
*/
|
||||
void vertexLine(float x, float y, float z, int color);
|
||||
|
||||
/**
|
||||
* Writes a line vertex to the sink using unpacked normalized colors. This is slower than
|
||||
* {@link LineVertexSink#vertexLine(float, float, float, int)} as it needs to pack the colors
|
||||
* each call.
|
||||
*
|
||||
* @param x The x-position of the vertex
|
||||
* @param y The y-position of the vertex
|
||||
* @param z The z-position of the vertex
|
||||
* @param r The normalized red component of the vertex's color
|
||||
* @param g The normalized green component of the vertex's color
|
||||
* @param b The normalized blue component of the vertex's color
|
||||
* @param a The normalized alpha component of the vertex's color
|
||||
*/
|
||||
default void vertexLine(float x, float y, float z, float r, float g, float b, float a) {
|
||||
this.vertexLine(x, y, z, ColorABGR.pack(r, g, b, a));
|
||||
}
|
||||
}
|
||||
-14
@@ -5,23 +5,9 @@ import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferView;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferWriterNio;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.line.LineVertexSink;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class LineVertexBufferWriterNio extends VertexBufferWriterNio implements LineVertexSink {
|
||||
public LineVertexBufferWriterNio(VertexBufferView backingBuffer) {
|
||||
super(backingBuffer, VanillaVertexTypes.LINES);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void vertexLine(float x, float y, float z, int color) {
|
||||
int i = this.writeOffset;
|
||||
|
||||
ByteBuffer buffer = this.byteBuffer;
|
||||
buffer.putFloat(i, x);
|
||||
buffer.putFloat(i + 4, y);
|
||||
buffer.putFloat(i + 8, z);
|
||||
buffer.putInt(i + 12, color);
|
||||
|
||||
this.advance();
|
||||
}
|
||||
}
|
||||
-13
@@ -1,7 +1,5 @@
|
||||
package me.jellysquid.mods.sodium.client.model.vertex.formats.line.writer;
|
||||
|
||||
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.VanillaVertexTypes;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferView;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferWriterUnsafe;
|
||||
@@ -12,15 +10,4 @@ public class LineVertexBufferWriterUnsafe extends VertexBufferWriterUnsafe imple
|
||||
super(backingBuffer, VanillaVertexTypes.LINES);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void vertexLine(float x, float y, float z, int color) {
|
||||
long i = this.writePointer;
|
||||
|
||||
memPutFloat(i, x);
|
||||
memPutFloat(i + 4, y);
|
||||
memPutFloat(i + 8, z);
|
||||
memPutInt(i + 12, color);
|
||||
|
||||
this.advance();
|
||||
}
|
||||
}
|
||||
-8
@@ -3,7 +3,6 @@ package me.jellysquid.mods.sodium.client.model.vertex.formats.line.writer;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.fallback.VertexWriterFallback;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.line.LineVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
|
||||
public class LineVertexWriterFallback extends VertexWriterFallback implements LineVertexSink {
|
||||
@@ -11,11 +10,4 @@ public class LineVertexWriterFallback extends VertexWriterFallback implements Li
|
||||
super(consumer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void vertexLine(float x, float y, float z, int color) {
|
||||
VertexConsumer consumer = this.consumer;
|
||||
consumer.vertex(x, y, z);
|
||||
consumer.color(ColorABGR.unpackRed(color), ColorABGR.unpackGreen(color), ColorABGR.unpackBlue(color), ColorABGR.unpackAlpha(color));
|
||||
consumer.next();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
package me.jellysquid.mods.sodium.client.model.vertex.formats.particle.writer;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorABGR;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.fallback.VertexWriterFallback;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.particle.ParticleVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
|
||||
public class ParticleVertexWriterFallback extends VertexWriterFallback implements ParticleVertexSink {
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.model.vertex.formats.quad.writer;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorABGR;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.NormI8;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.fallback.VertexWriterFallback;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.quad.QuadVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.Norm3b;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
|
||||
public class QuadVertexWriterFallback extends VertexWriterFallback implements QuadVertexSink {
|
||||
@@ -20,7 +20,7 @@ public class QuadVertexWriterFallback extends VertexWriterFallback implements Qu
|
||||
consumer.texture(u, v);
|
||||
consumer.overlay(overlay);
|
||||
consumer.light(light);
|
||||
consumer.normal(Norm3b.unpackX(normal), Norm3b.unpackY(normal), Norm3b.unpackZ(normal));
|
||||
consumer.normal(NormI8.unpackX(normal), NormI8.unpackY(normal), NormI8.unpackZ(normal));
|
||||
consumer.next();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,9 +1,9 @@
|
||||
package me.jellysquid.mods.sodium.client.model.vertex.formats.screen_quad.writer;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorABGR;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.fallback.VertexWriterFallback;
|
||||
import me.jellysquid.mods.sodium.client.model.vertex.formats.screen_quad.BasicScreenQuadVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
|
||||
|
||||
public class BasicScreenQuadVertexWriterFallback extends VertexWriterFallback implements BasicScreenQuadVertexSink {
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.DirectionUtil;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.HORIZONTAL_DIRECTIONS;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_X;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_Z;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_X;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_Z;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class ChunkRenderColumn<T extends ChunkGraphicsState> {
|
||||
@@ -48,7 +53,7 @@ public class ChunkRenderColumn<T extends ChunkGraphicsState> {
|
||||
}
|
||||
|
||||
public boolean areNeighborsPresent() {
|
||||
for (ForgeDirection dir : DirectionUtil.HORIZONTAL_DIRECTIONS) {
|
||||
for (var dir : HORIZONTAL_DIRECTIONS) {
|
||||
ChunkRenderColumn<T> adj = this.adjacent[dir.ordinal()];
|
||||
|
||||
if (adj == null) {
|
||||
@@ -58,13 +63,13 @@ public class ChunkRenderColumn<T extends ChunkGraphicsState> {
|
||||
ForgeDirection corner;
|
||||
|
||||
// Access the adjacent corner chunk from the neighbor in this direction
|
||||
if (dir == ForgeDirection.NORTH) {
|
||||
if (dir == NEG_Z) {
|
||||
corner = ForgeDirection.EAST;
|
||||
} else if (dir == ForgeDirection.SOUTH) {
|
||||
} else if (dir == POS_Z) {
|
||||
corner = ForgeDirection.WEST;
|
||||
} else if (dir == ForgeDirection.WEST) {
|
||||
} else if (dir == NEG_X) {
|
||||
corner = ForgeDirection.NORTH;
|
||||
} else if (dir == ForgeDirection.EAST) {
|
||||
} else if (dir == POS_X) {
|
||||
corner = ForgeDirection.SOUTH;
|
||||
} else {
|
||||
continue;
|
||||
|
||||
+9
-10
@@ -1,9 +1,17 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import lombok.Setter;
|
||||
import me.jellysquid.mods.sodium.client.gl.arena.GlBufferArena;
|
||||
import me.jellysquid.mods.sodium.client.gl.arena.GlBufferSegment;
|
||||
@@ -42,15 +50,6 @@ import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.Util;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* Shader-based chunk renderer which makes use of a custom memory allocator on top of large buffer objects to allow
|
||||
* for draw call batching without buffer switching.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.gl.arena.GlBufferSegment;
|
||||
import me.jellysquid.mods.sodium.client.gl.attribute.GlVertexFormat;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.CommandList;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.backends.oneshot;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import me.jellysquid.mods.sodium.client.gl.attribute.GlVertexAttributeBinding;
|
||||
import me.jellysquid.mods.sodium.client.gl.attribute.GlVertexFormat;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.backends.oneshot;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.CommandList;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.DrawCommandList;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
|
||||
|
||||
+3
-4
@@ -1,8 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.compile;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntMap;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Map;
|
||||
import lombok.Getter;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.gl.buffer.VertexData;
|
||||
@@ -24,9 +26,6 @@ import net.coderbot.iris.sodium.block_context.ContextAwareVertexWriter;
|
||||
import net.minecraft.block.Block;
|
||||
import org.lwjgl.BufferUtils;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* A collection of temporary buffers for each worker thread which will be used to build chunk meshes for given render
|
||||
* passes. This makes a best-effort attempt to pick a suitable size for each scratch buffer, but will never try to
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.compile.buffers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.compile.buffers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.compile.buffers;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
|
||||
|
||||
|
||||
+7
-7
@@ -1,14 +1,14 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.cull;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
|
||||
public class ChunkFaceFlags {
|
||||
public static final int UP = of(ModelQuadFacing.UP);
|
||||
public static final int DOWN = of(ModelQuadFacing.DOWN);
|
||||
public static final int WEST = of(ModelQuadFacing.WEST);
|
||||
public static final int EAST = of(ModelQuadFacing.EAST);
|
||||
public static final int NORTH = of(ModelQuadFacing.NORTH);
|
||||
public static final int SOUTH = of(ModelQuadFacing.SOUTH);
|
||||
public static final int UP = of(ModelQuadFacing.POS_Y);
|
||||
public static final int DOWN = of(ModelQuadFacing.NEG_Y);
|
||||
public static final int WEST = of(ModelQuadFacing.NEG_X);
|
||||
public static final int EAST = of(ModelQuadFacing.POS_X);
|
||||
public static final int NORTH = of(ModelQuadFacing.NEG_Z);
|
||||
public static final int SOUTH = of(ModelQuadFacing.POS_Z);
|
||||
public static final int UNASSIGNED = of(ModelQuadFacing.UNASSIGNED);
|
||||
|
||||
public static final int ALL = all();
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.data;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.gl.buffer.VertexData;
|
||||
import me.jellysquid.mods.sodium.client.gl.util.BufferSlice;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import me.jellysquid.mods.sodium.client.gl.buffer.VertexData;
|
||||
import me.jellysquid.mods.sodium.client.gl.util.BufferSlice;
|
||||
|
||||
public class ChunkMeshData {
|
||||
public static final ChunkMeshData EMPTY = new ChunkMeshData();
|
||||
|
||||
+7
-8
@@ -1,17 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.data;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionData;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ISpriteExt;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
|
||||
import lombok.Getter;
|
||||
import me.jellysquid.mods.sodium.client.gl.util.BufferSlice;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.EnumMap;
|
||||
@@ -19,6 +12,12 @@ import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import lombok.Getter;
|
||||
import me.jellysquid.mods.sodium.client.gl.util.BufferSlice;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
* The render data for a chunk render container containing all the information about which meshes are attached, the
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.region;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import me.jellysquid.mods.sodium.client.gl.arena.GlBufferArena;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.CommandList;
|
||||
|
||||
+5
-6
@@ -1,7 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.tasks;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.WorldUtil;
|
||||
import com.gtnewhorizons.angelica.compat.ModStatus;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionDataBuilder;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
|
||||
@@ -11,6 +10,9 @@ import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
|
||||
import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils;
|
||||
import it.unimi.dsi.fastutil.longs.LongArrayFIFOQueue;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderContainer;
|
||||
@@ -21,6 +23,7 @@ import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkMeshData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderBounds;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import me.jellysquid.mods.sodium.client.render.pipeline.WorldUtil;
|
||||
import me.jellysquid.mods.sodium.client.render.pipeline.context.ChunkRenderCacheLocal;
|
||||
import me.jellysquid.mods.sodium.client.util.MathUtil;
|
||||
import me.jellysquid.mods.sodium.client.util.task.CancellationSource;
|
||||
@@ -40,10 +43,6 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
/**
|
||||
* Rebuilds all the meshes of a chunk for each given render pass with non-occluded blocks. The result is then uploaded
|
||||
* to graphics memory on the main thread.
|
||||
@@ -186,7 +185,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(fluid.getBlock(), ExtendedDataHelper.FLUID_RENDER_TYPE);
|
||||
|
||||
cache.getBlockRenderer().renderFluidLogged(fluid, renderBlocks, pos, buffers.get(pass), seed);
|
||||
cache.getBlockRenderer().renderFluidLogged(cache.getWorldSlice(), fluid, renderBlocks, pos, buffers.get(pass), seed);
|
||||
}
|
||||
}
|
||||
if (canRenderInPass(block, pass) && !shouldUseSodiumFluidRendering(block)) {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.tasks;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import me.jellysquid.mods.sodium.client.gl.buffer.VertexData;
|
||||
import me.jellysquid.mods.sodium.client.gl.util.BufferSlice;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.ChunkGraphicsState;
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.render.occlusion;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class BlockOcclusionCache {
|
||||
private static final byte UNCACHED_VALUE = (byte) 127;
|
||||
@@ -25,12 +25,12 @@ public class BlockOcclusionCache {
|
||||
* @param facing The facing direction of the side to check
|
||||
* @return True if the block side facing {@param dir} is not occluded, otherwise false
|
||||
*/
|
||||
public boolean shouldDrawSide(Block block, int meta, IBlockAccess view, BlockPos pos, ForgeDirection facing) {
|
||||
if (facing == ForgeDirection.UNKNOWN)
|
||||
public boolean shouldDrawSide(Block block, int meta, IBlockAccess view, BlockPos pos, ModelQuadFacing facing) {
|
||||
if (facing == ModelQuadFacing.UNASSIGNED)
|
||||
return true;
|
||||
|
||||
final BlockPos adjPos = this.cpos;
|
||||
adjPos.set(pos.getX() + facing.offsetX, pos.getY() + facing.offsetY, pos.getZ() + facing.offsetZ);
|
||||
adjPos.set(pos.getX() + facing.getStepX(), pos.getY() + facing.getStepY(), pos.getZ() + facing.getStepZ());
|
||||
|
||||
final Block adjState = view.getBlock(adjPos.x, adjPos.y, adjPos.z);
|
||||
|
||||
|
||||
+39
-114
@@ -3,27 +3,23 @@ package me.jellysquid.mods.sodium.client.render.pipeline;
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadProvider;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.QuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadOrientation;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.DirectionUtil;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorMixer;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadViewMutable;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadOrientation;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.util.ModelQuadUtil;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ModeledBlock;
|
||||
import com.gtnewhorizons.angelica.utils.ObjectPooler;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightMode;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipelineProvider;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.Quad;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuffers;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.render.occlusion.BlockOcclusionCache;
|
||||
import me.jellysquid.mods.sodium.client.util.ModelQuadUtil;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
import me.jellysquid.mods.sodium.client.util.rand.XoRoShiRoRandom;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -31,12 +27,8 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockRenderer {
|
||||
private static final BlockPos POS_ZERO = new BlockPos(0, 0, 0);
|
||||
|
||||
@@ -49,10 +41,6 @@ public class BlockRenderer {
|
||||
private boolean useSeparateAo;
|
||||
|
||||
private final LightPipelineProvider lighters;
|
||||
private final BlockOcclusionCache occlusionCache;
|
||||
|
||||
private final ObjectPooler<QuadView> quadPool = new ObjectPooler<>(Quad::new);
|
||||
// TODO: Use modern model API, and store them here
|
||||
|
||||
|
||||
public BlockRenderer(LightPipelineProvider lighters) {
|
||||
@@ -60,10 +48,9 @@ public class BlockRenderer {
|
||||
// TODO: Sodium - AO Setting
|
||||
this.useAmbientOcclusion = Minecraft.getMinecraft().gameSettings.ambientOcclusion > 0;
|
||||
this.useSodiumAO = SodiumClientMod.options().quality.useSodiumAO;
|
||||
this.occlusionCache = new BlockOcclusionCache();
|
||||
}
|
||||
|
||||
public boolean renderFluidLogged(Fluid fluid, RenderBlocks renderBlocks, BlockPos pos, ChunkModelBuffers buffers, long seed) {
|
||||
public boolean renderFluidLogged(IBlockAccess world, Fluid fluid, RenderBlocks renderBlocks, BlockPos pos, ChunkModelBuffers buffers, long seed) {
|
||||
if (fluid == null) {
|
||||
return false;
|
||||
}
|
||||
@@ -73,6 +60,7 @@ public class BlockRenderer {
|
||||
}
|
||||
|
||||
boolean rendered = false;
|
||||
final int emitted = block.getLightValue(world, pos.x, pos.y, pos.z);
|
||||
|
||||
try {
|
||||
final LightMode mode = LightMode.SMOOTH; // TODO: this.getLightingMode(block); is what was previously used. The flat pipeline is busted and was only an optimization for very few blocks.
|
||||
@@ -86,12 +74,12 @@ public class BlockRenderer {
|
||||
tess.setOffset(POS_ZERO);
|
||||
tess.setTranslation(-pos.x, -pos.y, -pos.z);
|
||||
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
|
||||
final List<QuadView> quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
final var quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
tess.resetOffset();
|
||||
|
||||
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
|
||||
this.random.setSeed(seed);
|
||||
this.renderQuadList(pos, lighter, buffers, quads, facing, (this.useAmbientOcclusion && this.useSodiumAO));
|
||||
this.renderQuadList(pos, lighter, emitted, buffers, quads, facing, (this.useAmbientOcclusion && this.useSodiumAO));
|
||||
}
|
||||
|
||||
if (!quads.isEmpty()) rendered = true;
|
||||
@@ -110,60 +98,34 @@ public class BlockRenderer {
|
||||
boolean rendered = false;
|
||||
|
||||
this.useSeparateAo = AngelicaConfig.enableIris && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo();
|
||||
final int emitted = block.getLightValue(world, pos.x, pos.y, pos.z);
|
||||
|
||||
final QuadProvider model = ((ModeledBlock) block).getModel();
|
||||
|
||||
if (model != null) {
|
||||
|
||||
final int color = model.getColor(world, pos, block, meta, random);
|
||||
|
||||
for (ForgeDirection dir : DirectionUtil.ALL_DIRECTIONS) {
|
||||
try {
|
||||
TessellatorManager.startCapturing();
|
||||
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
|
||||
tess.startDrawingQuads();
|
||||
// Use setTranslation rather than setOffset so that the float data written to the internal buffer
|
||||
// is done in subchunk-relative coordinates
|
||||
tess.setOffset(POS_ZERO);
|
||||
tess.setTranslation(-pos.x, -pos.y, -pos.z);
|
||||
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
|
||||
final var quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
tess.resetOffset();
|
||||
|
||||
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
|
||||
this.random.setSeed(seed);
|
||||
List<QuadView> quads;
|
||||
|
||||
if (!cull || this.occlusionCache.shouldDrawSide(block, meta, world, pos, dir)) {
|
||||
quads = model.getQuads(world, pos, block, meta, dir, random, color, this.quadPool::getInstance);
|
||||
if (quads.isEmpty()) continue;
|
||||
|
||||
this.renderQuadList(pos, lighter, buffers, quads, ModelQuadFacing.fromDirection(dir), true);
|
||||
rendered = true;
|
||||
|
||||
if (model.isDynamic())
|
||||
for (QuadView q : quads) this.quadPool.releaseInstance(q);
|
||||
}
|
||||
this.renderQuadList(pos, lighter, emitted, buffers, quads, facing, (this.useAmbientOcclusion && this.useSodiumAO));
|
||||
}
|
||||
} else {
|
||||
|
||||
try {
|
||||
TessellatorManager.startCapturing();
|
||||
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
|
||||
tess.startDrawingQuads();
|
||||
// Use setTranslation rather than setOffset so that the float data written to the internal buffer
|
||||
// is done in subchunk-relative coordinates
|
||||
tess.setOffset(POS_ZERO);
|
||||
tess.setTranslation(-pos.x, -pos.y, -pos.z);
|
||||
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
|
||||
final List<QuadView> quads = TessellatorManager.stopCapturingToPooledQuads();
|
||||
tess.resetOffset();
|
||||
|
||||
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
|
||||
this.random.setSeed(seed);
|
||||
this.renderQuadList(pos, lighter, buffers, quads, facing, (this.useAmbientOcclusion && this.useSodiumAO));
|
||||
}
|
||||
|
||||
if (!quads.isEmpty()) rendered = true;
|
||||
} finally {
|
||||
TessellatorManager.cleanup();
|
||||
}
|
||||
if (!quads.isEmpty()) rendered = true;
|
||||
} finally {
|
||||
TessellatorManager.cleanup();
|
||||
}
|
||||
|
||||
return rendered;
|
||||
}
|
||||
|
||||
private void renderQuadList(BlockPos pos, LightPipeline lighter, ChunkModelBuffers buffers, List<QuadView> quads, ModelQuadFacing facing, boolean useSodiumLight) {
|
||||
final ForgeDirection cullFace = ModelQuadFacing.toDirection(facing);
|
||||
|
||||
private void renderQuadList(BlockPos pos, LightPipeline lighter, int emitted, ChunkModelBuffers buffers, List<ModelQuadViewMutable> quads, ModelQuadFacing facing, boolean useSodiumLight) {
|
||||
final ModelVertexSink sink = buffers.getSink(facing);
|
||||
sink.ensureCapacity(quads.size() * 4);
|
||||
|
||||
@@ -172,25 +134,25 @@ public class BlockRenderer {
|
||||
// This is a very hot allocation, iterate over it manually
|
||||
// noinspection ForLoopReplaceableByForEach
|
||||
for (int i = 0, quadsSize = quads.size(); i < quadsSize; i++) {
|
||||
final QuadView quad = quads.get(i);
|
||||
final var quad = quads.get(i);
|
||||
|
||||
final QuadLightData light = this.cachedQuadLightData;
|
||||
|
||||
if (quad.getFace() != cullFace)
|
||||
if (quad.getNormalFace() != facing)
|
||||
continue;
|
||||
|
||||
if (useSodiumLight || this.useSeparateAo)
|
||||
lighter.calculate(quad, pos, light, cullFace, quad.getLightFace(), quad.isShade());
|
||||
lighter.calculate(quad, pos, light, facing, quad.getLightFace(), quad.hasAmbientOcclusion());
|
||||
|
||||
this.renderQuad(sink, quad, light, renderData, useSodiumLight);
|
||||
this.renderQuad(sink, quad, emitted, light, renderData, useSodiumLight);
|
||||
}
|
||||
|
||||
sink.flush();
|
||||
}
|
||||
|
||||
private void renderQuad(ModelVertexSink sink, QuadView quad, QuadLightData light, ChunkRenderData.Builder renderData, boolean useSodiumLight) {
|
||||
private void renderQuad(ModelVertexSink sink, ModelQuadView quad, int emitted, QuadLightData light, ChunkRenderData.Builder renderData, boolean useSodiumLight) {
|
||||
|
||||
final ModelQuadOrientation order = (useSodiumLight || this.useSeparateAo) ? ModelQuadOrientation.orient(light.br) : ModelQuadOrientation.NORMAL;
|
||||
final ModelQuadOrientation order = (useSodiumLight || this.useSeparateAo) ? ModelQuadOrientation.orientByBrightness(light.br, light.lm) : ModelQuadOrientation.NORMAL;
|
||||
|
||||
int shaderBlockId = quad.getShaderBlockId();
|
||||
for (int dstIndex = 0; dstIndex < 4; dstIndex++) {
|
||||
@@ -207,60 +169,23 @@ public class BlockRenderer {
|
||||
color |= ((int) (ao * 255.0f)) << 24;
|
||||
} else {
|
||||
|
||||
color = (useSodiumLight) ? ColorABGR.mul(quad.getColor(srcIndex), light.br[srcIndex]) : quad.getColor(srcIndex);
|
||||
color = (useSodiumLight) ? ColorMixer.mulSingleWithoutAlpha(quad.getColor(srcIndex), (int)(light.br[srcIndex] * 255)) : quad.getColor(srcIndex);
|
||||
}
|
||||
|
||||
final float u = quad.getTexU(srcIndex);
|
||||
final float v = quad.getTexV(srcIndex);
|
||||
|
||||
final int lm = (useSeparateAo) ? ModelQuadUtil.mergeBakedLight(quad.getLight(srcIndex), light.lm[srcIndex]) :
|
||||
final int lm = (useSeparateAo) ? ModelQuadUtil.mergeBakedLight(quad.getLight(srcIndex), emitted, light.lm[srcIndex]) :
|
||||
(useSodiumLight) ? light.lm[srcIndex] : quad.getLight(srcIndex);
|
||||
|
||||
sink.writeQuad(x, y, z, color, u, v, lm, shaderBlockId);
|
||||
}
|
||||
|
||||
final TextureAtlasSprite sprite = quad.rubidium$getSprite();
|
||||
final TextureAtlasSprite sprite = (TextureAtlasSprite) quad.celeritas$getSprite();
|
||||
|
||||
if (sprite != null) {
|
||||
renderData.addSprite(sprite);
|
||||
}
|
||||
}
|
||||
|
||||
public static class Flags {
|
||||
boolean hasTexture;
|
||||
public boolean hasBrightness;
|
||||
public boolean hasColor;
|
||||
public boolean hasNormals;
|
||||
|
||||
public Flags(byte flags) {
|
||||
hasTexture = (flags & 1) != 0;
|
||||
hasBrightness = (flags & 2) != 0;
|
||||
hasColor = (flags & 4) != 0;
|
||||
hasNormals = (flags & 8) != 0;
|
||||
}
|
||||
|
||||
public Flags(boolean hasTexture, boolean hasBrightness, boolean hasColor, boolean hasNormals) {
|
||||
this.hasTexture = hasTexture;
|
||||
this.hasBrightness = hasBrightness;
|
||||
this.hasColor = hasColor;
|
||||
this.hasNormals = hasNormals;
|
||||
}
|
||||
|
||||
public byte toByte() {
|
||||
byte flags = 0;
|
||||
if(hasTexture) {
|
||||
flags |= 1;
|
||||
}
|
||||
if(hasBrightness) {
|
||||
flags |= 2;
|
||||
}
|
||||
if(hasColor) {
|
||||
flags |= 4;
|
||||
}
|
||||
if(hasNormals) {
|
||||
flags |= 8;
|
||||
}
|
||||
return flags;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,23 +1,27 @@
|
||||
package me.jellysquid.mods.sodium.client.render.pipeline;
|
||||
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.HORIZONTAL_DIRECTIONS;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.NEG_Y;
|
||||
import static com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing.POS_Y;
|
||||
import static org.joml.Math.lerp;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuad;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.ModelQuadViewMutable;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.DirectionUtil;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.WorldUtil;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorARGB;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.ColorMixer;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.NormI8;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuad;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadView;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.ModelQuadViewMutable;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFlags;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import java.util.Arrays;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightMode;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipelineProvider;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuffers;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
|
||||
import me.jellysquid.mods.sodium.client.util.Norm3b;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
|
||||
import me.jellysquid.mods.sodium.client.util.color.ColorARGB;
|
||||
import me.jellysquid.mods.sodium.client.world.WorldSlice;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -29,10 +33,6 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import static org.joml.Math.lerp;
|
||||
|
||||
public class FluidRenderer {
|
||||
private static final float EPSILON = 0.001f;
|
||||
private final LightPipelineProvider lpp;
|
||||
@@ -48,10 +48,10 @@ public class FluidRenderer {
|
||||
private final TextureAtlasSprite missingTex = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:missing");
|
||||
|
||||
public FluidRenderer(LightPipelineProvider lpp) {
|
||||
int normal = Norm3b.pack(0.0f, 1.0f, 0.0f);
|
||||
int normal = NormI8.pack(0.0f, 1.0f, 0.0f);
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
this.quad.setNormal(i, normal);
|
||||
this.quad.setForgeNormal(i, normal);
|
||||
}
|
||||
|
||||
this.lpp = lpp;
|
||||
@@ -69,8 +69,8 @@ public class FluidRenderer {
|
||||
return tmp;
|
||||
}
|
||||
|
||||
private boolean isSideExposed(IBlockAccess world, int x, int y, int z, ForgeDirection dir, float height) {
|
||||
BlockPos pos = this.scratchPos.set(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
|
||||
private boolean isSideExposed(IBlockAccess world, int x, int y, int z, ModelQuadFacing dir, float height) {
|
||||
BlockPos pos = this.scratchPos.set(x + dir.getStepX(), y + dir.getStepY(), z + dir.getStepZ());
|
||||
Block block = world.getBlock(pos.x, pos.y, pos.z);
|
||||
|
||||
if (block.getMaterial().isOpaque()) {
|
||||
@@ -79,7 +79,7 @@ public class FluidRenderer {
|
||||
// Hoist these checks to avoid allocating the shape below
|
||||
if (renderAsFullCube) {
|
||||
// The top face always be inset, so if the shape above is a full cube it can't possibly occlude
|
||||
return dir == ForgeDirection.UP;
|
||||
return dir == POS_Y;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
@@ -102,7 +102,7 @@ public class FluidRenderer {
|
||||
// Check for occluded sides; if everything is occluded, don't render
|
||||
boolean sfUp = this.isFluidOccluded(world, posX, posY, posZ, ForgeDirection.UP, fluid);
|
||||
boolean sfDown = this.isFluidOccluded(world, posX, posY, posZ, ForgeDirection.DOWN, fluid) ||
|
||||
!this.isSideExposed(world, posX, posY, posZ, ForgeDirection.DOWN, 0.8888889F);
|
||||
!this.isSideExposed(world, posX, posY, posZ, NEG_Y, 0.8888889F);
|
||||
boolean sfNorth = this.isFluidOccluded(world, posX, posY, posZ, ForgeDirection.NORTH, fluid);
|
||||
boolean sfSouth = this.isFluidOccluded(world, posX, posY, posZ, ForgeDirection.SOUTH, fluid);
|
||||
boolean sfWest = this.isFluidOccluded(world, posX, posY, posZ, ForgeDirection.WEST, fluid);
|
||||
@@ -142,7 +142,7 @@ public class FluidRenderer {
|
||||
|
||||
quad.setFlags(0);
|
||||
|
||||
if (!sfUp && this.isSideExposed(world, posX, posY, posZ, ForgeDirection.UP, Math.min(Math.min(h1, h2), Math.min(h3, h4)))) {
|
||||
if (!sfUp && this.isSideExposed(world, posX, posY, posZ, POS_Y, Math.min(Math.min(h1, h2), Math.min(h3, h4)))) {
|
||||
h1 -= 0.001F;
|
||||
h2 -= 0.001F;
|
||||
h3 -= 0.001F;
|
||||
@@ -157,7 +157,7 @@ public class FluidRenderer {
|
||||
|
||||
if (velocity.x == 0.0D && velocity.z == 0.0D) {
|
||||
sprite = sprites[0];
|
||||
facing = ModelQuadFacing.UP;
|
||||
facing = ModelQuadFacing.POS_Y;
|
||||
u1 = sprite.getInterpolatedU(0.0D);
|
||||
v1 = sprite.getInterpolatedV(0.0D);
|
||||
u2 = u1;
|
||||
@@ -204,7 +204,7 @@ public class FluidRenderer {
|
||||
this.setVertex(quad, 2, 1.0F, h3, 1.0F, u3, v3);
|
||||
this.setVertex(quad, 3, 1.0F, h4, 0.0f, u4, v4);
|
||||
|
||||
this.calculateQuadColors(quad, pos, lighter, ForgeDirection.UP, 1.0F, hc, slice);
|
||||
this.calculateQuadColors(quad, pos, lighter, POS_Y, 1.0F, hc, slice);
|
||||
this.flushQuad(buffers, quad, facing, false);
|
||||
|
||||
if (WorldUtil.method_15756(slice, this.scratchPos.set(posX, posY + 1, posZ), fluid)) {
|
||||
@@ -213,7 +213,7 @@ public class FluidRenderer {
|
||||
this.setVertex(quad, 1, 1.0F, h3, 1.0F, u3, v3);
|
||||
this.setVertex(quad, 0, 1.0F, h4, 0.0f, u4, v4);
|
||||
|
||||
this.flushQuad(buffers, quad, ModelQuadFacing.DOWN, true);
|
||||
this.flushQuad(buffers, quad, ModelQuadFacing.NEG_Y, true);
|
||||
}
|
||||
|
||||
rendered = true;
|
||||
@@ -233,15 +233,15 @@ public class FluidRenderer {
|
||||
this.setVertex(quad, 2, 1.0F, yOffset, 0.0f, maxU, minV);
|
||||
this.setVertex(quad, 3, 1.0F, yOffset, 1.0F, maxU, maxV);
|
||||
|
||||
this.calculateQuadColors(quad, pos, lighter, ForgeDirection.DOWN, 1.0F, hc, slice);
|
||||
this.flushQuad(buffers, quad, ModelQuadFacing.DOWN, false);
|
||||
this.calculateQuadColors(quad, pos, lighter, NEG_Y, 1.0F, hc, slice);
|
||||
this.flushQuad(buffers, quad, ModelQuadFacing.NEG_Y, false);
|
||||
|
||||
rendered = true;
|
||||
}
|
||||
|
||||
quad.setFlags(ModelQuadFlags.IS_ALIGNED);
|
||||
|
||||
for (ForgeDirection dir : DirectionUtil.HORIZONTAL_DIRECTIONS) {
|
||||
for (var facing : HORIZONTAL_DIRECTIONS) {
|
||||
float c1;
|
||||
float c2;
|
||||
float x1;
|
||||
@@ -249,8 +249,8 @@ public class FluidRenderer {
|
||||
float x2;
|
||||
float z2;
|
||||
|
||||
switch (dir) {
|
||||
case NORTH:
|
||||
switch (facing) {
|
||||
case NEG_Z:
|
||||
if (sfNorth) {
|
||||
continue;
|
||||
}
|
||||
@@ -262,7 +262,7 @@ public class FluidRenderer {
|
||||
z1 = 0.001f;
|
||||
z2 = z1;
|
||||
break;
|
||||
case SOUTH:
|
||||
case POS_Z:
|
||||
if (sfSouth) {
|
||||
continue;
|
||||
}
|
||||
@@ -274,7 +274,7 @@ public class FluidRenderer {
|
||||
z1 = 0.999f;
|
||||
z2 = z1;
|
||||
break;
|
||||
case WEST:
|
||||
case NEG_X:
|
||||
if (sfWest) {
|
||||
continue;
|
||||
}
|
||||
@@ -286,7 +286,7 @@ public class FluidRenderer {
|
||||
z1 = 1.0F;
|
||||
z2 = 0.0f;
|
||||
break;
|
||||
case EAST:
|
||||
case POS_X:
|
||||
if (sfEast) {
|
||||
continue;
|
||||
}
|
||||
@@ -302,10 +302,10 @@ public class FluidRenderer {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (this.isSideExposed(world, posX, posY, posZ, dir, Math.max(c1, c2))) {
|
||||
int adjX = posX + dir.offsetX;
|
||||
int adjY = posY + dir.offsetY;
|
||||
int adjZ = posZ + dir.offsetZ;
|
||||
if (this.isSideExposed(world, posX, posY, posZ, facing, Math.max(c1, c2))) {
|
||||
int adjX = posX + facing.getStepX();
|
||||
int adjY = posY + facing.getStepY();
|
||||
int adjZ = posZ + facing.getStepZ();
|
||||
|
||||
TextureAtlasSprite sprite = sprites[1];
|
||||
TextureAtlasSprite oSprite = sprites[2];
|
||||
@@ -333,11 +333,9 @@ public class FluidRenderer {
|
||||
this.setVertex(quad, 2, x1, yOffset, z1, u1, v3);
|
||||
this.setVertex(quad, 3, x1, c1, z1, u1, v1);
|
||||
|
||||
float br = dir.offsetZ != 0 ? 0.8F : 0.6F;
|
||||
float br = facing.getStepZ() != 0 ? 0.8F : 0.6F;
|
||||
|
||||
ModelQuadFacing facing = ModelQuadFacing.fromDirection(dir);
|
||||
|
||||
this.calculateQuadColors(quad, pos, lighter, dir, br, hc, slice);
|
||||
this.calculateQuadColors(quad, pos, lighter, facing, br, hc, slice);
|
||||
this.flushQuad(buffers, quad, facing, false);
|
||||
|
||||
if (sprite != oSprite) {
|
||||
@@ -356,7 +354,7 @@ public class FluidRenderer {
|
||||
return rendered;
|
||||
}
|
||||
|
||||
private void calculateQuadColors(ModelQuadView quad, BlockPos pos, LightPipeline lighter, ForgeDirection dir, float brightness, boolean colorized, WorldSlice slice) {
|
||||
private void calculateQuadColors(ModelQuadView quad, BlockPos pos, LightPipeline lighter, ModelQuadFacing dir, float brightness, boolean colorized, WorldSlice slice) {
|
||||
QuadLightData light = this.quadLightData;
|
||||
lighter.calculate(quad, pos, light, null, dir, false);
|
||||
|
||||
@@ -372,7 +370,7 @@ public class FluidRenderer {
|
||||
color &= 0x00FFFFFF;
|
||||
color |= ((int) (ao * 255.0f)) << 24;
|
||||
} else {
|
||||
color = ColorABGR.mul(color, ao);
|
||||
color = ColorMixer.mulSingleWithoutAlpha(color, (int)(ao * 255));
|
||||
}
|
||||
this.quadColors[i] = color;
|
||||
}
|
||||
@@ -410,7 +408,7 @@ public class FluidRenderer {
|
||||
vertexIdx += lightOrder;
|
||||
}
|
||||
|
||||
TextureAtlasSprite sprite = quad.rubidium$getSprite();
|
||||
TextureAtlasSprite sprite = (TextureAtlasSprite) quad.celeritas$getSprite();
|
||||
|
||||
if (sprite != null) {
|
||||
buffers.getRenderData().addSprite(sprite);
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
package me.jellysquid.mods.sodium.client.render.pipeline;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.model.quad.properties.ModelQuadFacing;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
/**
|
||||
* Contains methods stripped from BlockState or FluidState that didn't actually need to be there. Technically these
|
||||
* could be a mixin to Block or Fluid, but that's annoying while not actually providing any benefit.
|
||||
*/
|
||||
public class WorldUtil {
|
||||
|
||||
public static Vector3d getVelocity(IBlockAccess world, int x, int y, int z, Block thizz) {
|
||||
|
||||
Vector3d velocity = new Vector3d();
|
||||
int decay = getEffectiveFlowDecay(world, x, y, z, thizz);
|
||||
|
||||
for (var dire : ModelQuadFacing.HORIZONTAL_DIRECTIONS) {
|
||||
|
||||
int adjX = x + dire.getStepX();
|
||||
int adjZ = z + dire.getStepZ();
|
||||
|
||||
int adjDecay = getEffectiveFlowDecay(world, adjX, y, adjZ, thizz);
|
||||
|
||||
if (adjDecay < 0) {
|
||||
|
||||
if (!world.getBlock(adjX, y, adjZ).getMaterial().blocksMovement()) {
|
||||
|
||||
adjDecay = getEffectiveFlowDecay(world, adjX, y - 1, adjZ, thizz);
|
||||
|
||||
if (adjDecay >= 0) {
|
||||
|
||||
adjDecay -= (decay - 8);
|
||||
velocity = velocity.add((adjX - x) * adjDecay, 0, (adjZ - z) * adjDecay);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
adjDecay -= decay;
|
||||
velocity = velocity.add((adjX - x) * adjDecay, 0, (adjZ - z) * adjDecay);
|
||||
}
|
||||
}
|
||||
|
||||
if (world.getBlockMetadata(x, y, z) >= 8) {
|
||||
|
||||
if (thizz.isBlockSolid(world, x, y, z - 1, 2) || thizz.isBlockSolid(world, x, y, z + 1, 3)
|
||||
|| thizz.isBlockSolid(world, x - 1, y, z, 4)
|
||||
|| thizz.isBlockSolid(world, x + 1, y, z, 5)
|
||||
|| thizz.isBlockSolid(world, x, y + 1, z - 1, 2)
|
||||
|| thizz.isBlockSolid(world, x, y + 1, z + 1, 3)
|
||||
|| thizz.isBlockSolid(world, x - 1, y + 1, z, 4)
|
||||
|| thizz.isBlockSolid(world, x + 1, y + 1, z, 5)) {
|
||||
velocity = velocity.normalize().add(0.0D, -6.0D, 0.0D);
|
||||
}
|
||||
}
|
||||
|
||||
if (velocity.x == 0 && velocity.y == 0 && velocity.z == 0) return velocity.zero();
|
||||
return velocity.normalize();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if any block in a 3x3x3 cube is not the same fluid and not an opaque full cube. Equivalent to
|
||||
* FluidState::method_15756 in modern.
|
||||
*/
|
||||
public static boolean method_15756(IBlockAccess world, BlockPos pos, Fluid fluid) {
|
||||
for (int i = 0; i < 2; ++i) {
|
||||
for (int j = 0; j < 2; ++j) {
|
||||
Block block = world.getBlock(pos.x, pos.y, pos.z);
|
||||
if (!block.isOpaqueCube() && getFluid(block) != fluid) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns fluid height as a percentage of the block; 0 is none and 1 is full.
|
||||
*/
|
||||
public static float getFluidHeight(Fluid fluid, int meta) {
|
||||
return fluid == null ? 0 : 1 - BlockLiquid.getLiquidHeightPercent(meta);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the flow decay but converts values indicating falling liquid (values >=8) to their effective source block
|
||||
* value of zero
|
||||
*/
|
||||
public static int getEffectiveFlowDecay(IBlockAccess world, int x, int y, int z, Block thiz) {
|
||||
|
||||
if (world.getBlock(x, y, z).getMaterial() != thiz.getMaterial()) {
|
||||
|
||||
return -1;
|
||||
} else {
|
||||
|
||||
int decay = world.getBlockMetadata(x, y, z);
|
||||
return decay >= 8 ? 0 : decay;
|
||||
}
|
||||
}
|
||||
|
||||
// I believe forge mappings in modern say BreakableBlock, while yarn says TransparentBlock.
|
||||
// I have a sneaking suspicion isOpaque is neither, but it works for now
|
||||
public static boolean shouldDisplayFluidOverlay(Block block) {
|
||||
return !block.getMaterial().isOpaque() || block.getMaterial() == Material.leaves;
|
||||
}
|
||||
|
||||
public static boolean isFluidBlock(Block block) {
|
||||
return block instanceof IFluidBlock || block instanceof BlockLiquid;
|
||||
}
|
||||
|
||||
public static Fluid getFluid(Block b) {
|
||||
if (b instanceof IFluidBlock fluidBlock) return fluidBlock.getFluid();
|
||||
if (b instanceof BlockLiquid) {
|
||||
if (b.getMaterial() == Material.water) return FluidRegistry.WATER;
|
||||
if (b.getMaterial() == Material.lava) return FluidRegistry.LAVA;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Equivalent to method_15748 in 1.16.5
|
||||
*/
|
||||
public static boolean isEmptyOrSame(Fluid fluid, Fluid otherFluid) {
|
||||
return otherFluid == null || fluid == otherFluid;
|
||||
}
|
||||
|
||||
/**
|
||||
* Equivalent to method_15749 in 1.16.5
|
||||
*/
|
||||
public static boolean method_15749(IBlockAccess world, Fluid thiz, BlockPos pos, ForgeDirection dir) {
|
||||
Block b = world.getBlock(pos.x, pos.y, pos.z);
|
||||
Fluid f = getFluid(b);
|
||||
if (f == thiz) {
|
||||
return false;
|
||||
}
|
||||
if (dir == ForgeDirection.UP) {
|
||||
return true;
|
||||
}
|
||||
return b.getMaterial() != Material.ice && b.isSideSolid(world, pos.x, pos.y, pos.z, dir);
|
||||
}
|
||||
}
|
||||
@@ -24,7 +24,4 @@ public class MathUtil {
|
||||
return (a + b + 1) * (a + b) / 2 + b;
|
||||
}
|
||||
|
||||
public static boolean fuzzy_eq(float a, float b) {
|
||||
return Math.abs(a - b) < 1e-5;
|
||||
}
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
* Provides some utilities and constants for interacting with vanilla's model quad vertex format.
|
||||
*
|
||||
* This is the current vertex format used by Minecraft for chunk meshes and model quads. Internally, it uses integer
|
||||
* arrays for store baked quad data, and as such the following table provides both the byte and int indices.
|
||||
*
|
||||
* Byte Index Integer Index Name Format Fields
|
||||
* 0 ..11 0..2 Position 3 floats x, y, z
|
||||
* 12..15 3 Color 4 unsigned bytes a, r, g, b
|
||||
* 16..23 4..5 Block Texture 2 floats u, v
|
||||
* 24..27 6 Light Texture 2 shorts u, v
|
||||
* 28..30 7 Normal 3 unsigned bytes x, y, z
|
||||
* 31 Padding 1 byte
|
||||
*/
|
||||
public class ModelQuadUtil {
|
||||
// Integer indices for vertex attributes, useful for accessing baked quad data
|
||||
public static final int POSITION_INDEX = 0,
|
||||
COLOR_INDEX = 3,
|
||||
TEXTURE_INDEX = 4,
|
||||
LIGHT_INDEX = 6,
|
||||
NORMAL_INDEX = 7;
|
||||
|
||||
// Size of vertex format in 4-byte integers
|
||||
public static final int VERTEX_SIZE = 8;
|
||||
public static final int VERTEX_SIZE_BYTES = VERTEX_SIZE * 4;
|
||||
|
||||
// Cached array of normals for every facing to avoid expensive computation
|
||||
static final int[] NORMALS = new int[ForgeDirection.VALID_DIRECTIONS.length];
|
||||
|
||||
static {
|
||||
for (int i = 0; i < NORMALS.length; i++) {
|
||||
final ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[i];
|
||||
NORMALS[i] = Norm3b.pack(dir.offsetX, dir.offsetY, dir.offsetZ);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the normal vector for a model quad with the given {@param facing}.
|
||||
*/
|
||||
public static int getFacingNormal(ForgeDirection facing) {
|
||||
return NORMALS[facing.ordinal()];
|
||||
}
|
||||
|
||||
public static int getFacingNormal(ForgeDirection facing, int bakedNormal) {
|
||||
if(!hasNormal(bakedNormal))
|
||||
return NORMALS[facing.ordinal()];
|
||||
return bakedNormal;
|
||||
}
|
||||
|
||||
public static boolean hasNormal(int n) {
|
||||
return (n & 0xFFFFFF) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param vertexIndex The index of the vertex to access
|
||||
* @return The starting offset of the vertex's attributes
|
||||
*/
|
||||
public static int vertexOffset(int vertexIndex) {
|
||||
return vertexIndex * VERTEX_SIZE;
|
||||
}
|
||||
|
||||
public static int mergeBakedLight(int packedLight, int calcLight) {
|
||||
// bail early in most cases
|
||||
if (packedLight == 0)
|
||||
return calcLight;
|
||||
|
||||
final int psl = (packedLight >> 16) & 0xFF;
|
||||
final int csl = (calcLight >> 16) & 0xFF;
|
||||
final int pbl = (packedLight) & 0xFF;
|
||||
final int cbl = (calcLight) & 0xFF;
|
||||
final int bl = Math.max(pbl, cbl);
|
||||
final int sl = Math.max(psl, csl);
|
||||
return (sl << 16) | bl;
|
||||
}
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
import org.joml.Vector3f;
|
||||
import org.joml.Vector3i;
|
||||
|
||||
/**
|
||||
* Provides some utilities for working with packed normal vectors. Each getNormal component provides 8 bits of
|
||||
* precision in the range of [-1.0,1.0].
|
||||
*
|
||||
* | 32 | 24 | 16 | 8 |
|
||||
* | 0000 0000 | 0110 1100 | 0110 1100 | 0110 1100 |
|
||||
* | Padding | X | Y | Z |
|
||||
*/
|
||||
public class Norm3b {
|
||||
/**
|
||||
* The maximum value of a getNormal's vector component.
|
||||
*/
|
||||
private static final float COMPONENT_RANGE = 127.0f;
|
||||
|
||||
/**
|
||||
* Constant value which can be multiplied with a floating-point vector component to get the normalized value. The
|
||||
* multiplication is slightly faster than a floating point division, and this code is a hot path which justifies it.
|
||||
*/
|
||||
private static final float NORM = 1.0f / COMPONENT_RANGE;
|
||||
|
||||
static int pack(Vector3i norm) {
|
||||
return pack(norm.x, norm.y, norm.z);
|
||||
}
|
||||
|
||||
public static int pack(Vector3f dir) {
|
||||
return pack(dir.x, dir.y, dir.z);
|
||||
}
|
||||
|
||||
/**
|
||||
* Packs the specified vector components into a 32-bit integer in XYZ ordering with the 8 bits of padding at the
|
||||
* end.
|
||||
* @param x The x component of the getNormal's vector
|
||||
* @param y The y component of the getNormal's vector
|
||||
* @param z The z component of the getNormal's vector
|
||||
*/
|
||||
public static int pack(float x, float y, float z) {
|
||||
int normX = encode(x);
|
||||
int normY = encode(y);
|
||||
int normZ = encode(z);
|
||||
|
||||
return (normZ << 16) | (normY << 8) | normX;
|
||||
}
|
||||
|
||||
/**
|
||||
* Encodes a float in the range of -1.0..1.0 to a normalized unsigned integer in the range of 0..255 which can then
|
||||
* be passed to graphics memory.
|
||||
*/
|
||||
private static int encode(float comp) {
|
||||
// TODO: is the clamp necessary here? our inputs should always be normalized vector components
|
||||
return ((int) (MathHelper.clamp_float(comp, -1.0F, 1.0F) * COMPONENT_RANGE) & 255);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unpacks the x-component of the packed getNormal, denormalizing it to a float in the range of -1.0..1.0.
|
||||
* @param norm The packed getNormal
|
||||
*/
|
||||
public static float unpackX(int norm) {
|
||||
return ((byte) (norm & 0xFF)) * NORM;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unpacks the y-component of the packed getNormal, denormalizing it to a float in the range of -1.0..1.0.
|
||||
* @param norm The packed getNormal
|
||||
*/
|
||||
public static float unpackY(int norm) {
|
||||
return ((byte) ((norm >> 8) & 0xFF)) * NORM;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unpacks the z-component of the packed getNormal, denormalizing it to a float in the range of -1.0..1.0.
|
||||
* @param norm The packed getNormal
|
||||
*/
|
||||
public static float unpackZ(int norm) {
|
||||
return ((byte) ((norm >> 16) & 0xFF)) * NORM;
|
||||
}
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util.color;
|
||||
|
||||
/**
|
||||
* Provides some utilities for packing and unpacking color components from packed integer colors in ABGR format, which
|
||||
* is used by OpenGL for color vectors.
|
||||
*
|
||||
* | 32 | 24 | 16 | 8 |
|
||||
* | 0110 1100 | 0110 1100 | 0110 1100 | 0110 1100 |
|
||||
* | Alpha | Blue | Green | Red |
|
||||
*/
|
||||
public class ColorABGR implements ColorU8 {
|
||||
/**
|
||||
* Packs the specified color components into ABGR format.
|
||||
* @param r The red component of the color
|
||||
* @param g The green component of the color
|
||||
* @param b The blue component of the color
|
||||
* @param a The alpha component of the color
|
||||
*/
|
||||
public static int pack(int r, int g, int b, int a) {
|
||||
return (a & 0xFF) << 24 | (b & 0xFF) << 16 | (g & 0xFF) << 8 | (r & 0xFF);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see ColorABGR#pack(int, int, int, int)
|
||||
*/
|
||||
public static int pack(float r, float g, float b, float a) {
|
||||
return pack((int) (r * COMPONENT_RANGE), (int) (g * COMPONENT_RANGE), (int) (b * COMPONENT_RANGE), (int) (a * COMPONENT_RANGE));
|
||||
}
|
||||
|
||||
/**
|
||||
* Multiplies the RGB components of the packed ABGR color using the given scale factors.
|
||||
* @param color The ABGR packed color to be multiplied
|
||||
* @param rw The red component scale factor
|
||||
* @param gw The green component scale factor
|
||||
* @param bw The blue component scale factor
|
||||
*/
|
||||
public static int mul(int color, float rw, float gw, float bw) {
|
||||
float r = unpackRed(color) * rw;
|
||||
float g = unpackGreen(color) * gw;
|
||||
float b = unpackBlue(color) * bw;
|
||||
|
||||
return pack((int) r, (int) g, (int) b, 0xFF);
|
||||
}
|
||||
|
||||
public static int mul(int color, float w) {
|
||||
return mul(color, w, w, w);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ABGR color to unpack
|
||||
* @return The red color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackRed(int color) {
|
||||
return color & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ABGR color to unpack
|
||||
* @return The green color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackGreen(int color) {
|
||||
return color >> 8 & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ABGR color to unpack
|
||||
* @return The blue color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackBlue(int color) {
|
||||
return color >> 16 & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ABGR color to unpack
|
||||
* @return The red color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackAlpha(int color) {
|
||||
return color >> 24 & 0xFF;
|
||||
}
|
||||
|
||||
public static int pack(float r, float g, float b) {
|
||||
return pack(r, g, b, 255);
|
||||
}
|
||||
}
|
||||
@@ -1,66 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util.color;
|
||||
|
||||
/**
|
||||
* Provides some utilities for packing and unpacking color components from packed integer colors in ARGB format. This
|
||||
* packed format is used by most of Minecraft, but special care must be taken to pack it into ABGR format before passing
|
||||
* it to OpenGL attributes.
|
||||
*
|
||||
* | 32 | 24 | 16 | 8 |
|
||||
* | 0110 1100 | 0110 1100 | 0110 1100 | 0110 1100 |
|
||||
* | Alpha | Red | Green | Blue |
|
||||
*/
|
||||
public class ColorARGB implements ColorU8 {
|
||||
/**
|
||||
* Packs the specified color components into big-endian format for consumption by OpenGL.
|
||||
* @param r The red component of the color
|
||||
* @param g The green component of the color
|
||||
* @param b The blue component of the color
|
||||
* @param a The alpha component of the color
|
||||
*/
|
||||
public static int pack(int r, int g, int b, int a) {
|
||||
return (a & 0xFF) << 24 | (r & 0xFF) << 16 | (g & 0xFF) << 8 | (b & 0xFF);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ARGB color to unpack
|
||||
* @return The red color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackAlpha(int color) {
|
||||
return color >> 24 & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ARGB color to unpack
|
||||
* @return The red color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackRed(int color) {
|
||||
return color >> 16 & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ARGB color to unpack
|
||||
* @return The green color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackGreen(int color) {
|
||||
return color >> 8 & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color The packed 32-bit ARGB color to unpack
|
||||
* @return The blue color component in the range of 0..255
|
||||
*/
|
||||
public static int unpackBlue(int color) {
|
||||
return color & 0xFF;
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-packs the ARGB color into a aBGR color with the specified alpha component.
|
||||
*/
|
||||
public static int toABGR(int color, int alpha) {
|
||||
return Integer.reverseBytes(color << 8 | alpha);
|
||||
}
|
||||
|
||||
public static int toABGR(int color) {
|
||||
return Integer.reverseBytes(color << 8);
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util.color;
|
||||
|
||||
public class ColorMixer {
|
||||
private static final long MASK1 = 0x00FF00FF;
|
||||
private static final long MASK2 = 0xFF00FF00;
|
||||
|
||||
/**
|
||||
* Mixes two ARGB colors using the given ratios. Use {@link ColorMixer#getStartRatio(float)} and
|
||||
* {@link ColorMixer#getEndRatio(float)} to convert a floating-point ratio into a integer ratio.
|
||||
*
|
||||
* This method takes 64-bit inputs to avoid overflows when mixing the alpha channel. The helper method
|
||||
* {@link ColorMixer#mixARGB(int, int, int, int)} can be used with 32-bit inputs.
|
||||
*
|
||||
* @param c1 The first (starting) color to blend with in ARGB format
|
||||
* @param c2 The second (ending) color to blend with in ARGB format
|
||||
* @param f1 The ratio of the color {@param c1} as calculated by {@link ColorMixer#getStartRatio(float)}
|
||||
* @param f2 The ratio of the color {@param c2} as calculated by {@link ColorMixer#getEndRatio(float)}
|
||||
* @return The result of ((c1 * f1) + (c2 * f2) as an ARGB-encoded color
|
||||
*/
|
||||
public static long mixARGB(long c1, long c2, int f1, int f2) {
|
||||
return ((((((c1 & MASK1) * f1) + ((c2 & MASK1) * f2)) >> 8) & MASK1) |
|
||||
(((((c1 & MASK2) * f1) + ((c2 & MASK2) * f2)) >> 8) & MASK2));
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper method to convert 32-bit integers to 64-bit integers and back.
|
||||
* @see ColorMixer#mixARGB(long, long, int, int)
|
||||
*/
|
||||
public static int mixARGB(int c1, int c2, int f1, int f2) {
|
||||
return (int) mixARGB(Integer.toUnsignedLong(c1), Integer.toUnsignedLong(c2), f1, f2);
|
||||
}
|
||||
|
||||
public static int getStartRatio(float frac) {
|
||||
return (int) (256 * frac);
|
||||
}
|
||||
|
||||
public static int getEndRatio(float frac) {
|
||||
return 256 - getStartRatio(frac);
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util.color;
|
||||
|
||||
public interface ColorU8 {
|
||||
/**
|
||||
* The maximum value of a color component.
|
||||
*/
|
||||
float COMPONENT_RANGE = 255.0f;
|
||||
|
||||
/**
|
||||
* Constant value which can be multiplied with a floating-point color component to get the normalized value. The
|
||||
* multiplication is slightly faster than a floating point division, and this code is a hot path which justifies it.
|
||||
*/
|
||||
float NORM = 1.0f / COMPONENT_RANGE;
|
||||
|
||||
/**
|
||||
* Normalizes a color component to the range of 0..1.
|
||||
*/
|
||||
static float normalize(float v) {
|
||||
return v * NORM;
|
||||
}
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.util.color;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.function.Function;
|
||||
|
||||
import static org.joml.Math.lerp;
|
||||
|
||||
public class FastCubicSampler {
|
||||
private static final double[] DENSITY_CURVE = new double[] { 0.0D, 1.0D, 4.0D, 6.0D, 4.0D, 1.0D, 0.0D };
|
||||
private static final int DIAMETER = 6;
|
||||
|
||||
private static Vector3d unpackRgb(int rgb) {
|
||||
return new Vector3d((rgb >> 16 & 255) / 255.0, (rgb >> 8 & 255) / 255.0, (rgb & 255) / 255.0);
|
||||
}
|
||||
|
||||
public static Vector3d sampleColor(Vector3d pos, ColorFetcher colorFetcher, Function<Vector3d, Vector3d> transformer) {
|
||||
int intX = MathHelper.floor_double(pos.x);
|
||||
int intY = MathHelper.floor_double(pos.y);
|
||||
int intZ = MathHelper.floor_double(pos.z);
|
||||
|
||||
int[] values = new int[DIAMETER * DIAMETER * DIAMETER];
|
||||
|
||||
for(int x = 0; x < DIAMETER; ++x) {
|
||||
int blockX = (intX - 2) + x;
|
||||
|
||||
for(int y = 0; y < DIAMETER; ++y) {
|
||||
int blockY = (intY - 2) + y;
|
||||
|
||||
for(int z = 0; z < DIAMETER; ++z) {
|
||||
int blockZ = (intZ - 2) + z;
|
||||
|
||||
values[index(x, y, z)] = colorFetcher.fetch(blockX, blockY, blockZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fast path! Skip blending the colors if all inputs are the same
|
||||
if (isHomogenousArray(values)) {
|
||||
// Take the first color if it's homogenous (all elements are the same...)
|
||||
return transformer.apply(unpackRgb(values[0]));
|
||||
}
|
||||
|
||||
double deltaX = pos.x - (double)intX;
|
||||
double deltaY = pos.y - (double)intY;
|
||||
double deltaZ = pos.z - (double)intZ;
|
||||
|
||||
Vector3d sum = new Vector3d();
|
||||
double totalFactor = 0.0D;
|
||||
|
||||
for(int x = 0; x < DIAMETER; ++x) {
|
||||
double densityX = lerp(DENSITY_CURVE[x + 1], DENSITY_CURVE[x], deltaX);
|
||||
|
||||
for(int y = 0; y < DIAMETER; ++y) {
|
||||
double densityY = lerp(DENSITY_CURVE[y + 1], DENSITY_CURVE[y], deltaY);
|
||||
|
||||
for(int z = 0; z < DIAMETER; ++z) {
|
||||
double densityZ = lerp(DENSITY_CURVE[z + 1], DENSITY_CURVE[z], deltaZ);
|
||||
|
||||
double factor = densityX * densityY * densityZ;
|
||||
totalFactor += factor;
|
||||
|
||||
Vector3d color = transformer.apply(unpackRgb(values[index(x, y, z)]));
|
||||
sum.add(color.mul(factor));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sum.mul(1.0D / totalFactor);
|
||||
|
||||
return sum;
|
||||
}
|
||||
|
||||
private static int index(int x, int y, int z) {
|
||||
return (DIAMETER * DIAMETER * z) + (DIAMETER * y) + x;
|
||||
}
|
||||
|
||||
public interface ColorFetcher {
|
||||
int fetch(int x, int y, int z);
|
||||
}
|
||||
|
||||
private static boolean isHomogenousArray(int[] arr) {
|
||||
int val = arr[0];
|
||||
|
||||
for (int i = 1; i < arr.length; i++) {
|
||||
if (arr[i] != val) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.jellysquid.mods.sodium.client.util.math;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.util.Norm3b;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.cel.api.util.NormI8;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import org.joml.Matrix3f;
|
||||
import org.joml.Matrix4f;
|
||||
@@ -21,14 +21,14 @@ public class MatrixUtil {
|
||||
public static int transformPackedNormal(int norm, Matrix3f matrix) {
|
||||
Matrix3fExtended mat = MatrixUtil.getExtendedMatrix(matrix);
|
||||
|
||||
float normX1 = Norm3b.unpackX(norm);
|
||||
float normY1 = Norm3b.unpackY(norm);
|
||||
float normZ1 = Norm3b.unpackZ(norm);
|
||||
float normX1 = NormI8.unpackX(norm);
|
||||
float normY1 = NormI8.unpackY(norm);
|
||||
float normZ1 = NormI8.unpackZ(norm);
|
||||
|
||||
float normX2 = mat.transformVecX(normX1, normY1, normZ1);
|
||||
float normY2 = mat.transformVecY(normX1, normY1, normZ1);
|
||||
float normZ2 = mat.transformVecZ(normX1, normY1, normZ1);
|
||||
|
||||
return Norm3b.pack(normX2, normY2, normZ2);
|
||||
return NormI8.pack(normX2, normY2, normZ2);
|
||||
}
|
||||
}
|
||||
@@ -61,7 +61,7 @@ public class XoRoShiRoRandom extends Random {
|
||||
return (int) this.nextLong(n);
|
||||
}
|
||||
|
||||
private long nextLong(final long n) {
|
||||
public long nextLong(final long n) {
|
||||
if (n <= 0) {
|
||||
throw new IllegalArgumentException("illegal bound " + n + " (must be positive)");
|
||||
}
|
||||
@@ -147,4 +147,4 @@ public class XoRoShiRoRandom extends Random {
|
||||
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loaded 100 of 146 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user