diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java b/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java index 20727594b..6720309b1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/Feature.java @@ -77,7 +77,7 @@ public class Feature { // GL_AUTO_NORMAL flag , GLStateManager.blendMode // GL_BLEND flag // Enable bits for the user-definable clipping planes - // GL_COLOR_MATERIAL + , GLStateManager.colorMaterial // GL_COLOR_MATERIAL , GLStateManager.cullState // GL_CULL_FACE flag , GLStateManager.depthTest // GL_DEPTH_TEST flag // GL_DITHER flag @@ -148,13 +148,11 @@ public class Feature { // GL_TEXTURE_COMPRESSION_HINT setting )); attribToFeatures.put(GL11.GL_LIGHTING_BIT, ImmutableSet.of( - // GL_COLOR_MATERIAL enable bit - // GL_COLOR_MATERIAL_FACE value - // Color material parameters that are tracking the current color - // Ambient scene color - // GL_LIGHT_MODEL_LOCAL_VIEWER value - // GL_LIGHT_MODEL_TWO_SIDE setting - GLStateManager.lightingState // GL_LIGHTING enable bit + GLStateManager.colorMaterial // GL_COLOR_MATERIAL enable bit + , GLStateManager.colorMaterialFace // GL_COLOR_MATERIAL_FACE value + , GLStateManager.colorMaterialParameter // Color material parameters that are tracking the current color + , GLStateManager.lightModel // Ambient scene color, GL_LIGHT_MODEL_LOCAL_VIEWER, GL_LIGHT_MODEL_TWO_SIDE + , GLStateManager.lightingState // GL_LIGHTING enable bit // Enable bit for each light , GLStateManager.lightStates[0] // GL_LIGHT0 , GLStateManager.lightStates[1] // GL_LIGHT1 diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index 59c4c2c05..e3b9545f5 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -11,6 +11,7 @@ import com.gtnewhorizons.angelica.glsm.stacks.DepthStateStack; import com.gtnewhorizons.angelica.glsm.stacks.FogStateStack; import com.gtnewhorizons.angelica.glsm.stacks.IStateStack; import com.gtnewhorizons.angelica.glsm.stacks.IntegerStateStack; +import com.gtnewhorizons.angelica.glsm.stacks.LightModelStateStack; import com.gtnewhorizons.angelica.glsm.stacks.LightStateStack; import com.gtnewhorizons.angelica.glsm.stacks.MatrixModeStack; import com.gtnewhorizons.angelica.glsm.stacks.ViewPortStateStack; @@ -94,13 +95,9 @@ public class GLStateManager { // 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(); + protected static final IntegerStateStack activeTextureUnit = new IntegerStateStack(0); + protected static final IntegerStateStack shadeModelState = new IntegerStateStack(GL11.GL_SMOOTH); - 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(); @Getter protected static final BooleanStateStack blendMode = new BooleanStateStack(GL11.GL_BLEND); @@ -126,6 +123,11 @@ public class GLStateManager { @Getter protected static final BooleanStateStack[] lightStates = new BooleanStateStack[8]; @Getter protected static final LightStateStack[] lightDataStates = new LightStateStack[8]; + @Getter protected static final BooleanStateStack colorMaterial = new BooleanStateStack(GL11.GL_COLOR_MATERIAL); + @Getter protected static final IntegerStateStack colorMaterialFace = new IntegerStateStack(GL11.GL_FRONT_AND_BACK); + @Getter protected static final IntegerStateStack colorMaterialParameter = new IntegerStateStack(GL11.GL_AMBIENT_AND_DIFFUSE); + @Getter protected static final LightModelStateStack lightModel = new LightModelStateStack(); + static { for (int i = 0; i < lightStates.length; i ++) { lightStates[i] = new BooleanStateStack(GL11.GL_LIGHT0 + i); @@ -402,6 +404,8 @@ public class GLStateManager { case GL14.GL_BLEND_DST_RGB -> blendState.getDstRgb(); case GL14.GL_BLEND_SRC_ALPHA -> blendState.getSrcAlpha(); case GL14.GL_BLEND_SRC_RGB -> blendState.getSrcRgb(); + case GL11.GL_COLOR_MATERIAL_FACE -> colorMaterialFace.getValue(); + case GL11.GL_COLOR_MATERIAL_PARAMETER -> colorMaterialParameter.getValue(); case GL20.GL_CURRENT_PROGRAM -> activeProgram; default -> GL11.glGetInteger(pname); @@ -1544,20 +1548,44 @@ public class GLStateManager { } public static void glLightModel(int pname, FloatBuffer params) { - GL11.glLightModel(pname, params); + switch (pname) { + case GL11.GL_LIGHT_MODEL_AMBIENT -> lightModel.setAmbient(params); + case GL11.GL_LIGHT_MODEL_LOCAL_VIEWER -> lightModel.setLocalViewer(params); + case GL11.GL_LIGHT_MODEL_TWO_SIDE -> lightModel.setTwoSide(params); + default -> GL11.glLightModel(pname, params); + } } public static void glLightModel(int pname, IntBuffer params) { - GL11.glLightModel(pname, params); + switch (pname) { + case GL11.GL_LIGHT_MODEL_AMBIENT -> lightModel.setAmbient(params); + case GL12.GL_LIGHT_MODEL_COLOR_CONTROL -> lightModel.setColorControl(params); + case GL11.GL_LIGHT_MODEL_LOCAL_VIEWER -> lightModel.setLocalViewer(params); + case GL11.GL_LIGHT_MODEL_TWO_SIDE -> lightModel.setTwoSide(params); + default -> GL11.glLightModel(pname, params); + } } public static void glLightModelf(int pname, float param) { - GL11.glLightModelf(pname, param); + switch (pname) { + case GL11.GL_LIGHT_MODEL_LOCAL_VIEWER -> lightModel.setLocalViewer(param); + case GL11.GL_LIGHT_MODEL_TWO_SIDE -> lightModel.setTwoSide(param); + default -> GL11.glLightModelf(pname, param); + } } public static void glLightModeli(int pname, int param) { - GL11.glLightModeli(pname, param); + switch (pname) { + case GL12.GL_LIGHT_MODEL_COLOR_CONTROL -> lightModel.setColorControl(param); + case GL11.GL_LIGHT_MODEL_LOCAL_VIEWER -> lightModel.setLocalViewer(param); + case GL11.GL_LIGHT_MODEL_TWO_SIDE -> lightModel.setTwoSide(param); + default -> GL11.glLightModeli(pname, param); + } } public static void glColorMaterial(int face, int mode) { - GL11.glColorMaterial(face, mode); + if (shouldBypassCache() || (colorMaterialFace.getValue() != face || colorMaterialParameter.getValue() != mode)) { + colorMaterialFace.setValue(face); + colorMaterialParameter.setValue(mode); + GL11.glColorMaterial(face, mode); + } } public static void glDepthRange(double near, double far) { diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/IntegerStateStack.java b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/IntegerStateStack.java index b46da9dca..42889120b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/IntegerStateStack.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/stacks/IntegerStateStack.java @@ -9,10 +9,12 @@ public class IntegerStateStack extends IntegerState implements IStateStack { + + protected final LightModelState[] stack; + + protected int pointer; + + public LightModelStateStack() { + super(); + stack = new LightModelState[GLStateManager.MAX_ATTRIB_STACK_DEPTH]; + for (int i = 0; i < GLStateManager.MAX_ATTRIB_STACK_DEPTH; i++) { + stack[i] = new LightModelState(); + } + } + + public LightModelStateStack push() { + if (pointer == stack.length) { + throw new IllegalStateException("Stack overflow size " + (pointer + 1) + " reached"); + } + + stack[pointer++].set(this); + return this; + } + + public LightModelStateStack pop() { + if (pointer == 0) { + throw new IllegalStateException("Stack underflow"); + } + + set(stack[--pointer]); + return this; + } + + public boolean isEmpty() { return pointer == 0; } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/states/LightModelState.java b/src/main/java/com/gtnewhorizons/angelica/glsm/states/LightModelState.java new file mode 100644 index 000000000..66e12b6e1 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/states/LightModelState.java @@ -0,0 +1,121 @@ +package com.gtnewhorizons.angelica.glsm.states; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import org.joml.Vector4f; +import org.joml.Vector4i; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import java.nio.FloatBuffer; +import java.nio.IntBuffer; + +import static com.gtnewhorizons.angelica.glsm.GLStateManager.i2f; + +public class LightModelState implements ISettableState { + + private static final Vector4f vector4f = new Vector4f(); + private static final Vector4i vector4i = new Vector4i(); + + public final Vector4f ambient; + public int colorControl; + public float localViewer; + public float twoSide; + + public LightModelState() { + ambient = new Vector4f(0.2F, 0.2F, 0.2F, 1.0F); + colorControl = GL12.GL_SINGLE_COLOR; + localViewer = 0.0F; + twoSide = 0.0F; + } + + public void setAmbient(FloatBuffer newBuffer) { + vector4f.set(newBuffer); + if (GLStateManager.shouldBypassCache() || !this.ambient.equals(vector4f)) { + this.ambient.set(vector4f); + GL11.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, newBuffer); + } + } + + public void setAmbient(IntBuffer newBuffer) { + vector4i.set(newBuffer); + vector4f.set(i2f(vector4i.x), i2f(vector4i.y), i2f(vector4i.z), i2f(vector4i.w)); + if (GLStateManager.shouldBypassCache() || !this.ambient.equals(vector4f)) { + this.ambient.set(vector4f); + GL11.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, newBuffer); + } + } + + public void setColorControl(int val) { + if (GLStateManager.shouldBypassCache() || this.colorControl != val) { + this.colorControl = val; + GL11.glLightModeli(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, val); + } + } + + public void setColorControl(IntBuffer newBuffer) { + setColorControl(newBuffer.get()); + } + + public void setLocalViewer(float val) { + if (GLStateManager.shouldBypassCache() || Float.compare(this.localViewer, val) != 0) { + this.localViewer = val; + GL11.glLightModelf(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, val); + } + } + + public void setLocalViewer(FloatBuffer newBuffer) { + setLocalViewer(newBuffer.get()); + } + + public void setLocalViewer(IntBuffer newBuffer) { + setLocalViewer((float) newBuffer.get()); + } + + public void setLocalViewer(int val) { + setLocalViewer((float) val); + } + + public void setTwoSide(float val) { + if (GLStateManager.shouldBypassCache() || Float.compare(this.twoSide, val) != 0) { + this.twoSide = val; + GL11.glLightModelf(GL11.GL_LIGHT_MODEL_TWO_SIDE, val); + } + } + + public void setTwoSide(FloatBuffer newBuffer) { + setTwoSide(newBuffer.get()); + } + + public void setTwoSide(IntBuffer newBuffer) { + setTwoSide((float) newBuffer.get()); + } + + public void setTwoSide(int val) { + setTwoSide((float) val); + } + + @Override + public LightModelState set(LightModelState state) { + this.ambient.set(state.ambient); + this.colorControl = state.colorControl; + this.localViewer = state.localViewer; + this.twoSide = state.twoSide; + + return this; + } + + @Override + public boolean sameAs(Object state) { + if (this == state) return true; + if (!(state instanceof LightModelState lightModelState)) return false; + return this.ambient.equals(lightModelState.ambient) + && this.colorControl == lightModelState.colorControl + && Float.compare(lightModelState.localViewer, this.localViewer) == 0 + && Float.compare(lightModelState.twoSide, this.twoSide) == 0; + } + + @Override + public LightModelState copy() { + return new LightModelState().set(this); + } +} diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java index b6a3e3d88..a214dc510 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_Lighting_UnitTest.java @@ -4,6 +4,7 @@ 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.GL12; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -153,6 +154,78 @@ public class GLSM_Lighting_UnitTest { GLStateManager.glPopAttrib(); } + @Test + void testLightModel() { + verifyState(GL11.GL_LIGHT_MODEL_AMBIENT, new float[]{0.2F, 0.2F, 0.2F, 1.0F}, "GL_LIGHT_MODEL_AMBIENT initial state"); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + newf4b(0.8F, 0.6F, 0.4F, 0.2F); + GLStateManager.glLightModel(GL11.GL_LIGHT_MODEL_AMBIENT, f4b); + verifyState(GL11.GL_LIGHT_MODEL_AMBIENT, new float[]{0.8F, 0.6F, 0.4F, 0.2F}, "GL_LIGHT_MODEL_AMBIENT changed state"); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_LIGHT_MODEL_AMBIENT, new float[]{0.2F, 0.2F, 0.2F, 1.0F}); + + verifyState(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SINGLE_COLOR); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glLightModeli(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR); + verifyState(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SEPARATE_SPECULAR_COLOR); + GLStateManager.glPopAttrib(); + verifyState(GL12.GL_LIGHT_MODEL_COLOR_CONTROL, GL12.GL_SINGLE_COLOR); + + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, false); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 0.8F); + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, true); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, false); + + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, false); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glLightModeli(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, 1); + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, true); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_LIGHT_MODEL_LOCAL_VIEWER, false); + + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, false); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glLightModelf(GL11.GL_LIGHT_MODEL_TWO_SIDE, 0.8F); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, true); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, false); + + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, false); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glLightModeli(GL11.GL_LIGHT_MODEL_TWO_SIDE, 1); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, true); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, false); + } + + @Test + void testColorMaterial() { + verifyState(GL11.GL_COLOR_MATERIAL, false); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glEnable(GL11.GL_COLOR_MATERIAL); + verifyState(GL11.GL_COLOR_MATERIAL, true); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_COLOR_MATERIAL, false); + + verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT_AND_BACK); + verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_AMBIENT_AND_DIFFUSE); + GLStateManager.glPushAttrib(GL11.GL_LIGHTING_BIT); + GLStateManager.glColorMaterial(GL11.GL_FRONT, GL11.GL_AMBIENT_AND_DIFFUSE); + verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT); + verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_AMBIENT_AND_DIFFUSE); + GLStateManager.glColorMaterial(GL11.GL_FRONT, GL11.GL_SPECULAR); + verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT); + verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_SPECULAR); + GLStateManager.glColorMaterial(GL11.GL_BACK, GL11.GL_DIFFUSE); + verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_BACK); + verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_DIFFUSE); + GLStateManager.glPopAttrib(); + verifyState(GL11.GL_COLOR_MATERIAL_FACE, GL11.GL_FRONT_AND_BACK); + verifyState(GL11.GL_COLOR_MATERIAL_PARAMETER, GL11.GL_AMBIENT_AND_DIFFUSE); + } + static void newf4b(float x, float y, float z, float w) { f4b.clear(); f4b.put(x).put(y).put(z).put(w); diff --git a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java index 89e7dc897..66f47a319 100644 --- a/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java +++ b/src/test/java/com/gtnewhorizons/angelica/glsm/GLSM_PushPop_UnitTest.java @@ -337,8 +337,8 @@ class GLSM_PushPop_UnitTest { 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_LOCAL_VIEWER, true, "Light Model Local Viewer"); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, true, "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"); @@ -361,8 +361,8 @@ class GLSM_PushPop_UnitTest { 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_LOCAL_VIEWER, false, "Light Model Local Viewer - Reset"); + verifyState(GL11.GL_LIGHT_MODEL_TWO_SIDE, false, "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");