mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 03:49:22 +00:00
Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e3235a985 | ||
|
|
419fa9f0c0 | ||
|
|
c996e5e58c | ||
|
|
6d28df74a6 | ||
|
|
ce97ef876d | ||
|
|
8898a6f252 | ||
|
|
37f638ac34 | ||
|
|
f73c698a5a | ||
|
|
029da0e7fa | ||
|
|
e40ee19ac8 | ||
|
|
33832fe547 | ||
|
|
671a776952 | ||
|
|
445b6a3e68 | ||
|
|
ff65370cc5 | ||
|
|
ff290c19e2 | ||
|
|
d1e505308c | ||
|
|
594799103b | ||
|
|
8a65f471a0 | ||
|
|
d52e2b0454 | ||
|
|
9b31bae1c8 | ||
|
|
7cbb905bd7 | ||
|
|
8a50ed036d | ||
|
|
f1394382ab | ||
|
|
74e6c80aad | ||
|
|
da9d6bad56 | ||
|
|
58a6fabf3c | ||
|
|
f8c11967d1 | ||
|
|
6d1c4bf39c |
No files matched your search
@@ -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
|
||||
|
||||
@@ -10,5 +10,5 @@ permissions:
|
||||
|
||||
jobs:
|
||||
release-tags:
|
||||
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@fix-release-tags-for-opengl-testing
|
||||
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
|
||||
secrets: inherit
|
||||
@@ -8,7 +8,8 @@
|
||||
|
||||
# Required Dependencies
|
||||
* [UniMixins](https://github.com/LegacyModdingMC/UniMixins/releases) >= 0.1.14
|
||||
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.2.1
|
||||
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.2.4
|
||||
* 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
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
testLogging {
|
||||
events "passed", "skipped", "failed"
|
||||
}
|
||||
javaLauncher = javaToolchains.launcherFor {
|
||||
languageVersion = JavaLanguageVersion.of(8)
|
||||
}
|
||||
dependsOn("extractNatives2")
|
||||
jvmArgs += "-Djava.library.path=${tasks.extractNatives2.destinationFolder.asFile.get().path}"
|
||||
}
|
||||
|
||||
|
||||
allprojects {
|
||||
gradle.projectsEvaluated {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs << "-Xmaxerrs" << "2000"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
//version: 1707058017
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhconvention'
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
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.processResources {
|
||||
inputs.property("version", project.version.toString())
|
||||
filesMatching("META-INF/rfb-plugin/*") {
|
||||
expand("version" to project.version.toString())
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register<Copy>("copyDependencies") {
|
||||
group = "Angelica"
|
||||
description = "Collect dependencies into the testDependencies folder"
|
||||
from(configurations.default)
|
||||
into("testDependencies")
|
||||
}
|
||||
+7
-11
@@ -51,13 +51,14 @@ configurations {
|
||||
dependencies {
|
||||
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.4")
|
||||
|
||||
compileOnly("org.projectlombok:lombok:1.18.22") {transitive = false }
|
||||
compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:0.4.0") { transitive = false }
|
||||
|
||||
compileOnly("org.projectlombok:lombok:1.18.22") { transitive = false }
|
||||
annotationProcessor("org.projectlombok:lombok:1.18.22")
|
||||
|
||||
// Iris Shaders
|
||||
compileOnly('org.jetbrains:annotations:24.0.1')
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.2.1:dev")
|
||||
shadowImplementation("org.joml:joml:1.10.5") // MIT
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.2.4:dev")
|
||||
shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0
|
||||
implementation("io.github.douira:glsl-transformer:1.0.0")
|
||||
shadowImplementation("io.github.douira:glsl-transformer:1.0.0") { // glsl-transformer Noncommercial License 1.0.0
|
||||
@@ -71,8 +72,8 @@ dependencies {
|
||||
|
||||
// Notfine Deps
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
|
||||
runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev")
|
||||
compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") {transitive = false }
|
||||
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'))
|
||||
|
||||
compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.0:api")
|
||||
@@ -88,7 +89,7 @@ dependencies {
|
||||
// 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")
|
||||
@@ -100,8 +101,3 @@ dependencies {
|
||||
testImplementation("org.mockito:mockito-core:3.+")
|
||||
testImplementation("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209")
|
||||
}
|
||||
|
||||
task copyDependencies(type: Copy) {
|
||||
from configurations.default
|
||||
into 'testDependencies'
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
+18
-1
@@ -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()
|
||||
|
||||
+1
-1
@@ -16,5 +16,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.12'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.13'
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
name = "Angelica",
|
||||
version = Tags.VERSION,
|
||||
dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);"
|
||||
+ " after:archaicfix@[0.7.0,);" + " required-after:gtnhlib@[0.2.1,);",
|
||||
+ " after:archaicfix@[0.7.0,);" + " required-after:gtnhlib@[0.2.4,);",
|
||||
acceptedMinecraftVersions = "[1.7.10]",
|
||||
acceptableRemoteVersions = "*",
|
||||
guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory")
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -35,10 +35,10 @@ public class ChunkSectionPos extends Vector3i {
|
||||
return coord & 15;
|
||||
}
|
||||
|
||||
public static short packLocal(BlockPos pos) {
|
||||
int i = getLocalCoord(pos.x);
|
||||
int j = getLocalCoord(pos.y);
|
||||
int k = getLocalCoord(pos.z);
|
||||
public static short packLocal(int x, int y, int z) {
|
||||
final int i = getLocalCoord(x);
|
||||
final int j = getLocalCoord(y);
|
||||
final int k = getLocalCoord(z);
|
||||
return (short)(i << 8 | k << 4 | j << 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -155,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
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaMod;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.AlphaStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BlendStateStack;
|
||||
import com.gtnewhorizons.angelica.glsm.stacks.BooleanStateStack;
|
||||
@@ -75,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);
|
||||
@@ -84,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);
|
||||
protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack();
|
||||
protected static final IntegerStateStack shadeModelState = new IntegerStateStack();
|
||||
|
||||
static {
|
||||
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();
|
||||
@@ -117,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;
|
||||
@@ -130,7 +137,7 @@ 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;
|
||||
@@ -176,6 +183,18 @@ public class GLStateManager {
|
||||
.addFeature(GL11.GL_TEXTURE_ENV_COLOR)
|
||||
.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() {
|
||||
@@ -248,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();
|
||||
@@ -271,7 +293,7 @@ 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();
|
||||
@@ -314,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();
|
||||
@@ -342,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);
|
||||
@@ -370,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()) {
|
||||
@@ -423,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()) {
|
||||
@@ -447,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);
|
||||
@@ -462,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);
|
||||
@@ -569,6 +625,10 @@ public class GLStateManager {
|
||||
}
|
||||
}
|
||||
|
||||
public static void glClearDepth(double depth) {
|
||||
GL11.glClearDepth(depth);
|
||||
}
|
||||
|
||||
// ALPHA
|
||||
public static void enableAlphaTest() {
|
||||
if (AngelicaConfig.enableIris) {
|
||||
@@ -658,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.getValue()).setBinding(-1);
|
||||
GL11.glDeleteTextures(id);
|
||||
}
|
||||
|
||||
@@ -670,7 +754,6 @@ public class GLStateManager {
|
||||
onDeleteTexture(ids.get(i));
|
||||
}
|
||||
|
||||
textures.getTextureUnitBindings(GLStateManager.activeTextureUnit.getValue()).setBinding(-1);
|
||||
GL11.glDeleteTextures(ids);
|
||||
}
|
||||
|
||||
@@ -720,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) {
|
||||
@@ -735,10 +847,20 @@ public class GLStateManager {
|
||||
|
||||
public static void glDrawArrays(int mode, int first, int count) {
|
||||
// Iris -- TODO: This doesn't seem to work and is related to matchPass()
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
if(AngelicaConfig.enableIris) {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
}
|
||||
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);
|
||||
}
|
||||
@@ -791,16 +913,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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -858,8 +984,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);
|
||||
}
|
||||
}
|
||||
@@ -871,6 +997,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 {
|
||||
@@ -953,14 +1085,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
|
||||
@@ -970,6 +1108,13 @@ public class GLStateManager {
|
||||
|
||||
public static void glLoadMatrix(FloatBuffer m) {
|
||||
getMatrixStack().set(m);
|
||||
GL11.glLoadMatrix(m);
|
||||
}
|
||||
|
||||
public static void glLoadMatrix(DoubleBuffer m) {
|
||||
conersionMatrix4d.set(m);
|
||||
getMatrixStack().set(conersionMatrix4d);
|
||||
GL11.glLoadMatrix(m);
|
||||
}
|
||||
|
||||
public static Matrix4fStack getMatrixStack() {
|
||||
@@ -1243,4 +1388,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 {
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.glsm.stacks;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BooleanState;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
public class BooleanStateStack extends BooleanState implements IStateStack<BooleanStateStack> {
|
||||
|
||||
@@ -32,6 +33,9 @@ public class BooleanStateStack extends BooleanState implements IStateStack<Boole
|
||||
}
|
||||
|
||||
set(stack[--pointer]);
|
||||
if (GLStateManager.isAMD() && glCap == GL11.GL_BLEND) {
|
||||
setEnabled(enabled);
|
||||
}
|
||||
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() {
|
||||
|
||||
@@ -7,7 +7,6 @@ import com.gtnewhorizons.angelica.config.ConfigException;
|
||||
import com.gtnewhorizons.angelica.config.ConfigurationManager;
|
||||
import com.gtnewhorizons.angelica.mixins.Mixins;
|
||||
import com.gtnewhorizons.angelica.mixins.TargetedMod;
|
||||
import cpw.mods.fml.relauncher.FMLLaunchHandler;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
import mist475.mcpatcherforge.asm.AsmTransformers;
|
||||
import mist475.mcpatcherforge.asm.mappings.Namer;
|
||||
@@ -20,8 +19,6 @@ import org.apache.logging.log4j.core.config.LoggerConfig;
|
||||
import org.spongepowered.asm.launch.GlobalProperties;
|
||||
import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -47,6 +44,12 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
|
||||
loggerConfig.setLevel(Level.DEBUG);
|
||||
}
|
||||
ctx.updateLoggers();
|
||||
|
||||
// Too many bug reports because people refuse to read or just want to try it - so make these only able
|
||||
// to be enabled by system properties for now.
|
||||
AngelicaConfig.enableIris = Boolean.parseBoolean(System.getProperty("angelica.enableShaders", "false"));
|
||||
AngelicaConfig.enableMCPatcherForgeFeatures = Boolean.parseBoolean(System.getProperty("angelica.enableMCPatcherForgeFeatures", "false"));
|
||||
|
||||
} catch (ConfigException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
@@ -21,13 +21,13 @@ public class MixinCompatHackTweaker implements ITweaker {
|
||||
@Override
|
||||
public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) {
|
||||
verifyDependencies();
|
||||
|
||||
|
||||
if(DISABLE_OPTIFINE_AND_FASTCRAFT) {
|
||||
LOGGER.info("Disabling Optifine and Fastcraft (if present)");
|
||||
disableOptifineAndFastcraft();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void verifyDependencies() {
|
||||
if(MixinCompatHackTweaker.class.getResource("/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class") == null) {
|
||||
throw new RuntimeException("Missing dependency: Angelica requires GTNHLib 0.2.1 or newer! Download: https://modrinth.com/mod/gtnhlib");
|
||||
@@ -82,8 +82,12 @@ public class MixinCompatHackTweaker implements ITweaker {
|
||||
@Override
|
||||
public String[] getLaunchArguments() {
|
||||
if (FMLLaunchHandler.side().isClient()) {
|
||||
// Run after Mixins, but before LWJGl3ify
|
||||
Launch.classLoader.registerTransformer(RedirectorTransformer.class.getName());
|
||||
final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
|
||||
|
||||
if (!rfbLoaded) {
|
||||
// Run after Mixins, but before LWJGl3ify
|
||||
Launch.classLoader.registerTransformer(RedirectorTransformer.class.getName());
|
||||
}
|
||||
if(AngelicaConfig.enableSodium) {
|
||||
Launch.classLoader.registerTransformer(BlockTransformer.class.getName());
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.gtnewhorizons.angelica.loading.rfb;
|
||||
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.PluginContext;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RetroFuturaBootstrap;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RfbPlugin;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class AngelicaRfbPlugin implements RfbPlugin {
|
||||
|
||||
@Override
|
||||
public void onConstruction(@NotNull PluginContext ctx) {
|
||||
Launch.blackboard.put("angelica.rfbPluginLoaded", Boolean.TRUE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull RfbClassTransformer @Nullable [] makeTransformers() {
|
||||
final boolean isServer = (null == RetroFuturaBootstrap.API.launchClassLoader().findClassMetadata("net.minecraft.client.main.Main"));
|
||||
if (isServer) {
|
||||
return null;
|
||||
}
|
||||
return new RfbClassTransformer[] {
|
||||
new RedirectorTransformerWrapper()
|
||||
};
|
||||
}
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package com.gtnewhorizons.angelica.loading.rfb;
|
||||
|
||||
import com.gtnewhorizons.angelica.transform.RedirectorTransformer;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader;
|
||||
import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer;
|
||||
import org.intellij.lang.annotations.Pattern;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.jar.Manifest;
|
||||
|
||||
/** RFB wrapper for {@link com.gtnewhorizons.angelica.transform.RedirectorTransformer} */
|
||||
public class RedirectorTransformerWrapper implements RfbClassTransformer {
|
||||
|
||||
public final RedirectorTransformer inner = new RedirectorTransformer();
|
||||
|
||||
@Pattern("[a-z0-9-]+")
|
||||
@Override
|
||||
public @NotNull String id() {
|
||||
return "redirector";
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] sortAfter() {
|
||||
return new String[] {"*", "mixin:mixin"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] sortBefore() {
|
||||
return new String[] {"lwjgl3ify:redirect"};
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull String @Nullable [] additionalExclusions() {
|
||||
return RedirectorTransformer.getTransformerExclusions().toArray(new String[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
|
||||
@NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className,
|
||||
@NotNull ClassNodeHandle classNode) {
|
||||
if (!classNode.isPresent()) {
|
||||
return false;
|
||||
}
|
||||
if (!classNode.isOriginal()) {
|
||||
// If a class is already a transformed ClassNode, conservatively continue processing.
|
||||
return true;
|
||||
}
|
||||
return inner.shouldRfbTransform(classNode.getOriginalBytes());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
|
||||
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
|
||||
final boolean changed = inner.transformClassNode(className, classNode.getNode());
|
||||
if (changed) {
|
||||
classNode.computeMaxs();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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"
|
||||
@@ -136,6 +136,7 @@ public enum Mixins {
|
||||
,"shaders.MixinOpenGlHelper"
|
||||
,"shaders.MixinRender"
|
||||
,"shaders.MixinRenderGlobal"
|
||||
,"shaders.MixinRenderManager"
|
||||
)
|
||||
),
|
||||
|
||||
@@ -214,8 +215,8 @@ public enum Mixins {
|
||||
//,"notfine.clouds.MixinGameSettings"
|
||||
//,"notfine.clouds.MixinRenderGlobal"
|
||||
//,"notfine.clouds.MixinWorldType"
|
||||
"notfine.glint.MixinRenderBiped"
|
||||
,"notfine.glint.MixinRenderItem"
|
||||
"notfine.fix.MixinRenderItem"
|
||||
,"notfine.glint.MixinRenderBiped"
|
||||
,"notfine.glint.MixinRenderPlayer"
|
||||
,"notfine.gui.MixinGuiSlot"
|
||||
,"notfine.leaves.MixinBlockLeaves"
|
||||
@@ -225,7 +226,6 @@ public enum Mixins {
|
||||
//,"notfine.particles.MixinWorldClient"
|
||||
//,"notfine.particles.MixinWorldProvider"
|
||||
,"notfine.renderer.MixinRenderGlobal"
|
||||
,"notfine.settings.MixinGameSettings"
|
||||
//,"notfine.toggle.MixinGuiIngame"
|
||||
//,"notfine.toggle.MixinEntityRenderer"
|
||||
//,"notfine.toggle.MixinRender" --> No Sodium below
|
||||
@@ -241,8 +241,8 @@ public enum Mixins {
|
||||
.setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.enableNotFineFeatures &&
|
||||
!(AngelicaConfig.enableMCPatcherForgeFeatures && MCPatcherForgeConfig.instance().customItemTexturesEnabled)
|
||||
).addMixinClasses(
|
||||
"notfine.glint.MixinItemRenderer",
|
||||
"notfine.glint.MixinRenderItemGlint"
|
||||
"notfine.glint.MixinItemRenderer"
|
||||
,"notfine.glint.MixinRenderItem"
|
||||
)),
|
||||
|
||||
NOTFINE_LATE_TWILIGHT_FOREST_LEAVES(new Builder("NotFine Mod Leaves").addTargetedMod(TargetedMod.TWILIGHT_FOREST).setSide(Side.CLIENT)
|
||||
|
||||
-16
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
+1
-1
@@ -10,7 +10,7 @@ public abstract class MixinGameSettings {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Make clouds drawScreen at any drawScreen distance.
|
||||
* @reason Make clouds render at any render distance.
|
||||
*/
|
||||
@Overwrite
|
||||
public boolean shouldRenderClouds() {
|
||||
|
||||
+2
-2
@@ -24,7 +24,7 @@ public abstract class MixinRenderGlobal {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Adjust how cloud drawScreen mode is selected.
|
||||
* @reason Adjust how cloud render mode is selected.
|
||||
*/
|
||||
@Overwrite
|
||||
public void renderClouds(float partialTicks) {
|
||||
@@ -45,7 +45,7 @@ public abstract class MixinRenderGlobal {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Adjust fancy cloud drawScreen.
|
||||
* @reason Adjust fancy cloud render.
|
||||
*/
|
||||
@Overwrite
|
||||
public void renderCloudsFancy(float partialTicks) {
|
||||
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.notfine.fix;
|
||||
|
||||
import jss.notfine.core.Settings;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(value = RenderItem.class)
|
||||
public abstract class MixinRenderItem {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Makes renderGlint faster and fixes glBlendFunc being left with the wrong values.
|
||||
*/
|
||||
@Overwrite
|
||||
private void renderGlint(int unused, int posX, int posY, int width, int height) {
|
||||
if(!(boolean)Settings.MODE_GLINT_INV.option.getStore()) {
|
||||
return;
|
||||
}
|
||||
final float timeUVSpeed = 0.00390625F;
|
||||
final Tessellator tessellator = Tessellator.instance;
|
||||
final long time = Minecraft.getSystemTime();
|
||||
|
||||
float layerUVNoise = 4.0F;
|
||||
|
||||
OpenGlHelper.glBlendFunc(772, 1, 0, 1);
|
||||
|
||||
//for(int layer = 0; layer < 2; ++layer) {
|
||||
final int timeUVDenominator = 3000 /*+ layer * 1873*/;
|
||||
final float timeUVNoise = (float)(time % (long)timeUVDenominator) / (float)timeUVDenominator * 256F;
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(
|
||||
posX, (posY + height), zLevel,
|
||||
((timeUVNoise + (float)height * layerUVNoise) * timeUVSpeed), ((float)height * timeUVSpeed)
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
(posX + width), (posY + height), zLevel,
|
||||
((timeUVNoise + (float)width + (float)height * layerUVNoise) * timeUVSpeed), ((float)height * timeUVSpeed)
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
(posX + width), posY, zLevel,
|
||||
((timeUVNoise + (float)width) * timeUVSpeed), 0D
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
posX, posY, zLevel,
|
||||
(timeUVNoise * timeUVSpeed), 0D
|
||||
);
|
||||
tessellator.draw();
|
||||
|
||||
//layerUVNoise = -1.0F;
|
||||
//}
|
||||
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
}
|
||||
|
||||
@Shadow public float zLevel;
|
||||
|
||||
}
|
||||
+13
-51
@@ -1,63 +1,25 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.notfine.glint;
|
||||
|
||||
import jss.notfine.core.Settings;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(value = RenderItem.class)
|
||||
public abstract class MixinRenderItem {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Makes renderGlint faster and fixes glBlendFunc being left with the wrong values.
|
||||
*/
|
||||
@Overwrite
|
||||
private void renderGlint(int unused, int posX, int posY, int width, int height) {
|
||||
if(!(boolean)Settings.MODE_GLINT_INV.option.getStore()) {
|
||||
return;
|
||||
}
|
||||
final float timeUVSpeed = 0.00390625F;
|
||||
final Tessellator tessellator = Tessellator.instance;
|
||||
final long time = Minecraft.getSystemTime();
|
||||
|
||||
float layerUVNoise = 4.0F;
|
||||
|
||||
OpenGlHelper.glBlendFunc(772, 1, 0, 1);
|
||||
|
||||
//for(int layer = 0; layer < 2; ++layer) {
|
||||
final int timeUVDenominator = 3000 /*+ layer * 1873*/;
|
||||
final float timeUVNoise = (float)(time % (long)timeUVDenominator) / (float)timeUVDenominator * 256F;
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.addVertexWithUV(
|
||||
posX, (posY + height), zLevel,
|
||||
((timeUVNoise + (float)height * layerUVNoise) * timeUVSpeed), ((float)height * timeUVSpeed)
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
(posX + width), (posY + height), zLevel,
|
||||
((timeUVNoise + (float)width + (float)height * layerUVNoise) * timeUVSpeed), ((float)height * timeUVSpeed)
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
(posX + width), posY, zLevel,
|
||||
((timeUVNoise + (float)width) * timeUVSpeed), 0D
|
||||
);
|
||||
tessellator.addVertexWithUV(
|
||||
posX, posY, zLevel,
|
||||
(timeUVNoise * timeUVSpeed), 0D
|
||||
);
|
||||
tessellator.draw();
|
||||
|
||||
//layerUVNoise = -1.0F;
|
||||
//}
|
||||
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
@Redirect(
|
||||
method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z"
|
||||
),
|
||||
remap = false
|
||||
)
|
||||
private boolean notFine$toggleGlint(ItemStack stack, int pass) {
|
||||
return stack.hasEffect(pass) && (boolean)Settings.MODE_GLINT_WORLD.option.getStore();
|
||||
}
|
||||
|
||||
@Shadow public float zLevel;
|
||||
|
||||
}
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.notfine.glint;
|
||||
|
||||
import jss.notfine.core.Settings;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
// Separated for compat with MCPF
|
||||
@Mixin(RenderItem.class)
|
||||
public class MixinRenderItemGlint {
|
||||
|
||||
@Redirect(
|
||||
method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V",
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
target = "Lnet/minecraft/item/ItemStack;hasEffect(I)Z"
|
||||
),
|
||||
remap = false
|
||||
)
|
||||
private boolean notFine$toggleGlint(ItemStack stack, int pass) {
|
||||
return stack.hasEffect(pass) && (boolean) Settings.MODE_GLINT_WORLD.option.getStore();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -10,7 +10,7 @@ public abstract class MixinEffectRenderer {
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Makes most particles drawScreen with the expected depth.
|
||||
* @reason Makes most particles render with the expected depth.
|
||||
*/
|
||||
@Redirect(
|
||||
method = "renderParticles",
|
||||
|
||||
+8
-10
@@ -19,11 +19,9 @@ import com.llamalad7.mixinextras.injector.WrapWithCondition;
|
||||
|
||||
@Mixin(value = RenderGlobal.class)
|
||||
public abstract class MixinRenderGlobal {
|
||||
|
||||
@Shadow private int glSkyList;
|
||||
|
||||
@Shadow private int starGLCallList;
|
||||
@Shadow private int glSkyList2;
|
||||
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glCallList(I)V", remap = false))
|
||||
@@ -34,42 +32,42 @@ public abstract class MixinRenderGlobal {
|
||||
return (boolean)Settings.MODE_SKY.option.getStore();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@WrapWithCondition(
|
||||
method = "renderSky(F)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/IRenderHandler;render(FLnet/minecraft/client/multiplayer/WorldClient;Lnet/minecraft/client/Minecraft;)V", remap = false))
|
||||
private boolean conditionalRenderHandlerRender(IRenderHandler irh, float f, WorldClient wc, Minecraft mc) {
|
||||
return (boolean)Settings.MODE_SKY.option.getStore();
|
||||
}
|
||||
|
||||
|
||||
@Inject(method="renderSky(F)V", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/Tessellator;draw()I", ordinal = 0))
|
||||
private void conditionalTessellatorDrawEndSkybox(CallbackInfo ci) {
|
||||
if(!(boolean)Settings.MODE_SKY.option.getStore()) {
|
||||
Tessellator.instance.vertexCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Inject(method="renderSky(F)V", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/Tessellator;draw()I", ordinal = 1))
|
||||
private void conditionalTessellatorDrawSunsetSunrise(CallbackInfo ci) {
|
||||
if(!(boolean)Settings.MODE_SKY.option.getStore()) {
|
||||
Tessellator.instance.vertexCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Inject(method="renderSky(F)V", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/Tessellator;draw()I", ordinal = 2))
|
||||
private void conditionalTessellatorDrawSun(CallbackInfo ci) {
|
||||
if(!(boolean)Settings.MODE_SUN_MOON.option.getStore()) {
|
||||
Tessellator.instance.vertexCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Inject(method="renderSky(F)V", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/Tessellator;draw()I", ordinal = 3))
|
||||
private void conditionalTessellatorDrawMoon(CallbackInfo ci) {
|
||||
if(!(boolean)Settings.MODE_SUN_MOON.option.getStore()) {
|
||||
Tessellator.instance.vertexCount = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Inject(method="renderSky(F)V", at=@At(value="INVOKE", target="Lnet/minecraft/client/renderer/Tessellator;draw()I", ordinal = 4))
|
||||
private void conditionalTessellatorDrawHorizon(CallbackInfo ci) {
|
||||
if(!(boolean)Settings.MODE_SKY.option.getStore()) {
|
||||
|
||||
-235
@@ -1,235 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.notfine.settings;
|
||||
|
||||
import jss.notfine.core.SettingsManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.EnumDifficulty;
|
||||
import org.lwjgl.opengl.Display;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(value = GameSettings.class, priority = 990)
|
||||
public abstract class MixinGameSettings {
|
||||
|
||||
@Final
|
||||
private static String[] GUISCALES = new String[] {
|
||||
"options.guiScale.auto",
|
||||
"options.guiScale.small",
|
||||
"options.guiScale.normal",
|
||||
"options.guiScale.large",
|
||||
"options.guiScale.massive"
|
||||
};
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Makes this function not unreasonably slow.
|
||||
*/
|
||||
@Overwrite
|
||||
public void setOptionFloatValue(GameSettings.Options option, float value) {
|
||||
switch (option) {
|
||||
case SENSITIVITY -> mouseSensitivity = value;
|
||||
case FOV -> fovSetting = value;
|
||||
case GAMMA -> gammaSetting = value;
|
||||
case FRAMERATE_LIMIT -> limitFramerate = (int) value;
|
||||
case CHAT_OPACITY -> {
|
||||
chatOpacity = value;
|
||||
mc.ingameGUI.getChatGUI().refreshChat();
|
||||
}
|
||||
case CHAT_HEIGHT_FOCUSED -> {
|
||||
chatHeightFocused = value;
|
||||
mc.ingameGUI.getChatGUI().refreshChat();
|
||||
}
|
||||
case CHAT_HEIGHT_UNFOCUSED -> {
|
||||
chatHeightUnfocused = value;
|
||||
mc.ingameGUI.getChatGUI().refreshChat();
|
||||
}
|
||||
case CHAT_WIDTH -> {
|
||||
chatWidth = value;
|
||||
mc.ingameGUI.getChatGUI().refreshChat();
|
||||
}
|
||||
case CHAT_SCALE -> {
|
||||
chatScale = value;
|
||||
mc.ingameGUI.getChatGUI().refreshChat();
|
||||
}
|
||||
case ANISOTROPIC_FILTERING -> {
|
||||
if (anisotropicFiltering != (int) value) {
|
||||
anisotropicFiltering = (int) value;
|
||||
mc.getTextureMapBlocks().setAnisotropicFiltering(this.anisotropicFiltering);
|
||||
mc.scheduleResourcesRefresh();
|
||||
}
|
||||
}
|
||||
case MIPMAP_LEVELS -> {
|
||||
if (mipmapLevels != (int) value) {
|
||||
mipmapLevels = (int) value;
|
||||
mc.getTextureMapBlocks().setMipmapLevels(this.mipmapLevels);
|
||||
mc.scheduleResourcesRefresh();
|
||||
}
|
||||
}
|
||||
case RENDER_DISTANCE -> renderDistanceChunks = (int) value;
|
||||
case STREAM_BYTES_PER_PIXEL -> field_152400_J = value;
|
||||
case STREAM_VOLUME_MIC -> {
|
||||
field_152401_K = value;
|
||||
mc.func_152346_Z().func_152915_s();
|
||||
}
|
||||
case STREAM_VOLUME_SYSTEM -> {
|
||||
field_152402_L = value;
|
||||
mc.func_152346_Z().func_152915_s();
|
||||
}
|
||||
case STREAM_KBPS -> field_152403_M = value;
|
||||
case STREAM_FPS -> field_152404_N = value;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @author jss2a98aj
|
||||
* @reason Makes this function not unreasonably slow.
|
||||
*/
|
||||
@Overwrite
|
||||
public void setOptionValue(GameSettings.Options option, int value) {
|
||||
switch(option) {
|
||||
case INVERT_MOUSE:
|
||||
invertMouse = !invertMouse;
|
||||
break;
|
||||
case GUI_SCALE:
|
||||
guiScale = (guiScale + value) % 5;
|
||||
break;
|
||||
case PARTICLES:
|
||||
particleSetting = (particleSetting + value) % 3;
|
||||
break;
|
||||
case VIEW_BOBBING:
|
||||
viewBobbing = !viewBobbing;
|
||||
break;
|
||||
case RENDER_CLOUDS:
|
||||
clouds = !clouds;
|
||||
break;
|
||||
case FORCE_UNICODE_FONT:
|
||||
forceUnicodeFont = !forceUnicodeFont;
|
||||
mc.fontRenderer.setUnicodeFlag(mc.getLanguageManager().isCurrentLocaleUnicode() || forceUnicodeFont);
|
||||
break;
|
||||
case ADVANCED_OPENGL:
|
||||
advancedOpengl = !advancedOpengl;
|
||||
mc.renderGlobal.loadRenderers();
|
||||
case FBO_ENABLE:
|
||||
fboEnable = !fboEnable;
|
||||
break;
|
||||
case ANAGLYPH:
|
||||
anaglyph = !anaglyph;
|
||||
//refreshResources was overkill.
|
||||
mc.renderGlobal.loadRenderers();
|
||||
break;
|
||||
case DIFFICULTY:
|
||||
difficulty = EnumDifficulty.getDifficultyEnum(difficulty.getDifficultyId() + value & 3);
|
||||
break;
|
||||
case GRAPHICS:
|
||||
fancyGraphics = !fancyGraphics;
|
||||
SettingsManager.graphicsUpdated();
|
||||
mc.renderGlobal.loadRenderers();
|
||||
break;
|
||||
case AMBIENT_OCCLUSION:
|
||||
ambientOcclusion = (ambientOcclusion + value) % 3;
|
||||
mc.renderGlobal.loadRenderers();
|
||||
break;
|
||||
case CHAT_VISIBILITY:
|
||||
chatVisibility = EntityPlayer.EnumChatVisibility.getEnumChatVisibility((chatVisibility.getChatVisibility() + value) % 3);
|
||||
break;
|
||||
case STREAM_COMPRESSION:
|
||||
field_152405_O = (field_152405_O + value) % 3;
|
||||
break;
|
||||
case STREAM_SEND_METADATA:
|
||||
field_152406_P = !field_152406_P;
|
||||
break;
|
||||
case STREAM_CHAT_ENABLED:
|
||||
field_152408_R = (field_152408_R + value) % 3;
|
||||
break;
|
||||
case STREAM_CHAT_USER_FILTER:
|
||||
field_152409_S = (field_152409_S + value) % 3;
|
||||
break;
|
||||
case STREAM_MIC_TOGGLE_BEHAVIOR:
|
||||
field_152410_T = (field_152410_T + value) % 2;
|
||||
break;
|
||||
case CHAT_COLOR:
|
||||
chatColours = !chatColours;
|
||||
break;
|
||||
case CHAT_LINKS:
|
||||
chatLinks = !chatLinks;
|
||||
break;
|
||||
case CHAT_LINKS_PROMPT:
|
||||
chatLinksPrompt = !chatLinksPrompt;
|
||||
break;
|
||||
case SNOOPER_ENABLED:
|
||||
snooperEnabled = !snooperEnabled;
|
||||
break;
|
||||
case SHOW_CAPE:
|
||||
showCape = !showCape;
|
||||
break;
|
||||
case TOUCHSCREEN:
|
||||
touchscreen = !touchscreen;
|
||||
break;
|
||||
case USE_FULLSCREEN:
|
||||
fullScreen = !fullScreen;
|
||||
if (mc.isFullScreen() != fullScreen) {
|
||||
mc.toggleFullscreen();
|
||||
}
|
||||
break;
|
||||
case ENABLE_VSYNC:
|
||||
enableVsync = !enableVsync;
|
||||
Display.setVSyncEnabled(enableVsync);
|
||||
break;
|
||||
}
|
||||
saveOptions();
|
||||
}
|
||||
|
||||
@Shadow
|
||||
public void saveOptions() {
|
||||
}
|
||||
|
||||
@Shadow protected Minecraft mc;
|
||||
|
||||
@Shadow public float mouseSensitivity;
|
||||
@Shadow public boolean invertMouse;
|
||||
@Shadow public float fovSetting;
|
||||
@Shadow public float gammaSetting;
|
||||
@Shadow public int renderDistanceChunks;
|
||||
@Shadow public int guiScale;
|
||||
@Shadow public int particleSetting;
|
||||
@Shadow public boolean viewBobbing;
|
||||
@Shadow public boolean anaglyph;
|
||||
@Shadow public boolean advancedOpengl;
|
||||
@Shadow public int limitFramerate;
|
||||
@Shadow public boolean fboEnable;
|
||||
@Shadow public EnumDifficulty difficulty;
|
||||
@Shadow public boolean fancyGraphics;
|
||||
@Shadow public int ambientOcclusion;
|
||||
@Shadow public boolean clouds;
|
||||
@Shadow public EntityPlayer.EnumChatVisibility chatVisibility;
|
||||
@Shadow public boolean chatColours;
|
||||
@Shadow public boolean chatLinks;
|
||||
@Shadow public boolean chatLinksPrompt;
|
||||
@Shadow public float chatOpacity;
|
||||
@Shadow public boolean snooperEnabled;
|
||||
@Shadow public boolean fullScreen;
|
||||
@Shadow public boolean enableVsync;
|
||||
@Shadow public boolean showCape;
|
||||
@Shadow public boolean touchscreen;
|
||||
@Shadow public float chatHeightFocused;
|
||||
@Shadow public float chatHeightUnfocused;
|
||||
@Shadow public float chatScale;
|
||||
@Shadow public float chatWidth;
|
||||
@Shadow public int mipmapLevels;
|
||||
@Shadow public int anisotropicFiltering;
|
||||
@Shadow public float field_152400_J;
|
||||
@Shadow public float field_152401_K;
|
||||
@Shadow public float field_152402_L;
|
||||
@Shadow public float field_152403_M;
|
||||
@Shadow public float field_152404_N;
|
||||
@Shadow public int field_152405_O;
|
||||
@Shadow public boolean field_152406_P;
|
||||
@Shadow public int field_152408_R;
|
||||
@Shadow public int field_152409_S;
|
||||
@Shadow public int field_152410_T;
|
||||
@Shadow public boolean forceUnicodeFont;
|
||||
|
||||
}
|
||||
+1
-1
@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(RenderItem.class)
|
||||
@Mixin(value = RenderItem.class, priority = 1100)
|
||||
abstract public class MixinRenderItem {
|
||||
|
||||
@Redirect(
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.shaders;
|
||||
|
||||
import net.coderbot.iris.layer.GbufferPrograms;
|
||||
import net.coderbot.iris.uniforms.CapturedRenderingState;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(RenderManager.class)
|
||||
public class MixinRenderManager {
|
||||
|
||||
@Unique
|
||||
private static final String DO_RENDER = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V";
|
||||
|
||||
@Inject(method = "func_147939_a", at = @At(value = "INVOKE", target = DO_RENDER))
|
||||
private void iris$onRenderEntityPre(Entity entity, double x, double y, double z, float yaw, float partialTicks, boolean rebuild, CallbackInfoReturnable<Boolean> cir) {
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntity(entity.getEntityId());
|
||||
GbufferPrograms.beginEntities();
|
||||
}
|
||||
|
||||
@Inject(method = "func_147939_a", at = @At(value = "INVOKE", target = DO_RENDER, shift = At.Shift.AFTER))
|
||||
private void iris$onRenderEntityPost(Entity entity, double x, double y, double z, float yaw, float partialTicks, boolean rebuild, CallbackInfoReturnable<Boolean> cir) {
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntity(-1);
|
||||
GbufferPrograms.endEntities();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -45,7 +45,7 @@ public class MixinRenderingRegistry implements IRenderingRegistryExt {
|
||||
throw new RuntimeException(e.getCause());
|
||||
}
|
||||
});
|
||||
} else if (mainThreadHandler.getClass().isInstance(ThreadSafeISBRHFactory.class)) {
|
||||
} else if (ThreadSafeISBRHFactory.class.isAssignableFrom(mainThreadHandler.getClass())) {
|
||||
return THREAD_LOCAL_MAP.get().computeIfAbsent(mainThreadHandler.getClass(), k -> ((ThreadSafeISBRHFactory) mainThreadHandler).newInstance());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.InputEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import jss.notfine.core.Settings;
|
||||
import me.jellysquid.mods.sodium.client.SodiumDebugScreenHandler;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.client.IrisDebugScreenHandler;
|
||||
@@ -33,6 +34,7 @@ import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraftforge.client.event.EntityViewRenderEvent;
|
||||
import net.minecraftforge.client.event.FOVUpdateEvent;
|
||||
import net.minecraftforge.client.event.GuiOpenEvent;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -233,5 +235,12 @@ public class ClientProxy extends CommonProxy {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onFOVModifierUpdate(FOVUpdateEvent event) {
|
||||
if (!(boolean)Settings.DYNAMIC_FOV.option.getStore()){
|
||||
event.newfov = 1.0F;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
@@ -3,9 +3,9 @@ package com.gtnewhorizons.angelica.transform;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.spongepowered.asm.lib.ClassReader;
|
||||
import org.spongepowered.asm.lib.ClassWriter;
|
||||
import org.spongepowered.asm.lib.tree.ClassNode;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -6,24 +6,27 @@ import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.coderbot.iris.IrisLogging;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.spongepowered.asm.lib.ClassReader;
|
||||
import org.spongepowered.asm.lib.ClassWriter;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.tree.AbstractInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.ClassNode;
|
||||
import org.spongepowered.asm.lib.tree.FieldInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.InsnList;
|
||||
import org.spongepowered.asm.lib.tree.InsnNode;
|
||||
import org.spongepowered.asm.lib.tree.IntInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.LdcInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.IntInsnNode;
|
||||
import org.objectweb.asm.tree.LdcInsnNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
@@ -51,6 +54,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";
|
||||
@@ -89,6 +93,9 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
// Block owners we *shouldn't* redirect because they shadow one of our fields
|
||||
private static final Set<String> blockOwnerExclusions = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
|
||||
// Needed because the config is loaded in LaunchClassLoader, but we need to access it in the parent system loader.
|
||||
private static final MethodHandle angelicaConfigSodiumEnabledGetter;
|
||||
|
||||
static {
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_ALPHA_TEST, "AlphaTest");
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_BLEND, "Blend");
|
||||
@@ -104,7 +111,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 +123,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,42 +139,92 @@ 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"));
|
||||
methodRedirects.put(EXTBlendFunc, RedirectMap.newMap().add("glBlendFuncSeparateEXT", "tryBlendFuncSeparate"));
|
||||
methodRedirects.put(ARBMultiTexture, RedirectMap.newMap().add("glActiveTextureARB"));
|
||||
methodRedirects.put(Project, RedirectMap.newMap().add("gluPerspective"));
|
||||
|
||||
try {
|
||||
final Class<?> angelicaConfig = Class.forName("com.gtnewhorizons.angelica.config.AngelicaConfig", true, Launch.classLoader);
|
||||
final MethodHandle sodiumGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableSodium", boolean.class);
|
||||
angelicaConfigSodiumEnabledGetter = sodiumGetter;
|
||||
} catch (ReflectiveOperationException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isSodiumEnabled() {
|
||||
try {
|
||||
return (boolean) angelicaConfigSodiumEnabledGetter.invokeExact();
|
||||
} catch (Throwable e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isVanillaBlockSubclass(String className) {
|
||||
@@ -180,6 +243,14 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
return isVanillaBlockSubclass(className) || moddedBlockSubclasses.contains(className);
|
||||
}
|
||||
|
||||
public static List<String> getTransformerExclusions() {
|
||||
return Collections.unmodifiableList(TransformerExclusions);
|
||||
}
|
||||
|
||||
public boolean shouldRfbTransform(byte[] basicClass) {
|
||||
return cstPoolParser.find(basicClass, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(final String className, String transformedName, byte[] basicClass) {
|
||||
if (basicClass == null) return null;
|
||||
@@ -196,9 +267,27 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
// Keep in sync with com.gtnewhorizons.angelica.loading.rfb.RedirectorTransformerWrapper
|
||||
final ClassReader cr = new ClassReader(basicClass);
|
||||
final ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
final boolean changed = transformClassNode(transformedName, cn);
|
||||
if (changed) {
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
saveTransformedClass(bytes, transformedName);
|
||||
return bytes;
|
||||
}
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
/** @return Was the class changed? */
|
||||
public boolean transformClassNode(String transformedName, ClassNode cn)
|
||||
{
|
||||
if (cn == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Track subclasses of Block
|
||||
if (!isVanillaBlockSubclass(cn.name) && isBlockSubclass(cn.superName)) {
|
||||
@@ -297,7 +386,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
}
|
||||
}
|
||||
else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) {
|
||||
if(!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && AngelicaConfig.enableSodium) {
|
||||
if(!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) {
|
||||
Pair<String, String> fieldToRedirect = null;
|
||||
for(Pair<String, String> blockPairs : BlockBoundsFields) {
|
||||
if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) {
|
||||
@@ -343,14 +432,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
}
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
saveTransformedClass(bytes, transformedName);
|
||||
return bytes;
|
||||
}
|
||||
return basicClass;
|
||||
return changed;
|
||||
}
|
||||
|
||||
private File outputDir = null;
|
||||
|
||||
@@ -25,7 +25,6 @@ public class NotFine {
|
||||
@SidedProxy(clientSide = "jss.notfine.proxy.ClientProxy", serverSide = "jss.notfine.proxy.CommonProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
proxy.preInit(event);
|
||||
|
||||
@@ -20,7 +20,7 @@ public class NotFineConfig {
|
||||
}
|
||||
|
||||
public void loadSettings() {
|
||||
allowAdvancedOpenGL = notFineConfig.getBoolean("allowAdvancedOpenGL", CATEGORY_CLIENT, true, "Allow or always remove the Advanced OpenGL button");
|
||||
allowAdvancedOpenGL = notFineConfig.getBoolean("allowAdvancedOpenGL", CATEGORY_CLIENT, true, "Allow or always disable the Advanced OpenGL button");
|
||||
|
||||
if(notFineConfig.hasChanged()) {
|
||||
notFineConfig.save();
|
||||
|
||||
@@ -45,6 +45,7 @@ public enum Settings {
|
||||
SettingsManager.downfallDistanceUpdated();
|
||||
}
|
||||
},
|
||||
DYNAMIC_FOV(new NotFineOptionTickBox(true, null)),
|
||||
GUI_BACKGROUND(new NotFineOptionCycling<>(BackgroundSelect.DEFAULT, null)) {
|
||||
@Override
|
||||
public void applyChanges() {
|
||||
@@ -107,7 +108,7 @@ public enum Settings {
|
||||
SettingsManager.cloudsUpdated();
|
||||
}
|
||||
},
|
||||
TOTAL_STARS(new NotFineOptionSlider(1500, 0, 32000, 500, OptionImpact.LOW)) {
|
||||
TOTAL_STARS(new NotFineOptionSlider(1500, 500, 32000, 500, OptionImpact.LOW)) {
|
||||
@Override
|
||||
public void applyChanges() {
|
||||
RenderStars.reloadStarRenderList(Minecraft.getMinecraft().renderGlobal);
|
||||
@@ -197,7 +198,6 @@ public enum Settings {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static abstract class NotFineOption<T> implements Option<T> {
|
||||
private static final NotFineMinecraftOptionsStorage optionStorage = new NotFineMinecraftOptionsStorage();
|
||||
private final OptionImpact impact;
|
||||
|
||||
@@ -82,8 +82,6 @@ public class SettingsManager {
|
||||
}
|
||||
|
||||
public static void leavesUpdated() {
|
||||
//Do not re-enable, see MixinBlockLeaves workaround for Angelica/Sodium style menus.
|
||||
//mc.renderGlobal.loadRenderers();
|
||||
LeavesQuality value = (LeavesQuality)Settings.MODE_LEAVES.option.getStore();
|
||||
leavesOpaque = value == LeavesQuality.FAST || (value == LeavesQuality.DEFAULT && !mc.gameSettings.fancyGraphics);
|
||||
Blocks.leaves.setGraphicsLevel(!leavesOpaque);
|
||||
|
||||
@@ -19,7 +19,6 @@ public class GuiCustomMenu extends GuiScreen {
|
||||
private final OptionPage[] subPages;
|
||||
protected String screenTitle;
|
||||
|
||||
|
||||
private GuiListExtended optionsRowList;
|
||||
|
||||
public GuiCustomMenu(GuiScreen parentGuiScreen, OptionPage optionPage, OptionPage... subPages) {
|
||||
@@ -27,7 +26,6 @@ public class GuiCustomMenu extends GuiScreen {
|
||||
this.screenTitle = optionPage.getName();
|
||||
this.optionPage = optionPage;
|
||||
this.subPages = subPages;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,6 +3,7 @@ package jss.notfine.gui;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import jss.notfine.config.NotFineConfig;
|
||||
import jss.notfine.core.Settings;
|
||||
import jss.notfine.core.SettingsManager;
|
||||
import jss.notfine.gui.options.control.NotFineControlValueFormatter;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
|
||||
@@ -36,9 +37,10 @@ public class NotFineGameOptionPages {
|
||||
.setName(I18n.format("options.graphics"))
|
||||
.setTooltip(I18n.format("sodium.options.graphics_quality.tooltip"))
|
||||
.setControl(option -> new CyclingControl<>(option, GraphicsMode.class))
|
||||
.setBinding(
|
||||
(opts, value) -> opts.fancyGraphics = value.isFancy(),
|
||||
opts -> GraphicsMode.fromBoolean(opts.fancyGraphics))
|
||||
.setBinding((opts, value) -> {
|
||||
opts.fancyGraphics = value.isFancy();
|
||||
SettingsManager.graphicsUpdated();
|
||||
}, opts -> GraphicsMode.fromBoolean(opts.fancyGraphics))
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
@@ -95,6 +97,7 @@ public class NotFineGameOptionPages {
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing)
|
||||
.build())
|
||||
.add(Settings.DYNAMIC_FOV.option)
|
||||
.add(OptionImpl.createBuilder(LightingQuality.class, vanillaOpts)
|
||||
.setName(I18n.format("options.ao"))
|
||||
.setTooltip(I18n.format("sodium.options.smooth_lighting.tooltip"))
|
||||
@@ -113,6 +116,7 @@ public class NotFineGameOptionPages {
|
||||
.setName(I18n.format("options.mipmapLevels"))
|
||||
.setTooltip(I18n.format("sodium.options.mipmap_levels.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 0, 4, 1, ControlValueFormatter.multiplier()))
|
||||
//mc.getTextureMapBlocks().setMipmapLevels(this.mipmapLevels); ?
|
||||
.setBinding((opts, value) -> opts.mipmapLevels = value, opts -> opts.mipmapLevels)
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
.setFlags(OptionFlag.REQUIRES_ASSET_RELOAD)
|
||||
@@ -122,6 +126,7 @@ public class NotFineGameOptionPages {
|
||||
.setTooltip(I18n.format("sodium.options.anisotropic_filtering.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 0, 4, 1, NotFineControlValueFormatter.powerOfTwo()))
|
||||
.setBinding(
|
||||
//mc.getTextureMapBlocks().setAnisotropicFiltering(this.anisotropicFiltering); ?
|
||||
(opts, value) -> opts.anisotropicFiltering = value == 0 ? 1 : (int)Math.pow(2, value),
|
||||
(opts) -> opts.anisotropicFiltering == 1 ? 0 : (int)(Math.log(opts.anisotropicFiltering) / Math.log(2)))
|
||||
.setImpact(OptionImpact.MEDIUM)
|
||||
@@ -131,7 +136,6 @@ public class NotFineGameOptionPages {
|
||||
return new OptionPage(I18n.format("options.video"), ImmutableList.copyOf(groups));
|
||||
}
|
||||
|
||||
|
||||
public static OptionPage detail() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
@@ -151,6 +155,7 @@ public class NotFineGameOptionPages {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(Settings.MODE_SKY.option)
|
||||
.add(Settings.MODE_SUN_MOON.option)
|
||||
.add(Settings.MODE_CLOUDS.option)
|
||||
.add(Settings.RENDER_DISTANCE_CLOUDS.option)
|
||||
.add(Settings.CLOUD_HEIGHT.option)
|
||||
|
||||
@@ -14,9 +14,6 @@ public class ClientProxy extends CommonProxy {
|
||||
|
||||
@Override
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
if(event.getSide() == Side.CLIENT) {
|
||||
GameSettings.Options.FRAMERATE_LIMIT.valueStep = 1f;
|
||||
}
|
||||
NotFineConfig config = new NotFineConfig();
|
||||
config.loadSettings();
|
||||
|
||||
@@ -30,15 +27,11 @@ public class ClientProxy extends CommonProxy {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(FMLInitializationEvent event) {
|
||||
// Nothing to do here (yet)
|
||||
}
|
||||
public void init(FMLInitializationEvent event) { }
|
||||
|
||||
@Override
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
if(event.getSide() == Side.CLIENT) {
|
||||
SettingsManager.settingsFile.loadSettings();
|
||||
}
|
||||
SettingsManager.settingsFile.loadSettings();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,11 +6,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
public class CommonProxy {
|
||||
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
|
||||
}
|
||||
public void preInit(FMLPreInitializationEvent event) {}
|
||||
|
||||
public void init(FMLInitializationEvent event) {}
|
||||
|
||||
public void postInit(FMLPostInitializationEvent event) {}
|
||||
|
||||
}
|
||||
@@ -81,6 +81,7 @@ public class SodiumGameOptionPages {
|
||||
firstGroupBuilder.add(Settings.MODE_SKY.option);
|
||||
firstGroupBuilder.add(Settings.MODE_SUN_MOON.option);
|
||||
firstGroupBuilder.add(Settings.MODE_STARS.option);
|
||||
firstGroupBuilder.add(Settings.TOTAL_STARS.option);
|
||||
firstGroupBuilder.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("sodium.options.clouds.name"))
|
||||
.setTooltip(I18n.format("sodium.options.clouds.tooltip"))
|
||||
@@ -149,6 +150,7 @@ public class SodiumGameOptionPages {
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> opts.viewBobbing = value, opts -> opts.viewBobbing)
|
||||
.build())
|
||||
.add(Settings.DYNAMIC_FOV.option)
|
||||
.build());
|
||||
|
||||
return new OptionPage(I18n.format("stat.generalButton"), ImmutableList.copyOf(groups));
|
||||
@@ -249,7 +251,6 @@ public class SodiumGameOptionPages {
|
||||
.setBinding((opts, value) -> opts.quality.enableVignette = value, opts -> opts.quality.enableVignette)
|
||||
.setImpact(OptionImpact.LOW)
|
||||
.build())
|
||||
.add(Settings.TOTAL_STARS.option)
|
||||
.build());
|
||||
|
||||
|
||||
|
||||
+3
-1
@@ -1,5 +1,7 @@
|
||||
package me.jellysquid.mods.sodium.client.gui.options.named;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
||||
public enum LightingQuality implements NamedState {
|
||||
OFF("options.ao.off"),
|
||||
LOW("options.ao.min"),
|
||||
@@ -26,6 +28,6 @@ public enum LightingQuality implements NamedState {
|
||||
}
|
||||
|
||||
public static LightingQuality fromOrdinal(int ordinal) {
|
||||
return VALUES[ordinal];
|
||||
return VALUES[MathHelper.clamp_int(ordinal, 0, VALUES.length - 1)];
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package me.jellysquid.mods.sodium.client.gui.options.named;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
|
||||
public enum ParticleMode implements NamedState {
|
||||
ALL("options.particles.all"),
|
||||
DECREASED("options.particles.decreased"),
|
||||
@@ -19,6 +21,6 @@ public enum ParticleMode implements NamedState {
|
||||
}
|
||||
|
||||
public static ParticleMode fromOrdinal(int ordinal) {
|
||||
return VALUES[ordinal];
|
||||
return VALUES[MathHelper.clamp_int(ordinal, 0, VALUES.length - 1)];
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import com.gtnewhorizons.angelica.compat.mojang.Camera;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkPos;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
|
||||
import it.unimi.dsi.fastutil.ints.IntIterator;
|
||||
import it.unimi.dsi.fastutil.ints.IntList;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
|
||||
@@ -45,6 +46,7 @@ import java.util.ArrayDeque;
|
||||
import java.util.Collection;
|
||||
import java.util.Deque;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkStatusListener {
|
||||
/**
|
||||
@@ -639,9 +641,7 @@ public class ChunkRenderManager<T extends ChunkGraphicsState> implements ChunkSt
|
||||
}
|
||||
|
||||
private void scheduleRebuildOffThread(int x, int y, int z, boolean important) {
|
||||
// TODO: Sodium Threads
|
||||
throw new RuntimeException("scheduleRebuildOffThread");
|
||||
// Minecraft.getMinecraft().submit(() -> this.scheduleRebuild(x, y, z, important));
|
||||
AngelicaRenderQueue.executor().execute(() -> this.scheduleRebuild(x, y, z, important));
|
||||
}
|
||||
|
||||
public void scheduleRebuild(int x, int y, int z, boolean important) {
|
||||
|
||||
+1
-1
@@ -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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
@@ -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
|
||||
+ '}';
|
||||
}
|
||||
}
|
||||
+43
-35
@@ -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 + '}';
|
||||
}
|
||||
}
|
||||
@@ -87,7 +87,7 @@ public class ClonedChunkSection {
|
||||
|
||||
if (tileentity != null)
|
||||
{
|
||||
this.tileEntities.put(ChunkSectionPos.packLocal(new BlockPos(tileentity.xCoord & 15, tileentity.yCoord & 15, tileentity.zCoord & 15)), tileentity);
|
||||
this.tileEntities.put(ChunkSectionPos.packLocal(tileentity.xCoord & 15, tileentity.yCoord & 15, tileentity.zCoord & 15), tileentity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
name=Angelica
|
||||
version=${version}
|
||||
additionalVersions=
|
||||
className=com.gtnewhorizons.angelica.loading.rfb.AngelicaRfbPlugin
|
||||
transformerExclusions=com.gtnewhorizons.angelica.transform.RedirectorTransformer
|
||||
versionConstraints=
|
||||
loadBefore=
|
||||
loadAfter=mixin; lwjgl3ify
|
||||
loadRequires=
|
||||
@@ -86,6 +86,8 @@ sodium.options.default=Default
|
||||
sodium.options.buttons.undo=Undo
|
||||
sodium.options.buttons.apply=Apply
|
||||
sodium.options.buttons.donate=Buy coffee for JellySquid!
|
||||
options.dynamic_fov=Dynamic FOV
|
||||
options.dynamic_fov.tooltip=If enabled, the game's field of view will change based on the player's speed.
|
||||
options.framerate=%s FPS
|
||||
iris.shaders.toggled=Toggled shaders to %s!
|
||||
iris.shaders.disabled=Shaders disabled!
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
@@ -1,161 +0,0 @@
|
||||
package com.gtnewhorizons.angelica;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.LWJGLException;
|
||||
import org.lwjgl.opengl.Display;
|
||||
import org.lwjgl.opengl.DisplayMode;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL14;
|
||||
import org.lwjgl.opengl.GL20;
|
||||
import org.lwjgl.opengl.PixelFormat;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.FloatBuffer;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
class GLSM_UnitTest {
|
||||
private static DisplayMode mode;
|
||||
@BeforeAll
|
||||
static void setup() throws LWJGLException {
|
||||
mode = findDisplayMode(800, 600, Display.getDisplayMode().getBitsPerPixel());
|
||||
Display.setDisplayModeAndFullscreen(mode);
|
||||
final PixelFormat format = new PixelFormat().withDepthBits(24);
|
||||
Display.create(format);
|
||||
GLStateManager.preInit();
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void cleanup() {
|
||||
Display.destroy();
|
||||
}
|
||||
|
||||
private static DisplayMode findDisplayMode(int width, int height, int bpp) throws LWJGLException {
|
||||
final DisplayMode[] modes = Display.getAvailableDisplayModes();
|
||||
for ( DisplayMode mode : modes ) {
|
||||
if ( mode.getWidth() == width && mode.getHeight() == height && mode.getBitsPerPixel() >= bpp && mode.getFrequency() <= 60 ) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
return Display.getDesktopDisplayMode();
|
||||
}
|
||||
|
||||
void verifyState(int glCap, boolean expected) {
|
||||
Stream.of(GLStateManager.glIsEnabled(glCap), GL11.glIsEnabled(glCap)).forEach(b -> assertEquals(expected, b));
|
||||
}
|
||||
|
||||
void verifyState(int glCap, int expected) {
|
||||
Stream.of(GLStateManager.glGetInteger(glCap), GL11.glGetInteger(glCap)).forEach(i -> assertEquals(expected, i));
|
||||
}
|
||||
|
||||
void verifyState(int glCap, float expected) {
|
||||
Stream.of(GLStateManager.glGetFloat(glCap), GL11.glGetFloat(glCap)).forEach(f -> assertEquals(expected, f, 0.0001f));
|
||||
}
|
||||
|
||||
void verifyState(int glCap, float[] expected) {
|
||||
final FloatBuffer glBuffer = BufferUtils.createFloatBuffer(16);
|
||||
final FloatBuffer glsmBuffer = BufferUtils.createFloatBuffer(16);
|
||||
|
||||
GL11.glGetFloat(glCap, glBuffer);
|
||||
GLStateManager.glGetFloat(glCap, glsmBuffer);
|
||||
for (int i = 0; i < expected.length; i++) {
|
||||
assertEquals(expected[i], glBuffer.get(i), 0.0001f, "GL State Mismatch");
|
||||
assertEquals(expected[i], glsmBuffer.get(i), 0.0001f, "GLSM State Mismatch");
|
||||
}
|
||||
}
|
||||
|
||||
private void verifyState(int glCap, boolean[] expected) {
|
||||
final ByteBuffer glBuffer = BufferUtils.createByteBuffer(16);
|
||||
final ByteBuffer glsmBuffer = BufferUtils.createByteBuffer(16);
|
||||
|
||||
GL11.glGetBoolean(glCap, glBuffer);
|
||||
GLStateManager.glGetBoolean(glCap, glsmBuffer);
|
||||
for (int i = 0; i < expected.length; i++) {
|
||||
assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glBuffer.get(i), "GL State Mismatch");
|
||||
assertEquals(expected[i] ? GL11.GL_TRUE : GL11.GL_FALSE, glsmBuffer.get(i), "GLSM State Mismatch");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void testPushPopColorBufferBit() {
|
||||
|
||||
GLStateManager.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT);
|
||||
/*
|
||||
* GL_COLOR_BUFFER_BIT
|
||||
* GL_ALPHA_TEST enable bit
|
||||
* Alpha test function and reference value
|
||||
* GL_BLEND enable bit
|
||||
* Blending source and destination functions
|
||||
* Constant blend color
|
||||
* Blending equation
|
||||
* GL_DITHER enable bit
|
||||
* GL_DRAW_BUFFER setting
|
||||
* GL_COLOR_LOGIC_OP enable bit
|
||||
* GL_INDEX_LOGIC_OP enable bit
|
||||
* Logic op function
|
||||
* Color mode and index mode clear values
|
||||
* Color mode and index mode writemasks
|
||||
*/
|
||||
|
||||
GLStateManager.enableAlphaTest();
|
||||
GLStateManager.glAlphaFunc(GL11.GL_NEVER, 1f);
|
||||
GLStateManager.enableBlend();
|
||||
GLStateManager.glDisable(GL11.GL_DITHER);
|
||||
GLStateManager.glEnable(GL11.GL_COLOR_LOGIC_OP);
|
||||
GLStateManager.glEnable(GL11.GL_INDEX_LOGIC_OP);
|
||||
GLStateManager.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL14.glBlendColor(1f, 1f, 1f, 1f); // Not currently Implemented in GLSM
|
||||
GL20.glBlendEquationSeparate(GL14.GL_FUNC_REVERSE_SUBTRACT, GL14.GL_FUNC_REVERSE_SUBTRACT); // Not currently Implemented in GLSM
|
||||
GL11.glDrawBuffer(GL11.GL_FRONT_AND_BACK); // Not currently Implemented in GLSM
|
||||
GL11.glLogicOp(GL11.GL_OR);// Not currently Implemented in GLSM
|
||||
GLStateManager.glColor4f(0.5f, 0.5f, 0.5f, 0.5f); // This should not be reset
|
||||
GLStateManager.glColorMask(false, false, false, false);
|
||||
GLStateManager.glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
|
||||
|
||||
|
||||
verifyState(GL11.GL_ALPHA_TEST, true);
|
||||
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_NEVER);
|
||||
verifyState(GL11.GL_ALPHA_TEST_REF, 1f);
|
||||
verifyState(GL11.GL_BLEND, true);
|
||||
verifyState(GL11.GL_BLEND_SRC, GL11.GL_SRC_ALPHA);
|
||||
verifyState(GL11.GL_BLEND_DST, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
verifyState(GL14.GL_BLEND_COLOR, new float[]{1f, 1f, 1f, 1f});
|
||||
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_REVERSE_SUBTRACT);
|
||||
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_REVERSE_SUBTRACT);
|
||||
verifyState(GL11.GL_DITHER, false);
|
||||
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_FRONT_AND_BACK);
|
||||
verifyState(GL11.GL_COLOR_LOGIC_OP, true);
|
||||
verifyState(GL11.GL_INDEX_LOGIC_OP, true);
|
||||
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_OR);
|
||||
verifyState(GL11.GL_CURRENT_COLOR, new float[]{0.5f, 0.5f, 0.5f, 0.5f});
|
||||
verifyState(GL11.GL_COLOR_WRITEMASK, new boolean[]{false, false, false, false});
|
||||
verifyState(GL11.GL_COLOR_CLEAR_VALUE, new float[]{0.5f, 0.5f, 0.5f, 0.5f});
|
||||
|
||||
|
||||
GLStateManager.glPopAttrib();
|
||||
verifyState(GL11.GL_ALPHA_TEST, false);
|
||||
verifyState(GL11.GL_ALPHA_TEST_FUNC, GL11.GL_ALWAYS);
|
||||
verifyState(GL11.GL_ALPHA_TEST_REF, 0f);
|
||||
verifyState(GL11.GL_BLEND, false);
|
||||
verifyState(GL11.GL_BLEND_SRC, GL11.GL_ONE);
|
||||
verifyState(GL11.GL_BLEND_DST, GL11.GL_ZERO);
|
||||
verifyState(GL14.GL_BLEND_COLOR, new float[]{0f, 0f, 0f, 0f});
|
||||
verifyState(GL14.GL_BLEND_EQUATION, GL14.GL_FUNC_ADD);
|
||||
verifyState(GL20.GL_BLEND_EQUATION_ALPHA, GL14.GL_FUNC_ADD);
|
||||
verifyState(GL11.GL_DITHER, true);
|
||||
verifyState(GL11.GL_DRAW_BUFFER, GL11.GL_BACK);
|
||||
verifyState(GL11.GL_COLOR_LOGIC_OP, false);
|
||||
verifyState(GL11.GL_INDEX_LOGIC_OP, false);
|
||||
verifyState(GL11.GL_LOGIC_OP_MODE, GL11.GL_COPY);
|
||||
verifyState(GL11.GL_CURRENT_COLOR, new float[]{0.5f, 0.5f, 0.5f, 0.5f}); // This does not get reset
|
||||
verifyState(GL11.GL_COLOR_WRITEMASK, new boolean[]{true, true, true, true});
|
||||
verifyState(GL11.GL_COLOR_CLEAR_VALUE, new float[]{0f, 0f, 0f, 0f});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
package com.gtnewhorizons.angelica.glsm;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaExtension;
|
||||
import org.joml.Matrix4f;
|
||||
import org.joml.Matrix4fStack;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.EnumSource;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
@ExtendWith(AngelicaExtension.class)
|
||||
public class GLMS_MatrixStack_UnitTest {
|
||||
|
||||
final static FloatBuffer buffer = BufferUtils.createFloatBuffer(16);
|
||||
Matrix4f getMatrix(int matrix, boolean cached) {
|
||||
buffer.clear();
|
||||
if(cached) {
|
||||
GLStateManager.glGetFloat(matrix, buffer);
|
||||
} else {
|
||||
GL11.glGetFloat(matrix, buffer);
|
||||
}
|
||||
return new Matrix4f(buffer);
|
||||
}
|
||||
boolean matrixEquals(Matrix4f expected, Matrix4f actual) {
|
||||
if(expected.equals(actual, 0.0001f)) {
|
||||
return true;
|
||||
} else {
|
||||
System.out.println("Expected: " + expected);
|
||||
System.out.println("Actual: " + actual);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
void assertMatrixEquals(Matrix4f expected, Matrix4f actual, String message) {
|
||||
assertTrue(matrixEquals(expected, actual), message);
|
||||
}
|
||||
void validateMatrix(Matrix4f expected, int matrix, String message) {
|
||||
// Be careful of precision here
|
||||
assertAll(message,
|
||||
() -> assertMatrixEquals(expected, getMatrix(matrix, false), "GL State Mismatch"),
|
||||
() -> assertMatrixEquals(expected, getMatrix(matrix, true), "GLSM State Mismatch")
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
enum MatrixMode {
|
||||
MODELVIEW(GL11.GL_MODELVIEW, GL11.GL_MODELVIEW_MATRIX, "Model"),
|
||||
PROJECTION(GL11.GL_PROJECTION, GL11.GL_PROJECTION_MATRIX, "Projection"),
|
||||
TEXTURE(GL11.GL_TEXTURE, GL11.GL_TEXTURE_MATRIX, "Texture");
|
||||
|
||||
protected final int mode;
|
||||
protected final int getEnum;
|
||||
protected final String name;
|
||||
|
||||
MatrixMode(int mode, int getEnum, String name) {
|
||||
this.mode = mode;
|
||||
this.getEnum = getEnum;
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@EnumSource(MatrixMode.class)
|
||||
void validateMatrixOperations(MatrixMode matrix) {
|
||||
GLStateManager.glMatrixMode(matrix.mode);
|
||||
GLStateManager.glLoadIdentity();
|
||||
|
||||
GLStateManager.glPushMatrix();
|
||||
|
||||
Matrix4fStack testMatrix = new Matrix4fStack(2);
|
||||
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Identity " + matrix.name + " Matrix");
|
||||
|
||||
GLStateManager.glScalef(2.0f, 2.0f, 2.0f);
|
||||
testMatrix.scale(2.0f);
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Scaled " + matrix.name + " Matrix");
|
||||
|
||||
GLStateManager.glTranslatef(2.0f, 2.0f, 2.0f);
|
||||
testMatrix.translate(2.0f, 2.0f, 2.0f);
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Translated " + matrix.name + " Matrix");
|
||||
|
||||
GLStateManager.glRotatef(180.0f, 0.0f, 0.0f, 1.0f);
|
||||
testMatrix.rotate((float) Math.toRadians(180.0f), 0.0f, 0.0f, 1.0f);
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Rotated " + matrix.name + " Matrix");
|
||||
|
||||
GLStateManager.glOrtho(0, 800, 0, 600, -1, 1);
|
||||
testMatrix.ortho(0, 800, 0, 600, -1, 1);
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Ortho " + matrix.name + " Matrix");
|
||||
|
||||
Matrix4f testLoad = new Matrix4f();
|
||||
testLoad.m02(5f);
|
||||
testLoad.m12(12f);
|
||||
testLoad.get(buffer);
|
||||
|
||||
GLStateManager.glLoadMatrix(buffer);
|
||||
validateMatrix(testLoad, matrix.getEnum, "Loaded " + matrix.name + " Matrix");
|
||||
|
||||
GLStateManager.glPopMatrix();
|
||||
testMatrix.identity();
|
||||
validateMatrix(testMatrix, matrix.getEnum, "Popped " + matrix.name + " Matrix");
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void cleanup() {
|
||||
GLStateManager.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GLStateManager.glLoadIdentity();
|
||||
GLStateManager.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GLStateManager.glLoadIdentity();
|
||||
GLStateManager.glMatrixMode(GL11.GL_TEXTURE);
|
||||
GLStateManager.glLoadIdentity();
|
||||
|
||||
GLStateManager.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
}
|
||||
}
|
||||
@@ -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)
|
||||
));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user