wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add generic object sky/block light

Browse Source
This commit is contained in:
James Seibel
2024-06-30 17:45:50 -05:00
parent 6c8060fa87
commit 4a025de9d6
5 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderableBoxGroup.java
+8
View File
@@ -47,4 +47,12 @@ public interface IDhApiRenderableBoxGroup extends List<DhApiRenderableBox>
*/
void triggerBoxChange();
/** Only accepts values between 0 and 15 */
void setSkyLight(int skyLight);
int getSkyLight();
/** Only accepts values between 0 and 15 */
void setBlockLight(int blockLight);
int getBlockLight();
}
api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java
-3
View File
@@ -22,9 +22,6 @@ public class DhApiRenderableBox
public Color color;
/* TODO */
//public boolean fullBright = false;
//==============//
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/GenericObjectRenderer.java
+67 -16
View File
@@ -37,6 +37,7 @@ import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.AbstractVertexAttribute;
import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexPointer;
import com.seibel.distanthorizons.core.util.LodUtil;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
import com.seibel.distanthorizons.core.util.math.Mat4f;
@@ -100,12 +101,16 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
// shader uniforms
private int directShaderTransformUniformLocation;
private int directShaderColorUniformLocation;
private int directShaderTransformUniform;
private int directShaderColorUniform;
private int instancedShaderOffsetUniformLocation;
private int instancedShaderCameraPosUniformLocation;
private int instancedShaderProjectionModelViewMatrixUniformLocation;
private int instancedShaderOffsetUniform;
private int instancedShaderCameraPosUniform;
private int instancedShaderProjectionModelViewMatrixUniform;
private int lightMapUniform;
private int skyLightUniform;
private int blockLightUniform;
// TODO may need to be double buffered to prevent rendering lag
@@ -171,7 +176,7 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
this.useInstancedRendering = this.vertexAttribDivisorSupported || this.instancedArraysSupported;
if (!this.useInstancedRendering)
{
LOGGER.warn("Instanced rendering not supported by this GPU, falling back to direct rendering. Generic object rendering may be slow.");
LOGGER.warn("Instanced rendering not supported by this GPU, falling back to direct rendering. Generic object rendering will be slow.");
}
@@ -186,12 +191,16 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
this.useInstancedRendering ? "shaders/genericObject/instanced/frag.frag" : "shaders/genericObject/direct/frag.frag",
"fragColor", new String[]{"vPosition"});
this.directShaderTransformUniformLocation = this.shader.tryGetUniformLocation("uTransform");
this.directShaderColorUniformLocation = this.shader.tryGetUniformLocation("uColor");
this.directShaderTransformUniform = this.shader.tryGetUniformLocation("uTransform");
this.directShaderColorUniform = this.shader.tryGetUniformLocation("uColor");
this.instancedShaderOffsetUniformLocation = this.shader.tryGetUniformLocation("uOffset");
this.instancedShaderCameraPosUniformLocation = this.shader.tryGetUniformLocation("uCameraPos");
this.instancedShaderProjectionModelViewMatrixUniformLocation = this.shader.tryGetUniformLocation("uProjectionMvm");
this.instancedShaderOffsetUniform = this.shader.tryGetUniformLocation("uOffset");
this.instancedShaderCameraPosUniform = this.shader.tryGetUniformLocation("uCameraPos");
this.instancedShaderProjectionModelViewMatrixUniform = this.shader.tryGetUniformLocation("uProjectionMvm");
this.lightMapUniform = this.shader.getUniformLocation("uLightMap");
this.skyLightUniform = this.shader.getUniformLocation("uSkyLight");
this.blockLightUniform = this.shader.getUniformLocation("uBlockLight");
this.createBuffers();
@@ -230,6 +239,8 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
new DhApiVec3f(0f,0f,0f), new DhApiVec3f(16f,190f,16f),
new Color(Color.CYAN.getRed(), Color.CYAN.getGreen(), Color.CYAN.getBlue(), 125))
);
singleGiantBoxGroup.setSkyLight(LodUtil.MAX_MC_LIGHT);
singleGiantBoxGroup.setBlockLight(LodUtil.MAX_MC_LIGHT);
DhApi.Delayed.renderRegister.add(singleGiantBoxGroup);
@@ -239,6 +250,8 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
new DhApiVec3f(16f,0f,31f), new DhApiVec3f(17f,2000f,32f),
new Color(Color.GREEN.getRed(), Color.GREEN.getGreen(), Color.GREEN.getBlue(), 125))
);
singleTallBoxGroup.setSkyLight(LodUtil.MAX_MC_LIGHT);
singleTallBoxGroup.setBlockLight(LodUtil.MAX_MC_LIGHT);
DhApi.Delayed.renderRegister.add(singleTallBoxGroup);
@@ -477,23 +490,27 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
boxGroup.updateVertexAttributeData();
this.shader.setUniform(this.instancedShaderOffsetUniformLocation,
this.shader.setUniform(this.instancedShaderOffsetUniform,
new Vec3f(
boxGroup.originBlockPos.x,
boxGroup.originBlockPos.y,
boxGroup.originBlockPos.z
));
this.shader.setUniform(this.instancedShaderCameraPosUniformLocation,
this.shader.setUniform(this.instancedShaderCameraPosUniform,
new Vec3f(
camPos.x,
camPos.y,
camPos.z
));
this.shader.setUniform(this.instancedShaderProjectionModelViewMatrixUniformLocation,
this.shader.setUniform(this.instancedShaderProjectionModelViewMatrixUniform,
projectionMvmMatrix);
this.shader.setUniform(this.lightMapUniform, 0); // TODO this should probably be passed in
this.shader.setUniform(this.skyLightUniform, boxGroup.skyLight);
this.shader.setUniform(this.blockLightUniform, boxGroup.blockLight);
@@ -555,6 +572,10 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
private void renderBoxGroupDirect(RenderableBoxGroup boxGroup, Mat4f transformMatrix, Vec3f camPos)
{
this.shader.setUniform(this.lightMapUniform, 0); // TODO this should probably be passed in
this.shader.setUniform(this.skyLightUniform, boxGroup.skyLight);
this.shader.setUniform(this.blockLightUniform, boxGroup.blockLight);
for (DhApiRenderableBox box : boxGroup.boxList)
{
renderBox(boxGroup, box, transformMatrix, camPos);
@@ -584,9 +605,9 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
box.maxPos.z - box.minPos.z));
Mat4f transformMatrix = transformationMatrix.copy();
transformMatrix.multiply(boxTransform);
this.shader.setUniform(this.directShaderTransformUniformLocation, transformMatrix);
this.shader.setUniform(this.directShaderTransformUniform, transformMatrix);
this.shader.setUniform(this.directShaderColorUniformLocation, box.color);
this.shader.setUniform(this.directShaderColorUniform, box.color);
GL32.glDrawElements(GL32.GL_TRIANGLES, SOLID_BOX_INDICES.length, GL32.GL_UNSIGNED_INT, 0);
}
@@ -614,6 +635,9 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
private final Vec3f originBlockPos;
public int skyLight = 15;
public int blockLight = 0;
@Nullable
public Consumer<DhApiRenderParam> beforeRenderFunc;
@@ -644,8 +668,35 @@ public class GenericObjectRenderer implements IDhApiCustomRenderRegister
public DhApiVec3f getOriginBlockPos() { return new DhApiVec3f(this.originBlockPos.x, this.originBlockPos.y, this.originBlockPos.z); }
@Override
public void setSkyLight(int skyLight)
{
if (skyLight < LodUtil.MIN_MC_LIGHT || skyLight > LodUtil.MAX_MC_LIGHT)
{
throw new IllegalArgumentException("Sky light ["+skyLight+"] must be between ["+LodUtil.MIN_MC_LIGHT+"] and ["+LodUtil.MAX_MC_LIGHT+"] (inclusive).");
}
this.skyLight = skyLight;
}
@Override
public int getSkyLight() { return this.skyLight; }
@Override
public void setBlockLight(int blockLight)
{
if (blockLight < LodUtil.MIN_MC_LIGHT || blockLight > LodUtil.MAX_MC_LIGHT)
{
throw new IllegalArgumentException("Block light ["+blockLight+"] must be between ["+LodUtil.MIN_MC_LIGHT+"] and ["+LodUtil.MAX_MC_LIGHT+"] (inclusive).");
}
this.blockLight = blockLight;
}
@Override
public int getBlockLight() { return this.blockLight; }
//=============//
// constructor //
//=============//
public RenderableBoxGroup(Vec3f originBlockPos, List<DhApiRenderableBox> boxList, boolean positionBoxesRelativeToGroupOrigin)
{
core/src/main/resources/shaders/genericObject/direct/frag.frag
+9 -1
View File
@@ -1,9 +1,17 @@
#version 150 core
uniform vec4 uColor;
uniform int uSkyLight;
uniform int uBlockLight;
uniform sampler2D uLightMap;
out vec4 fragColor;
void main()
{
fragColor = uColor;
float blockLight = (float(uBlockLight)+0.5) / 16.0;
float skyLight = (float(uSkyLight)+0.5) / 16.0;
vec4 lightColor = vec4(texture(uLightMap, vec2(blockLight, skyLight)).xyz, 1.0);
fragColor = lightColor * uColor;
}
core/src/main/resources/shaders/genericObject/instanced/vert.vert
+9 -1
View File
@@ -7,6 +7,9 @@ layout (location = 3) in vec3 aScale;
uniform vec3 uOffset;
uniform vec3 uCameraPos;
uniform mat4 uProjectionMvm;
uniform int uSkyLight;
uniform int uBlockLight;
uniform sampler2D uLightMap;
in vec3 vPosition;
@@ -34,5 +37,10 @@ void main()
);
gl_Position = uProjectionMvm * transform * vec4(vPosition, 1.0);
fColor = aColor;
float blockLight = (float(uBlockLight)+0.5) / 16.0;
float skyLight = (float(uSkyLight)+0.5) / 16.0;
vec4 lightColor = vec4(texture(uLightMap, vec2(blockLight, skyLight)).xyz, 1.0);
fColor = lightColor * aColor;
}