working on #12

FalsePattern · Jun 1, 2022 · ceff4db · ceff4db
1 parent e11a047
commit ceff4db
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/main/java/com/falsepattern/triangulator/mixin/helper/ITessellatorMixin.java b/src/main/java/com/falsepattern/triangulator/mixin/helper/ITessellatorMixin.java
@@ -5,6 +5,7 @@
 public interface ITessellatorMixin {
     void setAlternativeTriangulation();
 
+    boolean isDrawingTris();
     boolean hackedQuadRendering();
     boolean quadTriangulationActive();
     boolean shaderOn();

diff --git a/...a/com/falsepattern/triangulator/mixin/mixins/client/optifine/TessellatorVanillaMixin.java b/...a/com/falsepattern/triangulator/mixin/mixins/client/optifine/TessellatorVanillaMixin.java
@@ -1,10 +1,12 @@
 package com.falsepattern.triangulator.mixin.mixins.client.optifine;
 
 import com.falsepattern.triangulator.mixin.helper.ITessellatorMixin;
+import lombok.val;
 import net.minecraft.client.renderer.Tessellator;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Tessellator.class)
@@ -15,4 +17,18 @@ public abstract class TessellatorVanillaMixin implements ITessellatorMixin {
     private void hackVertex(CallbackInfo ci) {
         triangulate();
     }
+
+    @Redirect(method = "draw",
+              at = @At(value = "INVOKE",
+                       target = "Ljava/lang/Math;min(II)I",
+                       ordinal = 0),
+              require = 1)
+    private int snapTo3(int a, int b) {
+        val v = Math.min(a, b);
+        if (isDrawingTris()) {
+            return v - (v % 3);
+        } else {
+            return v;
+        }
+    }
 }
diff --git a/...main/java/com/falsepattern/triangulator/mixin/mixins/client/vanilla/TessellatorMixin.java b/...main/java/com/falsepattern/triangulator/mixin/mixins/client/vanilla/TessellatorMixin.java
@@ -4,6 +4,7 @@
 import com.falsepattern.triangulator.api.ToggleableTessellator;
 import com.falsepattern.triangulator.mixin.helper.IQuadComparatorMixin;
 import com.falsepattern.triangulator.mixin.helper.ITessellatorMixin;
+import lombok.Getter;
 import net.minecraft.client.renderer.Tessellator;
 import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.lib.Opcodes;
@@ -23,6 +24,7 @@ public abstract class TessellatorMixin implements ITessellatorMixin, ToggleableT
     @Shadow private int rawBufferIndex;
     @Shadow private int vertexCount;
     private boolean hackedQuadRendering = false;
+    @Getter
     private boolean drawingTris = false;
     private boolean alternativeTriangulation = false;
     private boolean quadTriangulationTemporarilySuspended = false;