Compare commits

..
Author SHA1 Message Date
Jason Mitchell 018a47e400 fix release workaround 2024-02-09 17:53:26 -08:00
ah-OOG-ahandmakamys 509017551a Initial QuadProvider API (#256)
* Initial model testing

* Fix UV

* More quad work

* Update BlockRenderer.java

* QuadProvider renders right!

* Clean up

* Update CubeModel.java

* Initial colorization work

* (Badly) color grass

Unbreaks vanilla blocks

* Leaves are easier

* Add separate AO back

* Relocate to Angelica

* Cleanup + pool quads

* Add TODOs for future reference

* Update LightDataAccess.java

* Replace code comment with TODO

* Update WorldSlice.java

Co-authored-by: makamys <[email protected]>

* Default quads to UP

* Only coerce facing in Quad#getFace

Mirrors 1.16's face handling more accurately.
Fixes face culling not working properly for blocks like tall grass

* Iterate over unaligned quads too

* Don't cull unaligned faces

* Release QP quads

---------

Co-authored-by: makamys <[email protected]>
2024-02-09 17:41:15 -08:00
Jason Mitchell cf454f287c GLSM Improvements (#272)
* GLSM Improvements
* Add an IntegerStateStack
* Use IntegerStateStack to track the active texture unit
* Track activeTextureUnit with GL_TEXTURE_BIT
* Bugfix - Don't include color with GL_COLOR_BUFFER_BIT
* Fully test glPush/PopAttrib for GL_COLOR_BUFFER_BIT
* Split GLStateManager init into two pieces
2024-02-09 17:35:58 -08:00
Darren Eberly 0e3e4283af Compat with NotEnoughIDs 16-bit Metadata (#271)
* Compat with NotEnoughIDs 16-bit Metadata

* Less bad(maybe) version parsing
2024-02-09 00:33:42 -05:00
Bogdan 8176e1cd1c Don't put excessive buffer size (#267) 2024-02-04 13:57:04 -08:00
ah-OOG-ah d2cba7c321 Update settings.gradle (#268) 2024-02-04 13:56:22 -08:00
Raven Szewczyk f791b0dab3 [ci skip] upgraded build system 2024-02-04 19:56:28 +00:00
Jason Mitchell 5093531811 Cleanup 2024-02-03 16:04:19 -08:00
38 changed files with 1006 additions and 1805 deletions

No files matched your search

+1 -1
View File
@@ -10,5 +10,5 @@ permissions:
jobs:
release-tags:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@fix-release-tags-for-opengl-testing
secrets: inherit
+14
View File
@@ -1,3 +1,17 @@
test {
useJUnitPlatform()
testLogging {
events "passed", "skipped", "failed"
}
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(8)
}
dependsOn("extractNatives2")
jvmArgs += "-Djava.library.path=${tasks.extractNatives2.destinationFolder.asFile.get().path}"
}
allprojects {
gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
+2 -1621
View File
File diff suppressed because it is too large. Load diff
+13 -1
View File
@@ -81,7 +81,7 @@ dependencies {
compileOnly(rfg.deobf("curse.maven:extrautils-225561:2264383"))
compileOnly(rfg.deobf("curse.maven:dynamiclights-227874:2337326"))
compileOnly("com.github.GTNewHorizons:NotEnoughIds:1.5.3:dev") // Mixin Version
compileOnly("com.github.GTNewHorizons:NotEnoughIds:2.0.0:dev") // Mixin Version
compileOnly("com.github.GTNewHorizons:NotEnoughIds-Legacy:1.4.7:dev") // ASM Version
compileOnly(rfg.deobf("curse.maven:campfirebackport-387444:4611675"))
@@ -92,4 +92,16 @@ dependencies {
// Hodgepodge
transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
// Tests
testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
testImplementation("org.mockito:mockito-core:3.+")
testImplementation("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209")
}
task copyDependencies(type: Copy) {
from configurations.default
into 'testDependencies'
}
+91 -47
View File
@@ -1,81 +1,104 @@
# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
# LOCAL to test local config updates.
gtnh.settings.blowdryerTag = 0.2.2
# Human-readable mod name, available for mcmod.info population.
modName = Angelica
# This is a case-sensitive string to identify your mod. Convention is to use lower case.
# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
# Conventionally lowercase.
modId = angelica
# Root package of the mod, used to find various classes in other properties,
# mcmod.info substitution, enabling assertions in run tasks, etc.
modGroup = com.gtnewhorizons.angelica
# WHY is there no version field?
# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
# Whether to use modGroup as the maven publishing group.
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
useModGroupForPublishing = false
# Will update your build.gradle automatically whenever an update is available
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
autoUpdateBuildScript = false
# Version of Minecraft to target
minecraftVersion = 1.7.10
# Version of Minecraft Forge to target
forgeVersion = 10.13.4.1614
# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
channel = stable
# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
mappingsVersion = 12
# Define other MCP mappings for dependency deobfuscation
remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
# Defines other MCP mappings for dependency deobfuscation.
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
# restart Minecraft in development. Choose this dependent on your mod:
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
# Select a default username for testing your mod. You can always override this per-run by running
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer
# Enables using modern java syntax (up to version 17) via Jabel, while still targetting JVM 8.
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = true
# Enables injecting missing generics into the decompiled source code for a better coding experience
# Turns most publically visible List, Map, etc. into proper List<Type>, Map<K, V> types
# Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
enableGenericInjection = true
# Define a source file of your project with:
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...])
# Leave these properties empty to skip individual token replacements
# Generate a class with a String field for the mod version named as defined below.
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
generateGradleTokenClass = com.gtnewhorizons.angelica.Tags
gradleTokenModId =
gradleTokenModName =
# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = VERSION
# [DEPRECATED] Mod ID replacement token.
gradleTokenModId =
# [DEPRECATED] Mod name replacement token.
gradleTokenModName =
# [DEPRECATED] Mod Group replacement token.
gradleTokenGroupName =
# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...])
# Leave these properties empty to skip individual token replacements
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
apiPackage = api
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
# There can be multiple files in a comma-separated list.
# Example value: mymodid_at.cfg,nei_at.cfg
# There can be multiple files in a space-separated list.
# Example value: mymodid_at.cfg nei_at.cfg
accessTransformersFile = angelica_at.cfg notfine_at.cfg archaicfix_at.cfg mcpatcherforge_at.cfg
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
usesMixins = true
# Adds some debug arguments like verbose output and export
# Adds some debug arguments like verbose output and class export.
usesMixinDebug = false
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
mixinPlugin =
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
mixinsPackage = mixins
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
# This parameter is for legacy compatibility only
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
coreModClass = loading.AngelicaTweaker
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
containsMixinsAndOrCoreModOnly = false
@@ -83,22 +106,32 @@ containsMixinsAndOrCoreModOnly = false
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
forceEnableMixins = false
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
# responsibility check the licence and request permission for distribution, if required.
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
# responsibility to check the license and request permission for distribution if required.
usesShadowedDependencies = true
# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access
# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
# their own classes, making the minimization unreliable.
minimizeShadowedDependencies = true
# If disabled, won't rename the shadowed classes.
relocateShadowedDependencies = true
# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories
# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
includeWellKnownRepositories = true
# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
# 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.
usesMavenPublishing = true
# Maven repository to publish the mod to.
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
#
# The project's ID on Modrinth. Can be either the slug or the ID.
# Leave this empty if you don't want to publish on Modrinth.
# Leave this empty if you don't want to publish to Modrinth.
modrinthProjectId =
# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
@@ -110,9 +143,8 @@ modrinthProjectId =
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
modrinthRelations =
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
#
# The project's numeric ID on CurseForge. You can find this in the About Project box.
# Leave this empty if you don't want to publish on CurseForge.
curseForgeProjectId =
@@ -122,27 +154,39 @@ curseForgeProjectId =
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
# and the name is the CurseForge project slug of the other mod.
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
curseForgeRelations =
# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
# projects. New projects should not use this parameter.
# customArchiveBaseName =
# Optional parameter to prevent the source code from being published
# noPublishedSources =
# Optional parameter to have the build automatically fail if an illegal version is used.
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
# The check is ONLY performed if the version is a git tag.
# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
# versionPattern =
# Uncomment this to disable spotless checks
# Uncomment to prevent the source code from being published.
# noPublishedSources = true
# Uncomment this to disable Spotless checks.
# This should only be uncommented to keep it easier to sync with upstream/other forks.
# That is, if there is no other active fork/upstream, NEVER change this.
# Disabling to make easier to sync if some of the additional mods get any changes upstream
disableSpotless = true
# Override the IDEA build type. Valid value is "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
# Uncomment this to disable Checkstyle checks (currently wildcard import check).
# disableCheckstyle = true
# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
# (force use delegated build).
# This is meant to be set in $HOME/.gradle/gradle.properties.
# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be always native build.
# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
# ideaOverrideBuildType = idea
# Whether IDEA should run spotless checks when pressing the Build button.
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+10 -10
View File
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
+2 -9
View File
@@ -1,4 +1,3 @@
pluginManagement {
repositories {
maven {
@@ -6,6 +5,7 @@ pluginManagement {
name "GTNH Maven"
url "https://nexus.gtnewhorizons.com/repository/public/"
mavenContent {
includeGroup("com.gtnewhorizons")
includeGroupByRegex("com\\.gtnewhorizons\\..+")
}
}
@@ -16,12 +16,5 @@ pluginManagement {
}
plugins {
id 'com.diffplug.blowdryerSetup' version '1.7.1'
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains
}
blowdryerSetup {
repoSubfolder 'gtnhShared'
github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.2')
//devLocal '.' // Use this when testing config updates locally
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.12'
}
@@ -0,0 +1,15 @@
package com.gtnewhorizons.angelica.api;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
public interface QuadProvider {
List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool);
}
@@ -36,6 +36,10 @@ public class ExtendedBlockStorageExt extends ExtendedBlockStorage {
copyNibbleArray((ExtendedNibbleArray) storage.getBlockMSBArray(), (ExtendedNibbleArray) this.getBlockMSBArray());
}
arrayLen = block16BArray.length;
if (ModStatus.isNEIDMetadataExtended) {
final short[] block16BMetaArray = ((IExtendedBlockStorageMixin)(Object)this).getBlock16BMetaArray();
System.arraycopy(((IExtendedBlockStorageMixin)(Object)storage).getBlock16BMetaArray(), 0, block16BMetaArray, 0, block16BMetaArray.length);
}
}
else if (ModStatus.isOldNEIDLoaded){
final short[] blockLSBArray = Hooks.get(this);
@@ -54,7 +58,7 @@ public class ExtendedBlockStorageExt extends ExtendedBlockStorage {
}
copyNibbleArray((ExtendedNibbleArray) storage.getMetadataArray(), (ExtendedNibbleArray)this.getMetadataArray());
if (!ModStatus.isNEIDMetadataExtended) copyNibbleArray((ExtendedNibbleArray) storage.getMetadataArray(), (ExtendedNibbleArray)this.getMetadataArray());
copyNibbleArray((ExtendedNibbleArray) storage.getBlocklightArray(), (ExtendedNibbleArray)this.getBlocklightArray());
if(storage.getSkylightArray() != null) {
hasSky = true;
@@ -11,6 +11,8 @@ public class ModStatus {
* ASM Version
*/
public static boolean isOldNEIDLoaded;
public static boolean isNEIDMetadataExtended;
public static boolean isLotrLoaded;
public static boolean isChunkAPILoaded;
public static boolean isEIDBiomeLoaded;
@@ -21,5 +23,13 @@ public class ModStatus {
isLotrLoaded = Loader.isModLoaded("lotr");
isChunkAPILoaded = Loader.isModLoaded("chunkapi");
isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome");
isNEIDMetadataExtended = false;
if (isNEIDLoaded) {
int majorVersion = Integer.parseInt(Loader.instance().getIndexedModList().get("neid").getVersion().split("\\.")[0]);
if (majorVersion >= 2) {
isNEIDMetadataExtended = true;
}
}
}
}
@@ -12,7 +12,7 @@ public enum Axis {
case DOWN, UP -> Y;
case NORTH, SOUTH -> Z;
case WEST, EAST -> X;
default -> null;
case UNASSIGNED -> null;
};
}
@@ -1,7 +1,9 @@
package com.gtnewhorizons.angelica.compat.nd;
import lombok.Getter;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFacing;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFlags;
import me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraftforge.common.util.ForgeDirection;
@@ -35,6 +37,10 @@ public class Quad implements ModelQuadView {
private boolean hasShade;
private boolean hasNormals;
private int cachedFlags;
private ForgeDirection face;
private int colorIndex = -1;
public boolean hasColor() {
return this.hasColor;
}
@@ -51,9 +57,9 @@ public class Quad implements ModelQuadView {
return this.hasNormals;
}
public ForgeDirection getFace() {
// TODO: Sodium/Quad Facing
return ForgeDirection.UP;
/** Returns the face, forced to take one of 6 directions to mirror the behavior of baked quads in 1.16.5. */
public ForgeDirection getCoercedFace() {
return this.face != ForgeDirection.UNKNOWN ? this.face : ForgeDirection.UP;
}
@Override
@@ -88,7 +94,7 @@ public class Quad implements ModelQuadView {
@Override
public int getFlags() {
return 0;
return this.cachedFlags;
}
@Override
@@ -103,7 +109,7 @@ public class Quad implements ModelQuadView {
@Override
public int getColorIndex() {
return 0;
return colorIndex;
}
@Override
@@ -166,6 +172,8 @@ public class Quad implements ModelQuadView {
vectorA.cross(vectorB, vectorC);
normal = ModelQuadFacing.fromVector(vectorC);
this.face = ModelQuadFacing.toDirection(normal);
this.cachedFlags = ModelQuadFlags.getQuadFlags(this);
}
public static boolean isValid(Quad q) {
@@ -16,6 +16,11 @@ public class AngelicaConfig {
@Config.RequiresMcRestart
public static boolean enableSodiumFluidRendering;
@Config.Comment("Inject QuadProvider rendering into some vanilla blocks")
@Config.DefaultBoolean(false)
@Config.RequiresMcRestart
public static boolean injectQPRendering;
@Config.Comment("Enable Iris Shaders [Requires Sodium]")
@Config.DefaultBoolean(false)
@Config.RequiresMcRestart
@@ -50,9 +50,8 @@ public class Feature {
// GL_COLOR_LOGIC_OP enable bit
// GL_INDEX_LOGIC_OP enable bit
// Logic op function
, GLStateManager.colorMask // Color mode and index mode writemasks
, GLStateManager.color // Color mode and index mode writemasks
, GLStateManager.clearColor // Color mode and index mode clear values
, GLStateManager.colorMask // Color-mode and index-mode writemasks
, GLStateManager.clearColor // Color-mode and index-mode clear values
));
attribToFeatures.put(GL11.GL_CURRENT_BIT, ImmutableSet.of(
GLStateManager.color // Current RGBA color
@@ -219,11 +218,14 @@ public class Feature {
// Stencil buffer writemask
));
final Set<IStateStack<?>> textureAttribs = new HashSet<>(ImmutableSet.of(
GLStateManager.activeTextureUnit // Active texture unit
// Enable bits for the four texture coordinates
// Border color for each texture image
// Minification function for each texture image
// Magnification function for each texture image
// Texture coordinates and wrap mode for each texture image
// Color and mode for each texture environment
// Enable bits GL_TEXTURE_GEN_x, x is S, T, R, and Q
// GL_TEXTURE_GEN_MODE setting for S, T, R, and Q
@@ -234,9 +236,11 @@ public class Feature {
// Current Texture Bindings - GL_TEXTURE_BINDING_2D
for(int i = 0 ; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
textureAttribs.add(GLStateManager.textures.getTextureUnitBindings(i));
// textureAttribs.add(GLStateManager.textures.getInfo(i))
}
attribToFeatures.put(GL11.GL_TEXTURE_BIT, textureAttribs);
attribToFeatures.put(GL11.GL_TRANSFORM_BIT, ImmutableSet.of(
// Coefficients of the six clipping planes
// Enable bits for the user-definable clipping planes
@@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging;
import com.gtnewhorizons.angelica.glsm.stacks.AlphaStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.BlendStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.BooleanStateStack;
@@ -10,6 +11,7 @@ import com.gtnewhorizons.angelica.glsm.stacks.ColorMaskStack;
import com.gtnewhorizons.angelica.glsm.stacks.DepthStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.FogStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.IStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.IntegerStateStack;
import com.gtnewhorizons.angelica.glsm.stacks.MatrixModeStack;
import com.gtnewhorizons.angelica.glsm.stacks.ViewPortStateStack;
import com.gtnewhorizons.angelica.glsm.states.Color4;
@@ -84,9 +86,9 @@ public class GLStateManager {
// GLStateManager State Trackers
private static final IntStack attribs = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
private static final IntStack activeTextureUnit = new IntArrayList(MAX_ATTRIB_STACK_DEPTH);
protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack();
static {
activeTextureUnit.push(0); // GL_TEXTURE0
activeTextureUnit.setValue(0); // GL_TEXTURE0
}
@Getter protected static final TextureUnitArray textures = new TextureUnitArray();
@Getter protected static final BlendStateStack blendState = new BlendStateStack();
@@ -99,7 +101,7 @@ public class GLStateManager {
@Getter protected static final FogStateStack fogState = new FogStateStack();
@Getter protected static final BooleanStateStack fogMode = new BooleanStateStack(GL11.GL_FOG);
@Getter protected static final Color4Stack color = new Color4Stack();
@Getter protected static final Color4Stack clearColor = new Color4Stack();
@Getter protected static final Color4Stack clearColor = new Color4Stack(new Color4(0.0F, 0.0F, 0.0F, 0.0F));
@Getter protected static final ColorMaskStack colorMask = new ColorMaskStack();
@Getter protected static final BooleanStateStack cullState = new BooleanStateStack(GL11.GL_CULL_FACE);
@Getter protected static final AlphaStateStack alphaState = new AlphaStateStack();
@@ -135,6 +137,8 @@ public class GLStateManager {
private static final Map<IStateStack<?>, ISettableState<?>> glListStates = new Object2ObjectArrayMap<>();
private static final Int2ObjectMap<Set<Map.Entry<IStateStack<?>, ISettableState<?>>>> glListChanges = new Int2ObjectOpenHashMap<>();
public static class GLFeatureSet extends IntOpenHashSet {
public GLFeatureSet addFeature(int feature) {
super.add(feature);
@@ -143,10 +147,11 @@ public class GLStateManager {
}
public static void init() {
public static void preInit() {
capabilities = GLContext.getCapabilities();
HAS_MULTIPLE_SET
.addFeature(GL11.GL_ACCUM_CLEAR_VALUE)
.addFeature(GL14.GL_BLEND_COLOR)
.addFeature(GL11.GL_COLOR_CLEAR_VALUE)
.addFeature(GL11.GL_COLOR_WRITEMASK)
.addFeature(GL11.GL_CURRENT_COLOR)
@@ -171,6 +176,10 @@ public class GLStateManager {
.addFeature(GL11.GL_TEXTURE_ENV_COLOR)
.addFeature(GL11.GL_TEXTURE_MATRIX)
.addFeature(GL11.GL_VIEWPORT);
}
public static void init() {
RenderSystem.initRenderer();
@@ -247,7 +256,7 @@ public class GLStateManager {
case GL11.GL_FOG -> fogMode.isEnabled();
case GL11.GL_LIGHTING -> lightingState.isEnabled();
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.topInt()).isEnabled();
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
default -> GL11.glIsEnabled(cap);
};
@@ -266,7 +275,7 @@ public class GLStateManager {
case GL11.GL_FOG -> fogMode.isEnabled();
case GL11.GL_LIGHTING -> lightingState.isEnabled();
case GL11.GL_SCISSOR_TEST -> scissorTest.isEnabled();
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.topInt()).isEnabled();
case GL11.GL_TEXTURE_2D -> textures.getTextureUnitStates(activeTextureUnit.getValue()).isEnabled();
case GL12.GL_RESCALE_NORMAL -> rescaleNormalState.isEnabled();
default -> GL11.glGetBoolean(pname);
};
@@ -342,8 +351,9 @@ public class GLStateManager {
switch (pname) {
case GL11.GL_MODELVIEW_MATRIX -> modelViewMatrix.get(0, params);
case GL11.GL_PROJECTION_MATRIX -> projectionMatrix.get(0, params);
case GL11.GL_TEXTURE_MATRIX -> textures.getTextureUnitMatrix(getActiveTextureUnit()).get(0, params);
// case GL11.GL_TEXTURE_MATRIX -> textures.getTextureUnitMatrix(getActiveTextureUnit()).get(0, params);
case GL11.GL_COLOR_CLEAR_VALUE -> clearColor.get(params);
case GL11.GL_CURRENT_COLOR -> color.get(params);
default -> {
if(!HAS_MULTIPLE_SET.contains(pname)) {
params.put(0, glGetFloat(pname));
@@ -596,8 +606,7 @@ public class GLStateManager {
public static void glActiveTexture(int texture) {
final int newTexture = texture - GL13.GL_TEXTURE0;
if (shouldBypassCache() || getActiveTextureUnit() != newTexture) {
activeTextureUnit.popInt();
activeTextureUnit.push(newTexture);
activeTextureUnit.setValue(newTexture);
GL13.glActiveTexture(texture);
}
}
@@ -605,14 +614,13 @@ public class GLStateManager {
public static void glActiveTextureARB(int texture) {
final int newTexture = texture - GL13.GL_TEXTURE0;
if (shouldBypassCache() || getActiveTextureUnit() != newTexture) {
activeTextureUnit.popInt();
activeTextureUnit.push(newTexture);
activeTextureUnit.setValue(newTexture);
ARBMultitexture.glActiveTextureARB(texture);
}
}
public static int getBoundTexture() {
return getBoundTexture(activeTextureUnit.topInt());
return getBoundTexture(activeTextureUnit.getValue());
}
public static int getBoundTexture(int unit) {
@@ -626,7 +634,7 @@ public class GLStateManager {
return;
}
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt());
final TextureBinding textureUnit = textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue());
if (shouldBypassCache() || textureUnit.getBinding() != texture) {
GL11.glBindTexture(target, texture);
@@ -653,7 +661,7 @@ public class GLStateManager {
public static void glDeleteTextures(int id) {
onDeleteTexture(id);
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
GL11.glDeleteTextures(id);
}
@@ -662,7 +670,7 @@ public class GLStateManager {
onDeleteTexture(ids.get(i));
}
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
GL11.glDeleteTextures(ids);
}
@@ -1081,7 +1089,7 @@ public class GLStateManager {
}
public static int getActiveTextureUnit() {
return activeTextureUnit.topInt();
return activeTextureUnit.getValue();
}
public static int getListMode() {
@@ -32,12 +32,12 @@ public class OpenGLDebugging {
public class GLproperty {
public GLproperty(int init_gLconstant, String init_name, String init_description, String init_category, String init_fetchCommand) {
gLConstant = init_gLconstant;
name = init_name;
description = init_description;
category = init_category;
fetchCommand = init_fetchCommand;
public GLproperty(int glConstant, String name, String description, String category, String fetchCommand) {
this.gLConstant = glConstant;
this.name = name;
this.description = description;
this.category = category;
this.fetchCommand = fetchCommand;
}
public int gLConstant;
@@ -46,10 +46,9 @@ public class OpenGLDebugging {
public String category;
public String fetchCommand;
final ByteBuffer byteBuffer = BufferUtils.createByteBuffer(16);
final IntBuffer intBuffer = BufferUtils.createIntBuffer(16);
final FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(16);
static final ByteBuffer byteBuffer = BufferUtils.createByteBuffer(16);
static final IntBuffer intBuffer = BufferUtils.createIntBuffer(16);
static final FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(16);
public String getAsString(boolean glsm) {
switch(fetchCommand) {
@@ -111,8 +110,8 @@ public class OpenGLDebugging {
}
}
final Matrix4f cachedMatrix = new Matrix4f();
final Matrix4f uncachedMatrix = new Matrix4f();
static final Matrix4f cachedMatrix = new Matrix4f();
static final Matrix4f uncachedMatrix = new Matrix4f();
public Matrix4f getAsMatrix4f(boolean glsm) {
if(!fetchCommand.equals(GL_GET_FLOATV)) {
throw new IllegalArgumentException("This property does not return a matrix");
@@ -403,25 +402,17 @@ public class OpenGLDebugging {
public static void dumpState(Consumer<String> printer, boolean glsm) {
for (int i = 0; i < instance.propertyList.length; ++i) {
final GLproperty gLproperty = instance.propertyList[i];
printer.accept(gLproperty.name + ":" + gLproperty.getAsString(glsm) + " (" + gLproperty.description + ")");
final GLproperty gLProperty = instance.propertyList[i];
printer.accept(gLProperty.name + ":" + gLProperty.getAsString(glsm) + " (" + gLProperty.description + ")");
}
}
public static void dumpIsEnabledToFile() {
dumpToFile(p -> dumpIsEnabled(p, false), "gl-dump-enabled.txt");
public static void dumpIsEnabledToFile(boolean glsm) {
dumpToFile(p -> dumpIsEnabled(p, glsm), (glsm ? "glsm" : "gl") + "-dump-enabled.txt");
}
public static void dumpIsEnabledGLSMToFile() {
dumpToFile(p -> dumpIsEnabled(p, true), "gl-dump-enabled.txt");
}
public static void dumpIsEnabled() {
dumpIsEnabled(LINE_LOGGER, false);
}
public static void dumpIsEnabledGLSM() {
dumpIsEnabled(LINE_LOGGER, true);
public static void dumpIsEnabled(boolean glsm) {
dumpIsEnabled(LINE_LOGGER, glsm);
}
public static void dumpIsEnabled(Consumer<String> printer, boolean glsm) {
@@ -16,6 +16,11 @@ public class Color4Stack extends Color4 implements IStateStack<Color4Stack> {
}
}
public Color4Stack(Color4 color4) {
this();
set(color4);
}
public Color4Stack push() {
if(pointer == stack.length) {
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
@@ -0,0 +1,42 @@
package com.gtnewhorizons.angelica.glsm.stacks;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.states.IntegerState;
public class IntegerStateStack extends IntegerState implements IStateStack<IntegerStateStack> {
protected final IntegerState[] stack;
protected int pointer;
public IntegerStateStack() {
stack = new IntegerState[GLStateManager.MAX_ATTRIB_STACK_DEPTH];
for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) {
stack[i] = new IntegerState();
}
}
public IntegerStateStack push() {
if(pointer == stack.length) {
throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached");
}
stack[pointer++].set(this);
return this;
}
public IntegerStateStack push(int value) {
push().setValue(value);
return this;
}
public IntegerStateStack pop() {
if(pointer == 0) {
throw new IllegalStateException("Stack underflow");
}
set(stack[--pointer]);
return this;
}
}
@@ -0,0 +1,26 @@
package com.gtnewhorizons.angelica.glsm.states;
import lombok.Getter;
import lombok.Setter;
public class IntegerState implements ISettableState<IntegerState> {
@Getter @Setter private int value;
@Override
public IntegerState set(IntegerState state) {
this.value = state.value;
return this;
}
@Override
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof IntegerState integerState)) return false;
return value == integerState.value;
}
@Override
public IntegerState copy() {
return new IntegerState().set(this);
}
}
@@ -38,9 +38,9 @@ public class HUDCaching {
framebuffer.setFramebufferColor(0, 0, 0, 0);
}
private static boolean dirty = true;
public static boolean renderingCacheOverride;
/*
* Some HUD features cause problems/inaccuracies when being rendered into cache.
* We capture those and render them later
@@ -55,7 +55,7 @@ public class HUDCaching {
public static boolean renderCrosshairsCaptured;
public static final HUDCaching INSTANCE = new HUDCaching();
private HUDCaching() {}
@@ -65,11 +65,11 @@ public class HUDCaching {
private static boolean isEnabled = true;
private static final KeyBinding toggle = new KeyBinding("Toggle HUDCaching", 0, "Debug");
static {
public static void registerKeyBindings() {
ClientRegistry.registerKeyBinding(toggle);
}
// @SubscribeEvent
// @SubscribeEvent
// public void onFrame(RenderGameOverlayEvent.Post event) {
// if (event.type == RenderGameOverlayEvent.ElementType.TEXT) {
// final long currentTimeMillis = System.currentTimeMillis();
@@ -121,15 +121,15 @@ public class HUDCaching {
} else {
renderer.setupOverlayRendering();
}
ScaledResolution resolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
int width = resolution.getScaledWidth();
int height = resolution.getScaledHeight();
GLStateManager.enableBlend();
// reset the color that may be applied by some items
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
// render bits that were captured when rendering into cache
GuiIngameAccessor gui = (GuiIngameAccessor) ingame;
if (renderVignetteCaptured)
@@ -138,7 +138,7 @@ public class HUDCaching {
} else {
GLStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
}
if (ingame instanceof GuiIngameForge) {
GuiIngameForgeAccessor guiForge = ((GuiIngameForgeAccessor) ingame);
if (renderHelmetCaptured) {
@@ -168,11 +168,11 @@ public class HUDCaching {
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
framebuffer.bindFramebufferTexture();
drawTexturedRect(tessellator, (float) resolution.getScaledWidth_double(), (float) resolution.getScaledHeight_double());
GLStateManager.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
mc.getTextureManager().bindTexture(Gui.icons);
}
/**
* We are skipping certain render calls when rendering into cache,
* however, we cannot skip the GL state changes. This will fix
@@ -453,6 +453,17 @@ public enum Mixins {
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses("mcpatcherforge.ctm_cc.MixinTextureMap")),
NOVIS_OCULIS(new Builder("Non-Tessellator Quad provider")
.setSide(Side.CLIENT)
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.injectQPRendering)
.addTargetedMod(TargetedMod.VANILLA)
.addMixinClasses(
"angelica.models.MixinBlockStone",
"angelica.models.MixinBlockAir",
"angelica.models.MixinBlockWorkbench",
"angelica.models.MixinBlockLeaves")),
;
private final List<String> mixinClasses;
@@ -0,0 +1,25 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.models;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectImmutableList;
import java.util.List;
import java.util.Random;
import com.gtnewhorizons.angelica.api.QuadProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(BlockAir.class)
public abstract class MixinBlockAir implements QuadProvider {
private static List<Quad> quads = ObjectImmutableList.of();
public List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool) {
return quads;
}
}
@@ -0,0 +1,30 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.models;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import java.util.List;
import java.util.Random;
import com.gtnewhorizons.angelica.models.CubeModel;
import com.gtnewhorizons.angelica.api.QuadProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(BlockLeaves.class)
public abstract class MixinBlockLeaves extends Block implements QuadProvider {
// TODO: Use modern model API
private static final ThreadLocal<QuadProvider> model = ThreadLocal.withInitial(() -> new CubeModel(true));
public List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool) {
return model.get().getQuads(world, pos, block, meta, dir, random, quadPool);
}
private MixinBlockLeaves(Material materialIn) {
super(materialIn);
}
}
@@ -0,0 +1,23 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.models;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import java.util.List;
import java.util.Random;
import com.gtnewhorizons.angelica.models.CubeModel;
import com.gtnewhorizons.angelica.api.QuadProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStone;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(BlockStone.class)
public abstract class MixinBlockStone implements QuadProvider {
// TODO: Use modern model API
public List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool) {
return CubeModel.INSTANCE.get().getQuads(world, pos, block, meta, dir, random, quadPool);
}
}
@@ -0,0 +1,23 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.models;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import java.util.List;
import java.util.Random;
import com.gtnewhorizons.angelica.models.CubeModel;
import com.gtnewhorizons.angelica.api.QuadProvider;
import net.minecraft.block.Block;
import net.minecraft.block.BlockWorkbench;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(BlockWorkbench.class)
public class MixinBlockWorkbench implements QuadProvider {
// TODO: Use modern model API
public List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool) {
return CubeModel.INSTANCE.get().getQuads(world, pos, block, meta, dir, random, quadPool);
}
}
@@ -11,6 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class MixinInitGLStateManager {
@Inject(method = "initializeTextures", at = @At("RETURN"))
private static void angelica$initializeGLStateManager(CallbackInfo ci) {
GLStateManager.preInit();
GLStateManager.init();
}
}
@@ -0,0 +1,228 @@
package com.gtnewhorizons.angelica.models;
import com.gtnewhorizons.angelica.api.QuadProvider;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import it.unimi.dsi.fastutil.objects.ObjectImmutableList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
import me.jellysquid.mods.sodium.client.render.pipeline.BlockRenderer;
import net.minecraft.block.Block;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import static org.lwjgl.opengl.GL11.GL_QUADS;
public class CubeModel implements QuadProvider {
/*
* GL only cares if the coords are clockwise or counterclockwise - not the specific order [1].
* Which mean I get to decide it! Behold, Omni's Standard Cube Vertex Order (TM)!
*
* SOUTH (+z)
* (x + 1, y + 1, z + 1)
* 5 - - - - - - - - - 6
* | \ | \
* | \ | \
* | \ | \
* | 4 - - - - - - - - - 7
* | | | |
* | | | |
* | | | |
* 1 - - - | - - - - - 2 |
* \ | \ |
* <- WEST (-x) \ | \ | EAST (+x) ->
* \ | \ |
* 0 - - - - - - - - - 3
* (x, y, z)
* NORTH (-z)
*
* The horizontal directions are labeled, up and down should be obvious (and would be annoying to add).
* Vertices are written in counterclockwise order, as viewed from outside the cube, to orient the quad properly.
* (x, y, z) is the world pos of the block. 0 and 6 have been labeled, you can figure out the rest.
*
* [1] So apparently I was a bit wrong. GL doesn't care, but Sodium does because that's how it applies AO.
* Change it if you dare!
*/
// I'm sure the following constants could be condensed to a single magic array, but for clarity's sake they remain.
// The (x, y, z) positions of the vertices
private static final int[][] vertices = {
{ 0, 0, 0 },
{ 0, 0, 1 },
{ 1, 0, 1 },
{ 1, 0, 0 },
{ 0, 1, 0 },
{ 0, 1, 1 },
{ 1, 1, 1 },
{ 1, 1, 0 }
};
private static final int[][] uv = {
{ 0, 0 },
{ 0, 1 },
{ 1, 1 },
{ 1, 0 }
};
// Add the UV.
private static final int[][][] shiftsByDirection = {
// DOWN 1 0 3 2
{
vertices[1],
vertices[0],
vertices[3],
vertices[2]
},
//UP 4 5 6 7
{
vertices[4],
vertices[5],
vertices[6],
vertices[7]
},
//NORTH 7 3 0 4
{
vertices[7],
vertices[3],
vertices[0],
vertices[4]
},
//SOUTH 5 1 2 6
{
vertices[5],
vertices[1],
vertices[2],
vertices[6]
},
//WEST 4 0 1 5
{
vertices[4],
vertices[0],
vertices[1],
vertices[5]
},
//EAST 6 2 3 7
{
vertices[6],
vertices[2],
vertices[3],
vertices[7]
}
};
private static final int[][] initBufs = new int[6][32];
static {
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
final int dirI = dir.ordinal();
int[][] shifts = shiftsByDirection[dirI];
for (int vi = 0; vi < 4; ++vi) {
final int i = vi * 8;
// XYZ
initBufs[dirI][i + 0] = Float.floatToIntBits(shifts[vi][0]);
initBufs[dirI][i + 1] = Float.floatToIntBits(shifts[vi][1]);
initBufs[dirI][i + 2] = Float.floatToIntBits(shifts[vi][2]);
// UV
initBufs[dirI][i + 3] = Float.floatToIntBits(0);
initBufs[dirI][i + 4] = Float.floatToIntBits(0);
// Color, normal, brightness
initBufs[dirI][i + 5] = 0xFFFFFFFF;
initBufs[dirI][i + 6] = 0;
initBufs[dirI][i + 7] = 15_728_880; // 15 sky 15 block
}
}
}
public static final ThreadLocal<CubeModel> INSTANCE = ThreadLocal.withInitial(() -> new CubeModel(false));
private final boolean[] colorized = new boolean[6];
private final BlockRenderer.Flags flags = new BlockRenderer.Flags(true, true, false, false);
private static final List<Quad> EMPTY = ObjectImmutableList.of();
private final List<Quad> ONE = new ObjectArrayList<>(1);
public CubeModel(boolean colorized) {
Arrays.fill(this.colorized, colorized);
this.ONE.add(null);
}
public CubeModel(boolean[] colorized) {
System.arraycopy(colorized, 0, this.colorized, 0, 6);
this.ONE.add(null);
}
@Override
public List<Quad> getQuads(IBlockAccess world, BlockPos pos, Block block, int meta, ForgeDirection dir, Random random, ObjectPooler<Quad> quadPool) {
if (dir == ForgeDirection.UNKNOWN)
return EMPTY;
final Quad face = quadPool.getInstance();
final int[] buf = Arrays.copyOf(initBufs[dir.ordinal()], 32); // 8 ints per vertex, four vertices per quad. A cube only has one quad per side
// Format:
// x
// y
// z
// u
// v
// color
// normals
// brightness
// repeat
// all are float bits as ints
final IIcon tex = block.getIcon(dir.ordinal(), meta);
final int color;
if (this.colorized[dir.ordinal()]) {
final int c = block.colorMultiplier(world, pos.x, pos.y, pos.z);
final int r = (c >> 16) & 0xFF;
final int g = (c >> 8) & 0xFF;
final int b = c & 0xFF;
color = 0xFF << 24 | b << 16 | g << 8 | r;
} else { color = 0xFFFFFFFF; }
this.flags.hasColor = this.colorized[dir.ordinal()];
for (int vi = 0; vi < 4; ++vi) {
final int i = vi * 8;
// UV
buf[i + 3] = Float.floatToIntBits(tex.getInterpolatedU(uv[vi][0] * 16));
buf[i + 4] = Float.floatToIntBits(tex.getInterpolatedV(uv[vi][1] * 16));
// Color
buf[i + 5] = color;
}
face.setState(buf, 0, this.flags, GL_QUADS, 0, 0, 0);
// CubeModel is solid all over, and thus doesn't need to do this
// However, you need to drop deleted quads in proper model code
/*if (face.deleted) {
quadPool.releaseInstance(face);
return EMPTY;
}*/
ONE.set(0, face);
return ONE;
}
}
@@ -70,6 +70,7 @@ public class ClientProxy extends CommonProxy {
if(AngelicaConfig.enableHudCaching) {
FMLCommonHandler.instance().bus().register(HUDCaching.INSTANCE);
MinecraftForge.EVENT_BUS.register(HUDCaching.INSTANCE); // TODO remove debug stuff, unused registration}
HUDCaching.registerKeyBindings();
}
if(AngelicaConfig.enableSodium) {
MinecraftForge.EVENT_BUS.register(SodiumDebugScreenHandler.INSTANCE);
@@ -90,15 +91,14 @@ public class ClientProxy extends CommonProxy {
ClientRegistry.registerKeyBinding(glsmKeyBinding);
}
private long lastGLSMCheck = 0;
private boolean wasGLSMKeyPressed;
@SubscribeEvent
public void onKeypress(TickEvent.ClientTickEvent event) {
if(event.phase == TickEvent.Phase.END && glsmKeyBinding.getKeyCode() != 0 && Keyboard.isKeyDown(glsmKeyBinding.getKeyCode())) {
if(mc.systemTime - lastGLSMCheck > 500) {
lastGLSMCheck = mc.systemTime;
final boolean isPressed = glsmKeyBinding.getKeyCode() != 0 && Keyboard.isKeyDown(glsmKeyBinding.getKeyCode());
if(isPressed && !wasGLSMKeyPressed) {
OpenGLDebugging.checkGLSM();
}
}
wasGLSMKeyPressed = isPressed;
}
@Override
@@ -47,7 +47,7 @@ public abstract class LightDataAccess {
public abstract long get(int x, int y, int z);
protected long compute(int x, int y, int z) {
final BlockPos pos = this.pos.set(x, y, z);
final WorldSlice world = this.world;
final Block block = world.getBlock(x, y, z);
@@ -33,8 +33,8 @@ public class ModelQuadFlags {
* certain optimizations.
*/
public static int getQuadFlags(Quad quad) {
final ForgeDirection face = quad.getFace();
final Axis axis = Axis.fromDirection(quad.normal);
final ForgeDirection face = quad.getCoercedFace();
final Axis axis = Axis.fromDirection(ModelQuadFacing.fromDirection(face));
float minX = 32.0F;
float minY = 32.0F;
@@ -42,8 +42,6 @@ public class ChunkBuildBuffers implements ChunkBuildBuffersExt {
private BlockContextHolder iris$contextHolder;
private static final int EXPECTED_BUFFER_SIZE = 2097152;
public ChunkBuildBuffers(ChunkVertexType vertexType) {
this.vertexType = vertexType;
@@ -58,7 +56,7 @@ public class ChunkBuildBuffers implements ChunkBuildBuffersExt {
final VertexBufferBuilder[] buffers = this.buffersByLayer[passId];
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
buffers[facing.ordinal()] = new VertexBufferBuilder(vertexType.getBufferVertexFormat(), EXPECTED_BUFFER_SIZE / ModelQuadFacing.COUNT);
buffers[facing.ordinal()] = new VertexBufferBuilder(vertexType.getBufferVertexFormat(), pass.bufferSize() / ModelQuadFacing.COUNT);
}
}
@@ -1,23 +1,28 @@
package me.jellysquid.mods.sodium.client.render.chunk.passes;
/**
* The order of these enums must match the passes used by vanilla.
*/
public enum BlockRenderPass {
CUTOUT_MIPPED(false),
TRANSLUCENT(true);
CUTOUT_MIPPED(false, 131072),
TRANSLUCENT(true, 262144);
public static final BlockRenderPass[] VALUES = BlockRenderPass.values();
public static final int COUNT = VALUES.length;
private final boolean translucent;
private final int bufferSize;
BlockRenderPass(boolean translucent) {
BlockRenderPass(boolean translucent, int bufferSize) {
this.translucent = translucent;
this.bufferSize = bufferSize;
}
public boolean isTranslucent() {
return this.translucent;
}
public int bufferSize() {
return this.bufferSize;
}
}
@@ -0,0 +1,108 @@
package me.jellysquid.mods.sodium.client.render.occlusion;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap;
import net.minecraft.block.Block;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
public class BlockOcclusionCache {
private static final byte UNCACHED_VALUE = (byte) 127;
private final Object2ByteLinkedOpenHashMap<CachedOcclusionShapeTest> map;
private final CachedOcclusionShapeTest cachedTest = new CachedOcclusionShapeTest();
private final BlockPos cpos = new BlockPos();
public BlockOcclusionCache() {
this.map = new Object2ByteLinkedOpenHashMap<>(2048, 0.5F);
this.map.defaultReturnValue(UNCACHED_VALUE);
}
/**
* @param block The block in the world
* @param meta The meta value of the block
* @param view The world view for this render context
* @param pos The position of the block
* @param facing The facing direction of the side to check
* @return True if the block side facing {@param dir} is not occluded, otherwise false
*/
public boolean shouldDrawSide(Block block, int meta, IBlockAccess view, BlockPos pos, ForgeDirection facing) {
if (facing == ForgeDirection.UNKNOWN)
return true;
BlockPos adjPos = this.cpos;
adjPos.set(pos.getX() + facing.offsetX, pos.getY() + facing.offsetY, pos.getZ() + facing.offsetZ);
Block adjState = view.getBlock(adjPos.x, adjPos.y, adjPos.z);
return !adjState.isOpaqueCube();
// TODO: Use VoxelShape occlusion from modern
}
private boolean calculate(Block selfShape, Block adjShape) {
CachedOcclusionShapeTest cache = this.cachedTest;
cache.a = selfShape;
cache.b = adjShape;
cache.updateHash();
byte cached = this.map.getByte(cache);
if (cached != UNCACHED_VALUE) {
return cached == 1;
}
boolean ret = adjShape.isOpaqueCube() && selfShape.isOpaqueCube();
this.map.put(cache.copy(), (byte) (ret ? 1 : 0));
if (this.map.size() > 2048) {
this.map.removeFirstByte();
}
return ret;
}
private static final class CachedOcclusionShapeTest {
private Block a, b;
private int hashCode;
private CachedOcclusionShapeTest() {
}
private CachedOcclusionShapeTest(Block a, Block b, int hashCode) {
this.a = a;
this.b = b;
this.hashCode = hashCode;
}
public void updateHash() {
int result = System.identityHashCode(this.a);
result = 31 * result + System.identityHashCode(this.b);
this.hashCode = result;
}
public CachedOcclusionShapeTest copy() {
return new CachedOcclusionShapeTest(this.a, this.b, this.hashCode);
}
@Override
public boolean equals(Object o) {
if (o instanceof CachedOcclusionShapeTest) {
CachedOcclusionShapeTest that = (CachedOcclusionShapeTest) o;
return this.a == that.a &&
this.b == that.b;
}
return false;
}
@Override
public int hashCode() {
return this.hashCode;
}
}
}
@@ -1,10 +1,14 @@
package me.jellysquid.mods.sodium.client.render.pipeline;
import com.gtnewhorizons.angelica.api.QuadProvider;
import com.gtnewhorizons.angelica.client.renderer.CapturingTessellator;
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
import com.gtnewhorizons.angelica.compat.nd.Quad;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
import com.gtnewhorizons.angelica.utils.ObjectPooler;
import java.util.List;
import java.util.Random;
import me.jellysquid.mods.sodium.client.model.light.LightMode;
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
import me.jellysquid.mods.sodium.client.model.light.LightPipelineProvider;
@@ -14,7 +18,9 @@ import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadOrientati
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuffers;
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
import me.jellysquid.mods.sodium.client.render.occlusion.BlockOcclusionCache;
import me.jellysquid.mods.sodium.client.util.ModelQuadUtil;
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
import me.jellysquid.mods.sodium.client.util.rand.XoRoShiRoRandom;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.minecraft.block.Block;
@@ -24,9 +30,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.List;
import java.util.Random;
public class BlockRenderer {
private final Random random = new XoRoShiRoRandom();
@@ -37,12 +40,17 @@ public class BlockRenderer {
private boolean useSeparateAo;
private final LightPipelineProvider lighters;
private final BlockOcclusionCache occlusionCache;
private final ObjectPooler<Quad> quadPool = new ObjectPooler<>(Quad::new);
// TODO: Use modern model API, and store them here
public BlockRenderer(LightPipelineProvider lighters) {
this.lighters = lighters;
// TODO: Sodium - AO Setting
this.useAmbientOcclusion = Minecraft.getMinecraft().gameSettings.ambientOcclusion > 0;
this.occlusionCache = new BlockOcclusionCache();
}
public boolean renderModel(IBlockAccess world, RenderBlocks renderBlocks, Block block, int meta, BlockPos pos, ChunkModelBuffers buffers, boolean cull, long seed) {
@@ -53,32 +61,51 @@ public class BlockRenderer {
boolean rendered = false;
try {
TessellatorManager.startCapturing();
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
tess.startDrawingQuads();
// RenderBlocks adds the subchunk-relative coordinates as the offset, cancel it out here
if (block instanceof QuadProvider qBlock) {
tess.setOffset(pos);
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
final List<Quad> quads = TessellatorManager.stopCapturingToPooledQuads();
tess.resetOffset();
for (ForgeDirection dir : ForgeDirection.values()) {
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
this.random.setSeed(seed);
this.renderQuadList(pos, lighter, buffers, quads, facing);
List<Quad> quads = qBlock.getQuads(world, pos, block, meta, dir, random, this.quadPool);
if (quads.isEmpty()) continue;
if (!cull || this.occlusionCache.shouldDrawSide(block, meta, world, pos, dir)) {
this.renderQuadList(pos, lighter, buffers, quads, ModelQuadFacing.fromDirection(dir), true);
rendered = true;
}
for (Quad q : quads) this.quadPool.releaseInstance(q);
}
} else {
if (!quads.isEmpty()) rendered = true;
} finally {
TessellatorManager.cleanup();
try {
TessellatorManager.startCapturing();
final CapturingTessellator tess = (CapturingTessellator) TessellatorManager.get();
tess.startDrawingQuads();
// RenderBlocks adds the subchunk-relative coordinates as the offset, cancel it out here
tess.setOffset(pos);
renderBlocks.renderBlockByRenderType(block, pos.x, pos.y, pos.z);
final List<Quad> quads = TessellatorManager.stopCapturingToPooledQuads();
tess.resetOffset();
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
this.random.setSeed(seed);
this.renderQuadList(pos, lighter, buffers, quads, facing, false);
}
if (!quads.isEmpty()) rendered = true;
} finally {
TessellatorManager.cleanup();
}
}
return rendered;
}
private void renderQuadList(BlockPos pos, LightPipeline lighter, ChunkModelBuffers buffers, List<Quad> quads, ModelQuadFacing facing) {
private void renderQuadList(BlockPos pos, LightPipeline lighter, ChunkModelBuffers buffers, List<Quad> quads, ModelQuadFacing facing, boolean useSodiumLight) {
final ModelVertexSink sink = buffers.getSink(facing);
sink.ensureCapacity(quads.size() * 4);
@@ -96,21 +123,18 @@ public class BlockRenderer {
final QuadLightData light = this.cachedQuadLightData;
// TODO: use Sodium pipeline always
if(this.useSeparateAo) {
lighter.calculate(quad, pos, light, cullFace, quad.getFace(), quad.hasShade());
}
if (useSodiumLight || this.useSeparateAo)
lighter.calculate(quad, pos, light, cullFace, quad.getCoercedFace(), quad.hasShade());
this.renderQuad(sink, quad, light, renderData);
this.renderQuad(sink, quad, light, renderData, useSodiumLight);
}
sink.flush();
}
private void renderQuad(ModelVertexSink sink, Quad quad, QuadLightData light, ChunkRenderData.Builder renderData) {
private void renderQuad(ModelVertexSink sink, Quad quad, QuadLightData light, ChunkRenderData.Builder renderData, boolean useSodiumLight) {
final ModelQuadOrientation order = useSeparateAo ? ModelQuadOrientation.orient(light.br) : ModelQuadOrientation.NORMAL;
final ModelQuadOrientation order = (useSodiumLight || this.useSeparateAo) ? ModelQuadOrientation.orient(light.br) : ModelQuadOrientation.NORMAL;
for (int dstIndex = 0; dstIndex < 4; dstIndex++) {
final int srcIndex = order.getVertexIndex(dstIndex);
@@ -124,13 +148,16 @@ public class BlockRenderer {
if (useSeparateAo) {
color &= 0x00FFFFFF;
color |= ((int) (ao * 255.0f)) << 24;
} else {
color = (useSodiumLight) ? ColorABGR.mul(quad.getColor(srcIndex), light.br[srcIndex]) : quad.getColor(srcIndex);
}
final float u = quad.getTexU(srcIndex);
final float v = quad.getTexV(srcIndex);
final int quadLight = quad.getLight(srcIndex);
final int lm = useSeparateAo ? ModelQuadUtil.mergeBakedLight(quadLight, light.lm[srcIndex]) : quadLight;
final int lm = (useSeparateAo) ? ModelQuadUtil.mergeBakedLight(quad.getLight(srcIndex), light.lm[srcIndex]) :
(useSodiumLight) ? light.lm[srcIndex] : quad.getLight(srcIndex);
sink.writeQuad(x, y, z, color, u, v, lm);
}
@@ -184,9 +184,9 @@ public class WorldSlice implements IBlockAccess {
@Override
public int getLightBrightnessForSkyBlocks(int x, int y, int z, int min) {
if (y < 0 || y >= 256 || x < -30000000 || z < -30000000 || x >= 30000000 || z > 30000000) {
// skyBrightness = 15, blockBrightness = 0
return (15 << 20);
if (y < 0 || y >= 256 || x < -30_000_000 || z < -30_000_000 || x >= 30_000_000 || z >= 30_000_000) {
// skyBrightness = 15, blockBrightness = min
return (15 << 20) | (min << 4);
}
final int skyBrightness = this.getSkyBlockTypeBrightness(net.minecraft.world.EnumSkyBlock.Sky, x, y, z);
@@ -389,15 +389,15 @@ public class WorldSlice implements IBlockAccess {
// Modern checks if the sky is darkened, which only happens in the nether. However, I think 1.7.10's hasNoSky is
// close enough and possibly a behavior change between versions. I also don't know why it's rotationally asymmetric
public float getBrightness(ForgeDirection direction, boolean shaded) {
if (!shaded) {
return world.provider.hasNoSky ? 0.9f : 1.0f;
}
return switch (direction) {
case DOWN -> world.provider.hasNoSky ? 0.9f : 0.5f;
case UP -> world.provider.hasNoSky ? 0.9f : 1.0f;
case DOWN -> 0.5f;
case UP -> 1.0f;
case NORTH, SOUTH -> 0.8f;
case WEST, EAST -> 0.6f;
case UNKNOWN -> 1.0f;
default -> 0.6f;
};
}
@@ -47,4 +47,3 @@ public net.minecraft.client.gui.GuiSlot field_148165_u # hasListHeader
public net.minecraft.client.gui.GuiSlot field_148161_k # mc
public net.minecraft.client.gui.GuiSlot func_148121_k()V # void bindAmountScrolled()
public net.minecraft.client.gui.GuiSlot func_148136_c(IIII)V # void overlayBackground()
public net.minecraft.client.Minecraft field_71423_H # systemTime
@@ -0,0 +1,161 @@
package com.gtnewhorizons.angelica;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.lwjgl.BufferUtils;
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.PixelFormat;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
class GLSM_UnitTest {
private static DisplayMode mode;
@BeforeAll
static void setup() throws LWJGLException {
mode = findDisplayMode(800, 600, Display.getDisplayMode().getBitsPerPixel());
Display.setDisplayModeAndFullscreen(mode);
final PixelFormat format = new PixelFormat().withDepthBits(24);
Display.create(format);
GLStateManager.preInit();
}
@AfterAll
static void cleanup() {
Display.destroy();
}
private static DisplayMode findDisplayMode(int width, int height, int bpp) throws LWJGLException {
final DisplayMode[] modes = Display.getAvailableDisplayModes();
for ( DisplayMode mode : modes ) {
if ( mode.getWidth() == width && mode.getHeight() == height && mode.getBitsPerPixel() >= bpp && mode.getFrequency() <= 60 ) {
return mode;
}
}
return Display.getDesktopDisplayMode();
}
void verifyState(int glCap, boolean expected) {
Stream.of(GLStateManager.glIsEnabled(glCap), GL11.glIsEnabled(glCap)).forEach(b -> assertEquals(expected, b));
}
void verifyState(int glCap, int expected) {
Stream.of(GLStateManager.glGetInteger(glCap), GL11.glGetInteger(glCap)).forEach(i -> assertEquals(expected, i));
}
void verifyState(int glCap, float expected) {
Stream.of(GLStateManager.glGetFloat(glCap), GL11.glGetFloat(glCap)).forEach(f -> assertEquals(expected, f, 0.0001f));
}
void verifyState(int glCap, float[] expected) {
final FloatBuffer glBuffer = BufferUtils.createFloatBuffer(16);
final FloatBuffer glsmBuffer = BufferUtils.createFloatBuffer(16);
GL11.glGetFloat(glCap, glBuffer);
GLStateManager.glGetFloat(glCap, glsmBuffer);
for (int i = 0; i < expected.length; i++) {
assertEquals(expected[i], glBuffer.get(i), 0.0001f, "GL State Mismatch");
assertEquals(expected[i], glsmBuffer.get(i), 0.0001f, "GLSM State Mismatch");
}
}
private void verifyState(int glCap, boolean[] expected) {
final ByteBuffer glBuffer = BufferUtils.createByteBuffer(16);
final ByteBuffer glsmBuffer = BufferUtils.createByteBuffer(16);
GL11.glGetBoolean(glCap, glBuffer);
GLStateManager.glGetBoolean(glCap, glsmBuffer);
for (int i = 0; i < expected.length; i++) {
assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glBuffer.get(i), "GL State Mismatch");
assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glsmBuffer.get(i), "GLSM State Mismatch");
}
}
@Test
void testPushPopColorBufferBit() {
GLStateManager.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT);
/*
* GL_COLOR_BUFFER_BIT
* GL_ALPHA_TEST enable bit
* Alpha test function and reference value
* GL_BLEND enable bit
* Blending source and destination functions
* Constant blend color
* Blending equation
* GL_DITHER enable bit
* GL_DRAW_BUFFER setting
* GL_COLOR_LOGIC_OP enable bit
* GL_INDEX_LOGIC_OP enable bit
* Logic op function
* Color mode and index mode clear values
* Color mode and index mode writemasks
*/
GLStateManager.enableAlphaTest();
GLStateManager.glAlphaFunc(GL11.GL_NEVER, 1f);
GLStateManager.enableBlend();
GLStateManager.glDisable(GL11.GL_DITHER);
GLStateManager.glEnable(GL11.GL_COLOR_LOGIC_OP);
GLStateManager.glEnable(GL11.GL_INDEX_LOGIC_OP);
GLStateManager.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL14.glBlendColor(1f, 1f, 1f, 1f); // Not currently Implemented in GLSM
GL20.glBlendEquationSeparate(GL14.GL_FUNC_REVERSE_SUBTRACT, GL14.GL_FUNC_REVERSE_SUBTRACT); // Not currently Implemented in GLSM
GL11.glDrawBuffer(GL11.GL_FRONT_AND_BACK); // Not currently Implemented in GLSM
GL11.glLogicOp(GL11.GL_OR);// Not currently Implemented in GLSM
GLStateManager.glColor4f(0.5f, 0.5f, 0.5f, 0.5f); // This should not be reset
GLStateManager.glColorMask(false, false, false, false);
GLStateManager.glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
verifyState(GL11.GL_ALPHA_TEST, true);
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_NEVER);
verifyState(GL11.GL_ALPHA_TEST_REF, 1f);
verifyState(GL11.GL_BLEND, true);
verifyState(GL11.GL_BLEND_SRC, GL11.GL_SRC_ALPHA);
verifyState(GL11.GL_BLEND_DST, GL11.GL_ONE_MINUS_SRC_ALPHA);
verifyState(GL14.GL_BLEND_COLOR, new float[]{1f, 1f, 1f, 1f});
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_REVERSE_SUBTRACT);
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_REVERSE_SUBTRACT);
verifyState(GL11.GL_DITHER, false);
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_FRONT_AND_BACK);
verifyState(GL11.GL_COLOR_LOGIC_OP, true);
verifyState(GL11.GL_INDEX_LOGIC_OP, true);
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_OR);
verifyState(GL11.GL_CURRENT_COLOR, new float[]{0.5f, 0.5f, 0.5f, 0.5f});
verifyState(GL11.GL_COLOR_WRITEMASK, new boolean[]{false, false, false, false});
verifyState(GL11.GL_COLOR_CLEAR_VALUE, new float[]{0.5f, 0.5f, 0.5f, 0.5f});
GLStateManager.glPopAttrib();
verifyState(GL11.GL_ALPHA_TEST, false);
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_ALWAYS);
verifyState(GL11.GL_ALPHA_TEST_REF, 0f);
verifyState(GL11.GL_BLEND, false);
verifyState(GL11.GL_BLEND_SRC, GL11.GL_ONE);
verifyState(GL11.GL_BLEND_DST, GL11.GL_ZERO);
verifyState(GL14.GL_BLEND_COLOR, new float[]{0f, 0f, 0f, 0f});
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_ADD);
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_ADD);
verifyState(GL11.GL_DITHER, true);
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_BACK);
verifyState(GL11.GL_COLOR_LOGIC_OP, false);
verifyState(GL11.GL_INDEX_LOGIC_OP, false);
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_COPY);
verifyState(GL11.GL_CURRENT_COLOR, new float[]{0.5f, 0.5f, 0.5f, 0.5f}); // This does not get reset
verifyState(GL11.GL_COLOR_WRITEMASK, new boolean[]{true, true, true, true});
verifyState(GL11.GL_COLOR_CLEAR_VALUE, new float[]{0f, 0f, 0f, 0f});
}
}