Procházet zdrojové kódy

Merge remote-tracking branch 'BabylonJS/master' into viewer-update-configuration

Raanan Weber před 7 roky
rodič
revize
c10ac27169

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 10873 - 10578
Playground/babylon.d.txt


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 45 - 63
Viewer/dist/viewer.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 45 - 63
Viewer/dist/viewer.min.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3135 - 3127
dist/preview release/babylon.d.ts


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 3
dist/preview release/babylon.js


+ 10 - 2
dist/preview release/babylon.max.js

@@ -14587,12 +14587,20 @@ var BABYLON;
         Node.prototype.getAnimationRange = function (name) {
             return this._ranges[name];
         };
+        /**
+         * Will start the animation sequence
+         * @param name defines the range frames for animation sequence
+         * @param loop defines if the animation should loop (false by default)
+         * @param speedRatio defines the speed factor in which to run the animation (1 by default)
+         * @param onAnimationEnd defines a function to be executed when the animation ended (undefined by default)
+         * @returns the {BABYLON.Animatable} object created for this animation. If range does not exist, it will return null
+         */
         Node.prototype.beginAnimation = function (name, loop, speedRatio, onAnimationEnd) {
             var range = this.getAnimationRange(name);
             if (!range) {
-                return;
+                return null;
             }
-            this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
+            return this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
         };
         Node.prototype.serializeAnimationRanges = function () {
             var serializationRanges = [];

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 3
dist/preview release/babylon.worker.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 12623 - 12615
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.d.ts


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 3 - 3
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.js


+ 10 - 2
dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -14587,12 +14587,20 @@ var BABYLON;
         Node.prototype.getAnimationRange = function (name) {
             return this._ranges[name];
         };
+        /**
+         * Will start the animation sequence
+         * @param name defines the range frames for animation sequence
+         * @param loop defines if the animation should loop (false by default)
+         * @param speedRatio defines the speed factor in which to run the animation (1 by default)
+         * @param onAnimationEnd defines a function to be executed when the animation ended (undefined by default)
+         * @returns the {BABYLON.Animatable} object created for this animation. If range does not exist, it will return null
+         */
         Node.prototype.beginAnimation = function (name, loop, speedRatio, onAnimationEnd) {
             var range = this.getAnimationRange(name);
             if (!range) {
-                return;
+                return null;
             }
-            this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
+            return this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
         };
         Node.prototype.serializeAnimationRanges = function () {
             var serializationRanges = [];

+ 10 - 2
dist/preview release/customConfigurations/minimalGLTFViewer/es6.js

@@ -14573,12 +14573,20 @@ var BABYLON;
         Node.prototype.getAnimationRange = function (name) {
             return this._ranges[name];
         };
+        /**
+         * Will start the animation sequence
+         * @param name defines the range frames for animation sequence
+         * @param loop defines if the animation should loop (false by default)
+         * @param speedRatio defines the speed factor in which to run the animation (1 by default)
+         * @param onAnimationEnd defines a function to be executed when the animation ended (undefined by default)
+         * @returns the {BABYLON.Animatable} object created for this animation. If range does not exist, it will return null
+         */
         Node.prototype.beginAnimation = function (name, loop, speedRatio, onAnimationEnd) {
             var range = this.getAnimationRange(name);
             if (!range) {
-                return;
+                return null;
             }
-            this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
+            return this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
         };
         Node.prototype.serializeAnimationRanges = function () {
             var serializationRanges = [];

+ 10 - 2
dist/preview release/es6.js

@@ -14573,12 +14573,20 @@ var BABYLON;
         Node.prototype.getAnimationRange = function (name) {
             return this._ranges[name];
         };
+        /**
+         * Will start the animation sequence
+         * @param name defines the range frames for animation sequence
+         * @param loop defines if the animation should loop (false by default)
+         * @param speedRatio defines the speed factor in which to run the animation (1 by default)
+         * @param onAnimationEnd defines a function to be executed when the animation ended (undefined by default)
+         * @returns the {BABYLON.Animatable} object created for this animation. If range does not exist, it will return null
+         */
         Node.prototype.beginAnimation = function (name, loop, speedRatio, onAnimationEnd) {
             var range = this.getAnimationRange(name);
             if (!range) {
-                return;
+                return null;
             }
-            this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
+            return this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
         };
         Node.prototype.serializeAnimationRanges = function () {
             var serializationRanges = [];

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 2
dist/preview release/inspector/babylon.inspector.bundle.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1 - 1
dist/preview release/loaders/babylon.objFileLoader.min.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 2
dist/preview release/loaders/babylonjs.loaders.min.js


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

@@ -1,7 +1,7 @@
 {
-  "errors": 8179,
+  "errors": 8172,
   "babylon.typedoc.json": {
-    "errors": 8179,
+    "errors": 8172,
     "AnimationKeyInterpolation": {
       "Enumeration": {
         "Comments": {
@@ -22184,33 +22184,6 @@
             }
           }
         },
-        "beginAnimation": {
-          "Comments": {
-            "MissingText": true
-          },
-          "Parameter": {
-            "name": {
-              "Comments": {
-                "MissingText": true
-              }
-            },
-            "loop": {
-              "Comments": {
-                "MissingText": true
-              }
-            },
-            "speedRatio": {
-              "Comments": {
-                "MissingText": true
-              }
-            },
-            "onAnimationEnd": {
-              "Comments": {
-                "MissingText": true
-              }
-            }
-          }
-        },
         "computeWorldMatrix": {
           "Comments": {
             "MissingText": true
@@ -37217,18 +37190,6 @@
             }
           }
         },
-        "GetFolderPath": {
-          "Comments": {
-            "MissingText": true
-          },
-          "Parameter": {
-            "uri": {
-              "Comments": {
-                "MissingText": true
-              }
-            }
-          }
-        },
         "GetPointerPrefix": {
           "Comments": {
             "MissingText": true

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 9 - 9
dist/preview release/viewer/babylon.viewer.js


+ 11 - 3
src/babylon.node.ts

@@ -411,14 +411,22 @@
             return this._ranges[name];
         }
 
-        public beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): void {
+        /**
+         * Will start the animation sequence
+         * @param name defines the range frames for animation sequence
+         * @param loop defines if the animation should loop (false by default)
+         * @param speedRatio defines the speed factor in which to run the animation (1 by default)
+         * @param onAnimationEnd defines a function to be executed when the animation ended (undefined by default)
+         * @returns the {BABYLON.Animatable} object created for this animation. If range does not exist, it will return null
+         */
+        public beginAnimation(name: string, loop?: boolean, speedRatio?: number, onAnimationEnd?: () => void): Nullable<Animatable> {
             var range = this.getAnimationRange(name);
 
             if (!range) {
-                return;
+                return null;
             }
 
-            this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
+            return this._scene.beginAnimation(this, range.from, range.to, loop, speedRatio, onAnimationEnd);
         }
 
         public serializeAnimationRanges(): any {