Added xyzs to SpherePoints builder methods

Author: LatvianModder

src/main/java/dev/latvian/mods/kmath/SpherePoints.java

@@ -90,7 +90,7 @@ public void calculate() {
 		 */
 	}
 
-	public void buildQuads(UV uv, VertexCallback callback) {
+	public void buildQuads(float x, float y, float z, float s, UV uv, VertexCallback callback) {
 		var u0 = uv.u0();
 		var v0 = uv.v0();
 		var u1 = uv.u1();
@@ -109,27 +109,27 @@ public void buildQuads(UV uv, VertexCallback callback) {
 				var u1l = KMath.lerp(nc.u(), u0, u1);
 				var v1l = KMath.lerp(nr.v(), v0, v1);
 
-				callback.acceptPos(cc.x() * nr.m(), nr.y(), cc.z() * nr.m()).acceptTex(u0l, v1l).acceptNormal(nv.x, nv.y, nv.z);
-				callback.acceptPos(cc.x() * cr.m(), cr.y(), cc.z() * cr.m()).acceptTex(u0l, v0l).acceptNormal(nv.x, nv.y, nv.z);
-				callback.acceptPos(nc.x() * cr.m(), cr.y(), nc.z() * cr.m()).acceptTex(u1l, v0l).acceptNormal(nv.x, nv.y, nv.z);
-				callback.acceptPos(nc.x() * nr.m(), nr.y(), nc.z() * nr.m()).acceptTex(u1l, v1l).acceptNormal(nv.x, nv.y, nv.z);
+				callback.acceptPos(x + cc.x() * nr.m() * s, y + nr.y() * s, z + cc.z() * nr.m() * s).acceptTex(u0l, v1l).acceptNormal(nv.x, nv.y, nv.z);
+				callback.acceptPos(x + cc.x() * cr.m() * s, y + cr.y() * s, z + cc.z() * cr.m() * s).acceptTex(u0l, v0l).acceptNormal(nv.x, nv.y, nv.z);
+				callback.acceptPos(x + nc.x() * cr.m() * s, y + cr.y() * s, z + nc.z() * cr.m() * s).acceptTex(u1l, v0l).acceptNormal(nv.x, nv.y, nv.z);
+				callback.acceptPos(x + nc.x() * nr.m() * s, y + nr.y() * s, z + nc.z() * nr.m() * s).acceptTex(u1l, v1l).acceptNormal(nv.x, nv.y, nv.z);
 			}
 		}
 	}
 
-	public void buildLines(VertexCallback callback) {
+	public void buildLines(float x, float y, float z, float s, VertexCallback callback) {
 		for (int r = 0; r < rows.length - 1; r++) {
 			for (int c = 0; c < cols.length - 1; c++) {
 				var cr = rows[r];
 				var nr = rows[r + 1];
 				var cc = cols[c];
 				var nc = cols[c + 1];
 
-				callback.acceptPos(cc.x() * nr.m(), nr.y(), cc.z() * nr.m());
-				callback.acceptPos(cc.x() * cr.m(), cr.y(), cc.z() * cr.m());
+				callback.acceptPos(x + cc.x() * nr.m() * s, y + nr.y() * s, z + cc.z() * nr.m() * s);
+				callback.acceptPos(x + cc.x() * cr.m() * s, y + cr.y() * s, z + cc.z() * cr.m() * s);
 
-				callback.acceptPos(cc.x() * cr.m(), cr.y(), cc.z() * cr.m());
-				callback.acceptPos(nc.x() * cr.m(), cr.y(), nc.z() * cr.m());
+				callback.acceptPos(x + cc.x() * cr.m() * s, y + cr.y() * s, z + cc.z() * cr.m() * s);
+				callback.acceptPos(x + nc.x() * cr.m() * s, y + cr.y() * s, z + nc.z() * cr.m() * s);
 			}
 		}
 	}

src/main/java/dev/latvian/mods/kmath/render/SphereRenderer.java

@@ -10,27 +10,27 @@
 import net.minecraft.client.renderer.MultiBufferSource;
 
 public interface SphereRenderer {
-	static void entity(PoseStack ms, SpherePoints points, Color color, UV uv, LightUV light, OverlayUV overlay, VertexCallback callback) {
-		points.buildQuads(uv, ms.last().transform(callback).withColor(color).withLight(light).withOverlay(overlay));
+	static void entity(PoseStack ms, float x, float y, float z, float s, SpherePoints points, Color color, UV uv, LightUV light, OverlayUV overlay, VertexCallback callback) {
+		points.buildQuads(x, y, z, s, uv, ms.last().transform(callback).withColor(color).withLight(light).withOverlay(overlay));
 	}
 
-	static void entity(PoseStack ms, SpherePoints points, VertexCallback callback) {
-		entity(ms, points, Color.WHITE, UV.FULL, LightUV.NONE, OverlayUV.NORMAL, callback);
+	static void entity(PoseStack ms, float x, float y, float z, float s, SpherePoints points, VertexCallback callback) {
+		entity(ms, x, y, z, s, points, Color.WHITE, UV.FULL, LightUV.NONE, OverlayUV.NORMAL, callback);
 	}
 
-	static void quads(PoseStack ms, SpherePoints points, MultiBufferSource buffers, BufferSupplier type, boolean cull, Color color) {
-		quads(ms, points, color, type.quads(buffers, cull));
+	static void quads(PoseStack ms, float x, float y, float z, float s, SpherePoints points, MultiBufferSource buffers, BufferSupplier type, boolean cull, Color color) {
+		quads(ms, x, y, z, s, points, color, type.quads(buffers, cull));
 	}
 
-	static void quads(PoseStack ms, SpherePoints points, Color color, VertexCallback callback) {
-		points.buildQuads(UV.FULL, ms.last().transform(callback).withColor(color));
+	static void quads(PoseStack ms, float x, float y, float z, float s, SpherePoints points, Color color, VertexCallback callback) {
+		points.buildQuads(x, y, z, s, UV.FULL, ms.last().transform(callback).withColor(color));
 	}
 
-	static void lines(PoseStack ms, SpherePoints points, Color color, VertexCallback callback) {
-		points.buildLines(ms.last().transform(callback).withColor(color));
+	static void lines(PoseStack ms, float x, float y, float z, float s, SpherePoints points, Color color, VertexCallback callback) {
+		points.buildLines(x, y, z, s, ms.last().transform(callback).withColor(color));
 	}
 
-	static void lines(PoseStack ms, SpherePoints points, MultiBufferSource buffers, BufferSupplier type, Color color) {
-		points.buildLines(ms.last().transform(type.lines(buffers)).withColor(color));
+	static void lines(PoseStack ms, float x, float y, float z, float s, SpherePoints points, MultiBufferSource buffers, BufferSupplier type, Color color) {
+		points.buildLines(x, y, z, s, ms.last().transform(type.lines(buffers)).withColor(color));
 	}
 }