Compare commits

..
Author SHA1 Message Date
Jason Mitchell ff65370cc5 Blacklist bartworks from the main thread (#286)
Fixes #181
2024-02-12 22:34:24 -08:00
Jason MitchellandCaedis ff290c19e2 GLSM Tests & AMD Driver Workaround (#290)
* Store graphics vendor
* AMD driver workarounds

* Test TRANSFORM_BIT

* Test GL_TEXTURE_BIT
* Fix handling of bound textures on glDeleteTextures

* Switch up the LOGGER in RenderSystem so we don't trigger a Forge Configuration load; AMD driver default matrix mode workaround

* Switch BatchingFontRenderer to use the gl methods via GLSM to better respect cache bypassing
Fix a few instances of GLSM not respecting the bypass

* Start with "runningSplash" true always to disable the cache until loaded into the world

---------

Co-authored-by: Caedis <[email protected]>
2024-02-12 22:33:23 -08:00
Jason Mitchell d1e505308c Ask for graphics card vendor on bugs 2024-02-12 08:36:24 -08:00
Caedis 594799103b Exclude AMD in testPushPopEnableBit 2024-02-11 20:01:53 -08:00
Jason Mitchell 8a65f471a0 Make getBlockType and getBlockMetadata atomic
* Sidesteps/fixes a race condition in the WIP carpenter block thread safe ISBRH implementation
2024-02-11 19:29:17 -08:00
Jason Mitchellandembeddedt d52e2b0454 Do not return null results in translucency sort task if not cancelled (#284)
* Do not return null results in translucency sort task if not cancelled

Co-authored-by: embeddedt <[email protected]>
2024-02-11 22:55:16 +00:00
Raven Szewczyk 9b31bae1c8 Log more information in the no-result task exception (#283) 2024-02-11 22:12:05 +00:00
Ginsway 7cbb905bd7 Update Chinese translation (#261)
* 固有的

* 自己翻译的

* Update src/main/resources/assets/angelica/lang/zh_CN.lang
2024-02-11 13:32:18 -08:00
Jason Mitchell 8a50ed036d More GLSM Tests (#282)
* Properly Cache GL_SHADE_MODEL and make it a stack

* Add opengl_32_core to docs, so we can easily see what is needed to be deprecated/emulated
Add some stub functions to be fleshed out later
2024-02-11 12:13:51 -08:00
Jason Mitchell f1394382ab Make note of required versions of mods if present 2024-02-11 10:45:20 -08:00
Raven Szewczyk 74e6c80aad A few buildscript and test tweaks (#281)
* Kotlin buildscript for better IDE integration

* Fix transitive Bauble dep, move CoreTweaks to a fake-ivy dependency

* Don't scan fullscreen modes for window creation

* Update GTNHGradle
2024-02-11 05:24:08 -08:00
ah-OOG-ah da9d6bad56 Fix typo in issue template (#280) 2024-02-10 20:57:40 -08:00
Jason Mitchell 58a6fabf3c Enough with the bug reports about disabled features 2024-02-10 20:51:18 -08:00
Jason MitchellandDarren Eberly f8c11967d1 Glsm tests (#275)
* Tests for GL_DEPTH_BUFFER_BIT
* Swizzle DepthState.mask ~> enabled
* Use AssertAll so we can clearly see gl/glsm state differences
* Reset test state leakage from ColorBufferBit
* Add start of test for GL_CURRENT_BIT
* Initial basic display list tests
* Print mismatched array index for array comparisions
* Add message for all tests
* Test GL_CURRENT_BIT
* Implement GLSM stub functions
* Test GL_ENABLE_BIT
* Add verifyNotDefaultState when we don't care about the values, just that they're not the default
* GL_MULTISAMPLE seems to be broken on Nvidia
* Test GL_FOG_BIT
* Check glGetError() after every test
* Exclude some tests based on vendor
* Test most of GL_LIGHTING_BIT

---------

Co-authored-by: Darren Eberly <[email protected]>
2024-02-10 16:51:12 -08:00
Jason Mitchell 6d1c4bf39c Revert "fix release workaround"
This reverts commit 018a47e400.
2024-02-10 09:43:48 -08:00
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
61 changed files with 3163 additions and 1932 deletions

No files matched your search

+15 -1
View File
@@ -34,6 +34,20 @@ body:
- Other (Please Specify)
validations:
required: true
- type: dropdown
id: graphics
attributes:
label: Graphics Card Vendor
description: What graphics card vendor are you using?
options:
- Other (Please Specify)
- NVidia
- AMD/ATI
- Intel iGPU
- AMD iGPU
- Mesa/Software
validations:
required: true
- type: textarea
id: report
attributes:
@@ -62,6 +76,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 shader related (they aren't ready yet for testing)"
- 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
+1
View File
@@ -9,6 +9,7 @@
# Required Dependencies
* [UniMixins](https://github.com/LegacyModdingMC/UniMixins/releases) >= 0.1.14
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.2.1
* NOTE: Some mods are not required, but a specific version is required if present - see: `Permanent Incompatibilities` below.
# Known (temporary) Incompatibilities
* Forge Relocation - Currently non Thread Safe; safe if not in use
-7
View File
@@ -1,7 +0,0 @@
allprojects {
gradle.projectsEvaluated {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xmaxerrs" << "2000"
}
}
}
-1624
View File
File diff suppressed because it is too large. Load diff
+22
View File
@@ -0,0 +1,22 @@
plugins {
id("com.gtnewhorizons.gtnhconvention")
}
tasks.test {
useJUnitPlatform()
testLogging {
events("passed", "skipped", "failed")
}
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(8)
}
dependsOn(tasks.extractNatives2)
jvmArgs("-Djava.library.path=${tasks.extractNatives2.get().destinationFolder.asFile.get().path}")
}
tasks.register<Copy>("copyDependencies") {
group = "Angelica"
description = "Collect dependencies into the testDependencies folder"
from(configurations.default)
into("testDependencies")
}
+10 -3
View File
@@ -71,7 +71,7 @@ dependencies {
// Notfine Deps
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") {transitive = false }
compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410'))
@@ -81,15 +81,22 @@ 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"))
// HMMMMM
compileOnly(rfg.deobf("curse.maven:journeymap-32274:2367915"))
runtimeOnly(deobf("https://github.com/makamys/CoreTweaks/releases/download/0.3.3.2/CoreTweaks-1.7.10-0.3.3.2+nomixin.jar"))
runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))
// 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")
}
File diff suppressed because it is too large. Load diff
+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
+18 -1
View File
@@ -5,7 +5,24 @@ repositories {
name = 'mavenpattern'
url = 'https://mvn.falsepattern.com/releases'
content {
includeGroup "com.falsepattern"
includeGroup 'com.falsepattern'
}
}
exclusiveContent {
forRepository {
ivy {
name = 'CoreTweaks releases'
url = 'https://github.com/makamys/CoreTweaks/releases/download/'
patternLayout {
artifact '[revision]/[module]-1.7.10-[revision]+nomixin(-[classifier])(.[ext])'
}
metadataSources {
artifact()
}
}
}
filter {
includeGroup('CoreTweaks')
}
}
mavenLocal()
+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.13'
}
@@ -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);
}
@@ -248,7 +248,7 @@ public class BatchingFontRenderer {
batchCommands.sort(FontDrawCmd.DRAW_ORDER_COMPARATOR);
final boolean isTextureEnabledBefore = GLStateManager.glIsEnabled(GL11.GL_TEXTURE_2D);
final int boundTextureBefore = GLStateManager.getBoundTexture();
final int boundTextureBefore = GLStateManager.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
boolean textureChanged = false;
ResourceLocation lastTexture = DUMMY_RESOURCE_LOCATION;
@@ -265,7 +265,7 @@ public class BatchingFontRenderer {
glEnableClientState(GL_COLOR_ARRAY);
glVertexPointer(2, 0, batchVtxPositions);
glEnableClientState(GL_VERTEX_ARRAY);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
// Use plain for loop to avoid allocations
final FontDrawCmd[] cmdsData = batchCommands.elements();
@@ -274,9 +274,9 @@ public class BatchingFontRenderer {
final FontDrawCmd cmd = cmdsData[i];
if (!Objects.equals(lastTexture, cmd.texture)) {
if (lastTexture == null) {
GLStateManager.enableTexture();
GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
} else if (cmd.texture == null) {
GLStateManager.disableTexture();
GLStateManager.glDisable(GL11.GL_TEXTURE_2D);
}
if (cmd.texture != null) {
((FontRendererAccessor) underlying).angelica$bindTexture(cmd.texture);
@@ -292,7 +292,7 @@ public class BatchingFontRenderer {
glPopClientAttrib();
if (isTextureEnabledBefore) {
GLStateManager.enableTexture();
GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
}
if (textureChanged) {
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, boundTextureBefore);
@@ -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
@@ -156,7 +155,7 @@ public class Feature {
// Ambient, diffuse, specular, and emissive color for each material
// Ambient, diffuse, and specular color indices for each material
// Specular exponent for each material
// GL_SHADE_MODEL setting
, GLStateManager.shadeModelState // GL_SHADE_MODEL setting
));
attribToFeatures.put(GL11.GL_LINE_BIT, ImmutableSet.of(
// GL_LINE_SMOOTH flag
@@ -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
@@ -10,6 +10,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;
@@ -73,6 +74,7 @@ import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
public class GLStateManager {
public static ContextCapabilities capabilities;
@Getter protected static boolean poppingAttributes;
public static boolean BYPASS_CACHE = Boolean.parseBoolean(System.getProperty("angelica.disableGlCache", "false"));
public static final int MAX_ATTRIB_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_ATTRIB_STACK_DEPTH);
public static final int MAX_MODELVIEW_STACK_DEPTH = GL11.glGetInteger(GL11.GL_MAX_MODELVIEW_STACK_DEPTH);
@@ -82,11 +84,19 @@ public class GLStateManager {
public static final GLFeatureSet HAS_MULTIPLE_SET = new GLFeatureSet();
@Getter protected static boolean NVIDIA;
@Getter protected static boolean AMD;
@Getter protected static boolean INTEL;
@Getter protected static boolean MESA;
// 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();
protected static final IntegerStateStack shadeModelState = new IntegerStateStack();
static {
activeTextureUnit.push(0); // GL_TEXTURE0
activeTextureUnit.setValue(0); // GL_TEXTURE0
shadeModelState.setValue(GL11.GL_SMOOTH);
}
@Getter protected static final TextureUnitArray textures = new TextureUnitArray();
@Getter protected static final BlendStateStack blendState = new BlendStateStack();
@@ -99,7 +109,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();
@@ -115,7 +125,6 @@ public class GLStateManager {
@Getter protected static final ViewPortStateStack viewportState = new ViewPortStateStack();
private static int modelShadeMode;
// Iris Listeners
private static Runnable blendFuncListener = null;
@@ -128,13 +137,15 @@ public class GLStateManager {
// Thread Checking
@Getter private static final Thread MainThread = Thread.currentThread();
private static Thread CurrentThread = MainThread;
@Setter @Getter private static boolean runningSplash = false;
@Setter @Getter private static boolean runningSplash = true;
private static int glListMode = 0;
private static int glListId = -1;
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 +154,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)
@@ -172,6 +184,22 @@ public class GLStateManager {
.addFeature(GL11.GL_TEXTURE_MATRIX)
.addFeature(GL11.GL_VIEWPORT);
String glVendor = GL11.glGetString(GL11.GL_VENDOR);
NVIDIA = glVendor.toLowerCase().contains("nvidia");
AMD = glVendor.toLowerCase().contains("ati") || glVendor.toLowerCase().contains("amd");
INTEL = glVendor.toLowerCase().contains("intel");
MESA = glVendor.toLowerCase().contains("mesa");
if(AMD) {
// AMD Drivers seem to default to 0 for the matrix mode, so we need to set it to the default
GL11.glMatrixMode(GL11.GL_MODELVIEW);
}
}
public static void init() {
RenderSystem.initRenderer();
if (AngelicaConfig.enableIris) {
@@ -239,6 +267,9 @@ public class GLStateManager {
}
public static boolean glIsEnabled(int cap) {
if(shouldBypassCache()) {
return GL11.glIsEnabled(cap);
}
return switch (cap) {
case GL11.GL_ALPHA_TEST -> alphaTest.isEnabled();
case GL11.GL_BLEND -> blendMode.isEnabled();
@@ -247,7 +278,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);
};
@@ -262,11 +293,11 @@ public class GLStateManager {
case GL11.GL_BLEND -> blendMode.isEnabled();
case GL11.GL_CULL_FACE -> cullState.isEnabled();
case GL11.GL_DEPTH_TEST -> depthTest.isEnabled();
case GL11.GL_DEPTH_WRITEMASK -> depthState.isMask();
case GL11.GL_DEPTH_WRITEMASK -> depthState.isEnabled();
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);
};
@@ -305,6 +336,7 @@ public class GLStateManager {
case GL11.GL_DEPTH_FUNC -> depthState.getFunc();
case GL11.GL_LIST_MODE -> glListMode;
case GL11.GL_MATRIX_MODE -> matrixMode.getMode();
case GL11.GL_SHADE_MODEL -> shadeModelState.getValue();
case GL11.GL_TEXTURE_BINDING_2D -> getBoundTexture();
case GL14.GL_BLEND_DST_ALPHA -> blendState.getDstAlpha();
case GL14.GL_BLEND_DST_RGB -> blendState.getDstRgb();
@@ -333,6 +365,10 @@ public class GLStateManager {
}
}
public static void glGetLight(int light, int pname, FloatBuffer params) {
GL11.glGetLight(light, pname, params);
}
public static void glGetFloat(int pname, FloatBuffer params) {
if(shouldBypassCache()) {
GL11.glGetFloat(pname, params);
@@ -342,8 +378,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));
@@ -360,6 +397,10 @@ public class GLStateManager {
// GLStateManager Functions
public static void glBlendColor(float red, float green, float blue, float alpha) {
GL14.glBlendColor(red, green, blue, alpha);
}
public static void enableBlend() {
if (AngelicaConfig.enableIris) {
if (BlendModeStorage.isBlendLocked()) {
@@ -413,6 +454,14 @@ public class GLStateManager {
if (blendFuncListener != null) blendFuncListener.run();
}
public static void glBlendEquation(int mode) {
GL14.glBlendEquation(mode);
}
public static void glBlendEquationSeparate(int modeRGB, int modeAlpha) {
GL20.glBlendEquationSeparate(modeRGB, modeAlpha);
}
public static void tryBlendFuncSeparate(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
if (AngelicaConfig.enableIris) {
if (BlendModeStorage.isBlendLocked()) {
@@ -437,6 +486,19 @@ public class GLStateManager {
if (blendFuncListener != null) blendFuncListener.run();
}
public static void glNormal3b(byte nx, byte ny, byte nz) {
GL11.glNormal3b(nx, ny, nz);
}
public static void glNormal3d(double nx, double ny, double nz) {
GL11.glNormal3d(nx, ny, nz);
}
public static void glNormal3f(float nx, float ny, float nz) {
GL11.glNormal3f(nx, ny, nz);
}
public static void glNormal3i(int nx, int ny, int nz) {
GL11.glNormal3i(nx, ny, nz);
}
public static void glDepthFunc(int func) {
if (shouldBypassCache() || func != depthState.getFunc() ) {
depthState.setFunc(func);
@@ -452,12 +514,16 @@ public class GLStateManager {
}
}
if (mask != depthState.isMask()) {
depthState.setMask(mask);
if (shouldBypassCache() || mask != depthState.isEnabled()) {
depthState.setEnabled(mask);
GL11.glDepthMask(mask);
}
}
public static void glEdgeFlag(boolean flag) {
GL11.glEdgeFlag(flag);
}
public static void glColor4f(float red, float green, float blue, float alpha) {
if (changeColor(red, green, blue, alpha)) {
GL11.glColor4f(red, green, blue, alpha);
@@ -559,6 +625,10 @@ public class GLStateManager {
}
}
public static void glClearDepth(double depth) {
GL11.glClearDepth(depth);
}
// ALPHA
public static void enableAlphaTest() {
if (AngelicaConfig.enableIris) {
@@ -596,8 +666,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 +674,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 +694,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);
@@ -650,10 +718,34 @@ public class GLStateManager {
GL11.glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels_buffer_offset);
}
public static void glTexCoord1f(float s) {
GL11.glTexCoord1f(s);
}
public static void glTexCoord1d(double s) {
GL11.glTexCoord1d(s);
}
public static void glTexCoord2f(float s, float t) {
GL11.glTexCoord2f(s, t);
}
public static void glTexCoord2d(double s, double t) {
GL11.glTexCoord2d(s, t);
}
public static void glTexCoord3f(float s, float t, float r) {
GL11.glTexCoord3f(s, t, r);
}
public static void glTexCoord3d(double s, double t, double r) {
GL11.glTexCoord3d(s, t, r);
}
public static void glTexCoord4f(float s, float t, float r, float q) {
GL11.glTexCoord4f(s, t, r, q);
}
public static void glTexCoord4d(double s, double t, double r, double q) {
GL11.glTexCoord4d(s, t, r, q);
}
public static void glDeleteTextures(int id) {
onDeleteTexture(id);
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
GL11.glDeleteTextures(id);
}
@@ -662,7 +754,6 @@ public class GLStateManager {
onDeleteTexture(ids.get(i));
}
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.topInt()).setBinding(-1);
GL11.glDeleteTextures(ids);
}
@@ -712,6 +803,35 @@ public class GLStateManager {
textures.getTextureUnitStates(textureUnit).disable();
}
public static void glRasterPos2f(float x, float y) {
GL11.glRasterPos2f(x, y);
}
public static void glRasterPos2d(double x, double y) {
GL11.glRasterPos2d(x, y);
}
public static void glRasterPos2i(int x, int y) {
GL11.glRasterPos2i(x, y);
}
public static void glRasterPos3f(float x, float y, float z) {
GL11.glRasterPos3f(x, y, z);
}
public static void glRasterPos3d(double x, double y, double z) {
GL11.glRasterPos3d(x, y, z);
}
public static void glRasterPos3i(int x, int y, int z) {
GL11.glRasterPos3i(x, y, z);
}
public static void glRasterPos4f(float x, float y, float z, float w) {
GL11.glRasterPos4f(x, y, z, w);
}
public static void glRasterPos4d(double x, double y, double z, double w) {
GL11.glRasterPos4d(x, y, z, w);
}
public static void glRasterPos4i(int x, int y, int z, int w) {
GL11.glRasterPos4i(x, y, z, w);
}
public static void setFilter(boolean bilinear, boolean mipmap) {
int i, j;
if (bilinear) {
@@ -731,6 +851,14 @@ public class GLStateManager {
GL11.glDrawArrays(mode, first, count);
}
public static void glDrawBuffer(int mode) {
GL11.glDrawBuffer(mode);
}
public static void glLogicOp(int opcode) {
GL11.glLogicOp(opcode);
}
public static void defaultBlendFunc() {
tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
@@ -783,16 +911,20 @@ public class GLStateManager {
public static void glFog(int pname, FloatBuffer param) {
// TODO: Iris Notifier
GL11.glFog(pname, param);
if (pname == GL11.GL_FOG_COLOR) {
final float red = param.get(0);
final float green = param.get(1);
final float blue = param.get(2);
if (HAS_MULTIPLE_SET.contains(pname)) {
GL11.glFog(pname, param);
if (pname == GL11.GL_FOG_COLOR) {
final float red = param.get(0);
final float green = param.get(1);
final float blue = param.get(2);
fogState.getFogColor().set(red, green, blue);
fogState.setFogAlpha(param.get(3));
fogState.getFogColorBuffer().clear();
fogState.getFogColorBuffer().put((FloatBuffer) param.position(0)).flip();
fogState.getFogColor().set(red, green, blue);
fogState.setFogAlpha(param.get(3));
fogState.getFogColorBuffer().clear();
fogState.getFogColorBuffer().put((FloatBuffer) param.position(0)).flip();
}
} else {
GLStateManager.glFogf(pname, param.get(0));
}
}
@@ -850,8 +982,8 @@ public class GLStateManager {
}
public static void glShadeModel(int mode) {
if (shouldBypassCache() || modelShadeMode != mode) {
modelShadeMode = mode;
if (shouldBypassCache() || shadeModelState.getValue() != mode) {
shadeModelState.setValue(mode);
GL11.glShadeModel(mode);
}
}
@@ -863,6 +995,12 @@ public class GLStateManager {
if (AngelicaConfig.enableIris) {
PBRTextureManager.INSTANCE.onDeleteTexture(id);
}
for(int i = 0; i < GLStateManager.MAX_TEXTURE_UNITS; i++) {
if(textures.getTextureUnitBindings(i).getBinding() == id) {
textures.getTextureUnitBindings(i).setBinding(0);
}
}
}
public static void makeCurrent(Drawable drawable) throws LWJGLException {
@@ -945,14 +1083,20 @@ public class GLStateManager {
}
}
public static void glClear(int mask) {
// TODO: Implement
GL11.glClear(mask);
}
public static void glPushAttrib(int mask) {
pushState(mask);
GL11.glPushAttrib(mask);
}
public static void glPopAttrib() {
poppingAttributes = true;
popState();
GL11.glPopAttrib();
poppingAttributes = false;
}
// Matrix Operations
@@ -1081,7 +1225,7 @@ public class GLStateManager {
}
public static int getActiveTextureUnit() {
return activeTextureUnit.topInt();
return activeTextureUnit.getValue();
}
public static int getListMode() {
@@ -1235,4 +1379,32 @@ public class GLStateManager {
default -> GL11.glGetTexLevelParameteri(target, level, pname);
};
}
public static void glLight(int light, int pname, FloatBuffer params) {
GL11.glLight(light, pname, params);
}
public static void glLight(int light, int pname, IntBuffer params) {
GL11.glLight(light, pname, params);
}
public static void glLightModel(int pname, FloatBuffer params) {
GL11.glLightModel(pname, params);
}
public static void glLightModel(int pname, IntBuffer params) {
GL11.glLightModel(pname, params);
}
public static void glLightModelf(int pname, float param) {
GL11.glLightModelf(pname, param);
}
public static void glLightModeli(int pname, int param) {
GL11.glLightModeli(pname, param);
}
public static void glColorMaterial(int face, int mode) {
GL11.glColorMaterial(face, mode);
}
public static void glDepthRange(double near, double far) {
GL11.glDepthRange(near, far);
}
}
@@ -4,6 +4,8 @@ import com.gtnewhorizons.angelica.glsm.dsa.DSAARB;
import com.gtnewhorizons.angelica.glsm.dsa.DSAAccess;
import com.gtnewhorizons.angelica.glsm.dsa.DSACore;
import com.gtnewhorizons.angelica.glsm.dsa.DSAUnsupported;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import org.joml.Vector3i;
@@ -21,12 +23,12 @@ import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
/**
* This class is responsible for abstracting calls to OpenGL and asserting that calls are run on the render thread.
*/
public class RenderSystem {
private static final Logger LOGGER = LogManager.getLogger("RenderSystem");
private static DSAAccess dsaState;
private static boolean hasMultibind;
private static boolean supportsCompute;
@@ -50,6 +52,7 @@ public class RenderSystem {
} catch (NoSuchFieldError ignored) {}
if (dsaState == null) {
dsaState = new DSAUnsupported();
LOGGER.info("No DSA support detected, falling back to legacy OpenGL.");
}
try {
@@ -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) {
@@ -32,6 +32,7 @@ public class BooleanStateStack extends BooleanState implements IStateStack<Boole
}
set(stack[--pointer]);
this.setEnabled(this.enabled);
return this;
}
@@ -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;
}
}
@@ -5,10 +5,9 @@ import lombok.Getter;
import org.lwjgl.opengl.GL11;
public class BooleanState implements ISettableState<BooleanState> {
private final int glCap;
protected final int glCap;
@Getter
private boolean enabled;
@Getter protected boolean enabled;
public BooleanState(int glCap) {
this.glCap = glCap;
@@ -23,7 +22,7 @@ public class BooleanState implements ISettableState<BooleanState> {
}
public void setEnabled(boolean enabled) {
if (GLStateManager.shouldBypassCache() || enabled != this.enabled) {
if (GLStateManager.shouldBypassCache() || enabled != this.enabled || (this.glCap == GL11.GL_BLEND && GLStateManager.isAMD() && GLStateManager.isPoppingAttributes())) {
this.enabled = enabled;
if (enabled) {
GL11.glEnable(this.glCap);
@@ -6,12 +6,12 @@ import org.lwjgl.opengl.GL11;
@Getter @Setter
public class DepthState implements ISettableState<DepthState> {
protected boolean mask = true;
protected boolean enabled = true;
protected int func = GL11.GL_LESS;
@Override
public DepthState set(DepthState state) {
this.mask = state.mask;
this.enabled = state.enabled;
this.func = state.func;
return this;
}
@@ -20,7 +20,7 @@ public class DepthState implements ISettableState<DepthState> {
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof DepthState depthState)) return false;
return mask == depthState.mask && func == depthState.func;
return enabled == depthState.enabled && func == depthState.func;
}
@Override
public DepthState copy() {
@@ -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
@@ -18,7 +18,6 @@ public enum Mixins {
ANGELICA_STARTUP(new Builder("Angelica Startup").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT)
.setPhase(Phase.EARLY).addMixinClasses(
"angelica.startup.MixinInitGLStateManager"
,"angelica.startup.MixinSplashProgress"
)
),
@@ -106,6 +105,7 @@ public enum Mixins {
,"sodium.MixinRenderGlobal"
,"sodium.MixinWorldClient"
,"sodium.MixinTessellator"
,"sodium.MixinTileEntity"
,"sodium.MixinGuiIngameForge"
,"sodium.MixinEffectRenderer"
,"sodium.MixinTileEntityRendererDispatcher"
@@ -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();
}
}
@@ -1,16 +0,0 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.startup;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
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(targets="cpw/mods/fml/client/SplashProgress$3", remap = false)
public abstract class MixinSplashProgress {
@Inject(method = "setGL", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/locks/Lock;lock()V", shift = At.Shift.AFTER))
private void angelica$startSplash(CallbackInfo ci) {
GLStateManager.setRunningSplash(true);
}
}
@@ -0,0 +1,46 @@
package com.gtnewhorizons.angelica.mixins.early.sodium;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(TileEntity.class)
public class MixinTileEntity {
@Shadow private Block blockType;
@Shadow private int blockMetadata;
@Shadow World worldObj;
@Shadow int xCoord;
@Shadow int yCoord;
@Shadow int zCoord;
/**
* @author mitchej123
* @reason Make it atomic
*/
@Overwrite
public Block getBlockType() {
Block block = this.blockType;
if (block == null) {
this.blockType = block = this.worldObj.getBlock(this.xCoord, this.yCoord, this.zCoord);
}
return block;
}
/**
* @author mitchej123
* @reason Make it atomic
*/
@Overwrite
public int getBlockMetadata() {
int metadata = this.blockMetadata;
if (metadata == -1) {
this.blockMetadata = metadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
}
return metadata;
}
}
@@ -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 class AngelicaBlockSafetyRegistry {
&& (isbrh.getClass().isAnnotationPresent(ThreadSafeISBRH.class)
|| isbrh instanceof ThreadSafeISBRHFactory);
} else {
canBeOffThread = !(block.getClass().getName().startsWith("gregtech."));
canBeOffThread = !(block.getClass().getName().startsWith("gregtech.")) && !(block.getClass().getName().startsWith("com.github.bartimaeusnek."));
}
final long stamp = LOCK.writeLock();
@@ -51,6 +51,7 @@ public class RedirectorTransformer implements IClassTransformer {
private static final String GL11 = "org/lwjgl/opengl/GL11";
private static final String GL13 = "org/lwjgl/opengl/GL13";
private static final String GL14 = "org/lwjgl/opengl/GL14";
private static final String GL20 = "org/lwjgl/opengl/GL20";
private static final String Project = "org/lwjgl/util/glu/Project";
private static final String OpenGlHelper = "net/minecraft/client/renderer/OpenGlHelper";
@@ -104,7 +105,9 @@ public class RedirectorTransformer implements IClassTransformer {
.add("glBindTexture")
.add("glBlendFunc")
.add("glCallList")
.add("glClear")
.add("glClearColor")
.add("glClearDepth")
.add("glColor3b")
.add("glColor3d")
.add("glColor3f")
@@ -114,10 +117,14 @@ public class RedirectorTransformer implements IClassTransformer {
.add("glColor4f")
.add("glColor4ub")
.add("glColorMask")
.add("glColorMaterial")
.add("glDeleteTextures")
.add("glDepthFunc")
.add("glDepthMask")
.add("glDepthRange")
.add("glDrawArrays")
.add("glDrawBuffer")
.add("glEdgeFlag")
.add("glEndList")
.add("glFog")
.add("glFogf")
@@ -126,36 +133,70 @@ public class RedirectorTransformer implements IClassTransformer {
.add("glGetBoolean")
.add("glGetFloat")
.add("glGetInteger")
.add("glGetLight")
.add("glGetTexLevelParameteri")
.add("glGetTexParameterf")
.add("glGetTexParameteri")
.add("glIsEnabled")
.add("glLight")
.add("glLightModel")
.add("glLightModelf")
.add("glLightModeli")
.add("glLoadIdentity")
.add("glLoadMatrix")
.add("glLogicOp")
.add("glMatrixMode")
.add("glMultMatrix")
.add("glNewList")
.add("glNormal3b")
.add("glNormal3d")
.add("glNormal3f")
.add("glNormal3i")
.add("glOrtho")
.add("glPopAttrib")
.add("glPopMatrix")
.add("glPushAttrib")
.add("glPushMatrix")
.add("glRasterPos2d")
.add("glRasterPos2f")
.add("glRasterPos2i")
.add("glRasterPos3d")
.add("glRasterPos3f")
.add("glRasterPos3i")
.add("glRasterPos4d")
.add("glRasterPos4f")
.add("glRasterPos4i")
.add("glRotated")
.add("glRotatef")
.add("glScaled")
.add("glScalef")
.add("glShadeModel")
.add("glTexCoord1d")
.add("glTexCoord1f")
.add("glTexCoord2d")
.add("glTexCoord2f")
.add("glTexCoord3d")
.add("glTexCoord3f")
.add("glTexCoord4d")
.add("glTexCoord4f")
.add("glTexImage2D")
.add("glTexParameter")
.add("glTexParameterf")
.add("glTexParameteri")
.add("glShadeModel")
.add("glTexImage2D")
.add("glTexParameteri")
.add("glTranslated")
.add("glTranslatef")
.add("glViewport")
);
methodRedirects.put(GL13, RedirectMap.newMap().add("glActiveTexture"));
methodRedirects.put(GL14, RedirectMap.newMap().add("glBlendFuncSeparate", "tryBlendFuncSeparate"));
methodRedirects.put(GL14, RedirectMap.newMap()
.add("glBlendFuncSeparate", "tryBlendFuncSeparate")
.add("glBlendColor")
.add("glBlendEquation")
);
methodRedirects.put(GL20, RedirectMap.newMap()
.add("glBlendEquationSeparate")
);
methodRedirects.put(OpenGlHelper, RedirectMap.newMap()
.add("glBlendFunc", "tryBlendFuncSeparate")
.add("func_148821_a", "tryBlendFuncSeparate"));
@@ -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);
}
}
@@ -423,7 +423,7 @@ public class ChunkBuilder<T extends ChunkGraphicsState> {
LockSupport.unpark(GLStateManager.getMainThread());
} else if (!job.isCancelled()) {
// If the job wasn't cancelled and no result was produced, we've hit a bug
job.future.completeExceptionally(new RuntimeException("No result was produced by the task"));
job.future.completeExceptionally(new RuntimeException("No result was produced by the task " + job.task.getClass() + ": " + job.task));
}
}
}
@@ -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;
}
}
@@ -288,4 +288,16 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
public void releaseResources() {
this.context.releaseResources();
}
@Override
public String toString() {
return "ChunkRenderRebuildTask{"
+ "offset="
+ offset
+ ", camera="
+ camera
+ ", translucencySorting="
+ translucencySorting
+ '}';
}
}
@@ -19,6 +19,7 @@ import org.lwjgl.BufferUtils;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -28,6 +29,8 @@ import java.util.Map;
public class ChunkRenderTranslucencySortTask<T extends ChunkGraphicsState> extends ChunkRenderBuildTask<T> {
private static final BlockRenderPass[] TRANSLUCENT_PASSES = Arrays.stream(BlockRenderPass.VALUES).filter(BlockRenderPass::isTranslucent).toArray(BlockRenderPass[]::new);
private static final BlockRenderPass[] NO_PASSES = new BlockRenderPass[0];
private final ChunkRenderContainer<T> render;
private final BlockPos offset;
private final Vector3d camera;
@@ -42,46 +45,46 @@ public class ChunkRenderTranslucencySortTask<T extends ChunkGraphicsState> exten
@Override
public ChunkBuildResult<T> performBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource) {
ChunkRenderData data = this.render.getData();
if(data.isEmpty())
return null;
final ChunkRenderData data = this.render.getData();
final Map<BlockRenderPass, ChunkMeshData> replacementMeshes;
Map<BlockRenderPass, ChunkMeshData> replacementMeshes = new HashMap<>();
for(BlockRenderPass pass : TRANSLUCENT_PASSES) {
ChunkGraphicsState state = this.render.getGraphicsState(pass);
if(state == null)
continue;
ByteBuffer translucencyData = state.getTranslucencyData();
if(translucencyData == null)
continue;
ChunkMeshData translucentMesh = data.getMesh(pass);
if(translucentMesh == null)
continue;
if(!data.isEmpty()) {
replacementMeshes = new HashMap<>();
for(BlockRenderPass pass : TRANSLUCENT_PASSES) {
final ChunkGraphicsState state = this.render.getGraphicsState(pass);
if(state == null)
continue;
final ByteBuffer translucencyData = state.getTranslucencyData();
if(translucencyData == null)
continue;
final ChunkMeshData translucentMesh = data.getMesh(pass);
if(translucentMesh == null)
continue;
// Make a snapshot of the translucency data to sort
ByteBuffer sortedData = BufferUtils.createByteBuffer(translucencyData.capacity());
synchronized (translucencyData) {
sortedData.put(translucencyData);
translucencyData.position(0);
translucencyData.limit(translucencyData.capacity());
// Make a snapshot of the translucency data to sort
final ByteBuffer sortedData = BufferUtils.createByteBuffer(translucencyData.capacity());
synchronized (translucencyData) {
sortedData.put(translucencyData);
translucencyData.position(0);
translucencyData.limit(translucencyData.capacity());
}
sortedData.flip();
// Sort it and create the new mesh
ChunkBufferSorter.sortStandardFormat(buffers.getVertexType(), sortedData, sortedData.capacity(), (float) camera.x - offset.getX(), (float)camera.y - offset.getY(), (float)camera.z - offset.getZ());
final ChunkMeshData newMesh = new ChunkMeshData();
newMesh.setVertexData(new VertexData(sortedData, buffers.getVertexType().getCustomVertexFormat()));
for(Map.Entry<ModelQuadFacing, BufferSlice> entry : translucentMesh.getSlices()) {
newMesh.setModelSlice(entry.getKey(), entry.getValue());
}
replacementMeshes.put(pass, newMesh);
}
sortedData.flip();
// Sort it and create the new mesh
ChunkBufferSorter.sortStandardFormat(buffers.getVertexType(), sortedData, sortedData.capacity(), (float) camera.x - offset.getX(), (float)camera.y - offset.getY(), (float)camera.z - offset.getZ());
ChunkMeshData newMesh = new ChunkMeshData();
newMesh.setVertexData(new VertexData(sortedData, buffers.getVertexType().getCustomVertexFormat()));
for(Map.Entry<ModelQuadFacing, BufferSlice> entry : translucentMesh.getSlices()) {
newMesh.setModelSlice(entry.getKey(), entry.getValue());
}
replacementMeshes.put(pass, newMesh);
} else {
replacementMeshes = Collections.emptyMap();
}
if(replacementMeshes.isEmpty())
return null;
ChunkBuildResult<T> result = new ChunkBuildResult<>(this.render, data.copyAndReplaceMesh(replacementMeshes));
result.passesToUpload = replacementMeshes.keySet().toArray(new BlockRenderPass[0]);
final ChunkBuildResult<T> result = new ChunkBuildResult<>(this.render, data.copyAndReplaceMesh(replacementMeshes));
result.passesToUpload = replacementMeshes.keySet().toArray(NO_PASSES);
return result;
}
@@ -89,4 +92,9 @@ public class ChunkRenderTranslucencySortTask<T extends ChunkGraphicsState> exten
public void releaseResources() {
}
@Override
public String toString() {
return "ChunkRenderTranslucencySortTask{" + "offset=" + offset + ", camera=" + camera + '}';
}
}
@@ -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;
};
}
@@ -17,7 +17,7 @@ public class DepthColorStorage {
ColorMask colorMask = GLStateManager.getColorMask();
final DepthState depthState = GLStateManager.getDepthState();
originalDepthEnable = depthState.isMask();
originalDepthEnable = depthState.isEnabled();
originalColor = new net.coderbot.iris.gl.blending.ColorMask(colorMask.red, colorMask.green, colorMask.blue, colorMask.alpha);
}
@@ -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,129 @@
options.button.shader=光影包……
options.chunks=%s 区块
options.entityShadows=实体阴影
sodium.option_impact.low=低
sodium.option_impact.medium=中
sodium.option_impact.high=高
sodium.option_impact.extreme=极高
sodium.option_impact.varies=视情况而定
sodium.options.pages.quality=质量
sodium.options.pages.performance=性能
sodium.options.pages.advanced=高级
sodium.options.view_distance.tooltip=能见度 - 控制地形的渲染距离。距离越短,地形渲染越少,帧率(FPS)提升越明显。
sodium.options.simulation_distance.tooltip=模拟距离 - 控制地形和实体加载和更新的距离。更短的距离可以减少内部服务器的负载并可以提高帧率(FPS)。
sodium.options.brightness.tooltip=控制游戏的亮度(伽玛值)。
sodium.options.clouds.name=云
sodium.options.clouds.tooltip=控制云是否可见。
sodium.options.gui_scale.tooltip=设置要用于用户界面的最大缩放倍率。如果设为“自动(0)”,则始终使用最大的缩放倍率。
sodium.options.fullscreen.tooltip=如果启用,游戏将以全屏显示(如果支持)。
sodium.options.v_sync.tooltip=如果启用,游戏的帧率(FPS)将与显示器的刷新率同步,从而以整体输入延迟为代价获得更流畅的体验。如果你的系统性能较差,此设置反而可能会降低帧率。
sodium.options.fps_limit.tooltip=限制帧率(FPS)。这有助于减少多任务处理时的电池使用量和一般系统负载。如果启用了垂直同步,除非它低于显示器的刷新率,否则将忽略此选项。
sodium.options.view_bobbing.tooltip=如果启用,玩家的视野会在移动时不断摇晃。在游戏时感到晕眩的玩家可以从禁用此功能中受益。
sodium.options.attack_indicator.tooltip=控制攻击指示器在屏幕上的显示位置。
sodium.options.autosave_indicator.tooltip=如果启用,当游戏将存档保存到硬盘时将显示一个提示。
sodium.options.graphics_quality.tooltip=默认图形质量控制一些传统选项,并且是模组兼容性所必需的。如果下面的选项保留为“默认”,则它们将使用此设置。
sodium.options.clouds_quality.tooltip=控制天空中云渲染的质量。
sodium.options.weather_quality.tooltip=控制雨雪效果的质量。
sodium.options.leaves_quality.name=树叶质量
sodium.options.leaves_quality.tooltip=控制树叶的渲染质量。
sodium.options.grass_quality.name=草方块质量
sodium.options.grass_quality.tooltip=控制草方块侧面的质量。
sodium.options.particle_quality.name=粒子效果
sodium.options.particle_quality.tooltip=控制同时可在画面上渲染的最大粒子数量。
sodium.options.smooth_lighting.tooltip=控制方块是否平滑光照和渲染。这会略微增加重新构建区块所需的时间,但不会影响帧率(FPS)。
sodium.options.biome_blend.value=%s 个方块
sodium.options.biome_blend.tooltip=生物群系颜色互相平滑混合的距离,单位为方块。使用更高的值会极大增加区块加载或更新的用时,而对画质的提升会逐渐递减。
sodium.options.entity_distance.tooltip=实体渲染的距离修正乘数。更小的值会减少能被渲染的实体离玩家的最大距离,更大的值则会增加这个距离。
sodium.options.entity_shadows.tooltip=如果启用,将在生物和其他实体下方渲染简单的阴影。
sodium.options.vignette.name=晕影
sodium.options.vignette.tooltip=如果启用,将在玩家的画面上显示晕影效果。除非你的显卡像素填充率有限,否则这不太可能对帧率产生影响。
sodium.options.mipmap_levels.tooltip=控制将用于方块模型纹理的MipMap的数量。较高的值可以更好地渲染远处的方块,但可能会对许多纹理动画的性能产生不利影响。
sodium.options.use_chunk_multidraw.name=使用区块多重绘制
sodium.options.use_chunk_multidraw.tooltip=多重绘制允许用更少的绘制调用来渲染多个区块,大大减少了渲染世界时的CPU开销,同时也可能有更高的GPU利用率。此选项可能会让一些图形驱动程序出现问题,因此如果遇到相关问题,应尝试禁用它。
sodium.options.use_vertex_objects.name=使用顶点数组对象
sodium.options.use_vertex_objects.tooltip=通过将如何渲染有关顶点数据的信息移动到驱动程序中,让游戏可以优化相同对象的重复渲染,有助于提高性能。通常不应该禁此选项,除非你使用了不兼容的模组。
sodium.options.use_block_face_culling.name=使用方块面剔除
sodium.options.use_block_face_culling.tooltip=如果启用,则只会渲染面向相机一侧的方块面。这可以在渲染过程的早期消除大量方块面,从而节省GPU上的内存带宽和时间。某些资源包可能会在此选项上出现问题,因此如果你在方块中看到空洞,请尝试禁用它。
sodium.options.use_compact_vertex_format.name=使用压缩顶点格式
sodium.options.use_compact_vertex_format.tooltip=如果启用,将使用更紧凑的顶点格式来渲染方块。这可以显著降低显存使用量和带宽要求,尤其是集显,但由于降低了位置和纹理坐标属性的精度,可能会与一些资源包发生冲突。
sodium.options.use_fog_occlusion.name=使用雾遮挡剔除
sodium.options.use_fog_occlusion.tooltip=如果启用,确定被雾效果完全遮挡的块将不会被渲染,有助于提高性能。当雾效果较重时(例如在水下时),改进可能会更加显著,但在某些情况下可能会导致天空和雾之间出现不良的视觉瑕疵。
sodium.options.use_entity_culling.name=使用实体剔除
sodium.options.use_entity_culling.tooltip=如果启用,则在渲染期间将跳过确定不在任何可见区块中的实体。这可以通过避免渲染位于地下或墙后的实体来帮助提高性能。
sodium.options.use_particle_culling.name=使用粒子剔除
sodium.options.use_particle_culling.tooltip=如果启用,则只会渲染可见的粒子。当附近有许多粒子时,可以显著提高帧率。
sodium.options.animate_only_visible_textures.name=仅绘制可见动画纹理
sodium.options.animate_only_visible_textures.tooltip=如果启用,则只会更新确定为可见的纹理动画。这可以显著提高某些硬件的帧率(FPS),尤其是对于大型的资源包。如果你遇到某些纹理失去动画的问题,请尝试禁用此选项。
sodium.options.translucency_sorting.name=半透明排序
sodium.options.translucency_sorting.tooltip=如果启用,半透明方块将从后向前正确排序,当多个分层的半透明方块在视野中时,可以提供更好的渲染效果。这个选项性能花销较大。
sodium.options.cpu_render_ahead_limit.name=CPU 预渲染限制
sodium.options.cpu_render_ahead_limit.tooltip=指定CPU可以在GPU上等待完成渲染的最大帧数。非常低或非常高的值都可能会导致帧率(FPS)不稳定。
sodium.options.cpu_render_ahead_limit.value=%s 帧
sodium.options.allow_direct_memory_access.name=允许直接内存访问
sodium.options.allow_direct_memory_access.tooltip=如果启用,将允许某些关键代码路径使用直接内存访问来提高性能。这通常会大大减少区块和实体渲染的 CPU 开销,但会使诊断某些错误和崩溃变得更加困难。只有您被要求这么做或知道在做什么时,才应该禁用它。
sodium.options.ignore_driver_blacklist.name=忽略驱动程序黑名单
sodium.options.ignore_driver_blacklist.tooltip=如果启用,将忽略与硬件/驱动程序配置已知的不兼容,允许启用可能导致游戏问题的选项。你平时不应该碰这个选项,除非你确切地知道自己在做什么。更改此选项后,必须保存、关闭并重新打开设置屏幕。
sodium.options.enable_memory_tracing.name=启用内存跟踪
sodium.options.enable_memory_tracing.tooltip=调试功能。如果启用,堆栈跟踪将与内存分配一起收集,有助于在检测到内存泄漏时改进诊断信息。
sodium.options.performance_impact_string=性能影响:%s
sodium.options.use_persistent_mapping.name=启用持久映射
sodium.options.use_persistent_mapping.tooltip=如果启用,少量内存将被持久映射为区块上传的暂存缓冲区,有助于减少加载或更新区块时的CPU开销和帧时间不稳定。\n需要OpenGL 4.4或ARB_buffer_storage拓展。
sodium.options.chunk_memory_allocator.name=区块内存分配器
sodium.options.chunk_memory_allocator.tooltip=选择用于区块渲染的内存分配器。\n- 异步:最快的选项,适用于大多数现代图形驱动程序。\n- 交换:较旧的图形驱动程序的兼容选项。可能会显著增加内存使用量。
sodium.options.chunk_memory_allocator.async=异步
sodium.options.chunk_memory_allocator.swap=交换
sodium.options.chunk_update_threads.name=区块更新线程
sodium.options.chunk_update_threads.tooltip=指定用于区块构建的线程数。使用更多线程可以加快区块加载和更新的速度,但可能会对帧时间产生负面影响。
sodium.options.always_defer_chunk_updates.name=始终推迟区块更新
sodium.options.always_defer_chunk_updates.tooltip=如果启用,渲染将永远不会等待区块更新完成,即使它们很重要。这在某些情况下可以极大地提高帧率(FPS),但可能会在游戏时产生明显的视觉滞后。
sodium.options.use_no_error_context.name=使用禁用错误检查的上下文
sodium.options.use_no_error_context.tooltip=如果启用,OpenGL上下文将在禁用错误检查的情况下创建。这可能会略微提高性能,但也会增加游戏崩溃的风险,而不会优雅地处理OpenGL错误。如果遇到无法解释的突然崩溃,则应禁用此选项。
sodium.options.threads.value=%s 线程
sodium.options.use_gl_state_cache.name=使用GL状态缓存
sodium.options.use_gl_state_cache.tooltip=如果启用,OpenGL状态缓存将减少冗余状态更改的次数。这可以提高性能,但一些模组可能会出现问题。在游戏重启时不会持续。
sodium.options.default=默认
sodium.options.buttons.undo=撤销
sodium.options.buttons.apply=应用
sodium.options.buttons.donate=给JellySquid买杯咖啡!
options.framerate=%s FPS
iris.shaders.toggled=光影包已切换到 %s!
iris.shaders.disabled=光影包已禁用!
options.iris.apply=应用
options.iris.refresh=刷新
options.iris.openShaderPackFolder=打开光影包文件夹……
options.iris.shaderPackSettings=光影包设置……
options.iris.shaderPackList=光影包列表……
options.iris.refreshShaderPacks=刷新光影包
options.iris.shaderPackSelection=光影包……
options.iris.shaderPackSelection.title=光影
options.iris.shaderPackSelection.addedPack=已添加光影包“%s”
options.iris.shaderPackSelection.addedPacks=已添加 %s 个光影包
options.iris.shaderPackSelection.failedAdd=文件不是有效的光影包
options.iris.shaderPackSelection.failedAddSingle=“%s”不是有效的光影包
options.iris.shaderPackSelection.copyError=无法添加光影包“%s”
options.iris.shaderPackSelection.copyErrorAlreadyExists=“%s”已经在光影包文件夹里了!
options.iris.shaderPackOptions.tooManyFiles=无法导入多个光影设置文件!
options.iris.shaderPackOptions.failedImport=导入光影设置文件“%s”失败
options.iris.shaderPackOptions.importedSettings=已从“%s”导入光影设置
options.iris.shaders.disabled=光影:已禁用
options.iris.shaders.enabled=光影:已启用
options.iris.shaders.nonePresent=光影:无光影包
options.iris.back=返回
options.iris.reset=重置
options.iris.reset.tooltip=重置所有选项并应用?
options.iris.reset.tooltip.holdShift=按住 SHIFT 点击以重置
options.iris.importSettings.tooltip=从文件导入设置
options.iris.exportSettings.tooltip=将应用的设置导出至文件
options.iris.mustDisableFullscreen=请先禁用全屏!
options.iris.setToDefault=把选项设为默认值?
options.iris.profile=配置文件
options.iris.profile.custom=自定义
options.iris.shadowDistance=最大阴影距离
options.iris.shadowDistance.enabled=允许更改阴影的最远距离。超出此距离的地形和实体不会投射阴影。降低阴影距离可以显著提高性能。
options.iris.shadowDistance.disabled=你不能改变当前的光影包已经为阴影设置的渲染距离。
options.iris.gui.hide=隐藏 GUI
options.iris.gui.show=显示 GUI
pack.iris.select.title=选择
pack.iris.configure.title=配置
label.iris.true=开启
label.iris.false=关闭
@@ -2,47 +2,31 @@ options.button.detail=细节设置
options.button.other=其他设置
options.button.particle=粒子设置
options.button.sky=大气设置
options.chunks=%s 区块
options.graphics.shelledfancy=高品质混合
options.graphics.shelledfast=快速混合
options.graphics.smart=快速
options.graphics.ultra=卓越
options.off=关闭
options.on=开启
options.cloud_height=云高度
options.cloud_scale=云优化
options.gui_background=背景
options.gui_background.-1=默认
options.gui_background.0=沙子
options.gui_background.1=菌丝
options.gui_background.2=石砖
options.gui_background.3=苔石砖
options.gui_background.4=橡木木板
options.gui_background.5=白桦木板
options.guiScale.massive=巨大
options.downfall_distance=天气效果
options.mode_cloud_translucency=云半透明
options.mode_cloud_translucency.-1=默认
options.mode_cloud_translucency.0=总是
options.mode_cloud_translucency.1=从不
options.mode_clouds=云
options.mode_clouds.-1=默认
options.mode_clouds.0=精致
options.mode_clouds.1=快速
options.mode_clouds.2=关闭
options.mode_dropped_items=掉落物
options.mode_glint_inv=GUI附魔效果
options.mode_glint_world=世界附魔效果
options.mode_gui_background=菜单背景
options.mode_leaves=树叶
options.mode_leaves.-1=默认
options.mode_leaves.0=精致
options.mode_leaves.1=快速
options.mode_leaves.2=智能
options.mode_leaves.3=精致混合
options.mode_leaves.4=快速混合
options.mode_shadows=实体阴影
options.mode_shadows.-1=默认
options.mode_shadows.0=开启
options.mode_shadows.1=关闭
options.mode_sky=天空
options.mode_sun_moon=太阳和月亮
options.mode_stars=星星
options.mode_water=水
options.mode_vignette=晕影
options.mode_vignette.-1=默认
options.mode_vignette.0=开启
options.mode_vignette.1=关闭
options.particles_enc_table=附魔粒子
options.particles_void=虚空粒子
options.render_distance_clouds=云渲染距离
@@ -0,0 +1,62 @@
package com.gtnewhorizons.angelica;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.RenderSystem;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.lwjgl.LWJGLException;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.DisplayMode;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.PixelFormat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.GLOBAL;
public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, ExtensionContext.Store.CloseableResource {
private static boolean started = false;
private static DisplayMode displayMode;
public static String glVendor;
public static String glRenderer;
public static String glVersion;
@Override
public void beforeAll(ExtensionContext context) throws LWJGLException {
if (!started) {
started = true;
displayMode = new DisplayMode(800, 600);
Display.setDisplayModeAndFullscreen(displayMode);
Display.setResizable(false);
Display.setFullscreen(false);
final PixelFormat format = new PixelFormat().withDepthBits(24);
Display.create(format);
// Warm-up State Manager features
GLStateManager.preInit();
GLStateManager.setRunningSplash(false); // So we don't bypass the cache
GLStateManager.BYPASS_CACHE = false; // Just to be sure
RenderSystem.initRenderer();
context.getRoot().getStore(GLOBAL).put("AngelicaExtension", this);
glVendor = GL11.glGetString(GL11.GL_VENDOR);
glRenderer = GL11.glGetString(GL11.GL_RENDERER);
glVersion = GL11.glGetString(GL11.GL_VERSION);
System.out.println("OpenGL Vendor: " + glVendor);
System.out.println("OpenGL Renderer: " + glRenderer);
System.out.println("OpenGL Version: " + glVersion);
}
}
@Override
public void close() {
Display.destroy();
}
@Override
public void afterEach(ExtensionContext context) throws Exception {
assertEquals(GL11.GL_NO_ERROR, GL11.glGetError(), "GL Error");
}
}
@@ -0,0 +1,48 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.AngelicaExtension;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL20;
import static com.gtnewhorizons.angelica.util.GLSMUtil.*;
@ExtendWith(AngelicaExtension.class)
class GLSM_DisplayList_UnitTest {
@Test
void testDisplayListCompileCall() {
verifyState(GL11.GL_LIGHTING, false, "GL_LIGHTING Initial State");
int list = GL11.glGenLists(1);
GLStateManager.glNewList(list, GL11.GL_COMPILE);
GLStateManager.glEnable(GL11.GL_LIGHTING);
GLStateManager.glEndList();
verifyState(GL11.GL_LIGHTING, false, "GL_LIGHTING Post Display List Compile");
GLStateManager.glCallList(list);
verifyState(GL11.GL_LIGHTING, true, "GL_LIGHTING Post Display List Call");
// Reset state that we changed during test
GLStateManager.glDisable(GL11.GL_LIGHTING);
}
@Test
void testDisplayListCompileExecute() {
verifyState(GL11.GL_LIGHTING, false, "GL_LIGHTING Initial State");
int list = GL11.glGenLists(1);
GLStateManager.glNewList(list, GL11.GL_COMPILE_AND_EXECUTE);
GLStateManager.glEnable(GL11.GL_LIGHTING);
GLStateManager.glEndList();
verifyState(GL11.GL_LIGHTING, true, "GL_LIGHTING Post Display List Compile and Execute");
// Reset state that we changed during test
GLStateManager.glDisable(GL11.GL_LIGHTING);
}
}
@@ -0,0 +1,507 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.AngelicaExtension;
import com.gtnewhorizons.angelica.util.GLBit;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL14;
import org.lwjgl.opengl.GL20;
import java.nio.FloatBuffer;
import java.util.ArrayList;
import static com.gtnewhorizons.angelica.util.GLSMUtil.verifyIsEnabled;
import static com.gtnewhorizons.angelica.util.GLSMUtil.verifyLightState;
import static com.gtnewhorizons.angelica.util.GLSMUtil.verifyNotDefaultState;
import static com.gtnewhorizons.angelica.util.GLSMUtil.verifyState;
@ExtendWith(AngelicaExtension.class)
class GLSM_PushPop_UnitTest {
public static final boolean[] BOOLEAN_ARRAY_4_TRUE = { true, true, true, true };
public static final boolean[] BOOLEAN_ARRAY_4_FALSE = { false, false, false, false };
public static final float[] FLOAT_ARRAY_3_001 = { 0f, 0f, 1f };
public static final float[] FLOAT_ARRAY_3_POINT_5 = { 0.5f, 0.5f, 0.5f };
public static final float[] FLOAT_ARRAY_4_0 = { 0f, 0f, 0f, 0f };
public static final float[] FLOAT_ARRAY_4_POINT_5 = { 0.5f, 0.5f, 0.5f, 0.5f };
public static final float[] FLOAT_ARRAY_4_1 = { 1f, 1f, 1f, 1f };
public static final float[] FLOAT_ARRAY_4_1000 = { 1f, 0f, 0f, 0f };
public static final float[] FLOAT_ARRAY_4_0001 = { 0f, 0f, 0f, 1f };
public static final float[] FLOAT_ARRAY_MODEL_AMBIENT_DEFAULT = { 0.2f, 0.2f, 0.2f, 1.0f };
public static final float[] FLOAT_ARRAY_4_0010 = { 0f, 0f, 1f, 0f };
public static final float[] FLOAT_ARRAY_3_1 = { 1f, 1f, 1f };
public static final float[] FLOAT_ARRAY_GL_SPOT_DIRECTION_DEFAULT = { 0f, 0f, -1f };
@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);
GLStateManager.glBlendColor(1f, 1f, 1f, 1f);
GLStateManager.glBlendEquationSeparate(GL14.GL_FUNC_REVERSE_SUBTRACT, GL14.GL_FUNC_REVERSE_SUBTRACT);
GLStateManager.glDrawBuffer(GL11.GL_FRONT_AND_BACK);
GLStateManager.glLogicOp(GL11.GL_OR);
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);
verifyIsEnabled(GL11.GL_ALPHA_TEST, true, "Alpha Test Enable");
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_NEVER, "Alpha Test Function");
verifyState(GL11.GL_ALPHA_TEST_REF, 1f, "Alpha Test Reference");
verifyIsEnabled(GL11.GL_BLEND, true, "Blend Enable");
verifyState(GL11.GL_BLEND_SRC, GL11.GL_SRC_ALPHA, "Blend Source");
verifyState(GL11.GL_BLEND_DST, GL11.GL_ONE_MINUS_SRC_ALPHA, "Blend Destination");
verifyState(GL14.GL_BLEND_COLOR, FLOAT_ARRAY_4_1, "Blend Color");
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_REVERSE_SUBTRACT, "Blend Equation");
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_REVERSE_SUBTRACT, "Blend Equation Alpha");
verifyIsEnabled(GL11.GL_DITHER, false, "Dither Enable");
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_FRONT_AND_BACK, "Draw Buffer");
verifyIsEnabled(GL11.GL_COLOR_LOGIC_OP, true, "Color Logic Op Enable");
verifyIsEnabled(GL11.GL_INDEX_LOGIC_OP, true, "Index Logic Op Enable");
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_OR, "Logic Op Mode");
verifyState(GL11.GL_CURRENT_COLOR, FLOAT_ARRAY_4_POINT_5, "Current Color");
verifyState(GL11.GL_COLOR_WRITEMASK, BOOLEAN_ARRAY_4_FALSE, "Color Write Mask");
verifyState(GL11.GL_COLOR_CLEAR_VALUE, FLOAT_ARRAY_4_POINT_5, "Color Clear Value");
GLStateManager.glPopAttrib();
verifyIsEnabled(GL11.GL_ALPHA_TEST, false, "Alpha Test Enable - Reset");
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_ALWAYS, "Alpha Test Function - Reset");
verifyState(GL11.GL_ALPHA_TEST_REF, 0f, "Alpha Test Reference - Reset");
verifyIsEnabled(GL11.GL_BLEND, false, "Blend Enable - Reset");
verifyState(GL11.GL_BLEND_SRC, GL11.GL_ONE, "Blend Source - Reset");
verifyState(GL11.GL_BLEND_DST, GL11.GL_ZERO, "Blend Destination - Reset");
verifyState(GL14.GL_BLEND_COLOR, FLOAT_ARRAY_4_0, "Blend Color - Reset");
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_ADD, "Blend Equation - Reset");
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_ADD, "Blend Equation Alpha - Reset");
verifyIsEnabled(GL11.GL_DITHER, true, "Dither Enable - Reset");
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_BACK, "Draw Buffer - Reset");
verifyIsEnabled(GL11.GL_COLOR_LOGIC_OP, false, "Color Logic Op Enable - Reset");
verifyIsEnabled(GL11.GL_INDEX_LOGIC_OP, false, "Index Logic Op Enable - Reset");
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_COPY, "Logic Op Mode - Reset");
verifyState(GL11.GL_CURRENT_COLOR, FLOAT_ARRAY_4_POINT_5, "Current Color - (Not) Reset"); // This does not get reset
verifyState(GL11.GL_COLOR_WRITEMASK, BOOLEAN_ARRAY_4_TRUE, "Color Write Mask - Reset");
verifyState(GL11.GL_COLOR_CLEAR_VALUE, FLOAT_ARRAY_4_0, "Color Clear Value - Reset");
// Reset State
GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
}
@Test
void testPushPopCurrentBit() {
verifyState(GL11.GL_CURRENT_COLOR, FLOAT_ARRAY_4_1, "Initial Color State"); // Verify no state leakage from other tests
verifyState(GL11.GL_CURRENT_INDEX, 1, "Initial Index State");
verifyState(GL11.GL_CURRENT_TEXTURE_COORDS, FLOAT_ARRAY_4_0001, "Initial Texture Coordinates");
verifyState(GL11.GL_CURRENT_RASTER_POSITION, FLOAT_ARRAY_4_0001, "Initial Raster Position");
verifyState(GL11.GL_CURRENT_RASTER_POSITION_VALID, true, "Initial Raster Position Valid");
verifyState(GL11.GL_CURRENT_RASTER_COLOR, FLOAT_ARRAY_4_1, "Initial Raster Color");
verifyState(GL11.GL_CURRENT_RASTER_INDEX, 1, "Initial Raster Index");
verifyState(GL11.GL_CURRENT_RASTER_TEXTURE_COORDS, FLOAT_ARRAY_4_0001, "Initial Raster Texture Coordinates");
GLStateManager.glPushAttrib(GL11.GL_CURRENT_BIT);
GLStateManager.glColor4f(0.5f, 0.5f, 0.5f, 0.5f);
// Apparently glIndex is not implemented in lwjgl2?
GLStateManager.glNormal3f(0.5f, 0.5f, 0.5f);
GLStateManager.glTexCoord4f(0.5f, 0.5f, 0.5f, 0.5f); // Current texture coordinates
GLStateManager.glRasterPos4f(0.5f, 0.5f, 0.5f, 0.5f); // Current raster position
// GL_CURRENT_RASTER_POSITION_VALID flag
// RGBA color associated with current raster position
// Color index associated with current raster position
// Texture coordinates associated with current raster position
GLStateManager.glEdgeFlag(false); // GL_EDGE_FLAG flag
verifyState(GL11.GL_CURRENT_COLOR, FLOAT_ARRAY_4_POINT_5, "Current Color");
verifyState(GL11.GL_CURRENT_INDEX, 1f, "Current Index");
verifyState(GL11.GL_CURRENT_NORMAL, FLOAT_ARRAY_3_POINT_5, "Current Normal");
verifyState(GL11.GL_CURRENT_TEXTURE_COORDS, FLOAT_ARRAY_4_POINT_5, "Texture coordinates");
verifyNotDefaultState(GL11.GL_CURRENT_RASTER_POSITION, FLOAT_ARRAY_4_0001, "Raster Position");
verifyState(GL11.GL_CURRENT_RASTER_POSITION_VALID, true, "Raster Position Valid");
verifyState(GL11.GL_CURRENT_RASTER_COLOR, FLOAT_ARRAY_4_POINT_5, "Raster Color");
verifyState(GL11.GL_CURRENT_RASTER_INDEX, 1, "Raster Index");
verifyState(GL11.GL_CURRENT_RASTER_TEXTURE_COORDS, FLOAT_ARRAY_4_POINT_5, "Raster Texture Coordinates");
verifyState(GL11.GL_EDGE_FLAG, false, "Edge Flag");
GLStateManager.glPopAttrib();
verifyState(GL11.GL_CURRENT_COLOR, FLOAT_ARRAY_4_1, "Current Color - reset");
verifyState(GL11.GL_CURRENT_INDEX, 1, "Current Index - reset");
verifyState(GL11.GL_CURRENT_NORMAL, FLOAT_ARRAY_3_001, "Current normal - reset");
verifyState(GL11.GL_CURRENT_TEXTURE_COORDS, FLOAT_ARRAY_4_0001, "Texture coordinates - reset");
verifyState(GL11.GL_CURRENT_RASTER_POSITION, FLOAT_ARRAY_4_0001, "Raster Position - reset");
verifyState(GL11.GL_CURRENT_RASTER_POSITION_VALID, true, "Raster Position Valid - reset");
verifyState(GL11.GL_CURRENT_RASTER_COLOR, FLOAT_ARRAY_4_1, "Raster Color - reset");
verifyState(GL11.GL_CURRENT_RASTER_INDEX, 1, "Raster Index - reset");
verifyState(GL11.GL_CURRENT_RASTER_TEXTURE_COORDS, FLOAT_ARRAY_4_0001, "Raster Texture Coordinates - reset");
verifyState(GL11.GL_EDGE_FLAG, true, "Edge Flag - reset");
}
@Test
void testPushPopDepthBufferBit() {
verifyState(GL11.GL_DEPTH_WRITEMASK, true, "GL_DEPTH_WRITEMASK Initial State");
GLStateManager.glPushAttrib(GL11.GL_DEPTH_BUFFER_BIT);
GLStateManager.glEnable(GL11.GL_DEPTH_TEST);
GLStateManager.glDepthFunc(GL11.GL_NEVER);
GLStateManager.glClearDepth(0.5f); // Not currently Implemented in GLSM
GLStateManager.glDepthMask(false);
verifyState(GL11.GL_DEPTH_TEST, true, "Depth Test");
verifyState(GL11.GL_DEPTH_FUNC, GL11.GL_NEVER, "Depth Function");
verifyState(GL11.GL_DEPTH_CLEAR_VALUE, 0.5f, "Depth Clear Value");
verifyState(GL11.GL_DEPTH_WRITEMASK, false, "Depth Write Mask");
GLStateManager.glPopAttrib();
verifyState(GL11.GL_DEPTH_TEST, false, "Depth Test - Reset");
verifyState(GL11.GL_DEPTH_FUNC, GL11.GL_LESS, "Depth Function - Reset");
verifyState(GL11.GL_DEPTH_CLEAR_VALUE, 1f, "Depth Clear Value - Reset");
verifyState(GL11.GL_DEPTH_WRITEMASK, true, "Depth Write Mask - Reset");
}
@Test
void testPushPopEnableBit() {
final ArrayList<GLBit> bits = new ArrayList<>();
int i;
bits.add(new GLBit(GL11.GL_ALPHA_TEST, "Alpha Test", false));
bits.add(new GLBit(GL11.GL_AUTO_NORMAL, "Auto Normal", false));
bits.add(new GLBit(GL11.GL_BLEND, "Blend", false));
for(i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_CLIP_PLANES) ; i++) {
bits.add(new GLBit(GL11.GL_CLIP_PLANE0 + i, "Clip Plane " + i, false));
}
bits.add(new GLBit(GL11.GL_COLOR_MATERIAL, "Color Material", false));
bits.add(new GLBit(GL11.GL_CULL_FACE, "Cull Face", false));
bits.add(new GLBit(GL11.GL_DEPTH_TEST, "Depth Test", false));
bits.add(new GLBit(GL11.GL_DITHER, "Dither", true));
bits.add(new GLBit(GL11.GL_FOG, "Fog", false));
// This fails on the RESET test in xvfb
if(!(GLStateManager.MESA || GLStateManager.AMD)) {
for(i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS) ; i++) {
bits.add(new GLBit(GL11.GL_LIGHT0 + i, "Light " + i, false));
}
}
bits.add(new GLBit(GL11.GL_LIGHTING, "Lighting", false));
bits.add(new GLBit(GL11.GL_LINE_SMOOTH, "Line Smooth", false));
bits.add(new GLBit(GL11.GL_LINE_STIPPLE, "Line Stipple", false));
bits.add(new GLBit(GL11.GL_COLOR_LOGIC_OP, "Color Logic Op", false));
bits.add(new GLBit(GL11.GL_INDEX_LOGIC_OP, "Index Logic Op", false))
;
bits.add(new GLBit(GL11.GL_MAP1_VERTEX_3, "Map1 Vertex 3", false));
bits.add(new GLBit(GL11.GL_MAP1_VERTEX_4, "Map1 Vertex 4", false));
bits.add(new GLBit(GL11.GL_MAP1_INDEX, "Map1 Index", false));
bits.add(new GLBit(GL11.GL_MAP1_COLOR_4, "Map1 Color 4", false));
bits.add(new GLBit(GL11.GL_MAP1_NORMAL, "Map1 Normal", false));
bits.add(new GLBit(GL11.GL_MAP1_TEXTURE_COORD_1, "Map1 Texture Coord 1", false));
bits.add(new GLBit(GL11.GL_MAP1_TEXTURE_COORD_2, "Map1 Texture Coord 2", false));
bits.add(new GLBit(GL11.GL_MAP1_TEXTURE_COORD_3, "Map1 Texture Coord 3", false));
bits.add(new GLBit(GL11.GL_MAP1_TEXTURE_COORD_4, "Map1 Texture Coord 4", false));
bits.add(new GLBit(GL11.GL_MAP2_VERTEX_3, "Map2 Vertex 3", false));
bits.add(new GLBit(GL11.GL_MAP2_VERTEX_4, "Map2 Vertex 4", false));
bits.add(new GLBit(GL11.GL_MAP2_INDEX, "Map2 Index", false));
bits.add(new GLBit(GL11.GL_MAP2_COLOR_4, "Map2 Color 4", false));
bits.add(new GLBit(GL11.GL_MAP2_NORMAL, "Map2 Normal", false));
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_1, "Map2 Texture Coord 1", false));
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_2, "Map2 Texture Coord 2", false));
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_3, "Map2 Texture Coord 3", false));
bits.add(new GLBit(GL11.GL_MAP2_TEXTURE_COORD_4, "Map2 Texture Coord 4", false));
// Seems to be broken at least on Nvidia
if(!GLStateManager.NVIDIA) bits.add(new GLBit(GL13.GL_MULTISAMPLE, "Multisample", true));
bits.add(new GLBit(GL11.GL_NORMALIZE, "Normalize", false));
bits.add(new GLBit(GL11.GL_POINT_SMOOTH, "Point Smooth", false));
bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_LINE, "Polygon Offset Line", false));
bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_FILL, "Polygon Offset Fill", false));
bits.add(new GLBit(GL11.GL_POLYGON_OFFSET_POINT, "Polygon Offset Point", false));
bits.add(new GLBit(GL11.GL_POLYGON_SMOOTH, "Polygon Smooth", false));
bits.add(new GLBit(GL11.GL_POLYGON_STIPPLE, "Polygon Stipple", false));
bits.add(new GLBit(GL13.GL_SAMPLE_ALPHA_TO_COVERAGE, "Sample Alpha To Coverage", false));
bits.add(new GLBit(GL13.GL_SAMPLE_ALPHA_TO_ONE, "Sample Alpha To One", false));
bits.add(new GLBit(GL13.GL_SAMPLE_COVERAGE, "Sample Coverage", false));
bits.add(new GLBit(GL11.GL_SCISSOR_TEST, "Scissor Test", false));
bits.add(new GLBit(GL11.GL_STENCIL_TEST, "Stencil Test", false));
bits.add(new GLBit(GL11.GL_TEXTURE_1D, "Texture 1D", false));
bits.add(new GLBit(GL11.GL_TEXTURE_2D, "Texture 2D", false));
bits.add(new GLBit(GL12.GL_TEXTURE_3D, "Texture 3D", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_S, "Texture Gen S", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_T, "Texture Gen T", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_R, "Texture Gen R", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_Q, "Texture Gen Q", false));
GLStateManager.glPushAttrib(GL11.GL_ENABLE_BIT);
bits.forEach(bit -> {
verifyState(bit.glEnum(), bit.initial(), bit.name() + " Initial State");
if(bit.initial()) {
GLStateManager.glDisable(bit.glEnum());
} else {
GLStateManager.glEnable(bit.glEnum());
}
verifyState(bit.glEnum(), !bit.initial(), bit.name() + " Toggle State");
});
GLStateManager.glPopAttrib();
bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State"));
}
@Test
void testPushPopFogBit() {
final FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(16);
GLStateManager.glPushAttrib(GL11.GL_FOG_BIT);
GLStateManager.glEnable(GL11.GL_FOG);
floatBuffer.put(FLOAT_ARRAY_4_POINT_5).flip();
GLStateManager.glFog(GL11.GL_FOG_COLOR, floatBuffer);
GLStateManager.glFogf(GL11.GL_FOG_DENSITY, 0.5f);
GLStateManager.glFogf(GL11.GL_FOG_END, 0.5f);
GLStateManager.glFogf(GL11.GL_FOG_START, 0.5f);
GLStateManager.glFogf(GL11.GL_FOG_MODE, GL11.GL_LINEAR);
if(!GLStateManager.NVIDIA) GLStateManager.glFogf(GL11.GL_FOG_INDEX, 1f);
verifyIsEnabled(GL11.GL_FOG, true, "Fog Enable");
verifyState(GL11.GL_FOG_COLOR, FLOAT_ARRAY_4_POINT_5, "Fog Color");
verifyState(GL11.GL_FOG_DENSITY, 0.5f, "Fog Density");
verifyState(GL11.GL_FOG_END, 0.5f, "Fog End");
verifyState(GL11.GL_FOG_START, 0.5f, "Fog Start");
verifyState(GL11.GL_FOG_MODE, GL11.GL_LINEAR, "Fog Mode");
if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 1f, "Fog Index");
GLStateManager.glPopAttrib();
verifyIsEnabled(GL11.GL_FOG, false, "Fog Enable - Reset");
verifyState(GL11.GL_FOG_COLOR, FLOAT_ARRAY_4_0, "Fog Color - Reset");
verifyState(GL11.GL_FOG_DENSITY, 1f, "Fog Density - Reset");
verifyState(GL11.GL_FOG_END, 1f, "Fog End - Reset");
verifyState(GL11.GL_FOG_START, 0f, "Fog Start - Reset");
verifyState(GL11.GL_FOG_MODE, GL11.GL_EXP, "Fog Mode - Reset");
if(!GLStateManager.NVIDIA) verifyState(GL11.GL_FOG_INDEX, 0f, "Fog Index - Reset");
}
@Test
void testPushPopLightingBit() {
final ArrayList<GLBit> bits = new ArrayList<>();
final FloatBuffer floatBuffer = BufferUtils.createFloatBuffer(16);
bits.add(new GLBit(GL11.GL_COLOR_MATERIAL, "Color Material", false));
bits.add(new GLBit(GL11.GL_LIGHTING, "Lighting", false));
for(int i = 0 ; i < GL11.glGetInteger(GL11.GL_MAX_LIGHTS) ; i++) {
bits.add(new GLBit(GL11.GL_LIGHT0 + i, "Light " + i, false));
}
GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT);
GLStateManager.glColorMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT);
// Ambient scene color ??
GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 1f);
GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_TWO_SIDE, 1f);
floatBuffer.put(FLOAT_ARRAY_4_POINT_5).flip();
GLStateManager.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, floatBuffer);
GLStateManager.glLightModeli(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR);
GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_AMBIENT, floatBuffer);
GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, floatBuffer);
GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_SPECULAR, floatBuffer);
GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_POSITION, floatBuffer);
floatBuffer.put(FLOAT_ARRAY_4_0010).flip();
GLStateManager.glLight(GL11.GL_LIGHT0, GL11.GL_SPOT_DIRECTION, floatBuffer);
floatBuffer.put(FLOAT_ARRAY_4_0).flip();
GLStateManager.glShadeModel(GL11.GL_FLAT);
verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT, "Color Material Face");
verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_AMBIENT, "Color Material Parameter");
verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 1f, "Light Model Local Viewer");
verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, 1f, "Light Model Two Side");
verifyState(GL11.GL_LIGHT_MODEL_AMBIENT, FLOAT_ARRAY_4_POINT_5, "Light Model Ambient");
verifyState(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR, "Light Model Color Control");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_AMBIENT, FLOAT_ARRAY_4_POINT_5, "Light Ambient");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, FLOAT_ARRAY_4_POINT_5, "Light Diffuse");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_SPECULAR, FLOAT_ARRAY_4_POINT_5, "Light Specular");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_POSITION, FLOAT_ARRAY_4_POINT_5, "Light Position");
verifyState(GL11.GL_SHADE_MODEL, GL11.GL_FLAT, "Shade Model");
bits.forEach(bit -> {
verifyState(bit.glEnum(), bit.initial(), bit.name() + " Initial State");
if(bit.initial()) {
GLStateManager.glDisable(bit.glEnum());
} else {
GLStateManager.glEnable(bit.glEnum());
}
verifyState(bit.glEnum(), !bit.initial(), bit.name() + " Toggle State");
});
GLStateManager.glPopAttrib();
verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT_AND_BACK, "Color Material Face - Reset");
verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_AMBIENT_AND_DIFFUSE, "Color Material Parameter - Reset");
verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 0f, "Light Model Local Viewer - Reset");
verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, 0f, "Light Model Two Side - Reset");
verifyState(GL11.GL_LIGHT_MODEL_AMBIENT, FLOAT_ARRAY_MODEL_AMBIENT_DEFAULT, "Light Model Ambient - Reset");
verifyState(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SINGLE_COLOR, "Light Model Color Control - Reset");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_AMBIENT, FLOAT_ARRAY_4_0001, "Light Ambient - Reset");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_DIFFUSE, FLOAT_ARRAY_4_1, "Light Diffuse - Reset");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_SPECULAR, FLOAT_ARRAY_4_1, "Light Specular - Reset");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_POSITION, FLOAT_ARRAY_4_0010, "Light Position - Reset");
verifyLightState(GL11.GL_LIGHT0, GL11.GL_SPOT_DIRECTION, FLOAT_ARRAY_GL_SPOT_DIRECTION_DEFAULT, "Light Spot Direction - Reset");
verifyState(GL11.GL_SHADE_MODEL, GL11.GL_SMOOTH, "Shade Model - Reset");
bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State"));
}
@Test
void testPushPopTextureBit() {
final ArrayList<GLBit> bits = new ArrayList<>();
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_S, "Texture Gen S", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_T, "Texture Gen T", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_R, "Texture Gen R", false));
bits.add(new GLBit(GL11.GL_TEXTURE_GEN_Q, "Texture Gen Q", false));
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding");
final int tex1 = GL11.glGenTextures();
final int tex2 = GL11.glGenTextures();
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Unit 1 - Switch");
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex2);
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1 - Set");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 0");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex2, "Texture Binding - Unit 1");
bits.forEach(bit -> {
verifyState(bit.glEnum(), bit.initial(), bit.name() + " Initial State");
if(bit.initial()) {
GLStateManager.glDisable(bit.glEnum());
} else {
GLStateManager.glEnable(bit.glEnum());
}
verifyState(bit.glEnum(), !bit.initial(), bit.name() + " Toggle State");
});
GLStateManager.glPopAttrib();
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture Unit 0 - Reset");
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 0 - Reset");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Unit 1 - Reset");
bits.forEach(bit -> verifyState(bit.glEnum(), bit.initial(), bit.name() + " Reset State"));
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
GLStateManager.glDeleteTextures(tex1);
GLStateManager.glDeleteTextures(tex2);
}
@Test
void testPushPopTextureBitMultiple() {
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Initial Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Initial Texture Binding");
final int tex1 = GL11.glGenTextures();
final int tex2 = GL11.glGenTextures();
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, tex1);
GLStateManager.glPushAttrib(GL11.GL_TEXTURE_BIT);
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture");
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1");
GLStateManager.glDeleteTextures(tex2);
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding - Unit 1");
GLStateManager.glDeleteTextures(tex1);
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0");
GLStateManager.glPopAttrib();
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE1, "Active Texture - Reset 1");
verifyState(GL11.GL_TEXTURE_BINDING_2D, tex1, "Texture Binding Deleted - Unit 1");
GLStateManager.glDeleteTextures(tex1);
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 1");
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding Deleted - Unit 0");
GLStateManager.glPopAttrib();
verifyState(GL13.GL_ACTIVE_TEXTURE, GL13.GL_TEXTURE0, "Active Texture - Reset 2");
verifyState(GL11.GL_TEXTURE_BINDING_2D, 0, "Texture Binding - Reset 2");
}
@Test
void testPushPopTransformBit() {
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Initial Matrix Mode");
verifyState(GL11.GL_NORMALIZE, false, "Initial Normalize");
verifyState(GL12.GL_RESCALE_NORMAL, false, "Initial Rescale Normal");
GLStateManager.glPushAttrib(GL11.GL_TRANSFORM_BIT);
GLStateManager.glMatrixMode(GL11.GL_PROJECTION);
GLStateManager.glEnable(GL11.GL_NORMALIZE);
GLStateManager.glEnable(GL12.GL_RESCALE_NORMAL);
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_PROJECTION, "Matrix Mode");
verifyState(GL11.GL_NORMALIZE, true, "Normalize");
verifyState(GL12.GL_RESCALE_NORMAL, true, "Rescale Normal");
GLStateManager.glPopAttrib();
verifyState(GL11.GL_MATRIX_MODE, GL11.GL_MODELVIEW, "Matrix Mode - Reset");
verifyState(GL11.GL_NORMALIZE, false, "Normalize - Reset");
verifyState(GL12.GL_RESCALE_NORMAL, false, "Rescale Normal - Reset");
}
@Test
void testPushPopViewportBit() {
GLStateManager.glViewport(0, 0, 800, 600);
verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Initial");
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Initial");
GLStateManager.glPushAttrib(GL11.GL_VIEWPORT_BIT);
GLStateManager.glViewport(1, 1, 100, 100);
GLStateManager.glDepthRange(0.5, 1.0);
verifyState(GL11.GL_VIEWPORT, new int[] { 1, 1, 100, 100 }, "Viewport");
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.5f, 1.0f }, "Depth Range");
GLStateManager.glPopAttrib();
verifyState(GL11.GL_VIEWPORT, new int[] { 0, 0, 800, 600 }, "Viewport - Reset");
verifyState(GL11.GL_DEPTH_RANGE, new float[] { 0.0f, 1.0f }, "Depth Range - Reset");
}
}
@@ -0,0 +1,41 @@
package com.gtnewhorizons.angelica.util;
import java.util.Objects;
public final class GLBit {
private final int glEnum;
private final String name;
private final boolean initial;
public GLBit(int glEnum, String name, boolean initial) {
this.name = name;
this.glEnum = glEnum;
this.initial = initial;
}
public String name() {return name;}
public int glEnum() {return glEnum;}
public boolean initial() {return initial;}
@Override
public boolean equals(Object obj) {
if (obj == this) return true;
if (obj == null || obj.getClass() != this.getClass()) return false;
var that = (GLBit) obj;
return Objects.equals(this.name, that.name) && this.glEnum == that.glEnum && this.initial == that.initial;
}
@Override
public int hashCode() {
return Objects.hash(name, glEnum, initial);
}
@Override
public String toString() {
return "GLBit[" + "name=" + name + ", " + "glEnum=" + glEnum + ", " + "initial=" + initial + ']';
}
}
@@ -0,0 +1,127 @@
package com.gtnewhorizons.angelica.util;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
import java.util.stream.IntStream;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class GLSMUtil {
public static void verifyIsEnabled(int glCap, boolean expected) {
verifyIsEnabled(glCap, expected, "Is Enabled Mismatch");
}
public static void verifyIsEnabled(int glCap, boolean expected, String message) {
assertAll( message,
() -> assertEquals(expected, GL11.glIsEnabled(glCap), "GL State Mismatch"),
() -> assertEquals(expected, GLStateManager.glIsEnabled(glCap), "GLSM State Mismatch")
);
}
public static void verifyState(int glCap, boolean expected) {
verifyState(glCap, expected, "Boolean State Mismatch");
}
public static void verifyState(int glCap, boolean expected, String message) {
assertAll( message,
() -> assertEquals(expected, GL11.glGetBoolean(glCap), "GL State Mismatch"),
() -> assertEquals(expected, GLStateManager.glGetBoolean(glCap), "GLSM State Mismatch")
);
}
public static void verifyState(int glCap, int expected) {
verifyState(glCap, expected, "Int State Mismatch");
}
public static void verifyState(int glCap, int expected, String message) {
assertAll(message,
() -> assertEquals(expected, GL11.glGetInteger(glCap), "GL State Mismatch"),
() -> assertEquals(expected, GLStateManager.glGetInteger(glCap), "GLSM State Mismatch")
);
}
public static void verifyState(int glCap, float expected) {
verifyState(glCap, expected, "Float State Mismatch");
}
public static void verifyState(int glCap, float expected, String message) {
assertAll(message,
() -> assertEquals(expected, GL11.glGetFloat(glCap), 0.0001f, "GL State Mismatch"),
() -> assertEquals(expected, GLStateManager.glGetFloat(glCap), 0.0001f, "GLSM State Mismatch")
);
}
public static void verifyState(int glCap, int[] expected) {
verifyState(glCap, expected, "Int State Mismatch");
}
static final IntBuffer glIntBuffer = BufferUtils.createIntBuffer(16);
static final IntBuffer glsmIntBuffer = BufferUtils.createIntBuffer(16);
public static void verifyState(int glCap, int[] expected, String message) {
GL11.glGetInteger(glCap, (IntBuffer) glIntBuffer.clear());
GLStateManager.glGetInteger(glCap, (IntBuffer) glsmIntBuffer.clear());
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
() -> assertEquals(expected[i], glIntBuffer.get(i), "GL State Mismatch: " + i),
() -> assertEquals(expected[i], glsmIntBuffer.get(i), "GLSM State Mismatch: " + i)
));
}
public static void verifyState(int glCap, float[] expected) {
verifyState(glCap, expected, "Float State Mismatch");
}
static final FloatBuffer glFloatBuffer = BufferUtils.createFloatBuffer(16);
static final FloatBuffer glsmFloatBuffer = BufferUtils.createFloatBuffer(16);
public static void verifyState(int glCap, float[] expected, String message) {
GL11.glGetFloat(glCap, (FloatBuffer) glFloatBuffer.clear());
GLStateManager.glGetFloat(glCap, (FloatBuffer) glsmFloatBuffer.clear());
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
() -> assertEquals(expected[i], glFloatBuffer.get(i), 0.0001f, "GL State Mismatch: " + i),
() -> assertEquals(expected[i], glsmFloatBuffer.get(i), 0.0001f, "GLSM State Mismatch: " + i)
));
}
public static void verifyNotDefaultState(int glCap, float[] expected, String message) {
GL11.glGetFloat(glCap, (FloatBuffer) glFloatBuffer.clear());
GLStateManager.glGetFloat(glCap, (FloatBuffer) glsmFloatBuffer.clear());
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
() -> assertNotEquals(expected[i], glFloatBuffer.get(i), 0.0001f, "GL State Mismatch: " + i),
() -> assertNotEquals(expected[i], glsmFloatBuffer.get(i), 0.0001f, "GLSM State Mismatch: " + i)
));
}
public static void verifyState(int glCap, boolean[] expected) {
verifyState(glCap, expected, "Boolean State Mismatch");
}
static final ByteBuffer glByteBuffer = BufferUtils.createByteBuffer(16);
static final ByteBuffer glsmByteBuffer = BufferUtils.createByteBuffer(16);
public static void verifyState(int glCap, boolean[] expected, String message) {
GL11.glGetBoolean(glCap, (ByteBuffer) glByteBuffer.clear());
GLStateManager.glGetBoolean(glCap, (ByteBuffer) glsmByteBuffer.clear());
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
() -> assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glByteBuffer.get(i), "GL State Mismatch: " + i),
() -> assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glsmByteBuffer.get(i), "GLSM State Mismatch: " + i)
));
}
public static void verifyLightState(int glLight, int pname, float[] expected, String message) {
GL11.glGetLight(glLight, pname, (FloatBuffer) glFloatBuffer.clear());
GLStateManager.glGetLight(glLight, pname, (FloatBuffer) glsmFloatBuffer.clear());
IntStream.range (0, expected.length).forEach(i -> assertAll(message,
() -> assertEquals(expected[i], glFloatBuffer.get(i), 0.0001f, "GL State Mismatch: " + i),
() -> assertEquals(expected[i], glsmFloatBuffer.get(i), 0.0001f, "GLSM State Mismatch: " + i)
));
}
}