kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to OPENRNDR 0.3.41-rc.1, add unit tests for shape related code

Browse Source
This commit is contained in:
Edwin Jakobs
2020-03-31 14:54:54 +02:00
parent 99d49060bf
commit 065bf71e51
8 changed files with 134 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-mesh-generators/src/main/kotlin/Cap.kt
View File

@@ -13,7 +13,7 @@ fun generateCap(sides: Int, radius: Double, enveloppe: List<Vector2> = listOf(Ve
val normals2D = enveloppe.zipWithNext().map {
val d = it.second - it.first
d.normalized.perpendicular
d.normalized.perpendicular()
}
val basePositions = cleanEnveloppe.map { Vector3(it.x, it.y, 0.0) }
@@ -57,7 +57,7 @@ fun generateRevolve(sides: Int, length: Double, enveloppe: List<Vector2> = listO
val normals2D = enveloppe.zipWithNext().map {
val d = it.second - it.first
d.normalized.perpendicular * Vector2(1.0, -1.0)
d.normalized.perpendicular() * Vector2(1.0, -1.0)
}

2
orx-mesh-generators/src/main/kotlin/Cylinder.kt
View File

@@ -28,7 +28,7 @@ fun generateTaperedCylinder(sides: Int, segments: Int, radiusStart: Double, radi
val dr = radiusEnd - radiusStart
val baseNormal = Vector2(length, dr).normalized.perpendicular.let { Vector3(x=it.y, y=0.0, z=it.x)}
val baseNormal = Vector2(length, dr).normalized.perpendicular().let { Vector3(x=it.y, y=0.0, z=it.x)}
//val baseNormal = Vector3(1.0, 0.0, 0.0)
for (segment in 0 until segments) {