Inline Patterns feature and pattern rendering refactor-ish #764

SamsTheNerd · 2024-09-29T20:43:51Z

See #708 for details. This is (mostly) the same but cleaned up into fewer commits.

…e with it

vgskye · 2024-10-17T09:21:01Z

Common/src/main/java/at/petrak/hexcasting/api/casting/iota/EntityIota.java

@@ -73,6 +94,7 @@ public Component display(Tag tag) {
                return Component.translatable("hexcasting.spelldata.entity.whoknows");
            }
            var nameJson = ctag.getString("name");
+//            return Component.literal(nameJson);


vestigial debug statement?

vgskye · 2024-10-17T09:22:40Z

Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java

+                        Component.literal(bob.toString()).withStyle(ChatFormatting.WHITE))
+                .withStyle(ChatFormatting.GOLD);


indent change?

vgskye · 2024-10-17T09:27:28Z

Common/src/main/java/at/petrak/hexcasting/client/entity/WallScrollRenderer.java

+            RenderType layer = RenderType.entityCutout(this.getTextureLocation(wallScroll));
+
+            var verts = bufSource.getBuffer(layer);


why did layer get extracted into a variable here?

vgskye · 2024-10-17T09:27:53Z

Common/src/main/java/at/petrak/hexcasting/client/entity/WallScrollRenderer.java

