Skip to content

Commit bf66712

Browse files
elect86elect86
committed
fixed collada bug (vertices missing for submeshes other than the first one)
1 parent 2115cd8 commit bf66712

File tree

4 files changed

+68
-120
lines changed

4 files changed

+68
-120
lines changed

‎assimp.iml‎

Lines changed: 45 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -28,111 +28,62 @@
2828
<output-test url="file://$MODULE_DIR$/out/test/classes" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
3231
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
33-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
3432
<sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
3633
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
3734
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
3835
<excludeFolder url="file://$MODULE_DIR$/build" />
3936
<excludeFolder url="file://$MODULE_DIR$/out" />
4037
</content>
4138
<orderEntry type="inheritedJdk" />
4239
<orderEntry type="sourceFolder" forTests="false" />
43-
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.kotlin-graphics:uno-sdk:0446f661345134ff6aac460096d9fe38f2183662" level="project" />
44-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.21" level="project" />
45-
<orderEntry type="library" scope="PROVIDED" name="Gradle: io.github.microutils:kotlin-logging:1.4.6" level="project" />
46-
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.kotlin-graphics:gln:faf386ccb37c612de842869e2037e86b9be76eab" level="project" />
47-
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.kotlin-graphics:gli:144ae47f9788aa3edf885c0f36c950ea308ac8ba" level="project" />
48-
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.kotlin-graphics:glm:589f2e288a3b8912b0658c55d78d593011b525b4" level="project" />
49-
<orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:9f1103b13fa5840bafff72a6d40a2d3c9aea5e58" level="project" />
50-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.21" level="project" />
51-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT" level="project" />
52-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT:natives-linux" level="project" />
53-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT" level="project" />
54-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT:natives-linux" level="project" />
55-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT" level="project" />
56-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT:natives-linux" level="project" />
57-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT" level="project" />
58-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT:natives-linux" level="project" />
59-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT" level="project" />
60-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT:natives-linux" level="project" />
61-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT" level="project" />
62-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT:natives-linux" level="project" />
63-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
64-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jogamp.gluegen:gluegen-rt:2.3.2" level="project" />
65-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.jogamp.jogl:jogl-all:2.3.2" level="project" />
66-
<orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
67-
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.kotlin-graphics:uno-sdk:0446f661345134ff6aac460096d9fe38f2183662" level="project" />
68-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.21" level="project" />
69-
<orderEntry type="library" scope="RUNTIME" name="Gradle: io.github.microutils:kotlin-logging:1.4.6" level="project" />
70-
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.kotlin-graphics:gln:faf386ccb37c612de842869e2037e86b9be76eab" level="project" />
71-
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.kotlin-graphics:gli:144ae47f9788aa3edf885c0f36c950ea308ac8ba" level="project" />
72-
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.kotlin-graphics:glm:589f2e288a3b8912b0658c55d78d593011b525b4" level="project" />
73-
<orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:9f1103b13fa5840bafff72a6d40a2d3c9aea5e58" level="project" />
74-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.21" level="project" />
75-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT" level="project" />
76-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT:natives-windows" level="project" />
77-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT:natives-linux" level="project" />
78-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT" level="project" />
79-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT:natives-windows" level="project" />
80-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT:natives-linux" level="project" />
81-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT" level="project" />
82-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT:natives-windows" level="project" />
83-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT:natives-linux" level="project" />
84-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT" level="project" />
85-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT:natives-windows" level="project" />
86-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT:natives-linux" level="project" />
87-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT" level="project" />
88-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT:natives-windows" level="project" />
89-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT:natives-linux" level="project" />
90-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT" level="project" />
91-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT:natives-windows" level="project" />
92-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT:natives-linux" level="project" />
93-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
94-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jogamp.gluegen:gluegen-rt:2.3.2" level="project" />
95-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.jogamp.jogl:jogl-all:2.3.2" level="project" />
96-
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
97-
<orderEntry type="library" scope="TEST" name="Gradle: com.github.kotlin-graphics:uno-sdk:0446f661345134ff6aac460096d9fe38f2183662" level="project" />
98-
<orderEntry type="library" scope="TEST" name="Gradle: io.github.microutils:kotlin-logging:1.4.6" level="project" />
99-
<orderEntry type="library" scope="TEST" name="Gradle: io.kotlintest:kotlintest:2.0.7" level="project" />
100-
<orderEntry type="library" scope="TEST" name="Gradle: com.github.kotlin-graphics:gln:faf386ccb37c612de842869e2037e86b9be76eab" level="project" />
101-
<orderEntry type="library" scope="TEST" name="Gradle: com.github.kotlin-graphics:gli:144ae47f9788aa3edf885c0f36c950ea308ac8ba" level="project" />
102-
<orderEntry type="library" scope="TEST" name="Gradle: com.github.kotlin-graphics:glm:589f2e288a3b8912b0658c55d78d593011b525b4" level="project" />
103-
<orderEntry type="library" scope="TEST" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:9f1103b13fa5840bafff72a6d40a2d3c9aea5e58" level="project" />
104-
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.21" level="project" />
105-
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.21" level="project" />
106-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT" level="project" />
107-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT:natives-linux" level="project" />
108-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT" level="project" />
109-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT:natives-linux" level="project" />
110-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT" level="project" />
111-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT:natives-linux" level="project" />
112-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT" level="project" />
113-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT:natives-linux" level="project" />
114-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT" level="project" />
115-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT:natives-linux" level="project" />
116-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT" level="project" />
117-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT:natives-linux" level="project" />
118-
<orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
119-
<orderEntry type="library" scope="TEST" name="Gradle: org.jogamp.gluegen:gluegen-rt:2.3.2" level="project" />
120-
<orderEntry type="library" scope="TEST" name="Gradle: org.jogamp.jogl:jogl-all:2.3.2" level="project" />
121-
<orderEntry type="library" scope="TEST" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
122-
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
123-
<orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:2.7.11" level="project" />
40+
<orderEntry type="library" name="Gradle: com.github.kotlin-graphics:uno-sdk:6db5c2919e60af45389b5f255d1c0a29c29f7ef6" level="project" />
41+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.2.41" level="project" />
42+
<orderEntry type="library" name="Gradle: io.github.microutils:kotlin-logging:1.4.6" level="project" />
43+
<orderEntry type="library" name="Gradle: com.github.kotlin-graphics:gln:9e7578300874893436d0aabad5ffed9399fc44b4" level="project" />
44+
<orderEntry type="library" name="Gradle: com.github.kotlin-graphics:gli:814996a308c179eda93987213506cf77531d9a84" level="project" />
45+
<orderEntry type="library" name="Gradle: com.github.kotlin-graphics:glm:be40ccfb45812df60c08a32312d37dcd7579b340" level="project" />
46+
<orderEntry type="library" name="Gradle: com.github.kotlin-graphics:kotlin-unsigned:755ac3f8b6697485b794bc180e9c238281688d2e" level="project" />
47+
<orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.41" level="project" />
48+
<orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
49+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT" level="project" />
50+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT:natives-linux" level="project" />
51+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.7-SNAPSHOT" level="project" />
52+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.7-SNAPSHOT:natives-linux" level="project" />
53+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-openal:3.1.7-SNAPSHOT" level="project" />
54+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-openal:3.1.7-SNAPSHOT:natives-linux" level="project" />
55+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.7-SNAPSHOT" level="project" />
56+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.7-SNAPSHOT:natives-linux" level="project" />
57+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-stb:3.1.7-SNAPSHOT" level="project" />
58+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-stb:3.1.7-SNAPSHOT:natives-linux" level="project" />
59+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl-tootle:3.1.7-SNAPSHOT" level="project" />
60+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.1.7-SNAPSHOT" level="project" />
61+
<orderEntry type="library" name="Gradle: org.lwjgl:lwjgl:3.1.7-SNAPSHOT:natives-linux" level="project" />
62+
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
63+
<orderEntry type="library" name="Gradle: org.jogamp.gluegen:gluegen-rt:2.3.2" level="project" />
64+
<orderEntry type="library" name="Gradle: org.jogamp.jogl:jogl-all:2.3.2" level="project" />
65+
<orderEntry type="library" scope="TEST" name="Gradle: io.kotlintest:kotlintest-runner-junit5:3.0.5" level="project" />
66+
<orderEntry type="library" scope="TEST" name="Gradle: io.kotlintest:kotlintest-core:3.0.5" level="project" />
67+
<orderEntry type="library" scope="TEST" name="Gradle: io.kotlintest:kotlintest-assertions:3.0.5" level="project" />
68+
<orderEntry type="library" scope="TEST" name="Gradle: org.slf4j:slf4j-simple:1.7.25" level="project" />
12469
<orderEntry type="library" scope="TEST" name="Gradle: org.reflections:reflections:0.9.11" level="project" />
125-
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
126-
<orderEntry type="library" scope="TEST" name="Gradle: net.bytebuddy:byte-buddy:1.6.5" level="project" />
127-
<orderEntry type="library" scope="TEST" name="Gradle: net.bytebuddy:byte-buddy-agent:1.6.5" level="project" />
128-
<orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.5" level="project" />
70+
<orderEntry type="library" scope="TEST" name="Gradle: org.junit.platform:junit-platform-engine:1.1.0" level="project" />
71+
<orderEntry type="library" scope="TEST" name="Gradle: org.junit.platform:junit-platform-suite-api:1.1.0" level="project" />
72+
<orderEntry type="library" scope="TEST" name="Gradle: org.junit.jupiter:junit-jupiter-api:5.1.0" level="project" />
73+
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
74+
<orderEntry type="library" scope="TEST" name="Gradle: com.univocity:univocity-parsers:2.6.1" level="project" />
12975
<orderEntry type="library" scope="TEST" name="Gradle: com.google.guava:guava:20.0" level="project" />
13076
<orderEntry type="library" scope="TEST" name="Gradle: org.javassist:javassist:3.21.0-GA" level="project" />
131-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.5-SNAPSHOT:natives-windows" level="project" />
132-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.5-SNAPSHOT:natives-windows" level="project" />
133-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-openal:3.1.5-SNAPSHOT:natives-windows" level="project" />
134-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.5-SNAPSHOT:natives-windows" level="project" />
135-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-stb:3.1.5-SNAPSHOT:natives-windows" level="project" />
136-
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.1.5-SNAPSHOT:natives-windows" level="project" />
77+
<orderEntry type="library" scope="TEST" name="Gradle: org.junit.platform:junit-platform-commons:1.1.0" level="project" />
78+
<orderEntry type="library" scope="TEST" name="Gradle: org.apiguardian:apiguardian-api:1.0.0" level="project" />
79+
<orderEntry type="library" scope="TEST" name="Gradle: org.opentest4j:opentest4j:1.0.0" level="project" />
80+
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
81+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-glfw:3.1.7-SNAPSHOT:natives-windows" level="project" />
82+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-jemalloc:3.1.7-SNAPSHOT:natives-windows" level="project" />
83+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-openal:3.1.7-SNAPSHOT:natives-windows" level="project" />
84+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-opengl:3.1.7-SNAPSHOT:natives-windows" level="project" />
85+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-stb:3.1.7-SNAPSHOT:natives-windows" level="project" />
86+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl-tootle:3.1.7-SNAPSHOT:natives-windows" level="project" />
87+
<orderEntry type="library" scope="TEST" name="Gradle: org.lwjgl:lwjgl:3.1.7-SNAPSHOT:natives-windows" level="project" />
13788
</component>
13889
</module>

0 commit comments

Comments
 (0)