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

bump to 0.0.26

Browse Source 
add support for quad faces in orx-obj-loader
This commit is contained in:
Edwin Jakobs
2019-05-18 01:25:12 +02:00
parent 82693c8858
commit e195a8b389
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
allprojects { allprojects {
group 'org.openrndr.extra' group 'org.openrndr.extra'
version '0.0.25' version '0.0.26'
} }
repositories { repositories {

24
orx-obj-loader/src/main/kotlin/OBJLoader.kt
View File

@@ -145,29 +145,31 @@ fun loadOBJ(lines: List<String>): Map<String, List<Triangle>> {
it.map { it.toIntOrNull() } it.map { it.toIntOrNull() }
} }
if (indices.size == 3) { for (i in 0 until indices.size-2) {
val attributes = indices[0].size val attributes = indices[0].size
val o = i*2
val s = indices.size
val ps = if (attributes >= 1) arrayOf( val ps = if (attributes >= 1) arrayOf(
indices[0][0]?.let { positions[it - 1] } ?: Vector3.ZERO, indices[(0+o)%s][0]?.let { positions[it - 1] } ?: Vector3.ZERO,
indices[1][0]?.let { positions[it - 1] } ?: Vector3.ZERO, indices[(1+o)%s][0]?.let { positions[it - 1] } ?: Vector3.ZERO,
indices[2][0]?.let { positions[it - 1] } ?: Vector3.ZERO) indices[(2+o)%s][0]?.let { positions[it - 1] } ?: Vector3.ZERO)
else else
emptyArray() emptyArray()
val tcs = if (attributes >= 2) arrayOf( val tcs = if (attributes >= 2) arrayOf(
indices[0][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO, indices[(0+o)%s][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO,
indices[1][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO, indices[(1+o)%s][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO,
indices[2][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO) indices[(2+o)%s][1]?.let { textureCoords[it - 1] } ?: Vector2.ZERO)
else else
emptyArray() emptyArray()
val ns = if (attributes >= 3) arrayOf( val ns = if (attributes >= 3) arrayOf(
indices[0][2]?.let { normals[it - 1] } ?: Vector3.ZERO, indices[(0+o)%s][2]?.let { normals[it - 1] } ?: Vector3.ZERO,
indices[1][2]?.let { normals[it - 1] } ?: Vector3.ZERO, indices[(1+o)%s][2]?.let { normals[it - 1] } ?: Vector3.ZERO,
indices[2][2]?.let { normals[it - 1] } ?: Vector3.ZERO) indices[(2+o)%s][2]?.let { normals[it - 1] } ?: Vector3.ZERO)
else else
emptyArray() emptyArray()
@@ -175,8 +177,6 @@ fun loadOBJ(lines: List<String>): Map<String, List<Triangle>> {
if(meshes.isEmpty()) { if(meshes.isEmpty()) {
meshes["no-name"] = activeMesh meshes["no-name"] = activeMesh
} }
} else {
TODO("implement non triangular surfaces ${indices.size}")
} }
} }
} }