Skip to content

Commit fed9502

Browse files
gnembongnembon
committed
fix for scarpet shapes
1 parent 36c3501 commit fed9502

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎src/main/java/carpet/script/utils/ShapesRenderer.java

+29-29
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ public void renderFaces(Tesselator tesselator, double cx, double cy, double cz,
710710
}
711711
builder.addVertex((float) (vec.x() - cx), (float) (vec.y() - cy), (float) (vec.z() - cz)).setColor(shape.fr, shape.fg, shape.fb, shape.fa);
712712
}
713-
BufferUploader.draw(builder.buildOrThrow());
713+
BufferUploader.drawWithShader(builder.buildOrThrow());
714714

715715
RenderSystem.disableCull();
716716
RenderSystem.depthMask(false);
@@ -746,7 +746,7 @@ public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, do
746746
builder.addVertex((float) (vec.x() - cx), (float) (vec.y() - cy), (float) (vec.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
747747
}
748748
builder.addVertex((float) (vec0.x() - cx), (float) (vec0.y() - cy), (float) (vec0.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
749-
BufferUploader.draw(builder.buildOrThrow());
749+
BufferUploader.drawWithShader(builder.buildOrThrow());
750750
if (shape.inneredges)
751751
{
752752
BufferBuilder builderr = tesselator.begin(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR);
@@ -761,7 +761,7 @@ public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, do
761761
builderr.addVertex((float) (vec.x() - cx), (float) (vec.y() - cy), (float) (vec.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
762762
builderr.addVertex((float) (vec0.x() - cx), (float) (vec0.y() - cy), (float) (vec0.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
763763
}
764-
BufferUploader.draw(builderr.buildOrThrow());
764+
BufferUploader.drawWithShader(builderr.buildOrThrow());
765765
}
766766
return;
767767
}
@@ -806,7 +806,7 @@ public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, do
806806
builder.addVertex((float) (vec.x() - cx), (float) (vec.y() - cy), (float) (vec.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
807807
}
808808
}
809-
BufferUploader.draw(builder.buildOrThrow());
809+
BufferUploader.drawWithShader(builder.buildOrThrow());
810810
return;
811811
}
812812
if (shape.mode == 4)
@@ -840,7 +840,7 @@ public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, do
840840
builder.addVertex((float) (vecC.x() - cx), (float) (vecC.y() - cy), (float) (vecC.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
841841
builder.addVertex((float) (vecA.x() - cx), (float) (vecA.y() - cy), (float) (vecA.z() - cz)).setColor(shape.r, shape.g, shape.b, shape.a);
842842
}
843-
BufferUploader.draw(builder.buildOrThrow());
843+
BufferUploader.drawWithShader(builder.buildOrThrow());
844844
}
845845
}
846846
}
@@ -929,7 +929,7 @@ public static void drawLine(Tesselator tesselator, float x1, float y1, float z1,
929929
BufferBuilder builder = tesselator.begin(VertexFormat.Mode.DEBUG_LINES, DefaultVertexFormat.POSITION_COLOR);
930930
builder.addVertex(x1, y1, z1).setColor(red1, grn1, blu1, alpha);
931931
builder.addVertex(x2, y2, z2).setColor(red1, grn1, blu1, alpha);
932-
BufferUploader.draw(builder.buildOrThrow());
932+
BufferUploader.drawWithShader(builder.buildOrThrow());
933933
}
934934

935935
public static void drawBoxWireGLLines(
@@ -982,7 +982,7 @@ public static void drawBoxWireGLLines(
982982
builder.addVertex(x2, y2, z1).setColor(red1, grn1, blu1, alpha);
983983
builder.addVertex(x2, y2, z2).setColor(red1, grn1, blu1, alpha);
984984
}
985-
BufferUploader.draw(builder.buildOrThrow());
985+
BufferUploader.drawWithShader(builder.buildOrThrow());
986986
}
987987

988988
public static void drawBoxFaces(
@@ -1043,7 +1043,7 @@ public static void drawBoxFaces(
10431043
builder.addVertex(x1, y2, z2).setColor(red1, grn1, blu1, alpha);
10441044
}
10451045
}
1046-
BufferUploader.draw(builder.buildOrThrow());
1046+
BufferUploader.drawWithShader(builder.buildOrThrow());
10471047
}
10481048

10491049
public static void drawCylinderWireframe(Tesselator tesselator,
@@ -1076,7 +1076,7 @@ public static void drawCylinderWireframe(Tesselator tesselator,
10761076
float z = r * Mth.sin(theta);
10771077
builder.addVertex(x + cx, y + cy, z + cz).setColor(red, grn, blu, alpha);
10781078
}
1079-
BufferUploader.draw(builder.buildOrThrow());
1079+
BufferUploader.drawWithShader(builder.buildOrThrow());
10801080
}
10811081

10821082
if (!isFlat)
@@ -1094,7 +1094,7 @@ public static void drawCylinderWireframe(Tesselator tesselator,
10941094
builder.addVertex(cx + x, cy + h, cz - z).setColor(red, grn, blu, alpha);
10951095
builder.addVertex(cx - x, cy + h, cz + z).setColor(red, grn, blu, alpha);
10961096
builder.addVertex(cx - x, cy + 0, cz + z).setColor(red, grn, blu, alpha);
1097-
BufferUploader.draw(builder.buildOrThrow());
1097+
BufferUploader.drawWithShader(builder.buildOrThrow());
10981098
}
10991099
}
11001100
else
@@ -1108,7 +1108,7 @@ public static void drawCylinderWireframe(Tesselator tesselator,
11081108
builder.addVertex(cx - x, cy, cz + z).setColor(red, grn, blu, alpha);
11091109
builder.addVertex(cx + x, cy, cz - z).setColor(red, grn, blu, alpha);
11101110
}
1111-
BufferUploader.draw(builder.buildOrThrow());
1111+
BufferUploader.drawWithShader(builder.buildOrThrow());
11121112
}
11131113

