mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-10 12:34:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Underlay

Browse Source 
- Clamp overlay from 0 to 10 rather than 3 to 10 to fix everything
  appearing washed out
- Fix normalized short backed float vectors being unpacked incorrectly
- Set overlay in shadow instance component to fix shadows appearing red
  - Indicative of the ivec issue being present for divisor 0 vertex
    attributes
This commit is contained in:
Jozufozu 2024-02-22 12:31:29 -06:00
parent 68daac8659
commit 433129d5a0
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/jozufozu/flywheel/backend/compile/component/IndirectComponent.java
View File

@ -230,10 +230,10 @@ public class IndirectComponent implements SourceComponent {
private static GlslExpr unpackFloatVector(String fieldName, FloatRepr floatRepr, GlslStruct packed, int size) { private static GlslExpr unpackFloatVector(String fieldName, FloatRepr floatRepr, GlslStruct packed, int size) {
return switch (floatRepr) { return switch (floatRepr) {
case NORMALIZED_BYTE -> unpackBuiltin(fieldName, packed, size, "unpackSnorm4x8"); case NORMALIZED_BYTE -> unpackByteBuiltin(fieldName, packed, size, "unpackSnorm4x8");
case NORMALIZED_UNSIGNED_BYTE -> unpackBuiltin(fieldName, packed, size, "unpackUnorm4x8"); case NORMALIZED_UNSIGNED_BYTE -> unpackByteBuiltin(fieldName, packed, size, "unpackUnorm4x8");
case NORMALIZED_SHORT -> unpackBuiltin(fieldName, packed, size, "unpackSnorm2x16"); case NORMALIZED_SHORT -> unpackShortBuiltin(fieldName, packed, size, "unpackSnorm2x16");
case NORMALIZED_UNSIGNED_SHORT -> unpackBuiltin(fieldName, packed, size, "unpackUnorm2x16"); case NORMALIZED_UNSIGNED_SHORT -> unpackShortBuiltin(fieldName, packed, size, "unpackUnorm2x16");
case NORMALIZED_INT -> unpack(fieldName, packed, size, "int", "vec" + size, e -> e.div(2147483647f) case NORMALIZED_INT -> unpack(fieldName, packed, size, "int", "vec" + size, e -> e.div(2147483647f)
.clamp(-1, 1)); .clamp(-1, 1));
case NORMALIZED_UNSIGNED_INT -> case NORMALIZED_UNSIGNED_INT ->
@ -260,7 +260,7 @@ public class IndirectComponent implements SourceComponent {
.rsh(bitPos); .rsh(bitPos);
args.add(perElement.apply(element)); args.add(perElement.apply(element));
} }
return GlslExpr.call(outType + size, args); return GlslExpr.call(outType, args);
} }
private static GlslExpr unpackShortBacked(String fieldName, GlslStruct packed, int size, String outType, Function<GlslExpr, GlslExpr> perElement) { private static GlslExpr unpackShortBacked(String fieldName, GlslStruct packed, int size, String outType, Function<GlslExpr, GlslExpr> perElement) {
@ -296,7 +296,7 @@ public class IndirectComponent implements SourceComponent {
return GlslExpr.call(outType, args); return GlslExpr.call(outType, args);
} }
private static GlslExpr unpackBuiltin(String fieldName, GlslStruct packed, int size, String func) { private static GlslExpr unpackByteBuiltin(String fieldName, GlslStruct packed, int size, String func) {
packed.addField("uint", fieldName); packed.addField("uint", fieldName);
GlslExpr expr = UNPACKING_VARIABLE.access(fieldName) GlslExpr expr = UNPACKING_VARIABLE.access(fieldName)
.callFunction(func); .callFunction(func);
@ -308,6 +308,30 @@ public class IndirectComponent implements SourceComponent {
}; };
} }
private static GlslExpr unpackShortBuiltin(String fieldName, GlslStruct packed, int size, String func) {
if (size == 2) {
packed.addField("uint", fieldName);
return UNPACKING_VARIABLE.access(fieldName)
.callFunction(func);
} else {
var name0 = fieldName + "_" + 0;
var name1 = fieldName + "_" + 1;
packed.addField("uint", name0);
packed.addField("uint", name1);
GlslExpr xy = UNPACKING_VARIABLE.access(name0)
.callFunction(func);
GlslExpr zw = UNPACKING_VARIABLE.access(name1)
.callFunction(func);
if (size == 3) {
return GlslExpr.call("vec3", List.of(xy.swizzle("xy"), zw.swizzle("x")));
} else {
return GlslExpr.call("vec4", List.of(xy, zw));
}
}
}
private static GlslExpr unpackMatrix(String name, GlslStruct packed, MatrixElementType matrix) { private static GlslExpr unpackMatrix(String name, GlslStruct packed, MatrixElementType matrix) {
var repr = matrix.repr(); var repr = matrix.repr();

1
src/main/resources/assets/flywheel/flywheel/instance/shadow.vert
View File

@ -7,4 +7,5 @@ void flw_instanceVertex(in FlwInstance i) {
flw_vertexTexCoord = (flw_vertexPos.xz - i.entityPosXZ) * 0.5 / i.radius + 0.5; flw_vertexTexCoord = (flw_vertexPos.xz - i.entityPosXZ) * 0.5 / i.radius + 0.5;
flw_vertexColor.a = i.alpha; flw_vertexColor.a = i.alpha;
flw_vertexOverlay = ivec2(0, 10);
} }

2
src/main/resources/assets/flywheel/flywheel/internal/common.frag
View File

@ -42,7 +42,7 @@ void _flw_main() {
// This can be removed once instancing uses sampler buffers, though // This can be removed once instancing uses sampler buffers, though
// we may need a solution for the internal vertex format. Perhaps // we may need a solution for the internal vertex format. Perhaps
// pass as floats and convert to integers in the shader? // pass as floats and convert to integers in the shader?
ivec2 actualCoord = clamp(flw_fragOverlay, ivec2(3), ivec2(10)); ivec2 actualCoord = clamp(flw_fragOverlay, 0, 10);
vec4 overlayColor = texelFetch(_flw_overlayTex, actualCoord, 0); vec4 overlayColor = texelFetch(_flw_overlayTex, actualCoord, 0);
color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a);