cleanup and some preliminary tests
This commit is contained in:
1 parent
6654b5399c
commit
005faee612
3 files changed
+41
-14
No files matched your search
@@ -104,6 +104,7 @@ public class CarpetScriptServer extends ScriptServer
|
||||
registerBuiltInApp(Module.carpetNative("ai_tracker", false));
|
||||
registerBuiltInApp(Module.carpetNative("draw_beta", false));
|
||||
registerBuiltInApp(Module.carpetNative("shapes", true));
|
||||
//registerBuiltInApp(Module.carpetNative("sctest", false));
|
||||
registerBuiltInApp(Module.carpetNative("distance_beta", false));
|
||||
}
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ public class ShapesRenderer
|
||||
shapes.get(dimensionType).values().forEach(s -> {
|
||||
if ((!s.shape.debug || entityBoxes) && s.shouldRender(dimensionType))
|
||||
{
|
||||
s.renderLines(matrices, tesselator, cameraX, cameraY, cameraZ, partialTick, cameraa, s.shape.seethrough ? onTop : normal);
|
||||
s.renderLines(matrices, cameraX, cameraY, cameraZ, partialTick, cameraa, s.shape.seethrough ? onTop : normal);
|
||||
}
|
||||
});
|
||||
// faces
|
||||
@@ -188,7 +188,7 @@ public class ShapesRenderer
|
||||
labels.get(dimensionType).values().forEach(s -> {
|
||||
if ((!s.shape.debug || entityBoxes) && s.shouldRender(dimensionType))
|
||||
{
|
||||
s.renderLines(matrices, tesselator, cameraX, cameraY, cameraZ, partialTick, cameraa, s.shape.seethrough ? onTop : normal);
|
||||
s.renderLines(matrices, cameraX, cameraY, cameraZ, partialTick, cameraa, s.shape.seethrough ? onTop : normal);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -283,7 +283,7 @@ public class ShapesRenderer
|
||||
long expiryTick;
|
||||
double renderEpsilon;
|
||||
|
||||
public abstract void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives);
|
||||
public abstract void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives);
|
||||
|
||||
public void renderFaces(Tesselator tesselator, double cx, double cy, double cz, float partialTick, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
@@ -356,7 +356,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy,
|
||||
public void renderLines(PoseStack matrices, double cx, double cy,
|
||||
double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0.0)
|
||||
@@ -400,10 +400,6 @@ public class ShapesRenderer
|
||||
matrices.mulPose(Axis.YP.rotationDegrees(180));
|
||||
}
|
||||
|
||||
////RenderSystem.depthMask(true);
|
||||
////RenderSystem.enableCull();
|
||||
////RenderSystem.enableDepthTest();
|
||||
|
||||
blockPos = BlockPos.containing(v1);
|
||||
int light = 0;
|
||||
if (client.level != null)
|
||||
@@ -513,7 +509,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
public void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0.0)
|
||||
{
|
||||
@@ -602,7 +598,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
public void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0.0)
|
||||
{
|
||||
@@ -646,7 +642,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
public void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
Vec3 v1 = shape.relativiseRender(client.level, shape.from, partialTick);
|
||||
Vec3 v2 = shape.relativiseRender(client.level, shape.to, partialTick);
|
||||
@@ -717,7 +713,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy,
|
||||
public void renderLines(PoseStack matrices, double cx, double cy,
|
||||
double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0)
|
||||
@@ -853,7 +849,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
public void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0.0)
|
||||
{
|
||||
@@ -889,7 +885,7 @@ public class ShapesRenderer
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderLines(PoseStack matrices, Tesselator tesselator, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
public void renderLines(PoseStack matrices, double cx, double cy, double cz, float partialTick, LevelRenderState levelRenderState, DrawableGizmoPrimitives primitives)
|
||||
{
|
||||
if (shape.a == 0.0)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user