Sebastien Vandenberghe 7 年之前
父节点
当前提交
f1ed5c6ddf
共有 23 个文件被更改,包括 37934 次插入37570 次删除
  1. 10254 10227
      Playground/babylon.d.txt
  2. 11659 11632
      dist/preview release/babylon.d.ts
  3. 15 15
      dist/preview release/babylon.js
  4. 70 8
      dist/preview release/babylon.max.js
  5. 15 15
      dist/preview release/babylon.worker.js
  6. 15573 15546
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts
  7. 20 20
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js
  8. 73 10
      dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js
  9. 75 12
      dist/preview release/customConfigurations/minimalGLTFViewer/es6.js
  10. 72 10
      dist/preview release/es6.js
  11. 3 2
      dist/preview release/loaders/babylon.glTF2FileLoader.js
  12. 1 1
      dist/preview release/loaders/babylon.glTF2FileLoader.min.js
  13. 3 2
      dist/preview release/loaders/babylon.glTFFileLoader.js
  14. 2 2
      dist/preview release/loaders/babylon.glTFFileLoader.min.js
  15. 3 2
      dist/preview release/loaders/babylonjs.loaders.js
  16. 1 1
      dist/preview release/loaders/babylonjs.loaders.min.js
  17. 3 0
      dist/preview release/serializers/babylon.glTF2Serializer.js
  18. 1 1
      dist/preview release/serializers/babylon.glTF2Serializer.min.js
  19. 3 0
      dist/preview release/serializers/babylonjs.serializers.js
  20. 1 1
      dist/preview release/serializers/babylonjs.serializers.min.js
  21. 2 40
      dist/preview release/typedocValidationBaseline.json
  22. 15 15
      dist/preview release/viewer/babylon.viewer.js
  23. 70 8
      dist/preview release/viewer/babylon.viewer.max.js

文件差异内容过多而无法显示
+ 10254 - 10227
Playground/babylon.d.txt


文件差异内容过多而无法显示
+ 11659 - 11632
dist/preview release/babylon.d.ts


文件差异内容过多而无法显示
+ 15 - 15
dist/preview release/babylon.js


文件差异内容过多而无法显示
+ 70 - 8
dist/preview release/babylon.max.js


文件差异内容过多而无法显示
+ 15 - 15
dist/preview release/babylon.worker.js


文件差异内容过多而无法显示
+ 15573 - 15546
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


文件差异内容过多而无法显示
+ 20 - 20
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


文件差异内容过多而无法显示
+ 73 - 10
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js


文件差异内容过多而无法显示
+ 75 - 12
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js


文件差异内容过多而无法显示
+ 72 - 10
dist/preview release/es6.js


+ 3 - 2
dist/preview release/loaders/babylon.glTF2FileLoader.js

