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

You merely adopted it

Browse source 
- Default light to 0 in DefaultVertexList
- Take the max of mesh and instance light in the instance shader
This commit is contained in:
Jozufozu 2024-12-02 17:19:00 -08:00
parent 9e60045d43
commit e1ddd7c2fc
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/src/lib/java/dev/engine_room/flywheel/lib/vertex/DefaultVertexList.java
View file

@ -1,7 +1,6 @@
package dev.engine_room.flywheel.lib.vertex; package dev.engine_room.flywheel.lib.vertex;
import dev.engine_room.flywheel.api.vertex.MutableVertexList; import dev.engine_room.flywheel.api.vertex.MutableVertexList;
import net.minecraft.client.renderer.LightTexture;
import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.OverlayTexture;
public interface DefaultVertexList extends MutableVertexList { public interface DefaultVertexList extends MutableVertexList {
@ -57,7 +56,7 @@ public interface DefaultVertexList extends MutableVertexList {
@Override @Override
default int light(int index) { default int light(int index) {
return LightTexture.FULL_BRIGHT; return 0;
} }
@Override @Override

2
common/src/lib/resources/assets/flywheel/flywheel/instance/oriented.vert
View file

@ -6,5 +6,5 @@ void flw_instanceVertex(in FlwInstance i) {
flw_vertexColor *= i.color; flw_vertexColor *= i.color;
flw_vertexOverlay = i.overlay; flw_vertexOverlay = i.overlay;
// Some drivers have a bug where uint over float division is invalid, so use an explicit cast. // Some drivers have a bug where uint over float division is invalid, so use an explicit cast.
flw_vertexLight = vec2(i.light) / 256.0; flw_vertexLight = max(vec2(i.light) / 256.0, flw_vertexLight);
} }

2
common/src/lib/resources/assets/flywheel/flywheel/instance/posed.vert
View file

@ -4,5 +4,5 @@ void flw_instanceVertex(in FlwInstance i) {
flw_vertexColor *= i.color; flw_vertexColor *= i.color;
flw_vertexOverlay = i.overlay; flw_vertexOverlay = i.overlay;
// Some drivers have a bug where uint over float division is invalid, so use an explicit cast. // Some drivers have a bug where uint over float division is invalid, so use an explicit cast.
flw_vertexLight = vec2(i.light) / 256.0; flw_vertexLight = max(vec2(i.light) / 256.0, flw_vertexLight);
} }

2
common/src/lib/resources/assets/flywheel/flywheel/instance/transformed.vert
View file

@ -4,5 +4,5 @@ void flw_instanceVertex(in FlwInstance i) {
flw_vertexColor *= i.color; flw_vertexColor *= i.color;
flw_vertexOverlay = i.overlay; flw_vertexOverlay = i.overlay;
// Some drivers have a bug where uint over float division is invalid, so use an explicit cast. // Some drivers have a bug where uint over float division is invalid, so use an explicit cast.
flw_vertexLight = vec2(i.light) / 256.0; flw_vertexLight = max(vec2(i.light) / 256.0, flw_vertexLight);
} }