mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-18 19:39:09 +00:00
Weather instancing (#2127)
* Initial commit for weather-instancing * attempt to make the builder less ugly
This commit is contained in:
1 parent
53776684c8
commit
f2c07dea28
28 files changed
+1145
-11
No files matched your search
@@ -1468,6 +1468,7 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
|
||||
out[Instancing.TEMPLATE.ordinal()] = true;
|
||||
out[Instancing.CUBE.ordinal()] = AngelicaConfig.cubeInstancingEnabled();
|
||||
out[Instancing.PARTICLE.ordinal()] = true;
|
||||
out[Instancing.WEATHER.ordinal()] = true;
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -2356,11 +2357,16 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
|
||||
ProgramId.Particles, ProgramId.ParticlesTrans
|
||||
};
|
||||
|
||||
private static final ProgramId[] WEATHER_PROGRAM_IDS = {
|
||||
ProgramId.Weather
|
||||
};
|
||||
|
||||
private static ProgramId[] attributeProgramIds(Instancing kind) {
|
||||
return switch (kind) {
|
||||
case NONE -> ProgramId.values();
|
||||
case TEMPLATE, CUBE -> INSTANCED_PROGRAM_IDS;
|
||||
case PARTICLE -> PARTICLE_PROGRAM_IDS;
|
||||
case WEATHER -> WEATHER_PROGRAM_IDS;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ class AttributeTransformer {
|
||||
final boolean instancedVertex = vertex && parameters.instancing != Instancing.NONE;
|
||||
final boolean cubeVertex = vertex && parameters.instancing == Instancing.CUBE;
|
||||
final boolean particleVertex = vertex && parameters.instancing == Instancing.PARTICLE;
|
||||
final boolean weatherVertex = vertex && parameters.instancing == Instancing.WEATHER;
|
||||
final boolean matrixVertex = vertex && parameters.instancing.hasInstanceHead();
|
||||
final boolean wantsMvInverse = matrixVertex && transformer.containsCall("gl_ModelViewMatrixInverse");
|
||||
CoreTransformHelper.injectMatrixUniforms(transformer, vertex ? parameters.instancing : Instancing.NONE);
|
||||
@@ -47,7 +48,7 @@ class AttributeTransformer {
|
||||
aliasIfUsed(transformer, "normalMatrix", "iris_NormalMatrix");
|
||||
|
||||
if (parameters.type == ShaderType.VERTEX) {
|
||||
if (!particleVertex) {
|
||||
if (!particleVertex && !weatherVertex) {
|
||||
transformer.injectVariable("layout(location = 0) in vec4 iris_Vertex;");
|
||||
transformer.injectVariable("layout(location = 1) in vec4 iris_Color;");
|
||||
if (cubeVertex) {
|
||||
@@ -109,6 +110,10 @@ class AttributeTransformer {
|
||||
init.append(" iris_MultiTexCoord0 = ").append(InstancedGlslHelpers.particleUv("iris_InstUv", "iris_ParticleCorner")).append(';');
|
||||
init.append(" iris_MultiTexCoord1 = vec4(iris_InstLightmap, 0.0, 1.0);");
|
||||
assignMidTexCoord(transformer, init, "vec4((iris_InstUv.x + iris_InstUv.z) * 0.5, (iris_InstUv.y + iris_InstUv.w) * 0.5, 0.0, 1.0)");
|
||||
} else if (weatherVertex) {
|
||||
init.append(InstancedGlslHelpers.weatherPrologue("iris_", "iris_", "iris_WeatherCorner",
|
||||
"iris_Vertex", "iris_Color", "iris_MultiTexCoord0", "iris_MultiTexCoord1", " "));
|
||||
assignMidTexCoord(transformer, init, "vec4(0.5, 0.5, 0.0, 1.0)");
|
||||
} else {
|
||||
init.append("iris_ModelViewMatrix = ").append(InstancedGlslHelpers.mat4FromRows("iris_InstRow0", "iris_InstRow1", "iris_InstRow2")).append(';');
|
||||
init.append(" iris_NormalMatrix = ").append(InstancedGlslHelpers.mat3FromRows("iris_InstRow0", "iris_InstRow1", "iris_InstRow2")).append(';');
|
||||
|
||||
@@ -35,6 +35,20 @@ class CoreTransformHelper {
|
||||
transformer.injectVariable("uniform mat4 iris_ModelViewMatrixInverse;");
|
||||
transformer.injectVariable("uniform mat3 iris_NormalMatrix;");
|
||||
}
|
||||
case WEATHER -> {
|
||||
transformer.injectVariable("layout(location = " + VertexFormatElement.Usage.PRIMARY_UV.getAttributeLocation() + ") in vec2 iris_WeatherCorner;");
|
||||
injectAttributeDecls(transformer, instancing);
|
||||
transformer.injectVariable("uniform vec4 iris_WeatherParams0;");
|
||||
transformer.injectVariable("uniform vec4 iris_WeatherParams1;");
|
||||
transformer.injectVariable("uniform vec4 iris_WeatherParams2;");
|
||||
transformer.injectVariable("vec4 iris_Vertex;");
|
||||
transformer.injectVariable("vec4 iris_Color;");
|
||||
transformer.injectVariable("vec4 iris_MultiTexCoord0;");
|
||||
transformer.injectVariable("vec4 iris_MultiTexCoord1;");
|
||||
transformer.injectVariable("uniform mat4 iris_ModelViewMatrix;");
|
||||
transformer.injectVariable("uniform mat4 iris_ModelViewMatrixInverse;");
|
||||
transformer.injectVariable("uniform mat3 iris_NormalMatrix;");
|
||||
}
|
||||
case TEMPLATE, CUBE -> {
|
||||
injectAttributeDecls(transformer, instancing);
|
||||
transformer.injectVariable("mat4 iris_ModelViewMatrix;");
|
||||
|
||||
@@ -75,6 +75,7 @@ public final class CommonUniforms {
|
||||
IdMapUniforms.addEntityIdMapUniforms(uniforms);
|
||||
FogUniforms.addFogUniforms(uniforms, fogMode);
|
||||
IrisInternalUniforms.addFogUniforms(uniforms, fogMode);
|
||||
IrisInternalUniforms.addWeatherUniforms(uniforms);
|
||||
|
||||
uniforms.uniform2i("atlasSize", () -> {
|
||||
final int glId = GLStateManager.getBoundTextureForServerState(0);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package net.coderbot.iris.uniforms;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.ffp.WeatherParams;
|
||||
import net.coderbot.iris.gl.state.FogMode;
|
||||
import net.coderbot.iris.gl.state.StateUpdateNotifiers;
|
||||
import net.coderbot.iris.gl.uniform.DynamicUniformHolder;
|
||||
@@ -38,6 +39,19 @@ public class IrisInternalUniforms {
|
||||
return func & 0x7;
|
||||
}
|
||||
|
||||
private static final Vector4f WEATHER_0 = new Vector4f();
|
||||
private static final Vector4f WEATHER_1 = new Vector4f();
|
||||
private static final Vector4f WEATHER_2 = new Vector4f();
|
||||
|
||||
public static void addWeatherUniforms(DynamicUniformHolder uniforms) {
|
||||
uniforms.uniform4f(PER_FRAME, "iris_WeatherParams0", () -> WEATHER_0.set(
|
||||
WeatherParams.translateX, WeatherParams.translateY, WeatherParams.translateZ, WeatherParams.invRadius));
|
||||
uniforms.uniform4f(PER_FRAME, "iris_WeatherParams1", () -> WEATHER_1.set(
|
||||
WeatherParams.cameraFracX, WeatherParams.cameraFracZ, WeatherParams.partialTicks, WeatherParams.age));
|
||||
uniforms.uniform4f(PER_FRAME, "iris_WeatherParams2", () -> WEATHER_2.set(
|
||||
WeatherParams.rainScroll, WeatherParams.snowScroll, WeatherParams.rainStrength, 0.0f));
|
||||
}
|
||||
|
||||
public static void addFogUniforms(DynamicUniformHolder uniforms, FogMode fogMode) {
|
||||
uniforms.uniform4f(PER_FRAME, "iris_FogColor", () -> {
|
||||
final Vector3d color = GLStateManager.getFogState().getFogColor();
|
||||
|
||||
@@ -47,7 +47,8 @@ public final class PerFrameUniformBlockHarvester {
|
||||
private static final Set<String> LIVE_STATE_UNIFORMS = Set.of(
|
||||
"gbufferModelView", "gbufferModelViewInverse", "gbufferPreviousModelView",
|
||||
"gbufferProjection", "gbufferProjectionInverse", "gbufferPreviousProjection",
|
||||
"fogColor", "iris_FogColor", "iris_FogStart", "iris_FogEnd", "iris_FogDensity");
|
||||
"fogColor", "iris_FogColor", "iris_FogStart", "iris_FogEnd", "iris_FogDensity",
|
||||
"iris_WeatherParams0", "iris_WeatherParams1", "iris_WeatherParams2");
|
||||
|
||||
/**
|
||||
* @param primary manifest whose entry order defines the block layout
|
||||
|
||||
Reference in new issue
Block a user