@@ -1074,8 +1074,9 @@ var BABYLON;
                     node._babylonMesh.scaling = BABYLON.Vector3.One();
                 };
                 if (skin._loaded) {
-                    assignSkeleton();
-                    return skin._loaded;
+                    return skin._loaded.then(function () {
+                        assignSkeleton();
+                    });
                 }
                 // TODO: split into two parts so that bones are created before inverseBindMatricesData is loaded (for compiling materials).
                 return (skin._loaded = this._loadSkinInverseBindMatricesDataAsync(context, skin).then(function (inverseBindMatricesData) {

文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/loaders/babylon.glTF2FileLoader.min.js


+ 3 - 2
dist/preview release/loaders/babylon.glTFFileLoader.js

@@ -3250,8 +3250,9 @@ var BABYLON;
                     node._babylonMesh.scaling = BABYLON.Vector3.One();
                 };
                 if (skin._loaded) {
-                    assignSkeleton();
-                    return skin._loaded;
+                    return skin._loaded.then(function () {
+                        assignSkeleton();
+                    });
                 }
                 // TODO: split into two parts so that bones are created before inverseBindMatricesData is loaded (for compiling materials).
                 return (skin._loaded = this._loadSkinInverseBindMatricesDataAsync(context, skin).then(function (inverseBindMatricesData) {

文件差异内容过多而无法显示
+ 2 - 2
dist/preview release/loaders/babylon.glTFFileLoader.min.js


+ 3 - 2
dist/preview release/loaders/babylonjs.loaders.js

@@ -4218,8 +4218,9 @@ var BABYLON;
                     node._babylonMesh.scaling = BABYLON.Vector3.One();
                 };
                 if (skin._loaded) {
-                    assignSkeleton();
-                    return skin._loaded;
+                    return skin._loaded.then(function () {
+                        assignSkeleton();
+                    });
                 }
                 // TODO: split into two parts so that bones are created before inverseBindMatricesData is loaded (for compiling materials).
                 return (skin._loaded = this._loadSkinInverseBindMatricesDataAsync(context, skin).then(function (inverseBindMatricesData) {

文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/loaders/babylonjs.loaders.min.js


+ 3 - 0
dist/preview release/serializers/babylon.glTF2Serializer.js

@@ -973,6 +973,9 @@ var BABYLON;
                         BABYLON.Tools.Warn(babylonStandardMaterial.name + ": glTF 2.0 does not support alpha mode: " + babylonStandardMaterial.alphaMode.toString());
                     }
                 }
+                if (babylonStandardMaterial.emissiveColor) {
+                    glTFMaterial.emissiveFactor = babylonStandardMaterial.emissiveColor.asArray();
+                }
                 glTFMaterial.pbrMetallicRoughness = glTFPbrMetallicRoughness;
                 materials.push(glTFMaterial);
             };

文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/serializers/babylon.glTF2Serializer.min.js


+ 3 - 0
dist/preview release/serializers/babylonjs.serializers.js

@@ -1117,6 +1117,9 @@ var BABYLON;
                         BABYLON.Tools.Warn(babylonStandardMaterial.name + ": glTF 2.0 does not support alpha mode: " + babylonStandardMaterial.alphaMode.toString());
                     }
                 }
+                if (babylonStandardMaterial.emissiveColor) {
+                    glTFMaterial.emissiveFactor = babylonStandardMaterial.emissiveColor.asArray();
+                }
                 glTFMaterial.pbrMetallicRoughness = glTFPbrMetallicRoughness;
                 materials.push(glTFMaterial);
             };

文件差异内容过多而无法显示
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.min.js


+ 2 - 40
dist/preview release/typedocValidationBaseline.json

@@ -1,7 +1,7 @@
 {
-  "errors": 7231,
+  "errors": 7225,
   "babylon.typedoc.json": {
-    "errors": 7231,
+    "errors": 7225,
     "AnimationKeyInterpolation": {
       "Enumeration": {
         "Comments": {
@@ -14211,13 +14211,6 @@
             "MissingText": true
           }
         }
-      },
-      "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        }
       }
     },
     "GenericController": {
@@ -14237,13 +14230,6 @@
             "MissingText": true
           }
         }
-      },
-      "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        }
       }
     },
     "GenericPad": {
@@ -20416,13 +20402,6 @@
             "MissingText": true
           }
         }
-      },
-      "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        }
       }
     },
     "OimoJSPlugin": {
@@ -37366,13 +37345,6 @@
             "MissingText": true
           }
         }
-      },
-      "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        }
       }
     },
     "VolumetricLightScatteringPostProcess": {
@@ -37468,11 +37440,6 @@
         }
       },
       "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        },
         "initControllerMesh": {
           "Comments": {
             "MissingText": true
@@ -37578,11 +37545,6 @@
         }
       },
       "Method": {
-        "handleButtonChange": {
-          "Naming": {
-            "NotUnderscoreCamelCase": true
-          }
-        },
         "lerpAxisTransform": {
           "Naming": {
             "NotUnderscoreCamelCase": true

文件差异内容过多而无法显示
+ 15 - 15
dist/preview release/viewer/babylon.viewer.js


文件差异内容过多而无法显示
+ 70 - 8
dist/preview release/viewer/babylon.viewer.max.js