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

[orx-mesh-generators] Change vertex formats used by meshVertexBuffer and meshVertexBufferWithColor to be Std430 compliant

Browse Source
This commit is contained in:
Edwin Jakobs
2025-01-30 16:55:51 +01:00
parent 907a96c87a
commit 79e4df32d4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
orx-mesh-generators/src/commonMain/kotlin/MeshGenerators.kt
View File

@@ -1,9 +1,6 @@
package org.openrndr.extra.meshgenerators package org.openrndr.extra.meshgenerators
import org.openrndr.draw.BufferWriter import org.openrndr.draw.*
import org.openrndr.draw.VertexBuffer
import org.openrndr.draw.vertexBuffer
import org.openrndr.draw.vertexFormat
import org.openrndr.math.Vector2 import org.openrndr.math.Vector2
import org.openrndr.math.Vector3 import org.openrndr.math.Vector3
import org.openrndr.math.mod import org.openrndr.math.mod
@@ -34,7 +31,7 @@ fun bufferWriter(bw: BufferWriter): VertexWriter {
* - `textureCoordinate` (vec2) * - `textureCoordinate` (vec2)
*/ */
fun meshVertexBuffer(size: Int): VertexBuffer { fun meshVertexBuffer(size: Int): VertexBuffer {
return vertexBuffer(vertexFormat { return vertexBuffer(vertexFormat(BufferAlignment.STD430) {
position(3) position(3)
normal(3) normal(3)
textureCoordinate(2) textureCoordinate(2)
@@ -50,7 +47,7 @@ fun meshVertexBuffer(size: Int): VertexBuffer {
* - `color` (vec4) * - `color` (vec4)
*/ */
fun meshVertexBufferWithColor(size: Int): VertexBuffer { fun meshVertexBufferWithColor(size: Int): VertexBuffer {
return vertexBuffer(vertexFormat { return vertexBuffer(vertexFormat(BufferAlignment.STD430) {
position(3) position(3)
normal(3) normal(3)
textureCoordinate(2) textureCoordinate(2)

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

@@ -144,7 +144,7 @@ class TriangleMeshBuilder {
*/ */
fun toByteBuffer(): MPPBuffer { fun toByteBuffer(): MPPBuffer {
//val bb = ByteBuffer.allocateDirect(data.size * (3 * 4 + 3 * 4 + 2 * 4 + 4 * 4)) //val bb = ByteBuffer.allocateDirect(data.size * (3 * 4 + 3 * 4 + 2 * 4 + 4 * 4))
val bb = MPPBuffer.allocate(data.size * (3 * 4 + 3 * 4 + 2 * 4 + 4 * 4)) val bb = MPPBuffer.allocate(data.size * (4 * 4 + 4 * 4 + 4 * 4 + 4 * 4))
//bb.order(ByteOrder.nativeOrder()) //bb.order(ByteOrder.nativeOrder())
bb.rewind() bb.rewind()
@@ -152,13 +152,16 @@ class TriangleMeshBuilder {
bb.putFloat(d.position.x.toFloat()) bb.putFloat(d.position.x.toFloat())
bb.putFloat(d.position.y.toFloat()) bb.putFloat(d.position.y.toFloat())
bb.putFloat(d.position.z.toFloat()) bb.putFloat(d.position.z.toFloat())
bb.putFloat(0.0f)
bb.putFloat(d.normal.x.toFloat()) bb.putFloat(d.normal.x.toFloat())
bb.putFloat(d.normal.y.toFloat()) bb.putFloat(d.normal.y.toFloat())
bb.putFloat(d.normal.z.toFloat()) bb.putFloat(d.normal.z.toFloat())
bb.putFloat(0.0f)
bb.putFloat(d.texCoord.x.toFloat()) bb.putFloat(d.texCoord.x.toFloat())
bb.putFloat(d.texCoord.y.toFloat()) bb.putFloat(d.texCoord.y.toFloat())
bb.putFloat(0.0f)
bb.putFloat(0.0f)
bb.putFloat(d.color.r.toFloat()) bb.putFloat(d.color.r.toFloat())
bb.putFloat(d.color.g.toFloat()) bb.putFloat(d.color.g.toFloat())