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

[orx-mesh-generators] Fix grid issue when count==1

Browse Source
This commit is contained in:
Abe Pazos
2025-01-22 02:30:00 +01:00
parent ec340155a5
commit d1d3af7abc
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
orx-mesh-generators/src/commonMain/kotlin/TriangleMeshBuilder.kt
View File

@@ -249,13 +249,13 @@ fun TriangleMeshBuilder.grid(
when (coordinates) { when (coordinates) {
GridCoordinates.INDEX -> this.builder(u * 1.0, v * 1.0) GridCoordinates.INDEX -> this.builder(u * 1.0, v * 1.0)
GridCoordinates.BIPOLAR -> this.builder( GridCoordinates.BIPOLAR -> this.builder(
2 * u / (width - 1.0) - 1, if (width <= 1) 0.0 else 2 * u / (width - 1.0) - 1,
2 * v / (height - 1.0) - 1 if (height <= 1) 0.0 else 2 * v / (height - 1.0) - 1
) )
GridCoordinates.UNIPOLAR -> this.builder( GridCoordinates.UNIPOLAR -> this.builder(
u / (width - 1.0), if (width <= 1) 0.0 else u / (width - 1.0),
v / (height - 1.0) if (height <= 1) 0.0 else v / (height - 1.0)
) )
} }
} }
@@ -292,15 +292,15 @@ fun TriangleMeshBuilder.grid(
) )
GridCoordinates.BIPOLAR -> this.builder( GridCoordinates.BIPOLAR -> this.builder(
2 * u / (width - 1.0) - 1, if (width <= 1) 0.0 else 2 * u / (width - 1.0) - 1,
2 * v / (height - 1.0) - 1, if (height <= 1) 0.0 else 2 * v / (height - 1.0) - 1,
2 * w / (depth - 1.0) - 1 if (depth <= 1) 0.0 else 2 * w / (depth - 1.0) - 1
) )
GridCoordinates.UNIPOLAR -> this.builder( GridCoordinates.UNIPOLAR -> this.builder(
u / (width - 1.0), if (width <= 1) 0.0 else u / (width - 1.0),
v / (height - 1.0), if (height <= 1) 0.0 else v / (height - 1.0),
w / (depth - 1.0) if (depth <= 1) 0.0 else w / (depth - 1.0)
) )
} }
} }

5
orx-mesh-generators/src/jvmDemo/kotlin/DemoComplex05.kt
View File

@@ -4,7 +4,10 @@ import org.openrndr.draw.CullTestPass
import org.openrndr.draw.DrawPrimitive import org.openrndr.draw.DrawPrimitive
import org.openrndr.draw.shadeStyle import org.openrndr.draw.shadeStyle
import org.openrndr.extra.camera.Orbital import org.openrndr.extra.camera.Orbital
import org.openrndr.extra.meshgenerators.* import org.openrndr.extra.meshgenerators.buildTriangleMesh
import org.openrndr.extra.meshgenerators.extrudeShape
import org.openrndr.extra.meshgenerators.grid
import org.openrndr.extra.meshgenerators.twist
import org.openrndr.math.Vector3 import org.openrndr.math.Vector3
import org.openrndr.shape.Circle import org.openrndr.shape.Circle