From 794932104beddd133e93053f80c6d00cdf6b75eb Mon Sep 17 00:00:00 2001 From: Eirenliel Allier Date: Tue, 26 Apr 2016 11:12:37 +0300 Subject: [PATCH] Fix compatibility with Java 7 --- .../java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java | 2 +- .../java/com/jme3/scene/plugins/fbx/objects/FbxNode.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java index b73524b8b..930dd830d 100644 --- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java +++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxMesh.java @@ -320,7 +320,7 @@ public class FbxMesh extends FbxObject { // Build reverse vertex mapping reverseVertexMap = new ArrayList<>(srcVertexCount); for(int i = 0; i < srcVertexCount; ++i) - reverseVertexMap.add(new ArrayList<>()); + reverseVertexMap.add(new ArrayList()); for(int i = 0; i < vCount; ++i) { int index = vertexMap.get(i); reverseVertexMap.get(index).add(i); diff --git a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxNode.java b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxNode.java index b91d3d20e..ebb209492 100644 --- a/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxNode.java +++ b/jme3-plugins/src/fbx/java/com/jme3/scene/plugins/fbx/objects/FbxNode.java @@ -19,7 +19,6 @@ import com.jme3.scene.plugins.fbx.file.FbxElement; public class FbxNode extends FbxObject { - public Map userData = new HashMap<>(); public FaceCullMode cullMode = FaceCullMode.Back; public Transform localTransform; public Node node; @@ -44,6 +43,7 @@ public class FbxNode extends FbxObject { public FbxNode(SceneLoader scene, FbxElement element) { super(scene, element); + node = new Node(name); Vector3f translationLocalRaw = new Vector3f(); Vector3f rotationOffsetRaw = new Vector3f(); Vector3f rotationPivotRaw = new Vector3f(); @@ -108,7 +108,7 @@ public class FbxNode extends FbxObject { scene.warning("Unsupported user data type: " + userDataType + ". Ignoring."); continue; } - userData.put(userDataKey, userDataValue); + node.setUserData(userDataKey, userDataValue); break; } } @@ -164,8 +164,6 @@ public class FbxNode extends FbxObject { localTransform = new Transform(transformMatrix.toTranslationVector(), transformMatrix.toRotationQuat(), transformMatrix.toScaleVector()); - node = new Node(name); - userData.forEach((s, o) -> node.setUserData(s, o)); node.setLocalTransform(localTransform); }