浏览代码

More PR feedback

Michael Dahrea 8 年之前
父节点
当前提交
74409c278c
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      loaders/src/glTF/2.0/babylon.glTFLoader.ts

+ 2 - 4
loaders/src/glTF/2.0/babylon.glTFLoader.ts

@@ -508,7 +508,7 @@ module BABYLON.GLTF2 {
         var indexStarts = [];
         var indexStarts = [];
         var indexCounts = [];
         var indexCounts = [];
 
 
-        var morphTargetManager;
+        var morphTargetManager = new BABYLON.MorphTargetManager();
 
 
         // Positions, normals and UVs
         // Positions, normals and UVs
         for (var primitiveIndex = 0; primitiveIndex < mesh.primitives.length; primitiveIndex++) {
         for (var primitiveIndex = 0; primitiveIndex < mesh.primitives.length; primitiveIndex++) {
@@ -598,8 +598,6 @@ module BABYLON.GLTF2 {
 
 
             // Morph Targets
             // Morph Targets
             if (primitive.targets !== undefined) {
             if (primitive.targets !== undefined) {
-                morphTargetManager = new BABYLON.MorphTargetManager();
-
                 for (var targetsIndex = 0; targetsIndex < primitive.targets.length; targetsIndex++) {
                 for (var targetsIndex = 0; targetsIndex < primitive.targets.length; targetsIndex++) {
                     var target = primitive.targets[targetsIndex];
                     var target = primitive.targets[targetsIndex];
 
 
@@ -674,7 +672,7 @@ module BABYLON.GLTF2 {
         babylonMesh.computeWorldMatrix(true);
         babylonMesh.computeWorldMatrix(true);
 
 
         // Set morph target manager after all vertices data has been processed
         // Set morph target manager after all vertices data has been processed
-        if (morphTargetManager !== undefined && (<MorphTargetManager>morphTargetManager).numInfluencers != 0) {
+        if (morphTargetManager !== undefined && morphTargetManager.numInfluencers > 0) {
             babylonMesh.morphTargetManager = morphTargetManager;
             babylonMesh.morphTargetManager = morphTargetManager;
         }
         }