11141114
}
@@ -1126,7 +1126,7 @@ else if (axis == Direction.Axis.X)
11261126
float y = r * Mth.sin(theta);
11271127
builder.addVertex(x + cx, y + cy, z + cz).setColor(red, grn, blu, alpha);
11281128
}
1129-
BufferUploader.draw(builder.buildOrThrow());
1129+
BufferUploader.drawWithShader(builder.buildOrThrow());
11301130
}
11311131

11321132
if (!isFlat)
@@ -1143,7 +1143,7 @@ else if (axis == Direction.Axis.X)
11431143
builder.addVertex(cx + 0, cy + y, cz - z).setColor(red, grn, blu, alpha);
11441144
builder.addVertex(cx + h, cy + y, cz - z).setColor(red, grn, blu, alpha);
11451145
builder.addVertex(cx + h, cy - y, cz + z).setColor(red, grn, blu, alpha);
1146-
BufferUploader.draw(builder.buildOrThrow());
1146+
BufferUploader.drawWithShader(builder.buildOrThrow());
11471147
}
11481148
}
11491149
else
@@ -1157,7 +1157,7 @@ else if (axis == Direction.Axis.X)
11571157
builder.addVertex(cx, cy - y, cz + z).setColor(red, grn, blu, alpha);
11581158
builder.addVertex(cx, cy + y, cz - z).setColor(red, grn, blu, alpha);
11591159
}
1160-
BufferUploader.draw(builder.buildOrThrow());
1160+
BufferUploader.drawWithShader(builder.buildOrThrow());
11611161
}
11621162
}
11631163
else if (axis == Direction.Axis.Z)
@@ -1174,7 +1174,7 @@ else if (axis == Direction.Axis.Z)
11741174
float x = r * Mth.sin(theta);
11751175
builder.addVertex(x + cx, y + cy, z + cz).setColor(red, grn, blu, alpha);
11761176
}
1177-
BufferUploader.draw(builder.buildOrThrow());
1177+
BufferUploader.drawWithShader(builder.buildOrThrow());
11781178
}
11791179
if (!isFlat)
11801180
{
@@ -1190,7 +1190,7 @@ else if (axis == Direction.Axis.Z)
11901190
builder.addVertex(cx - x, cy + y, cz + 0).setColor(red, grn, blu, alpha);
11911191
builder.addVertex(cx - x, cy + y, cz + h).setColor(red, grn, blu, alpha);
11921192
builder.addVertex(cx + x, cy - y, cz + h).setColor(red, grn, blu, alpha);
1193-
BufferUploader.draw(builder.buildOrThrow());
1193+
BufferUploader.drawWithShader(builder.buildOrThrow());
11941194
}
11951195
}
11961196
else
@@ -1204,7 +1204,7 @@ else if (axis == Direction.Axis.Z)
12041204
builder.addVertex(cx + x, cy - y, cz).setColor(red, grn, blu, alpha);
12051205
builder.addVertex(cx - x, cy + y, cz).setColor(red, grn, blu, alpha);
12061206
}
1207-
BufferUploader.draw(builder.buildOrThrow());
1207+
BufferUploader.drawWithShader(builder.buildOrThrow());
12081208
}
12091209

12101210
}
@@ -1231,7 +1231,7 @@ public static void drawCylinderFaces(Tesselator tesselator,
12311231
float z = r * Mth.sin(theta);
12321232
builder.addVertex(x + cx, cy, z + cz).setColor(red, grn, blu, alpha);
12331233
}
1234-
BufferUploader.draw(builder.buildOrThrow());
1234+
BufferUploader.drawWithShader(builder.buildOrThrow());
12351235
if (!isFlat)
12361236
{
12371237
BufferBuilder builderr = tesselator.begin(VertexFormat.Mode.TRIANGLE_FAN, DefaultVertexFormat.POSITION_COLOR);
@@ -1243,7 +1243,7 @@ public static void drawCylinderFaces(Tesselator tesselator,
12431243
float z = r * Mth.sin(theta);
12441244
builderr.addVertex(x + cx, cy + h, z + cz).setColor(red, grn, blu, alpha);
12451245
}
1246-
BufferUploader.draw(builderr.buildOrThrow());
1246+
BufferUploader.drawWithShader(builderr.buildOrThrow());
12471247

12481248
BufferBuilder builderrr = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); // quad strip to quads
12491249
float xp = r * 1;
@@ -1260,7 +1260,7 @@ public static void drawCylinderFaces(Tesselator tesselator,
12601260
xp = x;
12611261
zp = z;
12621262
}
1263-
BufferUploader.draw(builderrr.buildOrThrow());
1263+
BufferUploader.drawWithShader(builderrr.buildOrThrow());
12641264
}
12651265