-            var tangent = p2.add(p1.negated()).normalized().scale(width * 0.5f);
-            var normal = new Vec2(-tangent.y, tangent.x);
-
-            var jlow = joinOffsets[i];
-            var jhigh = joinOffsets[i + 1];
-
-            var p1Down = p1.add(tangent.scale(Math.max(0f, jlow))).add(normal);
-            var p1Up = p1.add(tangent.scale(Math.max(0f, -jlow))).add(normal.negated());
-            var p2Down = p2.add(tangent.scale(Math.max(0f, jhigh)).negated()).add(normal);
-            var p2Up = p2.add(tangent.scale(Math.max(0f, -jhigh)).negated()).add(normal.negated());
-
-            // Draw the chamfer hexagon as two trapezoids
-            // the points are in different orders to keep clockwise
-            vertexCol(mat, normalMat, light, verts, color, p1);
-            vertexCol(mat, normalMat, light, verts, color, p2);
-            vertexCol(mat, normalMat, light, verts, color, p2Up);
-            vertexCol(mat, normalMat, light, verts, color, p1Up);
-
-            vertexCol(mat, normalMat, light, verts, color, p1);
-            vertexCol(mat, normalMat, light, verts, color, p1Down);
-            vertexCol(mat, normalMat, light, verts, color, p2Down);
-            vertexCol(mat, normalMat, light, verts, color, p2);
-
-            if (i > 0) {
-                var sangle = joinAngles[i];
-                var angle = Math.abs(sangle);
-                var rnormal = normal.negated();
-                var joinSteps = Mth.ceil(angle * 180 / (RenderLib.CAP_THETA * Mth.PI));
-                if (joinSteps < 1) continue;
-
-                if (sangle < 0) {
-                    var prevVert = new Vec2(p1.x - rnormal.x, p1.y - rnormal.y);
-                    for (var j = 1; j <= joinSteps; j++) {
-                        var fan = RenderLib.rotate(rnormal, -sangle * ((float) j / joinSteps));
-                        var fanShift = new Vec2(p1.x - fan.x, p1.y - fan.y);
-
-                        vertexCol(mat, normalMat, light, verts, color, p1);
-                        vertexCol(mat, normalMat, light, verts, color, p1);
-                        vertexCol(mat, normalMat, light, verts, color, fanShift);
-                        vertexCol(mat, normalMat, light, verts, color, prevVert);
-                        prevVert = fanShift;
-                    }
-                } else {
-                    var startFan = RenderLib.rotate(normal, -sangle);
-                    var prevVert = new Vec2(p1.x - startFan.x, p1.y - startFan.y);
-                    for (var j = joinSteps - 1; j >= 0; j--) {
-                        var fan = RenderLib.rotate(normal, -sangle * ((float) j / joinSteps));
-                        var fanShift = new Vec2(p1.x - fan.x, p1.y - fan.y);
-
-                        vertexCol(mat, normalMat, light, verts, color, p1);
-                        vertexCol(mat, normalMat, light, verts, color, p1);
-                        vertexCol(mat, normalMat, light, verts, color, fanShift);
-                        vertexCol(mat, normalMat, light, verts, color, prevVert);
-                        prevVert = fanShift;
-                    }
-                }
-            }
-        }
-
-        for (var pair : new Vec2[][]{
-            {points.get(0), points.get(1)},
-            {points.get(points.size() - 1), points.get(points.size() - 2)}
-        }) {
-            var point = pair[0];
-            var prev = pair[1];
-
-            var tangent = point.add(prev.negated()).normalized().scale(0.5f * width);
-            var normal = new Vec2(-tangent.y, tangent.x);
-            var joinSteps = Mth.ceil(180f / RenderLib.CAP_THETA);
-            for (int j = joinSteps; j > 0; j--) {
-                var fan0 = RenderLib.rotate(normal, -Mth.PI * ((float) j / joinSteps));
-                var fan1 = RenderLib.rotate(normal, -Mth.PI * ((float) (j - 1) / joinSteps));
-
-                vertexCol(mat, normalMat, light, verts, color, point);
-                vertexCol(mat, normalMat, light, verts, color, point);
-                vertexCol(mat, normalMat, light, verts, color, point.add(fan1));
-                vertexCol(mat, normalMat, light, verts, color, point.add(fan0));
-            }
-        }
-    }
-
-    private static void theCoolerDrawSpot(Matrix4f mat, Matrix3f normal, int light, VertexConsumer verts,
-        Vec2 point, float radius, int color) {
-        var fracOfCircle = 6;
-        for (int i = 0; i < fracOfCircle; i++) {
-            // We do need rects, irritatingly
-            // so we do fake triangles
-            vertexCol(mat, normal, light, verts, color, point);
-            vertexCol(mat, normal, light, verts, color, point);
-            for (int j = 0; j <= 1; j++) {
-                var theta = (i - j) / (float) fracOfCircle * Mth.TWO_PI;
-                var rx = Mth.cos(theta) * radius + point.x;
-                var ry = Mth.sin(theta) * radius + point.y;
-                vertexCol(mat, normal, light, verts, color, new Vec2(rx, ry));
-            }
-        }
+                .color(0xffffffff)
+                .uv(u, v).overlayCoords(OverlayTexture.NO_OVERLAY).uv2(light)
+                .normal(normal, nx, ny, nz)
+                .endVertex();


indent changes(again)

vgskye · 2024-10-17T09:35:36Z

Common/src/main/java/at/petrak/hexcasting/client/render/PatternRenderer.java

+    // TODO did we want to un-hardcode this for accessibility reasons ?
+    public static boolean shouldDoStrokeGradient(){
+        return Screen.hasControlDown();
+    }


maybe switch this over to sprint bind?

vgskye · 2024-10-17T09:47:11Z

Common/src/main/java/at/petrak/hexcasting/interop/inline/HexPatternMatcher.java

+        String escaped = regexMatch.group(1);
+        String dirString = regexMatch.group(2).toLowerCase().strip().replace("_", "");
+        String sizeModString = regexMatch.group(3);
+        String angleSigs = regexMatch.group(4);


why have named capturing groups and then index em with numbers?

gamma-delta · 2024-10-25T13:53:29Z

Sure LGTM I guess

SamsTheNerd added 3 commits September 29, 2024 16:30

add a weird file to gitignore so a bunch of other garbage doesn't com…

513f01b

…e with it

pattern rendering refactor

4f73086

add inline interop features

aaa98a3

SamsTheNerd requested a review from Alwinfy September 29, 2024 20:44

SamsTheNerd added 2 commits September 29, 2024 16:49

update inline version number in fabric/forge metadata

edad136

adjust pattern matching to catch bookkeepers nop properly

cab0f70

SamsTheNerd mentioned this pull request Oct 7, 2024

Inline Patterns !! (and also a small little pattern rendering rework) #708

Closed

vgskye reviewed Oct 17, 2024

View reviewed changes

gamma-delta merged commit 2f0509d into main Oct 25, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Inline Patterns feature and pattern rendering refactor-ish #764

Inline Patterns feature and pattern rendering refactor-ish #764

SamsTheNerd commented Sep 29, 2024

vgskye Oct 17, 2024

vgskye Oct 17, 2024

vgskye Oct 17, 2024

vgskye Oct 17, 2024

vgskye Oct 17, 2024

vgskye Oct 17, 2024

gamma-delta commented Oct 25, 2024

		Component.literal(bob.toString()).withStyle(ChatFormatting.WHITE))
		.withStyle(ChatFormatting.GOLD);

		RenderType layer = RenderType.entityCutout(this.getTextureLocation(wallScroll));

		var verts = bufSource.getBuffer(layer);

Inline Patterns feature and pattern rendering refactor-ish #764

Inline Patterns feature and pattern rendering refactor-ish #764

Conversation

SamsTheNerd commented Sep 29, 2024

vgskye Oct 17, 2024

Choose a reason for hiding this comment

vgskye Oct 17, 2024

Choose a reason for hiding this comment

vgskye Oct 17, 2024

Choose a reason for hiding this comment

vgskye Oct 17, 2024

Choose a reason for hiding this comment

vgskye Oct 17, 2024

Choose a reason for hiding this comment

vgskye Oct 17, 2024

Choose a reason for hiding this comment

gamma-delta commented Oct 25, 2024