mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-18 03:25:17 +00:00
Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c90f79c17 | ||
|
|
e4e657846d | ||
|
|
2dace708b4 | ||
|
|
1df1ec3530 | ||
|
|
d96ac28043 | ||
|
|
72c13cff67 | ||
|
|
f233ba65e3 | ||
|
|
c0d636d4f7 | ||
|
|
bd5cd350c3 | ||
|
|
88936d3713 | ||
|
|
cf5bf2e2e7 | ||
|
|
cfd2388c85 | ||
|
|
fd78f63f12 | ||
|
|
6cf119dfee | ||
|
|
8c5f4d2543 | ||
|
|
9e1fa7b80f | ||
|
|
6c99872459 | ||
|
|
f0809410ee | ||
|
|
98299b69d2 | ||
|
|
fed0aa77c5 | ||
|
|
f7fb3186c8 | ||
|
|
ab243bb936 | ||
|
|
60cce7ea1d | ||
|
|
b837b0571d | ||
|
|
7abc6213f5 | ||
|
|
b46643ae8c | ||
|
|
e3d1fedd48 |
No files matched your search
@@ -48,6 +48,27 @@ body:
|
||||
- Mesa/Software
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
id: shaders
|
||||
attributes:
|
||||
label: Shaders
|
||||
description: Do you have a shaderpack enabled?
|
||||
options:
|
||||
- "No"
|
||||
- "Yes: Please put relevant information about shaderpack in the report(what shaderpack, any special settings of note, etc)"
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
id: mcpf
|
||||
attributes:
|
||||
label: MCPF or other features disabled by default
|
||||
description: Do you have MCPF or any other features that are disabled by default enabled?
|
||||
options:
|
||||
- "No: Go ahead and create an issue"
|
||||
- "Yes: I will not create an issue"
|
||||
- "Yes: I don't read and shouldn't be creating an issue"
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: report
|
||||
attributes:
|
||||
@@ -76,6 +97,6 @@ body:
|
||||
required: true
|
||||
- label: "I am running an officially released version. (Or, if I've compiled it myself I plan to fix the issue)"
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - Shaders, MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
- label: "This issue is not related to a feature that is disabed by default - MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
|
||||
|
||||
@@ -29,5 +29,5 @@ body:
|
||||
required: true
|
||||
- label: "I have read the known incompatibilities and this is not related to one of those."
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - Shaders, MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
@@ -75,4 +75,6 @@
|
||||
license, see LICENSE in `com.gtnewhorizons.angelica.models`
|
||||
* Dynamic Lights
|
||||
* LambdAurora for [LambDynamicLights](https://github.com/LambdAurora/LambDynamicLights) under the MIT license, and the Forge port anthxnymc for [DynamicLightsReforged](https://github.com/anthxnymc/DynamicLightsReforged), also under the MIT license
|
||||
|
||||
* Embeddedt and Ferri_Arnus for [glsl-transformation-lib](https://github.com/TauMC/glsl-transformation-lib)
|
||||
* Also for work on [Monocle](https://github.com/ferriarnus/Monocle) which was used as a reference for implementing glsl-transformation-lib
|
||||
* Code from both glsl-transformation-lib and Monocle taken under their respective LGPL 3.0 licenses
|
||||
+13
-17
@@ -49,7 +49,7 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.31")
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.71")
|
||||
|
||||
compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:0.4.0") { transitive = false }
|
||||
|
||||
@@ -61,32 +61,29 @@ dependencies {
|
||||
|
||||
// Iris Shaders
|
||||
compileOnly('org.jetbrains:annotations:24.0.1')
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.4.2:dev")
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.5.12:dev")
|
||||
shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0
|
||||
implementation("io.github.douira:glsl-transformer:1.0.0")
|
||||
shadowImplementation("io.github.douira:glsl-transformer:1.0.0") { // glsl-transformer Noncommercial License 1.0.0
|
||||
shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") {
|
||||
exclude module: "antlr4" // we only want to shadow the runtime module
|
||||
}
|
||||
shadowImplementation("org.antlr:antlr4-runtime:4.13.2")
|
||||
compileOnly "org.apache.ant:ant:1.8.2"
|
||||
|
||||
// Because who doesn't want NEI
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.9-GTNH:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.2.0:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.39-GTNH:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.3.7:dev')
|
||||
|
||||
// Notfine Deps
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
|
||||
devOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.4:dev")
|
||||
compileOnly("com.github.GTNewHorizons:twilightforest:2.5.16:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false }
|
||||
compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
|
||||
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.0-GTNH:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Natura:2.6.1:dev")
|
||||
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Natura:2.7.3:dev")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.1:dev")
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.3:dev")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.0:dev") { transitive = false }
|
||||
compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false }
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.0:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.1:dev") { transitive = false }
|
||||
compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false }
|
||||
|
||||
compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false }
|
||||
@@ -97,7 +94,7 @@ dependencies {
|
||||
|
||||
compileOnly("curse.maven:minefactory-reloaded-66672:2277486")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.0.3:dev") // Mixin Version
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") // Mixin Version
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version
|
||||
|
||||
compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675"))
|
||||
@@ -105,7 +102,7 @@ dependencies {
|
||||
compileOnly(rfg.deobf("curse.maven:journeymap-32274:2367915"))
|
||||
compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:5060684"))
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:HoloInventory:2.4.4-GTNH:dev")
|
||||
compileOnly("com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev")
|
||||
|
||||
runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))
|
||||
|
||||
@@ -115,7 +112,6 @@ dependencies {
|
||||
// Better Crashes
|
||||
compileOnly("com.github.GTNewHorizons:BetterCrashes:1.4.0-GTNH:dev")
|
||||
|
||||
|
||||
// Tests
|
||||
testImplementation(platform('org.junit:junit-bom:5.9.2'))
|
||||
testImplementation('org.junit.jupiter:junit-jupiter')
|
||||
|
||||
+7
-1
@@ -122,9 +122,15 @@ minimizeShadowedDependencies = true
|
||||
# If disabled, won't rename the shadowed classes.
|
||||
relocateShadowedDependencies = true
|
||||
|
||||
# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||
includeWellKnownRepositories = true
|
||||
|
||||
# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
|
||||
# list of strings, with the acceptable keys being(case does not matter):
|
||||
# cursemaven
|
||||
# modrinth
|
||||
excludeWellKnownRepositories =
|
||||
|
||||
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
|
||||
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
|
||||
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -25,5 +25,12 @@ repositories {
|
||||
includeGroup('CoreTweaks')
|
||||
}
|
||||
}
|
||||
maven {
|
||||
name = 'taumc'
|
||||
url = 'https://maven.taumc.org/releases'
|
||||
content {
|
||||
includeGroup 'org.taumc'
|
||||
}
|
||||
}
|
||||
mavenLocal()
|
||||
}
|
||||
+1
-1
@@ -16,5 +16,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.gtnewhorizons.angelica;
|
||||
|
||||
import com.gtnewhorizons.angelica.common.BlockError;
|
||||
import com.gtnewhorizons.angelica.compat.ModStatus;
|
||||
import com.gtnewhorizons.angelica.proxy.CommonProxy;
|
||||
import com.gtnewhorizons.angelica.utils.AnimationMode;
|
||||
@@ -27,10 +28,13 @@ public class AngelicaMod {
|
||||
|
||||
public static final ManagedEnum<AnimationMode> animationsMode = new ManagedEnum<>(AnimationMode.VISIBLE_ONLY);
|
||||
|
||||
public static BlockError blockError;
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
ModStatus.preInit();
|
||||
proxy.preInit(event);
|
||||
blockError = new BlockError();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
|
||||
@@ -357,7 +357,7 @@ public class BatchingFontRenderer {
|
||||
final float underlineY = anchorY + underlying.FONT_HEIGHT - 1.0f;
|
||||
float underlineStartX = 0.0f;
|
||||
float underlineEndX = 0.0f;
|
||||
final float strikethroughY = anchorY + (float) (underlying.FONT_HEIGHT / 2);
|
||||
final float strikethroughY = anchorY + (float) (underlying.FONT_HEIGHT / 2) - 1.0F;
|
||||
float strikethroughStartX = 0.0f;
|
||||
float strikethroughEndX = 0.0f;
|
||||
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.gtnewhorizons.angelica.common;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
/**
|
||||
* This Block is not actually getting registered. A static instance is created in AngelicaMod.
|
||||
* Actually registering the block on the client but not the server can cause block IDs to
|
||||
* different between client/server, which is not good.
|
||||
|
||||
* We're essentially injecting the block's texture, so that we may use this block as if it were
|
||||
* any normal block for rendering purposes with RenderBlocks and such, but not have to actually
|
||||
* register it as a block.
|
||||
*/
|
||||
|
||||
public class BlockError extends Block {
|
||||
|
||||
public static final IIcon[] icons = new IIcon[2];
|
||||
|
||||
public BlockError() {
|
||||
super(Material.rock);
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onTextureStitch(TextureStitchEvent.Pre event) {
|
||||
if (event.map.getTextureType() == 0) {
|
||||
for (int i = 0; i < icons.length; i++) {
|
||||
icons[i] = event.map.registerIcon("angelica:error_block_" + i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
return meta >= 0 && meta < icons.length ? icons[meta] : null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import com.gtnewhorizons.angelica.helpers.LoadControllerHelper;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.versioning.ArtifactVersion;
|
||||
import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
|
||||
import mods.battlegear2.Battlegear;
|
||||
import net.dries007.holoInventory.HoloInventory;
|
||||
import xonin.backhand.Backhand;
|
||||
|
||||
@@ -52,6 +53,14 @@ public class ModStatus {
|
||||
) <= 0;
|
||||
}
|
||||
|
||||
// remove compat with original release of BG2
|
||||
if (isBattlegearLoaded){
|
||||
isBattlegearLoaded = new DefaultArtifactVersion("1.2.0")
|
||||
.compareTo(
|
||||
LoadControllerHelper.getOwningMod(Battlegear.class).getProcessedVersion()
|
||||
) <= 0;
|
||||
}
|
||||
|
||||
if (isBackhandLoaded){
|
||||
isBackhandLoaded = new DefaultArtifactVersion("1.4.1")
|
||||
.compareTo(
|
||||
|
||||
@@ -33,7 +33,7 @@ public class AngelicaConfig {
|
||||
public static boolean enableTestBlocks;
|
||||
|
||||
@Config.Comment("Enable Iris Shaders [Requires Sodium]")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean enableIris;
|
||||
|
||||
@@ -127,6 +127,17 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean fixFluidRendererCheckingBlockAgain;
|
||||
|
||||
@Config.Comment("Dynamically modifies the render distance of dropped items entities to preserve performance."
|
||||
+ " It starts reducing the render distance when exceeding the threshold set below.")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean dynamicItemRenderDistance;
|
||||
|
||||
@Config.Comment("Max amount of dropped item rendered")
|
||||
@Config.DefaultInt(256)
|
||||
@Config.RangeInt(min = 32, max = 2048)
|
||||
public static int droppedItemLimit;
|
||||
|
||||
@Config.Comment("Enable Debug Logging")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.RequiresMcRestart
|
||||
|
||||
@@ -971,6 +971,20 @@ public class GLStateManager {
|
||||
GL11.glDrawBuffer(mode);
|
||||
}
|
||||
|
||||
public static void glDrawElements(int mode, IntBuffer indices) {
|
||||
if(AngelicaConfig.enableIris) {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
}
|
||||
GL11.glDrawElements(mode, indices);
|
||||
}
|
||||
|
||||
public static void glBegin(int mode) {
|
||||
if (AngelicaConfig.enableIris) {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
}
|
||||
GL11.glBegin(mode);
|
||||
}
|
||||
|
||||
public static void glLogicOp(int opcode) {
|
||||
GL11.glLogicOp(opcode);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.loading;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.gtnewhorizon.gtnhlib.asm.ASMUtil;
|
||||
import com.gtnewhorizon.gtnhlib.config.ConfigException;
|
||||
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
||||
import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
|
||||
@@ -21,22 +22,28 @@ import org.spongepowered.asm.launch.GlobalProperties;
|
||||
import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
// ================== Important ==================
|
||||
// Due to a bug caused by this class both implementing
|
||||
// IFMLLoadingPlugin and IEarlyMixinLoader,
|
||||
// the IClassTransformer registered in this class
|
||||
// will not respect the sorting index defined.
|
||||
// They will instead use default index 0 which means they will see
|
||||
// obfuscated mappings and not SRG mappings when running outside of dev env.
|
||||
// ===============================================
|
||||
//@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 5)
|
||||
@IFMLLoadingPlugin.MCVersion("1.7.10")
|
||||
@IFMLLoadingPlugin.TransformerExclusions(
|
||||
{
|
||||
@IFMLLoadingPlugin.TransformerExclusions({
|
||||
"com.gtnewhorizons.angelica.transform.RedirectorTransformer",
|
||||
"com.gtnewhorizons.angelica.glsm.GLStateManager"
|
||||
}
|
||||
)
|
||||
@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 5)
|
||||
"com.gtnewhorizons.angelica.glsm.GLStateManager"})
|
||||
public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
|
||||
private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false"));
|
||||
private static boolean OBF_ENV;
|
||||
public static final Logger LOGGER = LogManager.getLogger("Angelica");
|
||||
|
||||
private String[] transformerClasses;
|
||||
@@ -68,18 +75,11 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
if (mixinTweakClasses != null) {
|
||||
mixinTweakClasses.add(MixinCompatHackTweaker.class.getName());
|
||||
}
|
||||
|
||||
// Return any others here
|
||||
if (transformerClasses == null) {
|
||||
|
||||
//Mod Compat transformers
|
||||
final List<String> transformers = new ArrayList<>();
|
||||
transformers.addAll(CompatASMTransformers.getTransformers());
|
||||
|
||||
//NotFine transformers
|
||||
Namer.initNames();
|
||||
transformers.addAll(Arrays.asList(AsmTransformers.getTransformers()));
|
||||
|
||||
final List<String> transformers = new ArrayList<>(CompatASMTransformers.getTransformers());
|
||||
final List<String> notFineTransformers = AsmTransformers.getTransformers();
|
||||
if (!notFineTransformers.isEmpty()) Namer.initNames();
|
||||
transformers.addAll(notFineTransformers);
|
||||
transformerClasses = transformers.toArray(new String[0]);
|
||||
}
|
||||
return transformerClasses;
|
||||
@@ -97,7 +97,7 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
|
||||
@Override
|
||||
public void injectData(Map<String, Object> data) {
|
||||
// no-op
|
||||
OBF_ENV = (boolean) data.get("runtimeDeobfuscationEnabled");
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -115,6 +115,24 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
return Mixins.getEarlyMixins(loadedCoreMods);
|
||||
}
|
||||
|
||||
public static boolean DUMP_CLASSES() {
|
||||
return DUMP_CLASSES || !OBF_ENV;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if we are in an obfuscated environment, returns false in dev environment.
|
||||
*/
|
||||
public static boolean isObfEnv() {
|
||||
return OBF_ENV;
|
||||
}
|
||||
|
||||
public static void dumpClass(String className, byte[] originalBytes, byte[] transformedBytes, Object transformer) {
|
||||
if (AngelicaTweaker.DUMP_CLASSES()) {
|
||||
ASMUtil.saveAsRawClassFile(originalBytes, className + "_PRE", transformer);
|
||||
ASMUtil.saveAsRawClassFile(transformedBytes, className + "_POST", transformer);
|
||||
}
|
||||
}
|
||||
|
||||
private static final ImmutableMap<String, TargetedMod> MODS_BY_CLASS = ImmutableMap.<String, TargetedMod>builder()
|
||||
.put("optifine.OptiFineForgeTweaker", TargetedMod.OPTIFINE)
|
||||
.put("fastcraft.Tweaker", TargetedMod.FASTCRAFT)
|
||||
|
||||
@@ -29,6 +29,7 @@ public enum Mixins {
|
||||
,"angelica.MixinMinecraft"
|
||||
,"angelica.optimizations.MixinRendererLivingEntity"
|
||||
,"angelica.MixinFMLClientHandler"
|
||||
,"angelica.bugfixes.MixinRenderGlobal_DestroyBlock"
|
||||
)
|
||||
),
|
||||
ANGELICA_VBO(
|
||||
@@ -69,6 +70,11 @@ public enum Mixins {
|
||||
.setApplyIf(() -> AngelicaConfig.fixFluidRendererCheckingBlockAgain)
|
||||
.addTargetedMod(TargetedMod.VANILLA)),
|
||||
|
||||
ANGELICA_LIMIT_DROPPED_ITEM_ENTITIES(new Builder("Dynamically modifies the render distance of dropped items entities to preserve performance")
|
||||
.setPhase(Phase.EARLY).addMixinClasses("angelica.optimizations.MixinRenderGlobal_ItemRenderDist").setSide(Side.CLIENT)
|
||||
.setApplyIf(() -> AngelicaConfig.dynamicItemRenderDistance)
|
||||
.addTargetedMod(TargetedMod.VANILLA)),
|
||||
|
||||
// Not compatible with the lwjgl debug callbacks, so disable if that's enabled
|
||||
ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses(
|
||||
@@ -100,15 +106,15 @@ public enum Mixins {
|
||||
|
||||
SODIUM(new Builder("Sodium").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodium).addMixinClasses(
|
||||
"sodium.MixinChunkProviderClient"
|
||||
,"sodium.MixinBlock"
|
||||
"sodium.MixinBlock"
|
||||
,"sodium.MixinBlockFluidBase"
|
||||
,"sodium.AccessorBiomeColorEvent"
|
||||
,"sodium.MixinBiomeGenBase"
|
||||
,"sodium.MixinChunk"
|
||||
,"sodium.MixinChunkProviderServer"
|
||||
,"sodium.MixinClientRegistry"
|
||||
,"sodium.MixinEntity"
|
||||
,"sodium.MixinEntity_RenderDist"
|
||||
,"sodium.MixinEntityItem_RenderDist"
|
||||
,"sodium.MixinRenderManager"
|
||||
,"sodium.MixinExtendedBlockStorage"
|
||||
,"sodium.MixinEntityRenderer"
|
||||
@@ -131,17 +137,13 @@ public enum Mixins {
|
||||
)
|
||||
),
|
||||
|
||||
// Required for Sodium's FluidRenderer, so it treats vanilla liquids as IFluidBlocks
|
||||
SODIUM_WISHLIST(new Builder("Sodiumer").addTargetedMod(TargetedMod.VANILLA).setSide(Side.BOTH)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableSodiumFluidRendering).addMixinClasses(
|
||||
"sodium.MixinBlockLiquid")),
|
||||
|
||||
IRIS_RENDERING(new Builder("Iris Shaders").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableIris).addMixinClasses(
|
||||
"shaders.MixinEntityRenderer"
|
||||
,"shaders.MixinGuiIngameForge"
|
||||
,"shaders.MixinFramebuffer"
|
||||
,"shaders.MixinItem"
|
||||
,"shaders.MixinItemRenderer"
|
||||
,"shaders.MixinLocale"
|
||||
,"shaders.MixinOpenGlHelper"
|
||||
,"shaders.MixinRender"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
@@ -10,9 +11,8 @@ import org.objectweb.asm.tree.ClassNode;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockTransformer implements IClassTransformer {
|
||||
public static final String BlockClass = "net/minecraft/block/Block";
|
||||
public static final String BlockPackage = BlockClass.substring(0, BlockClass.lastIndexOf('/') + 1);
|
||||
private static final String BlockClassFriendly = BlockClass.replace('/', '.');
|
||||
|
||||
private static final String BlockClassFriendly = "net.minecraft.block.Block";
|
||||
public static final List<Pair<String, String>> BlockBoundsFields = ImmutableList.of(
|
||||
Pair.of("minX", "field_149759_B"),
|
||||
Pair.of("minY", "field_149760_C"),
|
||||
@@ -28,18 +28,18 @@ public class BlockTransformer implements IClassTransformer {
|
||||
*/
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if(basicClass != null && transformedName.equals(BlockClassFriendly)) {
|
||||
if (basicClass != null && BlockClassFriendly.equals(transformedName)) {
|
||||
final ClassReader cr = new ClassReader(basicClass);
|
||||
final ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
|
||||
cn.fields.removeIf(node -> BlockBoundsFields.stream().anyMatch(pair -> node.name.equals(pair.getLeft()) || node.name.equals(pair.getRight())));
|
||||
|
||||
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);
|
||||
cn.accept(cw);
|
||||
basicClass = cw.toByteArray();
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,8 +4,6 @@ import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.spongepowered.asm.lib.ClassReader;
|
||||
import org.spongepowered.asm.lib.ClassWriter;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
@@ -18,19 +16,14 @@ import org.spongepowered.asm.lib.tree.MethodInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.transformers.MixinClassWriter;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
public class HUDCachingTransformer implements IClassTransformer, Opcodes {
|
||||
static final String HUDCaching = "com/gtnewhorizons/angelica/hudcaching/HUDCaching$HUDCachingHooks";
|
||||
private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false"));
|
||||
|
||||
static final Map<String, List<String>> ReturnEarlyMethods = ImmutableMap.of(
|
||||
private static final String HUDCaching = "com/gtnewhorizons/angelica/hudcaching/HUDCaching$HUDCachingHooks";
|
||||
private static final Map<String, List<String>> ReturnEarlyMethods = ImmutableMap.of(
|
||||
"thaumcraft.client.lib.RenderEventHandler", ImmutableList.of("renderOverlay"),
|
||||
"com.kentington.thaumichorizons.client.lib.RenderEventHandler", ImmutableList.of("renderOverlay")
|
||||
);
|
||||
@@ -70,43 +63,10 @@ public class HUDCachingTransformer implements IClassTransformer, Opcodes {
|
||||
MixinClassWriter cw = new MixinClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
saveTransformedClass(bytes, transformedName);
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
private File outputDir = null;
|
||||
private void saveTransformedClass(final byte[] data, final String transformedName) {
|
||||
if (!DUMP_CLASSES) {
|
||||
return;
|
||||
}
|
||||
if (outputDir == null) {
|
||||
outputDir = new File(Launch.minecraftHome, "ASM_HUD_CACHING");
|
||||
try {
|
||||
FileUtils.deleteDirectory(outputDir);
|
||||
} catch (IOException ignored) {}
|
||||
if (!outputDir.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
outputDir.mkdirs();
|
||||
}
|
||||
}
|
||||
final String fileName = transformedName.replace('.', File.separatorChar);
|
||||
final File classFile = new File(outputDir, fileName + ".class");
|
||||
final File outDir = classFile.getParentFile();
|
||||
if (!outDir.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
outDir.mkdirs();
|
||||
}
|
||||
if (classFile.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
classFile.delete();
|
||||
}
|
||||
try (final OutputStream output = Files.newOutputStream(classFile.toPath())) {
|
||||
output.write(data);
|
||||
} catch (IOException e) {
|
||||
AngelicaTweaker.LOGGER.error("Could not save transformed class (byte[]) " + transformedName, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,13 +2,10 @@ package com.gtnewhorizons.angelica.transform;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.coderbot.iris.IrisLogging;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
@@ -23,12 +20,8 @@ import org.objectweb.asm.tree.LdcInsnNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
@@ -38,17 +31,12 @@ import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockBoundsFields;
|
||||
import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockClass;
|
||||
import static com.gtnewhorizons.angelica.transform.BlockTransformer.BlockPackage;
|
||||
|
||||
/**
|
||||
* This transformer redirects many GL calls to our custom GLStateManager
|
||||
*/
|
||||
public class RedirectorTransformer implements IClassTransformer {
|
||||
|
||||
private static final boolean ASSERT_MAIN_THREAD = Boolean.parseBoolean(System.getProperty("angelica.assertMainThread", "false"));
|
||||
private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false"));
|
||||
private static final String Drawable = "org/lwjgl/opengl/Drawable";
|
||||
private static final String GLStateManager = "com/gtnewhorizons/angelica/glsm/GLStateManager";
|
||||
private static final String GL11 = "org/lwjgl/opengl/GL11";
|
||||
@@ -57,6 +45,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
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";
|
||||
@@ -106,6 +97,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_SCISSOR_TEST, "ScissorTest");
|
||||
methodRedirects.put(GL11, RedirectMap.newMap()
|
||||
.add("glAlphaFunc")
|
||||
.add("glBegin")
|
||||
.add("glBindTexture")
|
||||
.add("glBlendFunc")
|
||||
.add("glCallList")
|
||||
@@ -128,6 +120,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
.add("glDepthRange")
|
||||
.add("glDrawArrays")
|
||||
.add("glDrawBuffer")
|
||||
.add("glDrawElements")
|
||||
.add("glEdgeFlag")
|
||||
.add("glEndList")
|
||||
.add("glFog")
|
||||
@@ -233,9 +226,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
}
|
||||
|
||||
private boolean isVanillaBlockSubclass(String className) {
|
||||
if(className.startsWith(BlockTransformer.BlockPackage)) {
|
||||
for(String exclusion : VanillaBlockExclusions) {
|
||||
if(className.startsWith(exclusion)) {
|
||||
if (className.startsWith(BlockPackage)) {
|
||||
for (String exclusion : VanillaBlockExclusions) {
|
||||
if (className.startsWith(exclusion)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -281,7 +274,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
saveTransformedClass(bytes, transformedName);
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
return basicClass;
|
||||
@@ -309,9 +302,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
} else {
|
||||
// Check if we declare any known field names
|
||||
Set<String> fieldsDeclaredByClass = cn.fields.stream().map(f -> f.name).collect(Collectors.toSet());
|
||||
doWeShadow = BlockBoundsFields.stream().anyMatch(pair -> fieldsDeclaredByClass.contains(pair.getLeft()) || fieldsDeclaredByClass.contains(pair.getRight()));
|
||||
doWeShadow = BlockTransformer.BlockBoundsFields.stream().anyMatch(pair -> fieldsDeclaredByClass.contains(pair.getLeft()) || fieldsDeclaredByClass.contains(pair.getRight()));
|
||||
}
|
||||
if(doWeShadow) {
|
||||
if (doWeShadow) {
|
||||
AngelicaTweaker.LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name);
|
||||
blockOwnerExclusions.add(cn.name);
|
||||
}
|
||||
@@ -383,13 +376,13 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
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 = null;
|
||||
for(Pair<String, String> blockPairs : BlockBoundsFields) {
|
||||
for(Pair<String, String> blockPairs : BlockTransformer.BlockBoundsFields) {
|
||||
if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) {
|
||||
fieldToRedirect = blockPairs;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(fieldToRedirect != null) {
|
||||
if (fieldToRedirect != null) {
|
||||
if (IrisLogging.ENABLE_SPAM) {
|
||||
AngelicaTweaker.LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName);
|
||||
}
|
||||
@@ -398,9 +391,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
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) {
|
||||
if (node.getOpcode() == Opcodes.GETFIELD) {
|
||||
mn.instructions.insertBefore(fNode, getter);
|
||||
} else if(node.getOpcode() == Opcodes.PUTFIELD) {
|
||||
} else if (node.getOpcode() == Opcodes.PUTFIELD) {
|
||||
// FIXME: this code assumes doubles
|
||||
// Stack: Block, double
|
||||
final InsnList beforePut = new InsnList();
|
||||
@@ -418,7 +411,6 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
}
|
||||
changed = true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -430,40 +422,6 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
return changed;
|
||||
}
|
||||
|
||||
private File outputDir = null;
|
||||
|
||||
private void saveTransformedClass(final byte[] data, final String transformedName) {
|
||||
if (!DUMP_CLASSES) {
|
||||
return;
|
||||
}
|
||||
if (outputDir == null) {
|
||||
outputDir = new File(Launch.minecraftHome, "ASM_REDIRECTOR");
|
||||
try {
|
||||
FileUtils.deleteDirectory(outputDir);
|
||||
} catch (IOException ignored) {}
|
||||
if (!outputDir.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
outputDir.mkdirs();
|
||||
}
|
||||
}
|
||||
final String fileName = transformedName.replace('.', File.separatorChar);
|
||||
final File classFile = new File(outputDir, fileName + ".class");
|
||||
final File outDir = classFile.getParentFile();
|
||||
if (!outDir.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
outDir.mkdirs();
|
||||
}
|
||||
if (classFile.exists()) {
|
||||
//noinspection ResultOfMethodCallIgnored
|
||||
classFile.delete();
|
||||
}
|
||||
try (final OutputStream output = Files.newOutputStream(classFile.toPath())) {
|
||||
output.write(data);
|
||||
} catch (IOException e) {
|
||||
AngelicaTweaker.LOGGER.error("Could not save transformed class (byte[]) " + transformedName, e);
|
||||
}
|
||||
}
|
||||
|
||||
private static class RedirectMap<K> extends HashMap<K, K> {
|
||||
public static RedirectMap<String> newMap() {
|
||||
return new RedirectMap<>();
|
||||
|
||||
+3
-1
@@ -51,7 +51,9 @@ public class ExtraUtilsTransformer implements IClassTransformer {
|
||||
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
return cw.toByteArray();
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
public void addThreadSafeISBRHAnnotation(String transformedName, ClassNode cn) {
|
||||
|
||||
@@ -45,7 +45,7 @@ public enum AsmTransformers {
|
||||
.isClient());
|
||||
}
|
||||
|
||||
public static String[] getTransformers() {
|
||||
public static List<String> getTransformers() {
|
||||
final List<String> list = new ArrayList<>();
|
||||
for (AsmTransformers transformer : values()) {
|
||||
if (transformer.shouldBeLoaded()) {
|
||||
@@ -55,7 +55,7 @@ public enum AsmTransformers {
|
||||
AngelicaTweaker.LOGGER.info("Not loading transformer {}", (Object[]) transformer.transformerClasses);
|
||||
}
|
||||
}
|
||||
return list.toArray(new String[0]);
|
||||
return list;
|
||||
}
|
||||
|
||||
private enum Side {
|
||||
|
||||
@@ -2,6 +2,7 @@ package jss.notfine.asm;
|
||||
|
||||
import static jss.notfine.asm.ASMUtils.matchesNodeSequence;
|
||||
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
@@ -32,9 +33,10 @@ public class RenderBlocksTransformer implements IClassTransformer {
|
||||
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if ("net.minecraft.client.renderer.RenderBlocks".equals(transformedName)) {
|
||||
return patchRenderBlocks(basicClass);
|
||||
final byte[] bytes = patchRenderBlocks(basicClass);
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package jss.notfine.asm;
|
||||
|
||||
import static jss.notfine.asm.ASMUtils.matchesNodeSequence;
|
||||
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
@@ -26,9 +27,10 @@ public class WorldRendererTransformer implements IClassTransformer {
|
||||
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if ("net.minecraft.client.renderer.WorldRenderer".equals(transformedName)) {
|
||||
return patchWorldRenderer(basicClass);
|
||||
final byte[] bytes = patchWorldRenderer(basicClass);
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,9 +50,6 @@ public class Namer {
|
||||
final boolean obfuscated = !(Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
|
||||
AngelicaTweaker.LOGGER.info("Environment obfuscated: {}", obfuscated);
|
||||
if (obfuscated) {
|
||||
// due to mixin bug we can't use sortingIndex meaning we will run too early to use srg
|
||||
// new NamerSrg().setNames();
|
||||
//TODO: check if this is still the case in Angelica
|
||||
new NamerObf().setNames();
|
||||
} else {
|
||||
new NamerMcp().setNames();
|
||||
|
||||
@@ -19,6 +19,7 @@ import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsMode;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.GraphicsQuality;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.LightingQuality;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.named.ParticleMode;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.AngelicaOptionsStorage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.MultidrawChunkRenderBackend;
|
||||
@@ -36,6 +37,7 @@ import java.util.List;
|
||||
public class SodiumGameOptionPages {
|
||||
private static final SodiumOptionsStorage sodiumOpts = new SodiumOptionsStorage();
|
||||
private static final MinecraftOptionsStorage vanillaOpts = new MinecraftOptionsStorage();
|
||||
private static final AngelicaOptionsStorage angelicaOpts = new AngelicaOptionsStorage();
|
||||
|
||||
public static OptionPage general() {
|
||||
final List<OptionGroup> groups = new ArrayList<>();
|
||||
@@ -153,6 +155,15 @@ public class SodiumGameOptionPages {
|
||||
.add(Settings.DYNAMIC_FOV.option)
|
||||
.add(Settings.MODE_WATER.option)
|
||||
.add(Settings.MODE_DROPPED_ITEMS.option)
|
||||
.add(
|
||||
OptionImpl.createBuilder(int.class, angelicaOpts)
|
||||
.setName(I18n.format("options.angelica.droppedItemLimit"))
|
||||
.setTooltip(I18n.format("options.angelica.droppedItemLimit.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 32, 2048, 32, ControlValueFormatter.droppedItemLimitLimit()))
|
||||
.setBinding((options, value) -> AngelicaConfig.droppedItemLimit = value, options -> AngelicaConfig.droppedItemLimit)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.build()
|
||||
)
|
||||
.build());
|
||||
|
||||
return new OptionPage(I18n.format("stat.generalButton"), ImmutableList.copyOf(groups));
|
||||
@@ -246,7 +257,7 @@ public class SodiumGameOptionPages {
|
||||
.build())
|
||||
.build());
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.MODE_GLINT_INV.option)
|
||||
.add(Settings.MODE_GLINT_INV.option)
|
||||
.add(Settings.MODE_GLINT_WORLD.option)
|
||||
.build());
|
||||
|
||||
|
||||
+3
@@ -10,6 +10,9 @@ public interface ControlValueFormatter {
|
||||
static ControlValueFormatter fpsLimit() {
|
||||
return (v) -> (v == 260) ? I18n.format("options.framerateLimit.max") : I18n.format("options.framerate", v);
|
||||
}
|
||||
static ControlValueFormatter droppedItemLimitLimit() {
|
||||
return (v) -> (v == 2048) ? I18n.format("options.droppedItems.max") : I18n.format("options.droppedItems", v);
|
||||
}
|
||||
|
||||
static ControlValueFormatter brightness() {
|
||||
return (v) -> {
|
||||
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package me.jellysquid.mods.sodium.client.gui.options.storage;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
|
||||
public class AngelicaOptionsStorage implements OptionStorage<AngelicaConfig> {
|
||||
|
||||
public AngelicaOptionsStorage() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public AngelicaConfig getData() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void save() {
|
||||
ConfigurationManager.save(AngelicaConfig.class);
|
||||
SodiumClientMod.logger().info("Flushed changes to Angelica configuration");
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -25,6 +25,6 @@ public class SodiumOptionsStorage implements OptionStorage<SodiumGameOptions> {
|
||||
throw new RuntimeException("Couldn't save configuration changes", e);
|
||||
}
|
||||
|
||||
SodiumClientMod.logger().info("Flushed changes to Rubidium configuration");
|
||||
SodiumClientMod.logger().info("Flushed changes to Angelica configuration");
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,8 @@ import me.jellysquid.mods.sodium.client.render.chunk.backends.multidraw.Multidra
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.backends.oneshot.ChunkRenderBackendOneshot;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.format.DefaultModelVertexFormats;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTracker;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import me.jellysquid.mods.sodium.client.render.pipeline.context.ChunkRenderCacheShared;
|
||||
import me.jellysquid.mods.sodium.client.util.math.FrustumExtended;
|
||||
@@ -59,7 +61,7 @@ import java.util.Set;
|
||||
/**
|
||||
* Provides an extension to vanilla's {@link WorldRenderer}.
|
||||
*/
|
||||
public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
public class SodiumWorldRenderer {
|
||||
private static SodiumWorldRenderer instance;
|
||||
|
||||
private final Minecraft client;
|
||||
@@ -155,7 +157,6 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
this.chunkRenderBackend = null;
|
||||
}
|
||||
|
||||
this.loadedChunkPositions.clear();
|
||||
this.globalTileEntities.clear();
|
||||
|
||||
this.world = null;
|
||||
@@ -194,6 +195,8 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
public void updateChunks(Camera camera, Frustrum frustum, boolean hasForcedFrustum, int frame, boolean spectator) {
|
||||
this.frustum = frustum;
|
||||
|
||||
this.processChunkEvents();
|
||||
|
||||
this.useEntityCulling = SodiumClientMod.options().advanced.useEntityCulling;
|
||||
|
||||
if (this.client.gameSettings.renderDistanceChunks != this.renderDistance) {
|
||||
@@ -265,6 +268,11 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
}
|
||||
}
|
||||
|
||||
private void processChunkEvents() {
|
||||
var tracker = ChunkTrackerHolder.get(this.world);
|
||||
tracker.forEachEvent(this.chunkRenderManager::onChunkAdded, this.chunkRenderManager::onChunkRemoved);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs a render pass for the given {@link RenderLayer} and draws all visible chunks for it.
|
||||
*/
|
||||
@@ -324,7 +332,9 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
this.chunkRenderBackend.createShaders(device);
|
||||
|
||||
this.chunkRenderManager = new ChunkRenderManager<>(this, this.chunkRenderBackend, this.world, this.renderDistance);
|
||||
this.chunkRenderManager.restoreChunks(this.loadedChunkPositions);
|
||||
|
||||
var tracker = ChunkTrackerHolder.get(this.world);
|
||||
ChunkTracker.forEachChunk(tracker.getReadyChunks(), this.chunkRenderManager::onChunkAdded);
|
||||
}
|
||||
|
||||
private static ChunkRenderBackend<?> createChunkRenderBackend(RenderDevice device, SodiumGameOptions options, ChunkVertexType vertexFormat) {
|
||||
@@ -379,18 +389,6 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChunkAdded(int x, int z) {
|
||||
this.loadedChunkPositions.add(ChunkPos.toLong(x, z));
|
||||
this.chunkRenderManager.onChunkAdded(x, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChunkRemoved(int x, int z) {
|
||||
this.loadedChunkPositions.remove(ChunkPos.toLong(x, z));
|
||||
this.chunkRenderManager.onChunkRemoved(x, z);
|
||||
}
|
||||
|
||||
public void onChunkRenderUpdated(int x, int y, int z, ChunkRenderData meshBefore, ChunkRenderData meshAfter) {
|
||||
ListUtil.updateList(this.globalTileEntities, meshBefore.getGlobalTileEntities(), meshAfter.getGlobalTileEntities());
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.map;
|
||||
|
||||
public class ChunkStatus {
|
||||
public static final int FLAG_HAS_BLOCK_DATA = 1;
|
||||
public static final int FLAG_HAS_LIGHT_DATA = 2;
|
||||
public static final int FLAG_ALL = FLAG_HAS_BLOCK_DATA | FLAG_HAS_LIGHT_DATA;
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.map;
|
||||
|
||||
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.longs.LongCollection;
|
||||
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
|
||||
import it.unimi.dsi.fastutil.longs.LongSet;
|
||||
import it.unimi.dsi.fastutil.longs.LongSets;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
|
||||
public class ChunkTracker implements ClientChunkEventListener {
|
||||
private final Long2IntOpenHashMap chunkStatus = new Long2IntOpenHashMap();
|
||||
private final LongOpenHashSet chunkReady = new LongOpenHashSet();
|
||||
|
||||
private final LongSet unloadQueue = new LongOpenHashSet();
|
||||
private final LongSet loadQueue = new LongOpenHashSet();
|
||||
|
||||
public ChunkTracker() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateMapCenter(int chunkX, int chunkZ) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateLoadDistance(int loadDistance) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChunkStatusAdded(int x, int z, int flags) {
|
||||
var key = ChunkCoordIntPair.chunkXZ2Int(x, z);
|
||||
|
||||
var prev = this.chunkStatus.get(key);
|
||||
var cur = prev | flags;
|
||||
|
||||
if (prev == cur) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.chunkStatus.put(key, cur);
|
||||
|
||||
this.updateNeighbors(x, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onChunkStatusRemoved(int x, int z, int flags) {
|
||||
var key = ChunkCoordIntPair.chunkXZ2Int(x, z);
|
||||
|
||||
var prev = this.chunkStatus.get(key);
|
||||
int cur = prev & ~flags;
|
||||
|
||||
if (prev == cur) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cur == this.chunkStatus.defaultReturnValue()) {
|
||||
this.chunkStatus.remove(key);
|
||||
} else {
|
||||
this.chunkStatus.put(key, cur);
|
||||
}
|
||||
|
||||
this.updateNeighbors(x, z);
|
||||
}
|
||||
|
||||
private void updateNeighbors(int x, int z) {
|
||||
for (int ox = -1; ox <= 1; ox++) {
|
||||
for (int oz = -1; oz <= 1; oz++) {
|
||||
this.updateMerged(ox + x, oz + z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateMerged(int x, int z) {
|
||||
long key = ChunkCoordIntPair.chunkXZ2Int(x, z);
|
||||
|
||||
int flags = this.chunkStatus.get(key);
|
||||
|
||||
for (int ox = -1; ox <= 1; ox++) {
|
||||
for (int oz = -1; oz <= 1; oz++) {
|
||||
flags &= this.chunkStatus.get(ChunkCoordIntPair.chunkXZ2Int(ox + x, oz + z));
|
||||
}
|
||||
}
|
||||
|
||||
if (flags == ChunkStatus.FLAG_ALL) {
|
||||
if (this.chunkReady.add(key) && !this.unloadQueue.remove(key)) {
|
||||
this.loadQueue.add(key);
|
||||
}
|
||||
} else {
|
||||
if (this.chunkReady.remove(key) && !this.loadQueue.remove(key)) {
|
||||
this.unloadQueue.add(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public LongCollection getReadyChunks() {
|
||||
return LongSets.unmodifiable(this.chunkReady);
|
||||
}
|
||||
|
||||
public void forEachEvent(ChunkEventHandler loadEventHandler, ChunkEventHandler unloadEventHandler) {
|
||||
forEachChunk(this.unloadQueue, unloadEventHandler);
|
||||
this.unloadQueue.clear();
|
||||
|
||||
forEachChunk(this.loadQueue, loadEventHandler);
|
||||
this.loadQueue.clear();
|
||||
}
|
||||
|
||||
public static void forEachChunk(LongCollection queue, ChunkEventHandler handler) {
|
||||
var iterator = queue.iterator();
|
||||
|
||||
while (iterator.hasNext()) {
|
||||
var pos = iterator.nextLong();
|
||||
|
||||
var x = (int)(pos & 4294967295L);
|
||||
var z = (int)((pos >> 32L) & 4294967295L);
|
||||
|
||||
handler.apply(x, z);
|
||||
}
|
||||
}
|
||||
|
||||
public interface ChunkEventHandler {
|
||||
void apply(int x, int z);
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.map;
|
||||
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
|
||||
public interface ChunkTrackerHolder {
|
||||
static ChunkTracker get(WorldClient world) {
|
||||
return ((ChunkTrackerHolder) world).sodium$getTracker();
|
||||
}
|
||||
|
||||
ChunkTracker sodium$getTracker();
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package me.jellysquid.mods.sodium.client.render.chunk.map;
|
||||
|
||||
public interface ClientChunkEventListener {
|
||||
void updateMapCenter(int chunkX, int chunkZ);
|
||||
|
||||
void updateLoadDistance(int loadDistance);
|
||||
|
||||
void onChunkStatusAdded(int x, int z, int flags);
|
||||
void onChunkStatusRemoved(int x, int z, int flags);
|
||||
}
|
||||
+8
-4
@@ -1,6 +1,7 @@
|
||||
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.mojang.ChunkOcclusionDataBuilder;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
|
||||
@@ -32,7 +33,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@@ -153,7 +153,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
if (rendersOffThread(block)) {
|
||||
// Do regular block rendering
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && (!AngelicaConfig.enableSodiumFluidRendering || !(block instanceof IFluidBlock))) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE);
|
||||
@@ -169,7 +169,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
}
|
||||
|
||||
// Do fluid rendering without RenderBlocks
|
||||
if (AngelicaConfig.enableSodiumFluidRendering && block instanceof IFluidBlock) {
|
||||
if (shouldUseSodiumFluidRendering(block)) {
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal())) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
@@ -273,7 +273,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
|
||||
// Do regular block rendering
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && (!AngelicaConfig.enableSodiumFluidRendering || !(block instanceof IFluidBlock))) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE);
|
||||
@@ -306,4 +306,8 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
+ translucencySorting
|
||||
+ '}';
|
||||
}
|
||||
|
||||
private static boolean shouldUseSodiumFluidRendering(Block block) {
|
||||
return AngelicaConfig.enableSodiumFluidRendering && WorldUtil.isFluidBlock(block);
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -96,7 +95,8 @@ public class FluidRenderer {
|
||||
int posY = pos.y;
|
||||
int posZ = pos.z;
|
||||
|
||||
Fluid fluid = ((IFluidBlock) block).getFluid();
|
||||
|
||||
Fluid fluid = WorldUtil.getFluid(block);
|
||||
if (fluid == null) return false;
|
||||
|
||||
// Check for occluded sides; if everything is occluded, don't render
|
||||
@@ -437,7 +437,7 @@ public class FluidRenderer {
|
||||
|
||||
Block block = world.getBlock(x2, y + 1, z2);
|
||||
|
||||
if (block instanceof IFluidBlock && ((IFluidBlock) block).getFluid() == fluid) {
|
||||
if (WorldUtil.getFluid(block) == fluid) {
|
||||
return 1.0F;
|
||||
}
|
||||
|
||||
@@ -445,7 +445,7 @@ public class FluidRenderer {
|
||||
|
||||
block = world.getBlock(pos.x, pos.y, pos.z);
|
||||
int meta = world.getBlockMetadata(pos.x, pos.y, pos.z);
|
||||
Fluid fluid2 = block instanceof IFluidBlock ? ((IFluidBlock) world.getBlock(pos.x, pos.y, pos.z)).getFluid() : null;
|
||||
Fluid fluid2 = WorldUtil.getFluid(block);
|
||||
|
||||
if (fluid2 == fluid) {
|
||||
float height = WorldUtil.getFluidHeight(fluid2, meta);
|
||||
|
||||
@@ -2,157 +2,181 @@ package net.coderbot.iris.pipeline;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.mojang.Camera;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.InteractionHand;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.util.glu.Project;
|
||||
|
||||
import org.joml.Matrix4f;
|
||||
import java.util.Map;
|
||||
|
||||
public class HandRenderer {
|
||||
public static final HandRenderer INSTANCE = new HandRenderer();
|
||||
public static final HandRenderer INSTANCE = new HandRenderer();
|
||||
|
||||
private boolean ACTIVE;
|
||||
private boolean renderingSolid;
|
||||
public static final float DEPTH = 0.125F;
|
||||
private boolean ACTIVE;
|
||||
private boolean renderingSolid;
|
||||
public static final float DEPTH = 0.125F;
|
||||
|
||||
private void setupGlState(RenderGlobal gameRenderer, Camera camera, MatrixStack poseStack, float tickDelta) {
|
||||
// final MatrixStack.Entry pose = poseStack.peek();
|
||||
private void setupGlState(RenderGlobal gameRenderer, Camera camera, float tickDelta) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
// We need to scale the matrix by 0.125 so the hand doesn't clip through blocks.
|
||||
// Matrix4f scaleMatrix = new Matrix4f().scale(1F, 1F, DEPTH);
|
||||
// TODO: ProjectionMatrix
|
||||
// scaleMatrix.multiply(gameRenderer.getProjectionMatrix(camera, tickDelta, false));
|
||||
// scaleMatrix.mul(projectionMatrix);
|
||||
// RenderSystem.matrixMode(5889);
|
||||
// RenderSystem.loadIdentity();
|
||||
// RenderSystem.multMatrix(arg);
|
||||
// RenderSystem.matrixMode(5888);
|
||||
GL11.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GL11.glLoadIdentity();
|
||||
// We need to scale the matrix by 0.125 so the hand doesn't clip through blocks.
|
||||
GL11.glScalef(1.0F, 1.0F, DEPTH);
|
||||
|
||||
// pose.getModel().identity();
|
||||
// pose.getNormal().identity();
|
||||
// TODO: Anaglyph
|
||||
/*if (this.mc.gameSettings.anaglyph) {
|
||||
GL11.glTranslatef((float) (-(anaglyphChannel * 2 - 1)) * 0.07F, 0.0F, 0.0F);
|
||||
}*/
|
||||
|
||||
// gameRenderer.invokeBobHurt(poseStack, tickDelta);
|
||||
//
|
||||
// if (Minecraft.getMinecraft().gameSettings.viewBobbing) {
|
||||
//// gameRenderer.invokeBobView(poseStack, tickDelta);
|
||||
// }
|
||||
}
|
||||
if (mc.entityRenderer.cameraZoom != 1.0D) {
|
||||
GL11.glTranslatef((float) mc.entityRenderer.cameraYaw, (float) (-mc.entityRenderer.cameraPitch), 0.0F);
|
||||
GL11.glScaled(mc.entityRenderer.cameraZoom, mc.entityRenderer.cameraZoom, 1.0D);
|
||||
}
|
||||
|
||||
private boolean canRender(Camera camera, RenderGlobal gameRenderer) {
|
||||
return (camera.isThirdPerson() || !(camera.getEntity() instanceof EntityPlayer) || Minecraft.getMinecraft().gameSettings.hideGUI || (camera.getEntity() instanceof EntityLiving && ((EntityLiving)camera.getEntity()).isPlayerSleeping()));
|
||||
Project.gluPerspective(mc.entityRenderer.getFOVModifier(tickDelta, false), (float) mc.displayWidth / (float) mc.displayHeight, 0.05F, mc.entityRenderer.farPlaneDistance * 2.0F);
|
||||
|
||||
// return !(!gameRenderer.getRenderHand()
|
||||
// || camera.isThirdPerson()
|
||||
// || !(camera.getEntity() instanceof EntityPlayer)
|
||||
// || gameRenderer.getPanoramicMode()
|
||||
// || Minecraft.getMinecraft().gameSettings.hideGUI
|
||||
// || (camera.getEntity() instanceof EntityLiving && ((EntityLiving)camera.getEntity()).isPlayerSleeping())
|
||||
// // TODO: SPECTATOR
|
||||
// /*|| Minecraft.getMinecraft().gameMode.getPlayerMode() == GameType.SPECTATOR*/);
|
||||
}
|
||||
|
||||
public boolean isHandTranslucent(InteractionHand hand) {
|
||||
if (mc.playerController.enableEverythingIsScrewedUpMode()) {
|
||||
GL11.glScalef(1.0F, 2 / 3f, 1.0F);
|
||||
}
|
||||
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
// TODO: Anaglyph
|
||||
/*if (mc.gameSettings.anaglyph) {
|
||||
GL11.glTranslatef((float) (anaglyphChannel * 2 - 1) * 0.1F, 0.0F, 0.0F);
|
||||
}*/
|
||||
|
||||
mc.entityRenderer.hurtCameraEffect(tickDelta);
|
||||
|
||||
if (mc.gameSettings.viewBobbing) {
|
||||
mc.entityRenderer.setupViewBobbing(tickDelta);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean canRender(Camera camera, RenderGlobal gameRenderer) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
return mc.entityRenderer.debugViewDirection <= 0 &&
|
||||
mc.gameSettings.thirdPersonView == 0 &&
|
||||
!camera.getEntity().isPlayerSleeping() &&
|
||||
!mc.gameSettings.hideGUI &&
|
||||
// TODO: SPECTATOR
|
||||
// mc.playerController.currentGameType
|
||||
!mc.playerController.enableEverythingIsScrewedUpMode();
|
||||
}
|
||||
|
||||
public boolean isHandTranslucent(InteractionHand hand) {
|
||||
// TODO: Offhand
|
||||
// Item item = Minecraft.getMinecraft().thePlayer.getItemBySlot(hand == InteractionHand.OFF_HAND ? EquipmentSlot.OFFHAND : EquipmentSlot.MAINHAND).getItem();
|
||||
ItemStack heldItem = Minecraft.getMinecraft().thePlayer.getHeldItem();
|
||||
if (heldItem == null) {
|
||||
return false;
|
||||
}
|
||||
Item item = heldItem.getItem();
|
||||
|
||||
if (item instanceof ItemBlock itemBlock) {
|
||||
// TODO: RenderType
|
||||
// return ItemBlockRenderTypes.getChunkRenderType(itemBlock.getBlock().defaultBlockState()) == RenderType.translucent();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Item item = heldItem.getItem();
|
||||
|
||||
return false;
|
||||
}
|
||||
if (item instanceof ItemBlock itemBlock) {
|
||||
Map<Block, RenderLayer> blockTypeIds = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
|
||||
return blockTypeIds != null && blockTypeIds.get(itemBlock.field_150939_a) == RenderLayer.translucent();
|
||||
}
|
||||
|
||||
public boolean isAnyHandTranslucent() {
|
||||
return isHandTranslucent(InteractionHand.MAIN_HAND) || isHandTranslucent(InteractionHand.OFF_HAND);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void renderSolid(MatrixStack poseStack, float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
public boolean isAnyHandTranslucent() {
|
||||
return isHandTranslucent(InteractionHand.MAIN_HAND) || isHandTranslucent(InteractionHand.OFF_HAND);
|
||||
}
|
||||
|
||||
ACTIVE = true;
|
||||
public void renderSolid(float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_SOLID);
|
||||
ACTIVE = true;
|
||||
|
||||
// poseStack.push();
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_SOLID);
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.startSection("iris_hand");
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDepthMask(true); // actually write to the depth buffer, it's normally disabled at this point
|
||||
|
||||
// TODO: Iris
|
||||
// setupGlState(gameRenderer, camera, poseStack, tickDelta);
|
||||
mc.mcProfiler.startSection("iris_hand");
|
||||
|
||||
renderingSolid = true;
|
||||
// TODO: Hand
|
||||
// Minecraft.getMinecraft().getItemInHandRenderer().renderHandsWithItems(tickDelta, poseStack, bufferSource, Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().getEntityRenderDispatcher().getPackedLightCoords(camera.getEntity(), tickDelta));
|
||||
setupGlState(gameRenderer, camera, tickDelta);
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
renderingSolid = true;
|
||||
mc.entityRenderer.enableLightmap(tickDelta);
|
||||
mc.entityRenderer.itemRenderer.renderItemInFirstPerson(tickDelta);
|
||||
mc.entityRenderer.disableLightmap(tickDelta);
|
||||
|
||||
// TODO: ProjectionMatrix
|
||||
// gameRenderer.resetProjectionMatrix(CapturedRenderingState.INSTANCE.getGbufferProjection());
|
||||
GL11.glDepthMask(false);
|
||||
GL11.glPopMatrix();
|
||||
|
||||
// poseStack.pop();
|
||||
mc.mcProfiler.endSection();
|
||||
|
||||
// bufferSource.endBatch();
|
||||
resetProjectionMatrix();
|
||||
|
||||
renderingSolid = false;
|
||||
renderingSolid = false;
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
|
||||
ACTIVE = false;
|
||||
}
|
||||
ACTIVE = false;
|
||||
}
|
||||
|
||||
public void renderTranslucent(MatrixStack poseStack, float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !isAnyHandTranslucent() || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
// TODO: RenderType
|
||||
public void renderTranslucent(float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !isAnyHandTranslucent() || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
ACTIVE = true;
|
||||
ACTIVE = true;
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_TRANSLUCENT);
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_TRANSLUCENT);
|
||||
|
||||
poseStack.push();
|
||||
GL11.glPushMatrix();
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.startSection("iris_hand_translucent");
|
||||
mc.mcProfiler.startSection("iris_hand_translucent");
|
||||
|
||||
setupGlState(gameRenderer, camera, poseStack, tickDelta);
|
||||
setupGlState(gameRenderer, camera, tickDelta);
|
||||
|
||||
// TODO: Hand
|
||||
// Minecraft.getMinecraft().getItemInHandRenderer().renderHandsWithItems(tickDelta, poseStack, bufferSource, Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().getEntityRenderDispatcher().getPackedLightCoords(camera.getEntity(), tickDelta));
|
||||
mc.entityRenderer.enableLightmap(tickDelta);
|
||||
mc.entityRenderer.itemRenderer.renderItemInFirstPerson(tickDelta);
|
||||
mc.entityRenderer.disableLightmap(tickDelta);
|
||||
|
||||
poseStack.pop();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
resetProjectionMatrix();
|
||||
|
||||
// TODO: ProjectionMatrix
|
||||
// gameRenderer.resetProjectionMatrix(CapturedRenderingState.INSTANCE.getGbufferProjection());
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
|
||||
// bufferSource.endBatch();
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
ACTIVE = false;
|
||||
}
|
||||
|
||||
ACTIVE = false;
|
||||
}
|
||||
private void resetProjectionMatrix() {
|
||||
GL11.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GL11.glLoadIdentity();
|
||||
GL11.glMultMatrix(RenderingState.INSTANCE.getProjectionBuffer());
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
}
|
||||
|
||||
public boolean isActive() {
|
||||
return ACTIVE;
|
||||
}
|
||||
|
||||
public boolean isRenderingSolid() {
|
||||
return renderingSolid;
|
||||
}
|
||||
public boolean isActive() {
|
||||
return ACTIVE;
|
||||
}
|
||||
|
||||
public boolean isRenderingSolid() {
|
||||
return renderingSolid;
|
||||
}
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
|
||||
class AttributeParameters extends Parameters {
|
||||
public final boolean hasGeometry;
|
||||
public final InputAvailability inputs;
|
||||
|
||||
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs) {
|
||||
super(patch);
|
||||
this.hasGeometry = hasGeometry;
|
||||
this.inputs = inputs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = super.hashCode();
|
||||
result = prime * result + (hasGeometry ? 1231 : 1237);
|
||||
result = prime * result + ((inputs == null) ? 0 : inputs.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (!super.equals(obj))
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AttributeParameters other = (AttributeParameters) obj;
|
||||
if (hasGeometry != other.hasGeometry)
|
||||
return false;
|
||||
if (inputs == null) {
|
||||
if (other.inputs != null)
|
||||
return false;
|
||||
} else if (!inputs.equals(other.inputs))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,17 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.Profile;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
|
||||
import java.util.stream.Stream;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
import org.taumc.glsl.Util;
|
||||
|
||||
/**
|
||||
* Implements AttributeShaderTransformer using glsl-transformer AST
|
||||
* transformation methods.
|
||||
*/
|
||||
class AttributeTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
AttributeParameters parameters) {
|
||||
boolean isCore = (tree.getVersionStatement().profile == Profile.CORE || (tree.getVersionStatement().profile == null && tree.getVersionStatement().version.number > 140));
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit, AttributeParameters parameters, String profile, int version) {
|
||||
boolean isCore = (profile.equals("core") || version > 140);
|
||||
if (isCore) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
throw new IllegalStateException("Vertex shaders must be in the compatibility profile to run properly!");
|
||||
@@ -36,32 +23,22 @@ class AttributeTransformer {
|
||||
// lightmap texture coordinate.
|
||||
// See https://github.com/IrisShaders/Iris/issues/1149
|
||||
if (parameters.inputs.lightmap) {
|
||||
root.rename("gl_MultiTexCoord2", "gl_MultiTexCoord1");
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord2", "gl_MultiTexCoord1");
|
||||
}
|
||||
|
||||
Stream<Identifier> stream = Stream.empty();
|
||||
boolean hasItems = false;
|
||||
if (!parameters.inputs.lightmap) {
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord1"));
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord2"));
|
||||
hasItems = true;
|
||||
}
|
||||
if (!parameters.inputs.texture) {
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord0"));
|
||||
hasItems = true;
|
||||
}
|
||||
if (hasItems) {
|
||||
root.replaceReferenceExpressions(t, stream, "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
if (!parameters.inputs.lightmap) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord1", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord2", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
if (!parameters.inputs.texture) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord0", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
|
||||
patchTextureMatrices(t, tree, root, parameters.inputs.lightmap);
|
||||
patchTextureMatrices(translationUnit, parameters.inputs.lightmap);
|
||||
|
||||
if (parameters.type.glShaderType == ShaderType.VERTEX
|
||||
&& root.identifierIndex.has("gl_MultiTexCoord3")
|
||||
&& !root.identifierIndex.has("mc_midTexCoord")) {
|
||||
&& Util.hasVariable(translationUnit, "gl_MultiTexCoord3")
|
||||
&& !Util.hasVariable(translationUnit, "mc_midTexCoord")) {
|
||||
// TODO: proper type conversion
|
||||
// gl_MultiTexCoord3 is a super legacy alias of mc_midTexCoord. We don't do this
|
||||
// replacement if we think mc_midTexCoord could be defined just we can't handle
|
||||
@@ -69,43 +46,44 @@ class AttributeTransformer {
|
||||
// to define mc_midTexCoord only if it's not defined, and if it is defined,
|
||||
// figure out its type, then replace all occurrences of gl_MultiTexCoord3 with
|
||||
// the correct conversion from mc_midTexCoord's declared type to vec4.
|
||||
root.rename("gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"attribute vec4 mc_midTexCoord;");
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 mc_midTexCoord;");
|
||||
}
|
||||
}
|
||||
|
||||
private static void patchTextureMatrices(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
boolean hasLightmap) {
|
||||
root.rename("gl_TextureMatrix", "iris_TextureMatrix");
|
||||
private static void patchTextureMatrices(GLSLParser.Translation_unitContext translationUnit, boolean hasLightmap) {
|
||||
Util.rename(translationUnit, "gl_TextureMatrix", "iris_TextureMatrix");
|
||||
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"const float iris_ONE_OVER_256 = 0.00390625;",
|
||||
"const float iris_ONE_OVER_32 = iris_ONE_OVER_256 * 8;");
|
||||
if (hasLightmap) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"mat4 iris_LightmapTextureMatrix = gl_TextureMatrix[1];");
|
||||
} else {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS, "mat4 iris_LightmapTextureMatrix =" +
|
||||
"mat4(iris_ONE_OVER_256, 0.0, 0.0, 0.0," +
|
||||
" 0.0, iris_ONE_OVER_256, 0.0, 0.0," +
|
||||
" 0.0, 0.0, iris_ONE_OVER_256, 0.0," +
|
||||
" iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_256);");
|
||||
}
|
||||
// TODO: These were originally marked const, but that breaks things
|
||||
// If these are marked const, then using them below in the iris_LightmapTextureMatrix creation
|
||||
// breaks with them being undefined. I suppose the const variables cause them to get defined later than otherwise?
|
||||
// Similarly, if you make them a const, then iris_ONE_OVER_32 breaks because it references iris_ONE_OVER_256.
|
||||
// Not sure if it really matters if these are marked const or not. Alternatively they can be marked const
|
||||
// and the values hardcoded within the places that use them here, that seems to work fine, but this probably
|
||||
// stayed closer to the original way it worked.
|
||||
Util.injectVariable(translationUnit, "float iris_ONE_OVER_256 = 0.00390625;");
|
||||
Util.injectVariable(translationUnit, "float iris_ONE_OVER_32 = iris_ONE_OVER_256 * 8;");
|
||||
|
||||
// column major
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS, "mat4 iris_TextureMatrix[8] = mat4[8](" +
|
||||
"gl_TextureMatrix[0]," +
|
||||
"iris_LightmapTextureMatrix," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)" +
|
||||
");");
|
||||
if (hasLightmap) {
|
||||
Util.injectVariable(translationUnit, "mat4 iris_LightmapTextureMatrix = gl_TextureMatrix[1];");
|
||||
} else {
|
||||
Util.injectVariable(translationUnit, "mat4 iris_LightmapTextureMatrix =" +
|
||||
"mat4(iris_ONE_OVER_256, 0.0, 0.0, 0.0," +
|
||||
" 0.0, iris_ONE_OVER_256, 0.0, 0.0," +
|
||||
" 0.0, 0.0, iris_ONE_OVER_256, 0.0," +
|
||||
" iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_256);");
|
||||
}
|
||||
|
||||
// column major
|
||||
Util.injectVariable(translationUnit, "mat4 iris_TextureMatrix[8] = mat4[8](" +
|
||||
"gl_TextureMatrix[0]," +
|
||||
"iris_LightmapTextureMatrix," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)" +
|
||||
");");
|
||||
}
|
||||
}
|
||||
@@ -1,310 +1,55 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.DeclarationMember;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.FunctionParameter;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.TypeAndInitDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.Expression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.LiteralExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.ReferenceExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.unary.FunctionCallExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.DeclarationExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.EmptyDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.FunctionDefinition;
|
||||
import io.github.douira.glsl_transformer.ast.node.statement.Statement;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.StorageQualifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.StorageQualifier.StorageType;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.TypeQualifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.TypeQualifierPart;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.BuiltinNumericTypeSpecifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.FunctionPrototype;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.TypeSpecifier;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import io.github.douira.glsl_transformer.ast.transform.Template;
|
||||
import io.github.douira.glsl_transformer.util.Type;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
import net.coderbot.iris.pipeline.PatchedShaderPrinter;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import org.antlr.v4.runtime.tree.ParseTree;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLLexer;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class CompatibilityTransformer {
|
||||
static Logger LOGGER = LogManager.getLogger(CompatibilityTransformer.class);
|
||||
|
||||
private static final AutoHintedMatcher<Expression> sildursWaterFract = new AutoHintedMatcher<>(
|
||||
"fract(worldpos.y + 0.001)", Matcher.expressionPattern);
|
||||
private static final ShaderType[] pipeline = {ShaderType.VERTEX, ShaderType.GEOMETRY, ShaderType.FRAGMENT};
|
||||
|
||||
private static StorageQualifier getConstQualifier(TypeQualifier qualifier) {
|
||||
if (qualifier == null) {
|
||||
return null;
|
||||
}
|
||||
for (TypeQualifierPart constQualifier : qualifier.getChildren()) {
|
||||
if (constQualifier instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) constQualifier;
|
||||
if (storageQualifier.storageType == StorageQualifier.StorageType.CONST) {
|
||||
return storageQualifier;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void transformEach(ASTParser t, TranslationUnit tree, Root root, Parameters parameters) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
if (root.replaceExpressionMatches(t, sildursWaterFract, "fract(worldpos.y + 0.01)")) {
|
||||
Iris.logger.warn("Patched fract(worldpos.y + 0.001) to fract(worldpos.y + 0.01) to fix " +
|
||||
"waving water disconnecting from other water blocks; See https://github.com/IrisShaders/Iris/issues/509");
|
||||
}
|
||||
}
|
||||
public static void transformEach(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
;
|
||||
// TODO: sildur's jankness
|
||||
// This is a hacky patch for sildur's shaders that changes the way it does it's waving water to make it work better?
|
||||
// Why is this the GLSL transformation code in Iris, tell sildur to fix it and remove this?
|
||||
// it's still there in current, modern Iris
|
||||
// See https://github.com/IrisShaders/Iris/issues/509
|
||||
Util.replaceExpression(translationUnit, "fract(worldpos.y + 0.001)", "fract(worldpos.y + 0.01)");
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes const storage qualifier from declarations in functions if they are
|
||||
* initialized with const parameters. Const parameters are immutable parameters
|
||||
* and can't be used to initialize const declarations because they expect
|
||||
* constant, not just immutable, expressions. This varies between drivers and
|
||||
* versions. Also removes the const qualifier from declarations that use the
|
||||
* identifiers from which the declaration was removed previously.
|
||||
* See https://wiki.shaderlabs.org/wiki/Compiler_Behavior_Notes
|
||||
*/
|
||||
Map<FunctionDefinition, Set<String>> constFunctions = new HashMap<>();
|
||||
Set<String> processingSet = new HashSet<>();
|
||||
List<FunctionDefinition> unusedFunctions = new LinkedList<>();
|
||||
for (FunctionDefinition definition : root.nodeIndex.get(FunctionDefinition.class)) {
|
||||
// check if this function is ever used
|
||||
FunctionPrototype prototype = definition.getFunctionPrototype();
|
||||
String functionName = prototype.getName().getName();
|
||||
if (!functionName.equals("main") && root.identifierIndex.getStream(functionName).count() <= 1) {
|
||||
// remove unused functions
|
||||
// unused function removal can be helpful since some drivers don't do some
|
||||
// checks on unused functions. Additionally, sometimes bugs in unused code can
|
||||
// be avoided this way.
|
||||
// TODO: integrate into debug mode (allow user to disable this behavior for
|
||||
// debugging purposes)
|
||||
unusedFunctions.add(definition);
|
||||
if (PatchedShaderPrinter.prettyPrintShaders) {
|
||||
LOGGER.warn("Removing unused function " + functionName);
|
||||
} else if (unusedFunctions.size() == 1) {
|
||||
LOGGER.warn(
|
||||
"Removing unused function " + functionName
|
||||
+ " and omitting further such messages outside of debug mode. See debugging.md for more information.");
|
||||
}
|
||||
continue;
|
||||
}
|
||||
/**
|
||||
* Removes const storage qualifier from declarations in functions if they are
|
||||
* initialized with const parameters. Const parameters are immutable parameters
|
||||
* and can't be used to initialize const declarations because they expect
|
||||
* constant, not just immutable, expressions. This varies between drivers and
|
||||
* versions. Also removes the const qualifier from declarations that use the
|
||||
* identifiers from which the declaration was removed previously.
|
||||
* See https://wiki.shaderlabs.org/wiki/Compiler_Behavior_Notes
|
||||
*/
|
||||
Util.removeUnusedFunctions(translationUnit);
|
||||
Util.removeConstAssignment(translationUnit);
|
||||
|
||||
// stop on functions without parameters
|
||||
if (prototype.getChildren().isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// find the const parameters
|
||||
Set<String> names = new HashSet<>(prototype.getChildren().size());
|
||||
for (FunctionParameter parameter : prototype.getChildren()) {
|
||||
if (getConstQualifier(parameter.getType().getTypeQualifier()) != null) {
|
||||
String name = parameter.getName().getName();
|
||||
names.add(name);
|
||||
processingSet.add(name);
|
||||
}
|
||||
}
|
||||
if (!names.isEmpty()) {
|
||||
constFunctions.put(definition, names);
|
||||
}
|
||||
}
|
||||
|
||||
// remove collected unused functions
|
||||
for (FunctionDefinition definition : unusedFunctions) {
|
||||
definition.detachAndDelete();
|
||||
}
|
||||
|
||||
// find the reference expressions for the const parameters
|
||||
// and check that they are in the right function and are of the right type
|
||||
boolean constDeclarationHit = false;
|
||||
Deque<String> processingQueue = new ArrayDeque<>(processingSet);
|
||||
while (!processingQueue.isEmpty()) {
|
||||
String name = processingQueue.poll();
|
||||
processingSet.remove(name);
|
||||
for (Identifier id : root.identifierIndex.get(name)) {
|
||||
// since this searches for reference expressions, this won't accidentally find
|
||||
// the name as the name of a declaration member
|
||||
ReferenceExpression reference = id.getAncestor(ReferenceExpression.class);
|
||||
if (reference == null) {
|
||||
continue;
|
||||
}
|
||||
TypeAndInitDeclaration taid = reference.getAncestor(TypeAndInitDeclaration.class);
|
||||
if (taid == null) {
|
||||
continue;
|
||||
}
|
||||
FunctionDefinition inDefinition = taid.getAncestor(FunctionDefinition.class);
|
||||
if (inDefinition == null) {
|
||||
continue;
|
||||
}
|
||||
Set<String> constIdsInFunction = constFunctions.get(inDefinition);
|
||||
if (constIdsInFunction == null) {
|
||||
continue;
|
||||
}
|
||||
if (constIdsInFunction.contains(name)) {
|
||||
// remove the const qualifier from the reference expression
|
||||
TypeQualifier qualifier = taid.getType().getTypeQualifier();
|
||||
StorageQualifier constQualifier = getConstQualifier(qualifier);
|
||||
if (constQualifier == null) {
|
||||
continue;
|
||||
}
|
||||
constQualifier.detachAndDelete();
|
||||
if (qualifier.getChildren().isEmpty()) {
|
||||
qualifier.detachAndDelete();
|
||||
}
|
||||
constDeclarationHit = true;
|
||||
|
||||
// add all members of the declaration to the list of const parameters to process
|
||||
for (DeclarationMember member : taid.getMembers()) {
|
||||
String memberName = member.getName().getName();
|
||||
|
||||
// the name may not be the same as the parameter name
|
||||
if (constIdsInFunction.contains(memberName)) {
|
||||
throw new IllegalStateException("Illegal redefinition of const parameter " + name);
|
||||
}
|
||||
|
||||
constIdsInFunction.add(memberName);
|
||||
|
||||
// don't add to the queue twice if it's already been added by a different scope
|
||||
if (!processingSet.contains(memberName)) {
|
||||
processingQueue.add(memberName);
|
||||
processingSet.add(memberName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (constDeclarationHit) {
|
||||
LOGGER.warn(
|
||||
"Removed the const keyword from declarations that use const parameters. See debugging.md for more information.");
|
||||
}
|
||||
|
||||
// remove empty external declarations
|
||||
boolean emptyDeclarationHit = root.process(
|
||||
root.nodeIndex.getStream(EmptyDeclaration.class),
|
||||
ASTNode::detachAndDelete);
|
||||
if (emptyDeclarationHit) {
|
||||
LOGGER.warn(
|
||||
"Removed empty external declarations (\";\").");
|
||||
}
|
||||
}
|
||||
|
||||
private static class DeclarationMatcher extends AutoHintedMatcher<ExternalDeclaration> {
|
||||
private final StorageType storageType;
|
||||
|
||||
public DeclarationMatcher(StorageType storageType) {
|
||||
super("out float name;", Matcher.externalDeclarationPattern);
|
||||
this.storageType = storageType;
|
||||
markClassWildcard("qualifier", pattern.getRoot().nodeIndex.getOne(TypeQualifier.class));
|
||||
markClassWildcard("type", pattern.getRoot().nodeIndex.getOne(BuiltinNumericTypeSpecifier.class));
|
||||
markClassWildcard("name*", pattern.getRoot().identifierIndex.getOne("name").getAncestor(DeclarationMember.class));
|
||||
}
|
||||
|
||||
public boolean matchesSpecialized(ExternalDeclaration tree, ShaderType shaderType) {
|
||||
boolean result = super.matchesExtract(tree);
|
||||
if (!result) {
|
||||
return false;
|
||||
}
|
||||
TypeQualifier qualifier = getNodeMatch("qualifier", TypeQualifier.class);
|
||||
for (TypeQualifierPart part : qualifier.getParts()) {
|
||||
if (part instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) part;
|
||||
StorageType qualifierStorageType = storageQualifier.storageType;
|
||||
// TODO: investigate the specified behavior of varying in geometry shaders and
|
||||
// the combination of varying with in or out qualifiers
|
||||
if (qualifierStorageType == storageType ||
|
||||
qualifierStorageType == StorageType.VARYING &&
|
||||
(shaderType == ShaderType.VERTEX && storageType == StorageType.OUT ||
|
||||
shaderType == ShaderType.GEOMETRY && storageType == StorageType.OUT ||
|
||||
shaderType == ShaderType.FRAGMENT && storageType == StorageType.IN)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static final ShaderType[] pipeline = { ShaderType.VERTEX, ShaderType.GEOMETRY, ShaderType.FRAGMENT };
|
||||
private static final DeclarationMatcher outDeclarationMatcher = new DeclarationMatcher(StorageType.OUT);
|
||||
private static final DeclarationMatcher inDeclarationMatcher = new DeclarationMatcher(StorageType.IN);
|
||||
|
||||
private static final String tagPrefix = "iris_template_";
|
||||
private static final Template<ExternalDeclaration> declarationTemplate = Template
|
||||
.withExternalDeclaration("out __type __name;");
|
||||
private static final Template<Statement> initTemplate = Template.withStatement("__decl = __value;");
|
||||
private static final Template<ExternalDeclaration> variableTemplate = Template
|
||||
.withExternalDeclaration("__type __internalDecl;");
|
||||
private static final Template<Statement> statementTemplate = Template
|
||||
.withStatement("__oldDecl = vec3(__internalDecl);");
|
||||
private static final Template<Statement> statementTemplateVector = Template
|
||||
.withStatement("__oldDecl = vec3(__internalDecl, vec4(0));");
|
||||
|
||||
static {
|
||||
declarationTemplate.markLocalReplacement(declarationTemplate.getSourceRoot().nodeIndex.getOne(TypeQualifier.class));
|
||||
declarationTemplate.markLocalReplacement("__type", TypeSpecifier.class);
|
||||
declarationTemplate.markIdentifierReplacement("__name");
|
||||
initTemplate.markIdentifierReplacement("__decl");
|
||||
initTemplate.markLocalReplacement("__value", ReferenceExpression.class);
|
||||
variableTemplate.markLocalReplacement("__type", TypeSpecifier.class);
|
||||
variableTemplate.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplate.markIdentifierReplacement("__oldDecl");
|
||||
statementTemplate.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplate.markLocalReplacement(
|
||||
statementTemplate.getSourceRoot().nodeIndex.getStream(BuiltinNumericTypeSpecifier.class)
|
||||
.filter(specifier -> specifier.type == Type.F32VEC3).findAny().get());
|
||||
statementTemplateVector.markIdentifierReplacement("__oldDecl");
|
||||
statementTemplateVector.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplateVector.markLocalReplacement(
|
||||
statementTemplateVector.getSourceRoot().nodeIndex.getStream(BuiltinNumericTypeSpecifier.class)
|
||||
.filter(specifier -> specifier.type == Type.F32VEC3).findAny().get());
|
||||
}
|
||||
|
||||
private static Statement getInitializer(Root root, String name, Type type) {
|
||||
return initTemplate.getInstanceFor(root,
|
||||
new Identifier(name),
|
||||
type.isScalar()
|
||||
? LiteralExpression.getDefaultValue(type)
|
||||
: Root.indexNodes(root, () -> new FunctionCallExpression(
|
||||
new Identifier(type.getMostCompactName()),
|
||||
Stream.of(LiteralExpression.getDefaultValue(type)))));
|
||||
}
|
||||
|
||||
private static TypeQualifier makeQualifierOut(TypeQualifier typeQualifier) {
|
||||
for (TypeQualifierPart qualifierPart : typeQualifier.getParts()) {
|
||||
if (qualifierPart instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) qualifierPart;
|
||||
if (((StorageQualifier) qualifierPart).storageType == StorageType.IN) {
|
||||
storageQualifier.storageType = StorageType.OUT;
|
||||
}
|
||||
}
|
||||
}
|
||||
return typeQualifier;
|
||||
}
|
||||
// TODO: glsl-transformation-lib doesn't have a way to identify empty declarations
|
||||
// this transformation is not done in current versions of Iris, so not sure it's necessary
|
||||
// boolean emptyDeclarationHit = root.process(
|
||||
// root.nodeIndex.getStream(EmptyDeclaration.class),
|
||||
// ASTNode::detachAndDelete);
|
||||
// if (emptyDeclarationHit) {
|
||||
// LOGGER.warn(
|
||||
// "Removed empty external declarations (\";\").");
|
||||
// }
|
||||
}
|
||||
|
||||
// does transformations that require cross-shader type data
|
||||
public static void transformGrouped(
|
||||
ASTParser t,
|
||||
Map<PatchShaderType, TranslationUnit> trees,
|
||||
Parameters parameters) {
|
||||
public static void transformGrouped(Map<PatchShaderType, GLSLParser.Translation_unitContext> trees, Parameters parameters) {
|
||||
/**
|
||||
* find attributes that are declared as "in" in geometry or fragment but not
|
||||
* declared as "out" in the previous stage. The missing "out" declarations for
|
||||
@@ -320,225 +65,73 @@ public class CompatibilityTransformer {
|
||||
* iris_FogFragCoord if there are geometry shaders present
|
||||
* - improved geometry shader support? They use funky declarations
|
||||
*/
|
||||
ShaderType prevType = null;
|
||||
for (int i = 0; i < pipeline.length; i++) {
|
||||
ShaderType type = pipeline[i];
|
||||
PatchShaderType[] patchTypes = PatchShaderType.fromGlShaderType(type);
|
||||
ShaderType prevType = null;
|
||||
for (ShaderType type : pipeline) {
|
||||
PatchShaderType[] patchTypes = PatchShaderType.fromGlShaderType(type);
|
||||
|
||||
// check if the patch types have sources and continue if not
|
||||
boolean hasAny = false;
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
if (trees.get(currentType) != null) {
|
||||
hasAny = true;
|
||||
}
|
||||
}
|
||||
if (!hasAny) {
|
||||
continue;
|
||||
}
|
||||
// check if the patch types have sources and continue if not
|
||||
boolean hasAny = false;
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
if (trees.get(currentType) != null) {
|
||||
hasAny = true;
|
||||
}
|
||||
}
|
||||
if (!hasAny) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// if the current type has sources but the previous one doesn't, set the
|
||||
// previous one and continue
|
||||
if (prevType == null) {
|
||||
prevType = type;
|
||||
continue;
|
||||
}
|
||||
// if the current type has sources but the previous one doesn't, set the
|
||||
// previous one and continue
|
||||
if (prevType == null) {
|
||||
prevType = type;
|
||||
continue;
|
||||
}
|
||||
|
||||
PatchShaderType prevPatchTypes = PatchShaderType.fromGlShaderType(prevType)[0];
|
||||
TranslationUnit prevTree = trees.get(prevPatchTypes);
|
||||
Root prevRoot = prevTree.getRoot();
|
||||
PatchShaderType prevPatchTypes = PatchShaderType.fromGlShaderType(prevType)[0];
|
||||
GLSLParser.Translation_unitContext prevTree = trees.get(prevPatchTypes);
|
||||
|
||||
// test if the prefix tag is used for some reason
|
||||
if (prevRoot.identifierIndex.prefixQueryFlat(tagPrefix).findAny().isPresent()) {
|
||||
LOGGER.warn("The prefix tag " + tagPrefix + " is used in the shader, bailing compatibility transformation.");
|
||||
return;
|
||||
}
|
||||
// find out declarations
|
||||
Map<String, GLSLParser.Single_declarationContext> outDec = Util.findQualifiers(prevTree, GLSLLexer.OUT);
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
GLSLParser.Translation_unitContext currentTree = trees.get(currentType);
|
||||
|
||||
// find out declarations
|
||||
Map<String, BuiltinNumericTypeSpecifier> outDeclarations = new HashMap<>();
|
||||
for (DeclarationExternalDeclaration declaration : prevRoot.nodeIndex.get(DeclarationExternalDeclaration.class)) {
|
||||
if (outDeclarationMatcher.matchesSpecialized(declaration, prevType)) {
|
||||
BuiltinNumericTypeSpecifier extractedType = outDeclarationMatcher.getNodeMatch("type",
|
||||
BuiltinNumericTypeSpecifier.class);
|
||||
for (DeclarationMember member : outDeclarationMatcher
|
||||
.getNodeMatch("name*", DeclarationMember.class)
|
||||
.getAncestor(TypeAndInitDeclaration.class)
|
||||
.getMembers()) {
|
||||
String name = member.getName().getName();
|
||||
if (!name.startsWith("gl_")) {
|
||||
outDeclarations.put(name, extractedType);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (currentTree == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// add out declarations that are missing for in declarations
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
TranslationUnit currentTree = trees.get(currentType);
|
||||
if (currentTree == null) {
|
||||
continue;
|
||||
}
|
||||
Root currentRoot = currentTree.getRoot();
|
||||
Map<String, GLSLParser.Single_declarationContext> inDec = Util.findQualifiers(currentTree, GLSLLexer.IN);
|
||||
for (String in : inDec.keySet()) {
|
||||
if (in.startsWith("gl_")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (ExternalDeclaration declaration : currentRoot.nodeIndex.get(DeclarationExternalDeclaration.class)) {
|
||||
if (!inDeclarationMatcher.matchesSpecialized(declaration, currentType.glShaderType)) {
|
||||
continue;
|
||||
}
|
||||
if (!outDec.containsKey(in)) {
|
||||
if (!Util.containsCall(currentTree, in)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BuiltinNumericTypeSpecifier inTypeSpecifier = inDeclarationMatcher.getNodeMatch("type",
|
||||
BuiltinNumericTypeSpecifier.class);
|
||||
for (DeclarationMember inDeclarationMember : inDeclarationMatcher
|
||||
.getNodeMatch("name*", DeclarationMember.class)
|
||||
.getAncestor(TypeAndInitDeclaration.class)
|
||||
.getMembers()) {
|
||||
String name = inDeclarationMember.getName().getName();
|
||||
if (name.startsWith("gl_")) {
|
||||
continue;
|
||||
}
|
||||
Util.makeOutDeclaration(prevTree, inDec.get(in), in);
|
||||
|
||||
// patch missing declarations with an initialization
|
||||
if (!outDeclarations.containsKey(name)) {
|
||||
// make sure the declared in is actually used
|
||||
if (!currentRoot.identifierIndex.getAncestors(name, ReferenceExpression.class).findAny().isPresent()) {
|
||||
continue;
|
||||
}
|
||||
if (!Util.hasAssigment(prevTree, in)) {
|
||||
Util.initialize(prevTree, inDec.get(in), in);
|
||||
}
|
||||
} else {
|
||||
ParseTree outType = outDec.get(in).fully_specified_type().type_specifier().type_specifier_nonarray().children.get(0);
|
||||
ParseTree inType = inDec.get(in).fully_specified_type().type_specifier().type_specifier_nonarray().children.get(0);
|
||||
|
||||
if (inTypeSpecifier == null) {
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader that has a missing corresponding out declaration in the previous stage "
|
||||
+ prevType.name() + " has a non-numeric type and could not be compatibility-patched. See debugging.md for more information.");
|
||||
continue;
|
||||
}
|
||||
Type inType = inTypeSpecifier.type;
|
||||
if (outDec.get(in).fully_specified_type().type_specifier().array_specifier() != null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// insert the new out declaration but copy over the type qualifiers, except for
|
||||
// the in/out qualifier
|
||||
TypeQualifier outQualifier = (TypeQualifier) inDeclarationMatcher
|
||||
.getNodeMatch("qualifier").cloneInto(prevRoot);
|
||||
makeQualifierOut(outQualifier);
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, declarationTemplate.getInstanceFor(prevRoot,
|
||||
outQualifier,
|
||||
inTypeSpecifier.cloneInto(prevRoot),
|
||||
new Identifier(name)));
|
||||
|
||||
// add the initializer to the main function
|
||||
prevTree.prependMain(getInitializer(prevRoot, name, inType));
|
||||
|
||||
// update out declarations to prevent duplicates
|
||||
outDeclarations.put(name, null);
|
||||
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader is missing a corresponding out declaration in the previous stage "
|
||||
+ prevType.name() + " and has been compatibility-patched. See debugging.md for more information.");
|
||||
}
|
||||
|
||||
// patch mismatching declaration with a local variable and a cast
|
||||
else {
|
||||
// there is an out declaration for this in declaration, check if the types match
|
||||
BuiltinNumericTypeSpecifier outTypeSpecifier = outDeclarations.get(name);
|
||||
|
||||
// skip newly inserted out declarations
|
||||
if (outTypeSpecifier == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Type inType = inTypeSpecifier.type;
|
||||
Type outType = outTypeSpecifier.type;
|
||||
|
||||
// skip if the type matches, nothing has to be done
|
||||
if (inType == outType) {
|
||||
// if the types match but it's never assigned a value,
|
||||
// an initialization is added
|
||||
if (prevRoot.identifierIndex.get(name).size() > 1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// add an initialization statement for this declaration
|
||||
prevTree.prependMain(getInitializer(prevRoot, name, inType));
|
||||
outDeclarations.put(name, null);
|
||||
continue;
|
||||
}
|
||||
|
||||
// bail and warn on mismatching dimensionality
|
||||
if (outType.getDimension() != inType.getDimension()) {
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader has a mismatching dimensionality (scalar/vector/matrix) with the out declaration in the previous stage "
|
||||
+ prevType.name() + " and could not be compatibility-patched. See debugging.md for more information.");
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean isVector = outType.isVector();
|
||||
|
||||
// rename all references of this out declaration to a new name (iris_)
|
||||
String newName = tagPrefix + name;
|
||||
prevRoot.identifierIndex.rename(name, newName);
|
||||
|
||||
// rename the original out declaration back to the original name
|
||||
TypeAndInitDeclaration outDeclaration = outTypeSpecifier.getAncestor(TypeAndInitDeclaration.class);
|
||||
if (outDeclaration == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
List<DeclarationMember> outMembers = outDeclaration.getMembers();
|
||||
DeclarationMember outMember = null;
|
||||
for (DeclarationMember member : outMembers) {
|
||||
if (member.getName().getName().equals(newName)) {
|
||||
outMember = member;
|
||||
}
|
||||
}
|
||||
if (outMember == null) {
|
||||
throw new IllegalStateException("The targeted out declaration member is missing!");
|
||||
}
|
||||
outMember.getName().replaceByAndDelete(new Identifier(name));
|
||||
|
||||
// move the declaration member out of the declaration in case there is more than
|
||||
// one member to avoid changing the other member's type as well.
|
||||
if (outMembers.size() > 1) {
|
||||
outMember.detach();
|
||||
outTypeSpecifier = outTypeSpecifier.cloneInto(prevRoot);
|
||||
DeclarationExternalDeclaration singleOutDeclaration = (DeclarationExternalDeclaration) declarationTemplate
|
||||
.getInstanceFor(prevRoot,
|
||||
makeQualifierOut(outDeclaration.getType().getTypeQualifier().cloneInto(prevRoot)),
|
||||
outTypeSpecifier,
|
||||
new Identifier(name));
|
||||
((TypeAndInitDeclaration) singleOutDeclaration.getDeclaration()).getMembers().set(0, outMember);
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, singleOutDeclaration);
|
||||
}
|
||||
|
||||
// add a global variable with the new name and the old type
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, variableTemplate.getInstanceFor(prevRoot,
|
||||
outTypeSpecifier.cloneInto(prevRoot),
|
||||
new Identifier(newName)));
|
||||
|
||||
// insert a statement at the end of the main function that sets the value of the
|
||||
// out declaration to the value of the global variable and does a type cast
|
||||
prevTree.appendMain(
|
||||
(isVector && outType.getDimensions()[0] < inType.getDimensions()[0] ? statementTemplateVector
|
||||
: statementTemplate).getInstanceFor(prevRoot,
|
||||
new Identifier(name),
|
||||
new Identifier(newName),
|
||||
inTypeSpecifier.cloneInto(prevRoot)));
|
||||
|
||||
// make the out declaration use the same type as the fragment shader
|
||||
outTypeSpecifier.replaceByAndDelete(inTypeSpecifier.cloneInto(prevRoot));
|
||||
|
||||
// don't do the patch twice
|
||||
outDeclarations.put(name, null);
|
||||
|
||||
LOGGER.warn(
|
||||
"The out declaration '" + name + "' in the " + prevType.name()
|
||||
+ " shader has a different type " + outType.getMostCompactName()
|
||||
+ " than the corresponding in declaration of type " + inType.getMostCompactName()
|
||||
+ " in the following stage " + currentType.glShaderType.name()
|
||||
+ " and has been compatibility-patched. See debugging.md for more information.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
prevType = type;
|
||||
}
|
||||
}
|
||||
if (inType.getText().equals(outType.getText())) {
|
||||
if (!Util.hasAssigment(prevTree, in)) {
|
||||
Util.initialize(prevTree, inDec.get(in), in);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
prevType = type;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,16 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
class CompositeDepthTransformer {
|
||||
private static final AutoHintedMatcher<ExternalDeclaration> uniformFloatCenterDepthSmooth = new AutoHintedMatcher<>(
|
||||
"uniform float centerDepthSmooth;", Matcher.externalDeclarationPattern);
|
||||
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root) {
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit) {
|
||||
// replace original declaration
|
||||
if (root.processMatches(t, uniformFloatCenterDepthSmooth, ASTNode::detachAndDelete)) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"uniform sampler2D iris_centerDepthSmooth;");
|
||||
|
||||
// if centerDepthSmooth is not declared as a uniform, we don't make it available
|
||||
root.replaceReferenceExpressions(t, "centerDepthSmooth",
|
||||
"texture2D(iris_centerDepthSmooth, vec2(0.5)).r");
|
||||
}
|
||||
int type = Util.findType(translationUnit, "centerDepthSmooth");
|
||||
if (type != 0) {
|
||||
Util.injectVariable(translationUnit, "uniform sampler2D iris_centerDepthSmooth;");
|
||||
Util.replaceExpression(translationUnit, "centerDepthSmooth", "texture2D(iris_centerDepthSmooth, vec2(0.5)).r");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,26 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.unary.FunctionCallExpression;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
|
||||
import java.util.stream.Stream;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
class CompositeTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root) {
|
||||
CompositeDepthTransformer.transform(t, tree, root);
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit, int version) {
|
||||
CompositeDepthTransformer.transform(translationUnit);
|
||||
|
||||
// TODO: how to do this using glsl-transformation-lib?
|
||||
// Need to specifically find that these functions are called, not 100% sure how to do that
|
||||
// Also, is it possible to inject something before declarations?
|
||||
// Modern Iris doesn't seem to have this patch, so maybe it's just not even needed
|
||||
// More likely it's just an OpenGL core thing that ensures it's present
|
||||
|
||||
// if using a lod texture sampler and on version 120, patch in the extension
|
||||
// #extension GL_ARB_shader_texture_lod : require
|
||||
if (tree.getVersionStatement().version.number <= 120
|
||||
&& Stream.concat(
|
||||
root.identifierIndex.getStream("texture2DLod"),
|
||||
root.identifierIndex.getStream("texture3DLod"))
|
||||
.filter(id -> id.getParent() instanceof FunctionCallExpression)
|
||||
.findAny().isPresent()) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"#extension GL_ARB_shader_texture_lod : require\n");
|
||||
}
|
||||
// if (version <= 120
|
||||
// && Stream.concat(
|
||||
// root.identifierIndex.getStream("texture2DLod"),
|
||||
// root.identifierIndex.getStream("texture3DLod"))
|
||||
// .filter(id -> id.getParent() instanceof FunctionCallExpression)
|
||||
// .findAny().isPresent()) {
|
||||
// tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
// "#extension GL_ARB_shader_texture_lod : require\n")
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.job_parameter.JobParameters;
|
||||
|
||||
class Parameters extends JobParameters {
|
||||
public final Patch patch;
|
||||
public PatchShaderType type;
|
||||
|
||||
public Parameters(Patch patch) {
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((patch == null) ? 0 : patch.hashCode());
|
||||
result = prime * result + ((type == null) ? 0 : type.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
Parameters other = (Parameters) obj;
|
||||
if (patch != other.patch)
|
||||
return false;
|
||||
if (type != other.type)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
enum Patch {
|
||||
public enum Patch {
|
||||
ATTRIBUTES,
|
||||
SODIUM_TERRAIN,
|
||||
COMPOSITE
|
||||
|
||||
@@ -0,0 +1,300 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import com.google.common.base.Stopwatch;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import org.antlr.v4.runtime.CharStreams;
|
||||
import org.antlr.v4.runtime.CommonTokenStream;
|
||||
import org.antlr.v4.runtime.tree.ParseTree;
|
||||
import org.antlr.v4.runtime.tree.TerminalNode;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLLexer;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class ShaderTransformer {
|
||||
static String tab = "";
|
||||
|
||||
private static final Pattern versionPattern = Pattern.compile("#version\\s+(\\d+)(?:\\s+(\\w+))?");
|
||||
|
||||
private static final int CACHE_SIZE = 100;
|
||||
private static final Object2ObjectLinkedOpenHashMap<TransformKey, Map<PatchShaderType, String>> shaderTransformationCache = new Object2ObjectLinkedOpenHashMap<>();
|
||||
private static final boolean useCache = true;
|
||||
|
||||
private static final List<String> fullReservedWords = new ArrayList<>();
|
||||
private static final Map<Integer, List<String>> versionedReservedWords = new HashMap<>();;
|
||||
|
||||
static {
|
||||
fullReservedWords.add("texture");
|
||||
versionedReservedWords.put(400, Arrays.asList("sample"));
|
||||
}
|
||||
|
||||
private static final class TransformKey<P extends Parameters> {
|
||||
private final Patch patchType;
|
||||
private final EnumMap<PatchShaderType, String> inputs;
|
||||
private final P params;
|
||||
|
||||
private TransformKey(Patch patchType, EnumMap<PatchShaderType, String> inputs, P params) {
|
||||
this.patchType = patchType;
|
||||
this.inputs = inputs;
|
||||
this.params = params;
|
||||
}
|
||||
|
||||
public Patch patchType() {
|
||||
return patchType;
|
||||
}
|
||||
|
||||
public EnumMap<PatchShaderType, String> inputs() {
|
||||
return inputs;
|
||||
}
|
||||
|
||||
public P params() {
|
||||
return params;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj == this) return true;
|
||||
if (obj == null || obj.getClass() != this.getClass()) return false;
|
||||
var that = (TransformKey) obj;
|
||||
return Objects.equals(this.patchType, that.patchType) &&
|
||||
Objects.equals(this.inputs, that.inputs) &&
|
||||
Objects.equals(this.params, that.params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(patchType, inputs, params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TransformKey[" +
|
||||
"patchType=" + patchType + ", " +
|
||||
"inputs=" + inputs + ", " +
|
||||
"params=" + params + ']';
|
||||
}
|
||||
}
|
||||
|
||||
public static <P extends Parameters> Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, P parameters) {
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
} else {
|
||||
Map<PatchShaderType, String> result;
|
||||
|
||||
var patchType = parameters.patch;
|
||||
|
||||
EnumMap<PatchShaderType, String> inputs = new EnumMap<>(PatchShaderType.class);
|
||||
inputs.put(PatchShaderType.VERTEX, vertex);
|
||||
inputs.put(PatchShaderType.GEOMETRY, geometry);
|
||||
inputs.put(PatchShaderType.FRAGMENT, fragment);
|
||||
|
||||
var key = new TransformKey(patchType, inputs, parameters);
|
||||
|
||||
result = shaderTransformationCache.getAndMoveToFirst(key);
|
||||
if(result == null || !useCache) {
|
||||
result = transformInternal(inputs, patchType, parameters);
|
||||
// Clear this, we don't want whatever random type was last transformed being considered for the key
|
||||
parameters.type = null;
|
||||
if(shaderTransformationCache.size() >= CACHE_SIZE) {
|
||||
shaderTransformationCache.removeLast();
|
||||
}
|
||||
shaderTransformationCache.putAndMoveToLast(key, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
private static <P extends Parameters> Map<PatchShaderType, String> transformInternal(EnumMap<PatchShaderType, String> inputs, Patch patchType, P parameters) {
|
||||
EnumMap<PatchShaderType, String> result = new EnumMap<>(PatchShaderType.class);
|
||||
EnumMap<PatchShaderType, GLSLParser.Translation_unitContext> types = new EnumMap<>(PatchShaderType.class);
|
||||
EnumMap<PatchShaderType, String> prepatched = new EnumMap<>(PatchShaderType.class);
|
||||
|
||||
Stopwatch watch = Stopwatch.createStarted();
|
||||
|
||||
for (PatchShaderType type : PatchShaderType.values()) {
|
||||
parameters.type = type;
|
||||
if (inputs.get(type) == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String input = inputs.get(type);
|
||||
|
||||
Matcher matcher = versionPattern.matcher(input);
|
||||
if (!matcher.find()) {
|
||||
throw new IllegalArgumentException("No #version directive found in source code!");
|
||||
}
|
||||
|
||||
String versionString = matcher.group(1);
|
||||
if (versionString == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String profile = "";
|
||||
int versionInt = Integer.parseInt(versionString);
|
||||
if (versionInt >= 150) {
|
||||
profile = matcher.group(2);
|
||||
if (profile == null) {
|
||||
profile = "core";
|
||||
}
|
||||
}
|
||||
|
||||
String profileString = "#version " + versionString + " " + profile + "\n";
|
||||
|
||||
// This handles some reserved keywords which cause the AST parser to fail
|
||||
// but aren't necessarily invalid for GLSL versions prior to 400. This simple
|
||||
// renames the matching strings and prefixes them with iris_renamed_
|
||||
for (String reservedWord : fullReservedWords) {
|
||||
String newName = "iris_renamed_" + reservedWord;
|
||||
input = input.replaceAll("\\b" + reservedWord + "\\b", newName);
|
||||
}
|
||||
for (int version : versionedReservedWords.keySet()) {
|
||||
if (versionInt < version) {
|
||||
for (String reservedWord : versionedReservedWords.get(version)) {
|
||||
String newName = "iris_renamed_" + reservedWord;
|
||||
input = input.replaceAll("\\b" + reservedWord + "\\b", newName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GLSLLexer lexer = new GLSLLexer(CharStreams.fromString(input));
|
||||
GLSLParser parser = new GLSLParser(new CommonTokenStream(lexer));
|
||||
parser.setBuildParseTree(true);
|
||||
var translationUnit = parser.translation_unit();
|
||||
|
||||
switch(patchType) {
|
||||
case SODIUM_TERRAIN:
|
||||
SodiumTransformer.transform(translationUnit, parameters);
|
||||
break;
|
||||
case COMPOSITE:
|
||||
CompositeTransformer.transform(translationUnit, versionInt);
|
||||
break;
|
||||
case ATTRIBUTES:
|
||||
AttributeTransformer.transform(translationUnit, (AttributeParameters) parameters, profile, versionInt);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unknown patch type: " + patchType.name());
|
||||
}
|
||||
CompatibilityTransformer.transformEach(translationUnit, parameters);
|
||||
types.put(type, translationUnit);
|
||||
prepatched.put(type, profileString);
|
||||
}
|
||||
CompatibilityTransformer.transformGrouped(types, parameters);
|
||||
for (var entry : types.entrySet()) {
|
||||
result.put(entry.getKey(), getFormattedShader(entry.getValue(), prepatched.get(entry.getKey())));
|
||||
}
|
||||
watch.stop();
|
||||
Iris.logger.info("Transformed shader for {} in {}", patchType.name(), watch);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static void applyIntelHd4000Workaround(GLSLParser.Translation_unitContext translationUnit) {
|
||||
Util.renameFunctionCall(translationUnit, "ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
|
||||
public static void replaceGlMultiTexCoordBounded(GLSLParser.Translation_unitContext translationUnit, int min, int max) {
|
||||
for (int i = min; i <= max; i++) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord" + i, "vec4(0.0, 0.0, 0.0, 1.0)");
|
||||
}
|
||||
}
|
||||
|
||||
public static void patchMultiTexCoord3(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
if (parameters.type.glShaderType == ShaderType.VERTEX && Util.hasVariable(translationUnit, "gl_MultiTexCoord3") && !Util.hasVariable(translationUnit, "mc_midTexCoord")) {
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 mc_midTexCoord;");
|
||||
}
|
||||
}
|
||||
|
||||
public static void replaceMidTexCoord(GLSLParser.Translation_unitContext translationUnit, float textureScale) {
|
||||
int type = Util.findType(translationUnit, "mc_midTexCoord");
|
||||
if (type != 0) {
|
||||
Util.removeVariable(translationUnit, "mc_midTexCoord");
|
||||
}
|
||||
Util.replaceExpression(translationUnit, "mc_midTexCoord", "iris_MidTex");
|
||||
switch (type) {
|
||||
case 0:
|
||||
return;
|
||||
case GLSLLexer.BOOL:
|
||||
return;
|
||||
case GLSLLexer.FLOAT:
|
||||
Util.injectFunction(translationUnit, "float iris_MidTex = (mc_midTexCoord.x * " + textureScale + ").x;"); //TODO go back to variable if order is fixed
|
||||
break;
|
||||
case GLSLLexer.VEC2:
|
||||
Util.injectFunction(translationUnit, "vec2 iris_MidTex = (mc_midTexCoord.xy * " + textureScale + ").xy;");
|
||||
break;
|
||||
case GLSLLexer.VEC3:
|
||||
Util.injectFunction(translationUnit, "vec3 iris_MidTex = vec3(mc_midTexCoord.xy * " + textureScale + ", 0.0);");
|
||||
break;
|
||||
case GLSLLexer.VEC4:
|
||||
Util.injectFunction(translationUnit, "vec4 iris_MidTex = vec4(mc_midTexCoord.xy * " + textureScale + ", 0.0, 1.0);");
|
||||
break;
|
||||
default:
|
||||
|
||||
}
|
||||
|
||||
Util.injectVariable(translationUnit, "in vec2 mc_midTexCoord;"); //TODO why is this inserted oddly?
|
||||
|
||||
}
|
||||
|
||||
public static void addIfNotExists(GLSLParser.Translation_unitContext translationUnit, String name, String code) {
|
||||
if (!Util.hasVariable(translationUnit, name)) {
|
||||
Util.injectVariable(translationUnit, code);
|
||||
}
|
||||
}
|
||||
|
||||
public static void addIfNotExistsType(GLSLParser.Translation_unitContext translationUnit, String name, String type) {
|
||||
if (!Util.hasVariable(translationUnit, name)) {
|
||||
Util.injectVariable(translationUnit, type + " " + name + ";");
|
||||
}
|
||||
}
|
||||
|
||||
public static String getFormattedShader(ParseTree tree, String string) {
|
||||
StringBuilder sb = new StringBuilder(string + "\n");
|
||||
getFormattedShader(tree, sb);
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private static void getFormattedShader(ParseTree tree, StringBuilder stringBuilder) {
|
||||
if (tree instanceof TerminalNode) {
|
||||
String text = tree.getText();
|
||||
if (text.equals("<EOF>")) {
|
||||
return;
|
||||
}
|
||||
if (text.equals("#")) {
|
||||
stringBuilder.append("\n#");
|
||||
return;
|
||||
}
|
||||
stringBuilder.append(text);
|
||||
if (text.equals("{")) {
|
||||
stringBuilder.append(" \n\t");
|
||||
tab = "\t";
|
||||
}
|
||||
|
||||
if (text.equals("}")) {
|
||||
stringBuilder.deleteCharAt(stringBuilder.length() - 2);
|
||||
tab = "";
|
||||
}
|
||||
stringBuilder.append(text.equals(";") ? " \n" + tab : " ");
|
||||
} else {
|
||||
for(int i = 0; i < tree.getChildCount(); ++i) {
|
||||
getFormattedShader(tree.getChild(i), stringBuilder);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.Expression;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
|
||||
/**
|
||||
* Does the sodium terrain transformations using glsl-transformer AST.
|
||||
*/
|
||||
class SodiumTerrainTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
switch (parameters.type) {
|
||||
// For Sodium patching, treat fragment and geometry the same
|
||||
case FRAGMENT:
|
||||
case GEOMETRY:
|
||||
transformFragment(t, tree, root, parameters);
|
||||
break;
|
||||
case VERTEX:
|
||||
transformVertex(t, tree, root, parameters);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected Sodium terrain patching shader type: " + parameters.type);
|
||||
}
|
||||
}
|
||||
|
||||
private static final AutoHintedMatcher<Expression> glTextureMatrix0 = new AutoHintedMatcher<>(
|
||||
"gl_TextureMatrix[0]", Matcher.expressionPattern);
|
||||
|
||||
/**
|
||||
* Transforms vertex shaders.
|
||||
*/
|
||||
public static void transformVertex(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"attribute vec3 iris_Pos;",
|
||||
"attribute vec4 iris_Color;",
|
||||
"attribute vec2 iris_TexCoord;",
|
||||
"attribute vec2 iris_LightCoord;",
|
||||
"attribute vec3 iris_Normal;", // some are shared
|
||||
"uniform vec3 u_ModelScale;",
|
||||
"uniform vec2 u_TextureScale;",
|
||||
"attribute vec4 iris_ModelOffset;",
|
||||
"vec4 iris_LightTexCoord = vec4(iris_LightCoord, 0, 1);",
|
||||
"vec4 ftransform() { return gl_ModelViewProjectionMatrix * gl_Vertex; }");
|
||||
|
||||
transformShared(t, tree, root, parameters);
|
||||
|
||||
root.replaceReferenceExpressions(t, "gl_Vertex",
|
||||
"vec4((iris_Pos * u_ModelScale) + iris_ModelOffset.xyz, 1.0)");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord0",
|
||||
"vec4(iris_TexCoord * u_TextureScale, 0.0, 1.0)");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord1",
|
||||
"iris_LightTexCoord");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord2",
|
||||
"iris_LightTexCoord");
|
||||
root.rename("gl_Color", "iris_Color");
|
||||
root.rename("gl_Normal", "iris_Normal");
|
||||
root.rename("ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms fragment shaders. The fragment shader does only the shared things
|
||||
* from the vertex shader.
|
||||
*/
|
||||
public static void transformFragment(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
// interestingly there is nothing that isn't shared
|
||||
transformShared(t, tree, root, parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the things that transformVertex and transformFragment have in common.
|
||||
*/
|
||||
private static void transformShared(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"uniform mat4 iris_ModelViewMatrix;",
|
||||
"uniform mat4 u_ModelViewProjectionMatrix;",
|
||||
"uniform mat4 iris_NormalMatrix;",
|
||||
"uniform mat4 iris_LightmapTextureMatrix;");
|
||||
root.rename("gl_ModelViewMatrix", "iris_ModelViewMatrix");
|
||||
root.rename("gl_ModelViewProjectionMatrix", "u_ModelViewProjectionMatrix");
|
||||
root.replaceReferenceExpressions(t,
|
||||
"gl_NormalMatrix", "mat3(iris_NormalMatrix)");
|
||||
|
||||
root.replaceExpressionMatches(
|
||||
t,
|
||||
glTextureMatrix0,
|
||||
"mat4(1.0)");
|
||||
root.replaceExpressionMatches(t, glTextureMatrix1, "iris_LightmapTextureMatrix");
|
||||
}
|
||||
private static final String lightmapCoordsExpression = "iris_LightCoord";
|
||||
private static final AutoHintedMatcher<Expression> glTextureMatrix1 = new AutoHintedMatcher<>(
|
||||
"gl_TextureMatrix[1]", Matcher.expressionPattern);
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
class SodiumTransformer {
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
switch (parameters.type) {
|
||||
// For Sodium patching, treat fragment and geometry the same
|
||||
case FRAGMENT:
|
||||
case GEOMETRY:
|
||||
transformFragment(translationUnit, parameters);
|
||||
break;
|
||||
case VERTEX:
|
||||
transformVertex(translationUnit, parameters);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected Sodium terrain patching shader type: " + parameters.type);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms vertex shaders.
|
||||
*/
|
||||
public static void transformVertex(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
|
||||
Util.injectVariable(translationUnit, "attribute vec3 iris_Pos;");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 iris_Color;");
|
||||
Util.injectVariable(translationUnit, "attribute vec2 iris_TexCoord;");
|
||||
Util.injectVariable(translationUnit, "attribute vec2 iris_LightCoord;");
|
||||
Util.injectVariable(translationUnit, "attribute vec3 iris_Normal;");
|
||||
Util.injectVariable(translationUnit, "uniform vec3 u_ModelScale;");
|
||||
Util.injectVariable(translationUnit, "uniform vec2 u_TextureScale;");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 iris_ModelOffset;");
|
||||
Util.injectFunction(translationUnit, "vec4 iris_LightTexCoord = vec4(iris_LightCoord, 0, 1);");
|
||||
Util.injectFunction(translationUnit, "vec4 ftransform() { return gl_ModelViewProjectionMatrix * gl_Vertex; }");
|
||||
|
||||
transformShared(translationUnit, parameters);
|
||||
|
||||
Util.replaceExpression(translationUnit, "gl_Vertex", "vec4((iris_Pos * u_ModelScale) + iris_ModelOffset.xyz, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord0", "vec4(iris_TexCoord * u_TextureScale, 0.0, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord1", "iris_LightTexCoord");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord2", "iris_LightTexCoord");
|
||||
Util.rename(translationUnit, "gl_Color", "iris_Color");
|
||||
Util.rename(translationUnit, "gl_Normal", "iris_Normal");
|
||||
Util.rename(translationUnit, "ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms fragment shaders. The fragment shader does only the shared things
|
||||
* from the vertex shader.
|
||||
*/
|
||||
public static void transformFragment(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
// interestingly there is nothing that isn't shared
|
||||
transformShared(translationUnit, parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the things that transformVertex and transformFragment have in common.
|
||||
*/
|
||||
private static void transformShared(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_ModelViewMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 u_ModelViewProjectionMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_NormalMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_LightmapTextureMatrix;");
|
||||
|
||||
Util.rename(translationUnit, "gl_ModelViewMatrix", "iris_ModelViewMatrix");
|
||||
Util.rename(translationUnit, "gl_ModelViewProjectionMatrix", "u_ModelViewProjectionMatrix");
|
||||
Util.replaceExpression(translationUnit, "gl_NormalMatrix", "mat3(iris_NormalMatrix)");
|
||||
|
||||
Util.replaceExpression(translationUnit, "gl_TextureMatrix[0]", "mat4(1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_TextureMatrix[1]", "iris_LightmapTextureMatrix");
|
||||
}
|
||||
}
|
||||
@@ -1,226 +1,115 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.Version;
|
||||
import io.github.douira.glsl_transformer.ast.print.PrintType;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.transform.EnumASTTransformer;
|
||||
import io.github.douira.glsl_transformer.cst.core.SemanticException;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.ChannelFilter;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.TokenChannel;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.TokenFilter;
|
||||
import io.github.douira.glsl_transformer.util.LRUCache;
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
import net.coderbot.iris.pipeline.PatchedShaderPrinter;
|
||||
import org.antlr.v4.runtime.RecognitionException;
|
||||
import org.antlr.v4.runtime.Token;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* The transform patcher (triforce 2) uses glsl-transformer's ASTTransformer to
|
||||
* do shader transformation.
|
||||
*
|
||||
* The TransformPatcher does caching on the source string and associated
|
||||
* parameters. For this to work, all objects contained in a parameter must have
|
||||
* an equals method and they must never be changed after having been used for
|
||||
* patching. Since the cache also contains the source string, it doesn't need to
|
||||
* be disabled when developing shaderpacks. However, when changes are made to
|
||||
* the patcher, the cache should be disabled with {@link #useCache}.
|
||||
*
|
||||
* NOTE: This patcher expects (and ensures) that the string doesn't contain any
|
||||
* (!) preprocessor directives. The only allowed ones are #extension and #pragma
|
||||
* as they are considered "parsed" directives. If any other directive appears in
|
||||
* the string, it will throw.
|
||||
*/
|
||||
public class TransformPatcher {
|
||||
static Logger LOGGER = LogManager.getLogger(TransformPatcher.class);
|
||||
private static EnumASTTransformer<Parameters, PatchShaderType> transformer;
|
||||
private static final boolean useCache = true;
|
||||
private static final Map<CacheKey, Map<PatchShaderType, String>> cache = new LRUCache<>(400);
|
||||
|
||||
private static class CacheKey {
|
||||
final Parameters parameters;
|
||||
final String vertex;
|
||||
final String geometry;
|
||||
final String fragment;
|
||||
private static final int MAX_CACHE_ENTRIES = 400;
|
||||
private static final Map<TransformPatcher.CacheKey, Map<PatchShaderType, String>> cache = new LinkedHashMap<>(MAX_CACHE_ENTRIES + 1, .75F, true) {
|
||||
public boolean removeEldestEntry(Map.Entry eldest) {
|
||||
return size() > MAX_CACHE_ENTRIES;
|
||||
}
|
||||
};
|
||||
|
||||
public CacheKey(Parameters parameters, String vertex, String geometry, String fragment) {
|
||||
this.parameters = parameters;
|
||||
this.vertex = vertex;
|
||||
this.geometry = geometry;
|
||||
this.fragment = fragment;
|
||||
}
|
||||
private static final boolean useCache = true;
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((fragment == null) ? 0 : fragment.hashCode());
|
||||
result = prime * result + ((geometry == null) ? 0 : geometry.hashCode());
|
||||
result = prime * result + ((parameters == null) ? 0 : parameters.hashCode());
|
||||
result = prime * result + ((vertex == null) ? 0 : vertex.hashCode());
|
||||
return result;
|
||||
}
|
||||
private static class CacheKey {
|
||||
final Parameters parameters;
|
||||
final String vertex;
|
||||
final String geometry;
|
||||
final String fragment;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
CacheKey other = (CacheKey) obj;
|
||||
if (fragment == null) {
|
||||
if (other.fragment != null)
|
||||
return false;
|
||||
} else if (!fragment.equals(other.fragment))
|
||||
return false;
|
||||
if (geometry == null) {
|
||||
if (other.geometry != null)
|
||||
return false;
|
||||
} else if (!geometry.equals(other.geometry))
|
||||
return false;
|
||||
if (parameters == null) {
|
||||
if (other.parameters != null)
|
||||
return false;
|
||||
} else if (!parameters.equals(other.parameters))
|
||||
return false;
|
||||
if (vertex == null) {
|
||||
if (other.vertex != null)
|
||||
return false;
|
||||
} else if (!vertex.equals(other.vertex))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
public CacheKey(Parameters parameters, String vertex, String geometry, String fragment) {
|
||||
this.parameters = parameters;
|
||||
this.vertex = vertex;
|
||||
this.geometry = geometry;
|
||||
this.fragment = fragment;
|
||||
}
|
||||
|
||||
// TODO: Only do the NewLines patches if the source code isn't from
|
||||
// gbuffers_lines (what does this mean?)
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((fragment == null) ? 0 : fragment.hashCode());
|
||||
result = prime * result + ((geometry == null) ? 0 : geometry.hashCode());
|
||||
result = prime * result + ((parameters == null) ? 0 : parameters.hashCode());
|
||||
result = prime * result + ((vertex == null) ? 0 : vertex.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
static TokenFilter<Parameters> parseTokenFilter = new ChannelFilter<Parameters>(TokenChannel.PREPROCESSOR) {
|
||||
@Override
|
||||
public boolean isTokenAllowed(Token token) {
|
||||
if (!super.isTokenAllowed(token)) {
|
||||
throw new SemanticException("Unparsed preprocessor directives such as '" + token.getText()
|
||||
+ "' may not be present at this stage of shader processing!");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
TransformPatcher.CacheKey other = (TransformPatcher.CacheKey) obj;
|
||||
if (fragment == null) {
|
||||
if (other.fragment != null)
|
||||
return false;
|
||||
} else if (!fragment.equals(other.fragment))
|
||||
return false;
|
||||
if (geometry == null) {
|
||||
if (other.geometry != null)
|
||||
return false;
|
||||
} else if (!geometry.equals(other.geometry))
|
||||
return false;
|
||||
if (parameters == null) {
|
||||
if (other.parameters != null)
|
||||
return false;
|
||||
} else if (!parameters.equals(other.parameters))
|
||||
return false;
|
||||
if (vertex == null) {
|
||||
if (other.vertex != null)
|
||||
return false;
|
||||
} else if (!vertex.equals(other.vertex))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
transformer = new EnumASTTransformer<Parameters, PatchShaderType>(PatchShaderType.class) {
|
||||
@Override
|
||||
public TranslationUnit parseTranslationUnit(String input) throws RecognitionException {
|
||||
// parse #version directive using an efficient regex before parsing so that the
|
||||
// parser can be set to the correct version
|
||||
Matcher matcher = versionPattern.matcher(input);
|
||||
if (!matcher.find()) {
|
||||
throw new IllegalArgumentException("No #version directive found in source code! See debugging.md for more information.");
|
||||
}
|
||||
Version version = Version.fromNumber(Integer.parseInt(matcher.group(1)));
|
||||
transformer.getLexer().version = version;
|
||||
private static Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, Parameters parameters) {
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return super.parseTranslationUnit(input);
|
||||
}
|
||||
};
|
||||
transformer.setTransformation((trees, parameters) -> {
|
||||
for (PatchShaderType type : PatchShaderType.values()) {
|
||||
TranslationUnit tree = trees.get(type);
|
||||
if (tree == null) {
|
||||
continue;
|
||||
}
|
||||
// @Asek3 I have old GLSL-Transformer on JRE8, so I will off this
|
||||
//tree.outputOptions.enablePrintInfo();
|
||||
// check if this has been cached
|
||||
TransformPatcher.CacheKey key;
|
||||
Map<PatchShaderType, String> result = null;
|
||||
if (useCache) {
|
||||
key = new TransformPatcher.CacheKey(parameters, vertex, geometry, fragment);
|
||||
if (cache.containsKey(key)) {
|
||||
result = cache.get(key);
|
||||
}
|
||||
}
|
||||
|
||||
parameters.type = type;
|
||||
Root root = tree.getRoot();
|
||||
// if there is no cache result, transform the shaders
|
||||
if (result == null) {
|
||||
result = ShaderTransformer.transform(vertex, geometry, fragment, parameters);
|
||||
if (useCache) {
|
||||
cache.put(key, result);
|
||||
}
|
||||
}
|
||||
|
||||
// check for illegal references to internal Iris shader interfaces
|
||||
Optional<Identifier> violation = root.identifierIndex.prefixQueryFlat("iris_").findAny();
|
||||
if (!violation.isPresent()) {
|
||||
violation = root.identifierIndex.prefixQueryFlat("irisMain").findAny();
|
||||
}
|
||||
violation.ifPresent(id -> {
|
||||
throw new SemanticException(
|
||||
"Detected a potential reference to unstable and internal Iris shader interfaces (iris_ and irisMain). This isn't currently supported. Violation: "
|
||||
+ id.getName() + ". See debugging.md for more information.");
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
Root.indexBuildSession(tree, () -> {
|
||||
switch (parameters.patch) {
|
||||
case ATTRIBUTES:
|
||||
AttributeTransformer.transform(transformer, tree, root, (AttributeParameters) parameters);
|
||||
break;
|
||||
case SODIUM_TERRAIN:
|
||||
SodiumTerrainTransformer.transform(transformer, tree, root, parameters);
|
||||
break;
|
||||
case COMPOSITE:
|
||||
CompositeTransformer.transform(transformer, tree, root);
|
||||
break;
|
||||
}
|
||||
CompatibilityTransformer.transformEach(transformer, tree, root, parameters);
|
||||
});
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String fragment, InputAvailability inputs) {
|
||||
return transform(vertex, geometry, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs));
|
||||
}
|
||||
|
||||
// the compatibility transformer does a grouped transformation
|
||||
CompatibilityTransformer.transformGrouped(transformer, trees, parameters);
|
||||
});
|
||||
transformer.setParseTokenFilter(parseTokenFilter);
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchSodiumTerrain(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.SODIUM_TERRAIN));
|
||||
}
|
||||
|
||||
private static final Pattern versionPattern = Pattern.compile("^.*#version\\s+(\\d+)", Pattern.DOTALL);
|
||||
|
||||
private static Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, Parameters parameters) {
|
||||
// stop if all are null
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// check if this has been cached
|
||||
CacheKey key;
|
||||
Map<PatchShaderType, String> result = null;
|
||||
if (useCache) {
|
||||
key = new CacheKey(parameters, vertex, geometry, fragment);
|
||||
if (cache.containsKey(key)) {
|
||||
result = cache.get(key);
|
||||
}
|
||||
}
|
||||
|
||||
// if there is no cache result, transform the shaders
|
||||
if (result == null) {
|
||||
transformer.setPrintType(PatchedShaderPrinter.prettyPrintShaders ? PrintType.INDENTED : PrintType.SIMPLE);
|
||||
EnumMap<PatchShaderType, String> inputs = new EnumMap<>(PatchShaderType.class);
|
||||
inputs.put(PatchShaderType.VERTEX, vertex);
|
||||
inputs.put(PatchShaderType.GEOMETRY, geometry);
|
||||
inputs.put(PatchShaderType.FRAGMENT, fragment);
|
||||
result = transformer.transform(inputs, parameters);
|
||||
if (useCache) {
|
||||
cache.put(key, result);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String fragment, InputAvailability inputs) {
|
||||
return transform(vertex, geometry, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs));
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchSodiumTerrain(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.SODIUM_TERRAIN));
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchComposite(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.COMPOSITE));
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchComposite(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.COMPOSITE));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
import net.coderbot.iris.pipeline.transform.Patch;
|
||||
|
||||
public class AttributeParameters extends Parameters {
|
||||
public final boolean hasGeometry;
|
||||
public final InputAvailability inputs;
|
||||
|
||||
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs) {
|
||||
super(patch);
|
||||
this.hasGeometry = hasGeometry;
|
||||
this.inputs = inputs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = super.hashCode();
|
||||
result = prime * result + (hasGeometry ? 1231 : 1237);
|
||||
result = prime * result + ((inputs == null) ? 0 : inputs.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (!super.equals(obj))
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AttributeParameters other = (AttributeParameters) obj;
|
||||
if (hasGeometry != other.hasGeometry)
|
||||
return false;
|
||||
if (inputs == null) {
|
||||
if (other.inputs != null)
|
||||
return false;
|
||||
} else if (!inputs.equals(other.inputs))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
public interface JobParameters {
|
||||
|
||||
JobParameters EMPTY = new JobParameters() {
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return other == this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
boolean equals(Object other);
|
||||
|
||||
int hashCode();
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
import net.coderbot.iris.pipeline.transform.Patch;
|
||||
import net.coderbot.iris.pipeline.transform.PatchShaderType;
|
||||
|
||||
public class Parameters implements JobParameters {
|
||||
public final Patch patch;
|
||||
public PatchShaderType type; // may only be set by TransformPatcher
|
||||
// WARNING: adding new fields requires updating hashCode and equals methods!
|
||||
|
||||
// name of the shader, this should not be part of hash/equals
|
||||
public String name; // set by TransformPatcher
|
||||
|
||||
public Parameters(Patch patch) {
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((patch == null) ? 0 : patch.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
Parameters other = (Parameters) obj;
|
||||
return patch == other.patch;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,13 @@
|
||||
public net.minecraft.block.Block func_149641_N()Ljava/lang/String; # getTextureName
|
||||
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78476_b(FI)V # void renderHand(float, int)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78481_a(FZ)F # float getFOVModifier(float, boolean)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78482_e(F)V # void hurtCameraEffect(float)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78475_f(F)V # void setupViewBobbing(float)
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78503_V # cameraZoom
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78502_W # cameraYaw
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78509_X # cameraPitch
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78530_s # farPlaneDistance
|
||||
|
||||
public net.minecraft.client.renderer.RenderGlobal field_72765_l # worldRenderers
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ options.button.shader=Shaders...
|
||||
|
||||
options.chunks=%s chunks
|
||||
options.entityShadows=Entity Shadows
|
||||
options.droppedItems=%s items
|
||||
options.droppedItems.max=Unlimited
|
||||
sodium.option_impact.low=Low
|
||||
sodium.option_impact.medium=Medium
|
||||
sodium.option_impact.high=High
|
||||
@@ -124,12 +126,15 @@ options.iris.setToDefault=Set option to default value?
|
||||
options.iris.profile=Profile
|
||||
options.iris.profile.custom=Custom
|
||||
options.iris.shadowDistance=Max Shadow Distance
|
||||
options.iris.shadowDistance.sodium_tooltip=Max Shadow Distance
|
||||
options.iris.shadowDistance.enabled=Allows you to change the maximum distance for shadows. Terrain and entities beyond this distance will not cast shadows. Lowering the shadow distance can significantly increase performance.
|
||||
options.iris.shadowDistance.disabled=Your current shader pack has already set a render distance for shadows; you cannot change it.
|
||||
options.iris.gui.hide=Hide GUI
|
||||
options.iris.gui.show=Show GUI
|
||||
options.dynamic_lights=Dynamic Lights
|
||||
options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - no delay. Disabled if shaders are in use.
|
||||
options.angelica.droppedItemLimit=Dropped Item Render Limit
|
||||
options.angelica.droppedItemLimit.tooltip=The maximum number of dropped items that will be rendered. Lower values can improve performance.
|
||||
pack.iris.select.title=Select
|
||||
pack.iris.configure.title=Configure
|
||||
label.iris.true=On
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
@@ -11,33 +11,57 @@ options.graphics.ultra=Ultra
|
||||
options.off=Off
|
||||
options.on=On
|
||||
options.cloud_height=Cloud Elevation
|
||||
options.cloud_height.tooltip=Cloud Elevation
|
||||
options.cloud_scale=Cloud Scale
|
||||
options.cloud_scale.tooltip=Cloud Scale
|
||||
options.gui_background=Background
|
||||
options.gui_background.tooltip=Background
|
||||
options.downfall_distance=Weather Effects
|
||||
options.downfall_distance.tooltip=Weather Effects
|
||||
options.dynamic_fov=Dynamic FOV
|
||||
options.dynamic_fov.tooltip=If enabled, the game's field of view will change based on the player's speed.
|
||||
options.fog_near_distance=Near Fog Distance
|
||||
options.fog_near_distance.tooltip=Near Fog Distance
|
||||
options.mode_cloud_translucency=Cloud Translucency
|
||||
options.mode_cloud_translucency.tooltip=Cloud Translucency
|
||||
options.mode_clouds=Clouds
|
||||
options.mode_clouds.tooltip=Clouds
|
||||
options.mode_dropped_items=Dropped Items
|
||||
options.mode_dropped_items.tooltip=Dropped Items Rendering Quality
|
||||
options.mode_glint_inv=GUI Enchant VFX
|
||||
options.mode_glint_inv.tooltip=GUI Enchant VFX
|
||||
options.mode_glint_world=World Enchant VFX
|
||||
options.mode_glint_world.tooltip=World Enchant VFX
|
||||
options.mode_gui_background=Menu Backgrounds
|
||||
options.mode_gui_background.tooltip=Menu Backgrounds
|
||||
options.mode_leaves=Foliage
|
||||
options.mode_leaves.tooltip=Foliage
|
||||
options.mode_light_flicker=Light Flicker
|
||||
options.mode_light_flicker.tooltip=Light Flicker
|
||||
options.mode_shadows=Entity Shadows
|
||||
options.mode_shadows.tooltip=Entity Shadows
|
||||
options.mode_sky=Sky
|
||||
options.mode_sky.tooltip=Render the Sky
|
||||
options.mode_sun_moon=Sun & Moon
|
||||
options.mode_sun_moon.tooltip=Render Sun & Moon
|
||||
options.mode_stars=Stars
|
||||
options.mode_stars.tooltip=Render Stars
|
||||
options.mode_water=Water
|
||||
options.mode_water.tooltip=Water
|
||||
options.mode_vignette=Vignette
|
||||
options.mode_vignette.tooltip=Vignette
|
||||
options.particles_enc_table=Enchantment Particles
|
||||
options.particles_enc_table.tooltip=Enchantment Particles
|
||||
options.particles_void=Void Particles
|
||||
options.particles_void.tooltip=Void Particles
|
||||
options.render_distance_clouds=Minimum Cloud Distance
|
||||
options.render_distance_clouds.tooltip=Minimum Cloud Distance
|
||||
options.title.detail=Detail Settings
|
||||
options.title.other=Other Settings
|
||||
options.title.particle=Particle Settings
|
||||
options.title.sky=Atmosphere Settings
|
||||
options.title.video=Video Settings
|
||||
options.total_stars=Star Density
|
||||
options.total_stars.tooltip=Star Density
|
||||
options.void_fog=Void Fog
|
||||
options.void_fog.tooltip=Void Fog
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.texture.TextureInfo;
|
||||
import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
|
||||
import com.llamalad7.mixinextras.sugar.Share;
|
||||
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(RenderGlobal.class)
|
||||
public class MixinRenderGlobal_DestroyBlock {
|
||||
@Inject(
|
||||
method = "drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V"),
|
||||
remap = false
|
||||
)
|
||||
private void iris$beginDrawBlockDamageTexture(Tessellator tessellator, EntityLivingBase entity, float partialTicks, CallbackInfo ci, @Share("lastMin") LocalIntRef lastMin, @Share("lastMag") LocalIntRef lastMag) {
|
||||
TextureInfo info = TextureInfoCache.INSTANCE.getInfo(GLStateManager.getBoundTexture());
|
||||
lastMin.set(info.getMinFilter());
|
||||
lastMag.set(info.getMagFilter());
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPopMatrix()V"),
|
||||
remap = false
|
||||
)
|
||||
private void iris$endDrawBlockDamageTexture(Tessellator tessellator, EntityLivingBase entity, float partialTicks, CallbackInfo ci, @Share("lastMin") LocalIntRef lastMin, @Share("lastMag") LocalIntRef lastMag) {
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, lastMin.get());
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, lastMag.get());
|
||||
}
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica.optimizations;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyVariable;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(RenderGlobal.class)
|
||||
public class MixinRenderGlobal_ItemRenderDist {
|
||||
|
||||
@Unique private static final int[] sodium$entityItemCount = new int[256];
|
||||
@Unique private static int sodium$itemRenderDist = 255;
|
||||
|
||||
@Inject(method = "renderEntities", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderGlobal;countEntitiesRendered:I", ordinal = 0))
|
||||
private void sodium$resetEntitycount(CallbackInfo ci) {
|
||||
int entityCount = 0;
|
||||
boolean reachedLimit = false;
|
||||
final int itemLimit = AngelicaConfig.droppedItemLimit == 2048 ? Integer.MAX_VALUE : AngelicaConfig.droppedItemLimit;
|
||||
for (int i = 0; i < sodium$entityItemCount.length; i++) {
|
||||
entityCount += sodium$entityItemCount[i];
|
||||
sodium$entityItemCount[i] = 0;
|
||||
if (!reachedLimit && entityCount > itemLimit) {
|
||||
reachedLimit = true;
|
||||
sodium$itemRenderDist = i == 0 ? 1 : i;
|
||||
}
|
||||
}
|
||||
if (!reachedLimit) {
|
||||
sodium$itemRenderDist = 255;
|
||||
}
|
||||
}
|
||||
|
||||
@ModifyVariable(method = "renderEntities", at = @At(value = "STORE", ordinal = 0), ordinal = 0, name = "flag")
|
||||
private boolean sodium$renderEntityItems(boolean flag,
|
||||
@Local(ordinal = 0, name = "entity") Entity entity,
|
||||
@Local(ordinal = 0, name = "d0") double d0,
|
||||
@Local(ordinal = 1, name = "d1") double d1,
|
||||
@Local(ordinal = 2, name = "d2") double d2) {
|
||||
if (flag && entity instanceof EntityItem) {
|
||||
final int i = Math.min((int) (entity.getDistanceSq(d0, d1, d2) / 4.0D), 255);
|
||||
sodium$entityItemCount[i]++;
|
||||
return i <= sodium$itemRenderDist;
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
}
|
||||
+22
-5
@@ -12,11 +12,15 @@ import net.coderbot.iris.pipeline.WorldRenderingPhase;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
|
||||
import net.coderbot.iris.uniforms.CapturedRenderingState;
|
||||
import net.coderbot.iris.uniforms.SystemTimeUniforms;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.resources.IResourceManagerReloadListener;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
@@ -29,11 +33,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
public abstract class MixinEntityRenderer implements IResourceManagerReloadListener {
|
||||
@Shadow public Minecraft mc;
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glClear(I)V", shift = At.Shift.AFTER, ordinal = 0), method = "renderWorld(FJ)V", remap = false)
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/culling/ClippingHelperImpl;getInstance()Lnet/minecraft/client/renderer/culling/ClippingHelper;", shift = At.Shift.AFTER, ordinal = 0), method = "renderWorld(FJ)V")
|
||||
private void iris$beginRender(float partialTicks, long startTime, CallbackInfo ci, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
CapturedRenderingState.INSTANCE.setTickDelta(partialTicks);
|
||||
SystemTimeUniforms.COUNTER.beginFrame();
|
||||
SystemTimeUniforms.TIMER.beginFrame(startTime);
|
||||
SystemTimeUniforms.TIMER.beginFrame(System.nanoTime());
|
||||
|
||||
Program.unbind();
|
||||
|
||||
@@ -42,18 +46,25 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
|
||||
pipeline.get().beginLevelRendering();
|
||||
}
|
||||
|
||||
@Inject(method = "renderWorld(FJ)V", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
|
||||
@Inject(method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;dispatchRenderLast(Lnet/minecraft/client/renderer/RenderGlobal;F)V"))
|
||||
private void iris$endLevelRender(float partialTicks, long limitTime, CallbackInfo callback, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
// TODO: Iris
|
||||
final Camera camera = new Camera(mc.renderViewEntity, partialTicks);
|
||||
HandRenderer.INSTANCE.renderTranslucent(null /*poseStack*/, partialTicks, camera, mc.renderGlobal, pipeline.get());
|
||||
HandRenderer.INSTANCE.renderTranslucent(partialTicks, camera, mc.renderGlobal, pipeline.get());
|
||||
Minecraft.getMinecraft().mcProfiler.endStartSection("iris_final");
|
||||
pipeline.get().finalizeLevelRendering();
|
||||
pipeline.set(null);
|
||||
Program.unbind();
|
||||
}
|
||||
|
||||
@Inject(at = @At(value= "INVOKE", target="Lnet/minecraft/client/renderer/RenderGlobal;clipRenderersByFrustum(Lnet/minecraft/client/renderer/culling/ICamera;F)V", shift=At.Shift.AFTER), method = "renderWorld(FJ)V")
|
||||
@WrapOperation(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemInFirstPerson(F)V"))
|
||||
private void iris$disableVanillaRenderHand(ItemRenderer instance, float partialTicks, Operation<Void> original) {
|
||||
if (!IrisApi.getInstance().isShaderPackInUse()) {
|
||||
original.call(instance, partialTicks);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;clipRenderersByFrustum(Lnet/minecraft/client/renderer/culling/ICamera;F)V", shift = At.Shift.AFTER), method = "renderWorld(FJ)V")
|
||||
private void iris$beginEntities(float partialTicks, long startTime, CallbackInfo ci, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
final Camera camera = new Camera(mc.renderViewEntity, partialTicks);
|
||||
pipeline.get().renderShadows((EntityRenderer) (Object) this, camera);
|
||||
@@ -98,4 +109,10 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
|
||||
pipeline.get().setPhase(WorldRenderingPhase.NONE);
|
||||
}
|
||||
|
||||
@WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V"))
|
||||
private void iris$blockDamageTexture(RenderGlobal instance, Tessellator tessellator, EntityLivingBase entity, float partialTicks, Operation<Void> original, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
pipeline.get().setPhase(WorldRenderingPhase.DESTROY);
|
||||
original.call(instance, tessellator, entity, partialTicks);
|
||||
pipeline.get().setPhase(WorldRenderingPhase.NONE);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.shaders;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.mojang.InteractionHand;
|
||||
import net.coderbot.iris.pipeline.HandRenderer;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ItemRenderer.class)
|
||||
public class MixinItemRenderer {
|
||||
@Inject(method = "renderItemInFirstPerson", at = @At("HEAD"), cancellable = true)
|
||||
private void iris$skipTranslucentHands(float partialTicks, CallbackInfo ci) {
|
||||
if (IrisApi.getInstance().isShaderPackInUse()) {
|
||||
// TODO: Offhand
|
||||
boolean isHandTranslucent = HandRenderer.INSTANCE.isHandTranslucent(InteractionHand.MAIN_HAND);
|
||||
if (HandRenderer.INSTANCE.isRenderingSolid() && isHandTranslucent) {
|
||||
ci.cancel();
|
||||
} else if (!HandRenderer.INSTANCE.isRenderingSolid() && !isHandTranslucent) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -24,7 +24,7 @@ public class MixinRendererLivingEntity {
|
||||
final float r = (j >> 16 & 255) / 255.0F;
|
||||
final float g = (j >> 8 & 255) / 255.0F;
|
||||
final float b = (j & 255) / 255.0F;
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntityColor(r, g, b, 1.0F - a);
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntityColor(r, g, b, a);
|
||||
return j;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(BlockLiquid.class)
|
||||
public abstract class MixinBlockLiquid implements IFluidBlock {
|
||||
|
||||
@Shadow
|
||||
public abstract int getBlockColor();
|
||||
|
||||
@Override
|
||||
public Fluid getFluid() {
|
||||
return ((Block) (Object) this).getMaterial() == Material.water ? FluidRegistry.WATER : FluidRegistry.LAVA;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getFilledPercentage(World world, int x, int y, int z) {
|
||||
return getFluid() == null ? 0 : 1 - BlockLiquid.getLiquidHeightPercent(world.getBlockMetadata(x, y, z));
|
||||
}
|
||||
}
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import net.minecraft.client.multiplayer.ChunkProviderClient;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ChunkProviderClient.class)
|
||||
public abstract class MixinChunkProviderClient {
|
||||
|
||||
@Inject(method="unloadChunk", at=@At("TAIL"))
|
||||
private void sodium$unloadChunk(int x, int z, CallbackInfo ci) {
|
||||
SodiumWorldRenderer.getInstance().onChunkRemoved(x, z);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import net.minecraft.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(Entity.class)
|
||||
public abstract class MixinEntity {
|
||||
|
||||
@Shadow
|
||||
public abstract boolean isInRangeToRenderDist(double dist);
|
||||
|
||||
@Inject(method ="isInRangeToRender3d", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isInRangeToRenderDist(D)Z"), cancellable = true)
|
||||
private void sodium$afterDistCalc(CallbackInfoReturnable<Boolean> ci, @Local(ordinal = 6) double d6) {
|
||||
ci.setReturnValue(this.isInRangeToRenderDist(d6/(SodiumGameOptions.EntityRenderDistance.entityRenderDistanceMultiplier * SodiumGameOptions.EntityRenderDistance.entityRenderDistanceMultiplier)));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.world.World;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
@Mixin(EntityItem.class)
|
||||
public abstract class MixinEntityItem_RenderDist extends Entity {
|
||||
|
||||
public MixinEntityItem_RenderDist(World worldIn) {
|
||||
super(worldIn);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInRangeToRender3d(double x, double y, double z) {
|
||||
double d3 = this.posX - x;
|
||||
double d4 = this.posY - y;
|
||||
double d5 = this.posZ - z;
|
||||
double d6 = d3 * d3 + d4 * d4 + d5 * d5;
|
||||
// set render distance to 32 blocks
|
||||
return this.isInRangeToRenderDist(d6 / 4.0D);
|
||||
}
|
||||
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import net.minecraft.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
|
||||
@Mixin(Entity.class)
|
||||
public abstract class MixinEntity_RenderDist {
|
||||
|
||||
@ModifyArg(method = "isInRangeToRender3d", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isInRangeToRenderDist(D)Z"))
|
||||
private double sodium$afterDistCalc(double d6) {
|
||||
final double mult = SodiumGameOptions.EntityRenderDistance.entityRenderDistanceMultiplier;
|
||||
return d6 / (mult * mult);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,18 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaMod;
|
||||
import com.gtnewhorizons.angelica.common.BlockError;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -15,6 +23,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
@Mixin(RenderBlocks.class)
|
||||
public abstract class MixinRenderBlocks {
|
||||
|
||||
@Unique
|
||||
private static final ObjectOpenHashSet<String> isbrhExceptionCache = new ObjectOpenHashSet<>();
|
||||
|
||||
@Unique
|
||||
private static final Object2IntOpenHashMap<Class<? extends Exception>> exceptionErrorBlockMap = new Object2IntOpenHashMap<>();
|
||||
|
||||
static {
|
||||
exceptionErrorBlockMap.put(NullPointerException.class, 0);
|
||||
exceptionErrorBlockMap.put(ArrayIndexOutOfBoundsException.class, 1);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private boolean isRenderingByType = false;
|
||||
|
||||
@@ -28,6 +47,44 @@ public abstract class MixinRenderBlocks {
|
||||
this.isRenderingByType = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* This mixin and the one below(wrapRenderWorldBlockDeobfuscated) achieve the same goal. The goal is to wrap ISBRH rendering in a try/catch
|
||||
* to ignore NPE, as mods commonly like to not null-guard the tile entity casting, and Sodium introduces a race condition where when a block
|
||||
* is broken, the TE can be removed from the world before the render thread gets to it, but the block data is deep copied to the thread, so
|
||||
* it still tries to render the block.
|
||||
|
||||
* The reason there's two mixins to the same thing for this, is because FMLRenderAccessLibrary is an old Forge remnant of Optifine compat
|
||||
* whereby they provided this class for Optifine to be able to access Forge's rendering methods. For some reason, in a deobfuscated environment,
|
||||
* that class lives in net.minecraft.src.FMLRenderAccessLibrary. However in an obfuscated prod environment, it gets moved into the root unnamed
|
||||
* package. So basically, only one of these two redirects will actually end up getting applied, and the other will fail, based on what environment
|
||||
* you're running in.
|
||||
*/
|
||||
@Redirect(
|
||||
method = "renderBlockByRenderType",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "LFMLRenderAccessLibrary;renderWorldBlock(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)Z",
|
||||
remap = false
|
||||
),
|
||||
expect = 0
|
||||
)
|
||||
private boolean wrapRenderWorldBlockObfuscated(RenderBlocks rb, IBlockAccess world, int x, int y, int z, Block block, int modelId) {
|
||||
return handleISBRHException(rb, world, x, y, z, block, modelId);
|
||||
}
|
||||
|
||||
@Redirect(
|
||||
method = "renderBlockByRenderType",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/src/FMLRenderAccessLibrary;renderWorldBlock(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)Z",
|
||||
remap = false
|
||||
),
|
||||
expect = 0
|
||||
)
|
||||
private boolean wrapRenderWorldBlockDeobfuscated(RenderBlocks rb, IBlockAccess world, int x, int y, int z, Block block, int modelId) {
|
||||
return handleISBRHException(rb, world, x, y, z, block, modelId);
|
||||
}
|
||||
|
||||
@Redirect(method = "renderStandardBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z"))
|
||||
private boolean checkAOEnabled() {
|
||||
if ((this.isRenderingByType && Minecraft.isAmbientOcclusionEnabled() && SodiumClientMod.options().quality.useSodiumAO) ||
|
||||
@@ -37,4 +94,23 @@ public abstract class MixinRenderBlocks {
|
||||
|
||||
return Minecraft.isAmbientOcclusionEnabled();
|
||||
}
|
||||
|
||||
private boolean handleISBRHException(RenderBlocks rb, IBlockAccess world, int x, int y, int z, Block block, int modelId) {
|
||||
try {
|
||||
return RenderingRegistry.instance().renderWorldBlock(rb, world, x, y, z, block, modelId);
|
||||
} catch (NullPointerException | ArrayIndexOutOfBoundsException e) {
|
||||
// Render Error Block
|
||||
int meta = exceptionErrorBlockMap.getOrDefault(e.getClass(), 0);
|
||||
rb.overrideBlockTexture = BlockError.icons[exceptionErrorBlockMap.getOrDefault(e.getClass(), 0)];
|
||||
rb.renderStandardBlock(AngelicaMod.blockError, x, y, z);
|
||||
rb.overrideBlockTexture = null;
|
||||
|
||||
// Check if we've already caught the exception for this block and log it if we haven't
|
||||
String key = block.getUnlocalizedName() + ":" + meta;
|
||||
if (isbrhExceptionCache.add(key)) {
|
||||
AngelicaTweaker.LOGGER.warn("Caught an exception during ISBRH rendering for {} at position {}, {}, {} with renderer ID {}", block.getUnlocalizedName(), x, y, z, modelId, e);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -154,13 +154,14 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
|
||||
if(pass == 0) {
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_CUTOUT);
|
||||
} else if(pass == 1) {
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_TRANSLUCENT);
|
||||
final Camera camera = new Camera(mc.renderViewEntity, (float) partialTicks);
|
||||
|
||||
// iris$beginTranslucents
|
||||
pipeline.beginHand();
|
||||
HandRenderer.INSTANCE.renderSolid(null /*poseStack*/, (float) partialTicks, camera, mc.renderGlobal, pipeline);
|
||||
HandRenderer.INSTANCE.renderSolid((float) partialTicks, camera, mc.renderGlobal, pipeline);
|
||||
|
||||
mc.mcProfiler.endStartSection("iris_pre_translucent");
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_TRANSLUCENT);
|
||||
pipeline.beginTranslucents();
|
||||
this.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
|
||||
+16
-3
@@ -1,6 +1,9 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkStatus;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTracker;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.map.ChunkTrackerHolder;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -8,10 +11,20 @@ import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(WorldClient.class)
|
||||
public class MixinWorldClient {
|
||||
public class MixinWorldClient implements ChunkTrackerHolder {
|
||||
private final ChunkTracker angelica$tracker = new ChunkTracker();
|
||||
|
||||
@Inject(method = "doPreChunk", at = @At("TAIL"))
|
||||
private void sodium$loadChunk(int x, int z, boolean load, CallbackInfo ci) {
|
||||
if(load)
|
||||
SodiumWorldRenderer.getInstance().onChunkAdded(x, z);
|
||||
if(load) {
|
||||
this.angelica$tracker.onChunkStatusAdded(x, z, ChunkStatus.FLAG_ALL);
|
||||
} else {
|
||||
this.angelica$tracker.onChunkStatusRemoved(x, z, ChunkStatus.FLAG_ALL);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkTracker sodium$getTracker() {
|
||||
return this.angelica$tracker;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user