Skip to content

Commit 02930ad

Browse files
committed
- resolved also the bloody fbx tests, fbx model::resolveLink was bugged
1 parent a498fec commit 02930ad

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ group = 'com.github.kotlin-graphics'
99

1010
buildscript {
1111

12-
ext.kotlinVersion = '1.2.21'
12+
ext.kotlinVersion = '1.2.40-eap-51'
1313

1414
repositories {
1515
jcenter()
@@ -32,7 +32,7 @@ dependencies {
3232
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
3333
implementation "org.jetbrains.kotlin:kotlin-reflect"
3434

35-
implementation 'com.github.kotlin-graphics:uno-sdk:641ec79aa3d5cf696590276f75b8b89804dc9d09'
35+
implementation 'com.github.kotlin-graphics:uno-sdk:b885fad02bbcced22aa2ef4958050e871bc6e219'
3636

3737
testCompile 'io.kotlintest:kotlintest:2.0.7'
3838

@@ -57,7 +57,7 @@ dependencies {
5757
break
5858
}
5959

60-
ext.lwjglVersion = "3.1.5-SNAPSHOT"
60+
ext.lwjglVersion = "3.1.7-SNAPSHOT"
6161
implementation "org.lwjgl:lwjgl:${lwjglVersion}"
6262
implementation "org.lwjgl:lwjgl-glfw:${lwjglVersion}"
6363
implementation "org.lwjgl:lwjgl-jemalloc:${lwjglVersion}"

src/main/kotlin/assimp/format/fbx/fbxConverter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ class Converter(val out: AiScene, val doc: Document) {
181181
// ignore object-property links
182182
if (con.prop.isNotEmpty()) continue
183183

184-
val object_ = con.sourceObject
185-
if (object_ == null) {
184+
val `object` = con.sourceObject
185+
if (`object` == null) {
186186
logger.warn("failed to convert source object for Model link")
187187
continue
188188
}
189189

190-
val model = object_ as? Model
190+
val model = `object` as? Model
191191

192192
if (model != null) {
193193
nodesChain.clear()

src/main/kotlin/assimp/format/fbx/fbxDocument.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,14 @@ class Model(id: Long, element: Element, doc: Document, name: String) : Object(id
409409
continue
410410
}
411411

412+
var `continue` = true
412413
when (ob) {
413414
is Material -> materials += ob
414415
is Geometry -> geometry += ob
415416
is NodeAttribute -> attributes += ob
417+
else -> `continue` = false
416418
}
419+
if(`continue`) continue
417420

418421
domWarning("source object for model link is neither Material, NodeAttribute nor Geometry, ignoring", element)
419422
continue

0 commit comments

Comments
 (0)