Skip to content

Commit 3623155

Browse files
authored
Merge pull request #215 from MankinChung/master
.dae (collada) load only one material fixed
2 parents 9100813 + c33470d commit 3623155

File tree

1 file changed

+4
-4
lines changed
  • engine/src/main/java/org/andresoviedo/android_3d_model_engine/services/collada/loader

1 file changed

+4
-4
lines changed

engine/src/main/java/org/andresoviedo/android_3d_model_engine/services/collada/loader/SkeletonLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ private JointData createJointData(XmlNode jointNode, JointData parent, AtomicInt
234234
if (bind_material != null){
235235
XmlNode technique_common = bind_material.getChild("technique_common");
236236
if (technique_common != null){
237-
XmlNode instance_material = technique_common.getChild("instance_material");
238-
if (instance_material != null){
239-
String material_symbol = instance_material.getAttribute("symbol");
240-
String material_name = instance_material.getAttribute("target").substring(1);
237+
List<XmlNode> materialNodes = technique_common.getChildren("instance_material");
238+
for (XmlNode materialNode :materialNodes) {
239+
String material_symbol = materialNode.getAttribute("symbol");
240+
String material_name = materialNode.getAttribute("target").substring(1);
241241
materials.put(material_symbol,material_name);
242242
Log.v("SkeletonLoader",String.format("Loaded material: " +
243243
"%s->%s",material_symbol,material_name));

0 commit comments

Comments
 (0)