diff --git a/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt b/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt index 5cd94376..408ff677 100644 --- a/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt +++ b/orx-mesh-generators/src/main/kotlin/GeneratorBuffer.kt @@ -132,9 +132,21 @@ fun GeneratorBuffer.extrudeShape( scale: Double = 1.0, frontCap: Boolean = true, backCap: Boolean = true, - distanceTolerance: Double = 0.5 + sides: Boolean = true ) { - extrudeShape(baseTriangles, contours, -length / 2.0, length / 2.0, scale, scale, frontCap = frontCap, backCap = backCap, distanceTolerance = distanceTolerance, flipNormals = false, writer = this::write) + extrudeShape( + baseTriangles = baseTriangles, + contours = contours, + front = -length / 2.0, + back = length / 2.0, + frontScale = scale, + backScale = scale, + frontCap = frontCap, + backCap = backCap, + sides = sides, + flipNormals = false, + writer = this::write + ) } fun GeneratorBuffer.extrudeShape( diff --git a/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt b/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt index ac0c8237..192f548f 100644 --- a/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt +++ b/orx-mesh-generators/src/main/kotlin/MeshGenerators.kt @@ -54,7 +54,6 @@ fun extrudeShape(baseTriangles: List, contours: List>, fr frontCap: Boolean = true, backCap: Boolean = true, sides: Boolean = true, - distanceTolerance: Double = 0.5, flipNormals: Boolean = false, writer: VertexWriter) { val depth = back - front @@ -142,8 +141,19 @@ fun extrudeShape(shape: Shape, val baseTriangles = triangulate(shape, distanceTolerance) val points = shape.contours.map { it.adaptivePositions(distanceTolerance) } - extrudeShape(baseTriangles, points, front, back, frontScale, backScale, sides, frontCap, backCap, distanceTolerance, - flipNormals, writer) + extrudeShape( + baseTriangles = baseTriangles, + contours = points, + front = front, + back = back, + frontScale = frontScale, + backScale = backScale, + frontCap = frontCap, + backCap = backCap, + sides = sides, + flipNormals = flipNormals, + writer = writer + ) } fun extrudeShapes(shapes: List, @@ -157,7 +167,19 @@ fun extrudeShapes(shapes: List, distanceTolerance: Double = 0.5, flipNormals: Boolean = false, writer: VertexWriter) { shapes.forEach { - extrudeShape(it, front, back, frontScale, backScale, frontCap, backCap, sides, distanceTolerance, flipNormals, writer) + extrudeShape( + shape = it, + front = front, + back = back, + frontScale = frontScale, + backScale = backScale, + frontCap = frontCap, + backCap = backCap, + sides = sides, + distanceTolerance = distanceTolerance, + flipNormals = flipNormals, + writer = writer + ) } }