12661266
}
@@ -1275,7 +1275,7 @@ else if (axis == Direction.Axis.X)
12751275
float z = r * Mth.sin(theta);
12761276
builder.addVertex(cx, cy + y, z + cz).setColor(red, grn, blu, alpha);
12771277
}
1278-
BufferUploader.draw(builder.buildOrThrow());
1278+
BufferUploader.drawWithShader(builder.buildOrThrow());
12791279
if (!isFlat)
12801280
{
12811281
BufferBuilder builderr = tesselator.begin(VertexFormat.Mode.TRIANGLE_FAN, DefaultVertexFormat.POSITION_COLOR);
@@ -1287,7 +1287,7 @@ else if (axis == Direction.Axis.X)
12871287
float z = r * Mth.sin(theta);
12881288
builderr.addVertex(cx + h, cy + y, cz + z).setColor(red, grn, blu, alpha);
12891289
}
1290-
BufferUploader.draw(builderr.buildOrThrow());
1290+
BufferUploader.drawWithShader(builderr.buildOrThrow());
12911291

12921292
BufferBuilder builderrr = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); // quad strip to quads
12931293
float yp = r * 1;
@@ -1304,7 +1304,7 @@ else if (axis == Direction.Axis.X)
13041304
yp = y;
13051305
zp = z;
13061306
}
1307-
BufferUploader.draw(builderrr.buildOrThrow());
1307+
BufferUploader.drawWithShader(builderrr.buildOrThrow());
13081308
}
13091309
}
13101310
else if (axis == Direction.Axis.Z)
@@ -1318,7 +1318,7 @@ else if (axis == Direction.Axis.Z)
13181318
float y = r * Mth.sin(theta);
13191319
builder.addVertex(x + cx, cy + y, cz).setColor(red, grn, blu, alpha);
13201320
}
1321-
BufferUploader.draw(builder.buildOrThrow());
1321+
BufferUploader.drawWithShader(builder.buildOrThrow());
13221322
if (!isFlat)
13231323
{
13241324
BufferBuilder builderr = tesselator.begin(VertexFormat.Mode.TRIANGLE_FAN, DefaultVertexFormat.POSITION_COLOR);
@@ -1330,7 +1330,7 @@ else if (axis == Direction.Axis.Z)
13301330
float y = r * Mth.sin(theta);
13311331
builderr.addVertex(x + cx, cy + y, cz + h).setColor(red, grn, blu, alpha);
13321332
}
1333-
BufferUploader.draw(builderr.buildOrThrow());
1333+
BufferUploader.drawWithShader(builderr.buildOrThrow());
13341334

13351335
BufferBuilder builderrr = tesselator.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR); // quad strip to quads
13361336
float xp = r;
@@ -1347,7 +1347,7 @@ else if (axis == Direction.Axis.Z)
13471347
xp = x;
13481348
yp = y;
13491349
}
1350-
BufferUploader.draw(builderrr.buildOrThrow());
1350+
BufferUploader.drawWithShader(builderrr.buildOrThrow());
13511351
}
13521352
}
13531353
}
@@ -1372,7 +1372,7 @@ public static void drawSphereWireframe(Tesselator tesselator,
13721372
float y = r * Mth.cos(phi);
13731373
builder.addVertex(x + cx, y + cy, z + cz).setColor(red, grn, blu, alpha);
13741374
}
1375-
BufferUploader.draw(builder.buildOrThrow());
1375+
BufferUploader.drawWithShader(builder.buildOrThrow());
13761376
}
13771377
for (int j = 0; j <= num_steps180; j++)
13781378
{
@@ -1387,7 +1387,7 @@ public static void drawSphereWireframe(Tesselator tesselator,
13871387
float y = r * Mth.cos(phi);
13881388
builder.addVertex(x + cx, y + cy, z + cz).setColor(red, grn, blu, alpha);
13891389
}
1390-
BufferUploader.draw(builder.buildOrThrow());
1390+
BufferUploader.drawWithShader(builder.buildOrThrow());
13911391
}
13921392

13931393
}
@@ -1429,7 +1429,7 @@ public static void drawSphereFaces(Tesselator tesselator,
14291429
zbp = zp;
14301430
yp = y;
14311431
}
1432-
BufferUploader.draw(builder.buildOrThrow());
1432+
BufferUploader.drawWithShader(builder.buildOrThrow());
14331433
}
14341434
}
14351435
}

0 commit comments

Comments
 (0)