David Catuhe пре 7 година
родитељ
комит
2b8d6644e3

Разлика између датотеке није приказан због своје велике величине
+ 20819 - 20819
Playground/babylon.d.txt


Разлика између датотеке није приказан због своје велике величине
+ 11424 - 11424
dist/preview release/babylon.d.ts


Разлика између датотеке није приказан због своје велике величине
+ 4 - 4
dist/preview release/babylon.js


+ 9 - 3
dist/preview release/babylon.max.js

@@ -12017,7 +12017,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.2.0-rc.3";
+                return "3.2.0-rc.4";
             },
             enumerable: true,
             configurable: true
@@ -51532,11 +51532,11 @@ var BABYLON;
         /**
          * This function will normalize every animation in the group to make sure they all go from beginFrame to endFrame
          * It can add constant keys at begin or end
-         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to 0)
+         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to null)
          * @param endFrame defines the new end frame for all animations or the largest end frame of all animations if null (defaults to null)
          */
         AnimationGroup.prototype.normalize = function (beginFrame, endFrame) {
-            if (beginFrame === void 0) { beginFrame = 0; }
+            if (beginFrame === void 0) { beginFrame = null; }
             if (endFrame === void 0) { endFrame = null; }
             if (beginFrame == null)
                 beginFrame = this._from;
@@ -79974,6 +79974,9 @@ var BABYLON;
                 if (bone.length) {
                     serializedBone.length = bone.length;
                 }
+                if (bone.metadata) {
+                    serializedBone.metadata = bone.metadata;
+                }
                 if (bone.animations && bone.animations.length > 0) {
                     serializedBone.animation = bone.animations[0].serialize();
                 }
@@ -80016,6 +80019,9 @@ var BABYLON;
                 if (parsedBone.length) {
                     bone.length = parsedBone.length;
                 }
+                if (parsedBone.metadata) {
+                    bone.metadata = parsedBone.metadata;
+                }
                 if (parsedBone.animation) {
                     bone.animations.push(BABYLON.Animation.Parse(parsedBone.animation));
                 }

+ 9 - 3
dist/preview release/babylon.no-module.max.js

@@ -11984,7 +11984,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.2.0-rc.3";
+                return "3.2.0-rc.4";
             },
             enumerable: true,
             configurable: true
@@ -51499,11 +51499,11 @@ var BABYLON;
         /**
          * This function will normalize every animation in the group to make sure they all go from beginFrame to endFrame
          * It can add constant keys at begin or end
-         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to 0)
+         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to null)
          * @param endFrame defines the new end frame for all animations or the largest end frame of all animations if null (defaults to null)
          */
         AnimationGroup.prototype.normalize = function (beginFrame, endFrame) {
-            if (beginFrame === void 0) { beginFrame = 0; }
+            if (beginFrame === void 0) { beginFrame = null; }
             if (endFrame === void 0) { endFrame = null; }
             if (beginFrame == null)
                 beginFrame = this._from;
@@ -79941,6 +79941,9 @@ var BABYLON;
                 if (bone.length) {
                     serializedBone.length = bone.length;
                 }
+                if (bone.metadata) {
+                    serializedBone.metadata = bone.metadata;
+                }
                 if (bone.animations && bone.animations.length > 0) {
                     serializedBone.animation = bone.animations[0].serialize();
                 }
@@ -79983,6 +79986,9 @@ var BABYLON;
                 if (parsedBone.length) {
                     bone.length = parsedBone.length;
                 }
+                if (parsedBone.metadata) {
+                    bone.metadata = parsedBone.metadata;
+                }
                 if (parsedBone.animation) {
                     bone.animations.push(BABYLON.Animation.Parse(parsedBone.animation));
                 }

Разлика између датотеке није приказан због своје велике величине
+ 4 - 4
dist/preview release/babylon.worker.js


+ 9 - 3
dist/preview release/es6.js

@@ -11984,7 +11984,7 @@ var BABYLON;
              * Returns the current version of the framework
              */
             get: function () {
-                return "3.2.0-rc.3";
+                return "3.2.0-rc.4";
             },
             enumerable: true,
             configurable: true
@@ -51499,11 +51499,11 @@ var BABYLON;
         /**
          * This function will normalize every animation in the group to make sure they all go from beginFrame to endFrame
          * It can add constant keys at begin or end
-         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to 0)
+         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to null)
          * @param endFrame defines the new end frame for all animations or the largest end frame of all animations if null (defaults to null)
          */
         AnimationGroup.prototype.normalize = function (beginFrame, endFrame) {
-            if (beginFrame === void 0) { beginFrame = 0; }
+            if (beginFrame === void 0) { beginFrame = null; }
             if (endFrame === void 0) { endFrame = null; }
             if (beginFrame == null)
                 beginFrame = this._from;
@@ -79941,6 +79941,9 @@ var BABYLON;
                 if (bone.length) {
                     serializedBone.length = bone.length;
                 }
+                if (bone.metadata) {
+                    serializedBone.metadata = bone.metadata;
+                }
                 if (bone.animations && bone.animations.length > 0) {
                     serializedBone.animation = bone.animations[0].serialize();
                 }
@@ -79983,6 +79986,9 @@ var BABYLON;
                 if (parsedBone.length) {
                     bone.length = parsedBone.length;
                 }
+                if (parsedBone.metadata) {
+                    bone.metadata = parsedBone.metadata;
+                }
                 if (parsedBone.animation) {
                     bone.animations.push(BABYLON.Animation.Parse(parsedBone.animation));
                 }

+ 1 - 1
dist/preview release/gltf2Interface/package.json

@@ -1,7 +1,7 @@
 {
     "name": "babylonjs-gltf2interface",
     "description": "A typescript declaration of babylon's gltf2 inteface.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
dist/preview release/gui/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-gui",
     "description": "The Babylon.js GUI library is an extension you can use to generate interactive user interface. It is build on top of the DynamicTexture.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
dist/preview release/inspector/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-inspector",
     "description": "The Babylon.js inspector.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 2
dist/preview release/loaders/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-loaders",
     "description": "The Babylon.js file loaders library is an extension you can use to load different 3D file types into a Babylon scene.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -27,7 +27,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "3.2.0-rc.3"
+        "babylonjs-gltf2interface": "3.2.0-rc.4"
     },
     "peerDependencies": {
         "babylonjs": ">=3.2.0-alpha"

+ 1 - 1
dist/preview release/materialsLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-materials",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
dist/preview release/postProcessesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-post-process",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
dist/preview release/proceduralTexturesLibrary/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-procedural-textures",
     "description": "The Babylon.js materials library is a collection of advanced materials to be used in a Babylon.js scene.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 2
dist/preview release/serializers/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-serializers",
     "description": "The Babylon.js serializers library is an extension you can use to serialize Babylon scenes.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"
@@ -27,7 +27,7 @@
     ],
     "license": "Apache-2.0",
     "dependencies": {
-        "babylonjs-gltf2interface": "3.2.0-rc.3"
+        "babylonjs-gltf2interface": "3.2.0-rc.4"
     },
     "peerDependencies": {
         "babylonjs": ">=3.2.0-alpha"

+ 8 - 2
dist/preview release/viewer/babylon.viewer.d.ts

@@ -5,8 +5,8 @@ declare module "babylonjs-loaders"{ export=BABYLON;}
 
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../tools/Gulp/babylonjs
-//   ../../tools/Gulp/babylonjs-loaders
+//   ../../Tools/Gulp/babylonjs
+//   ../../Tools/Gulp/babylonjs-loaders
 
 declare module BabylonViewer {
     
@@ -651,6 +651,12 @@ declare module BabylonViewer {
                 * @returns The model aniamtion to be played.
                 */
             playAnimation(name: string): IModelAnimation;
+            setCurrentAnimationByName(name: string): IModelAnimation;
+            /**
+                * Apply a material configuration to a material
+                * @param material BABYLON.Material to apply configuration to
+                */
+            _applyModelMaterialConfiguration(material: BABYLON.Material): void;
             /**
              * Begin @animations with the specified @easingFunction
              * @param animations The BABYLON Animations to begin

Разлика између датотеке није приказан због своје велике величине
+ 49 - 48
dist/preview release/viewer/babylon.viewer.js


Разлика између датотеке није приказан због своје велике величине
+ 246 - 125
dist/preview release/viewer/babylon.viewer.max.js


+ 9 - 3
dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -5,8 +5,8 @@ declare module "babylonjs-loaders"{ export=BABYLON;}
 
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../tools/Gulp/babylonjs
-//   ../../tools/Gulp/babylonjs-loaders
+//   ../../Tools/Gulp/babylonjs
+//   ../../Tools/Gulp/babylonjs-loaders
 
 declare module 'babylonjs-viewer' {
     import { mapperManager } from 'babylonjs-viewer/configuration/mappers';
@@ -518,7 +518,7 @@ declare module 'babylonjs-viewer/loader/modelLoader' {
 }
 
 declare module 'babylonjs-viewer/model/viewerModel' {
-    import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, AnimationGroup, AbstractMesh, Observable, SceneLoaderProgressEvent, ParticleSystem, Skeleton, IDisposable, Nullable, Animation } from "babylonjs";
+    import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, AnimationGroup, AbstractMesh, Observable, SceneLoaderProgressEvent, ParticleSystem, Skeleton, IDisposable, Nullable, Animation, Material } from "babylonjs";
     import { GLTF2 } from "babylonjs-loaders";
     import { IModelConfiguration } from "babylonjs-viewer/configuration/configuration";
     import { IModelAnimation } from "babylonjs-viewer/model/modelAnimation";
@@ -651,6 +651,12 @@ declare module 'babylonjs-viewer/model/viewerModel' {
                 * @returns The model aniamtion to be played.
                 */
             playAnimation(name: string): IModelAnimation;
+            setCurrentAnimationByName(name: string): IModelAnimation;
+            /**
+                * Apply a material configuration to a material
+                * @param material Material to apply configuration to
+                */
+            _applyModelMaterialConfiguration(material: Material): void;
             /**
              * Begin @animations with the specified @easingFunction
              * @param animations The BABYLON Animations to begin

+ 1 - 1
dist/preview release/viewer/package.json

@@ -4,7 +4,7 @@
     },
     "name": "babylonjs-viewer",
     "description": "A simple-to-use viewer based on BabylonJS to display 3D elements natively",
-    "version": "3.2.0-rc.3.2",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 1 - 1
package.json

@@ -9,7 +9,7 @@
     ],
     "name": "babylonjs",
     "description": "Babylon.js is a JavaScript 3D engine based on webgl.",
-    "version": "3.2.0-rc.3",
+    "version": "3.2.0-rc.4",
     "repository": {
         "type": "git",
         "url": "https://github.com/BabylonJS/Babylon.js.git"

+ 2 - 2
src/Animations/babylon.animationGroup.ts

@@ -115,10 +115,10 @@ module BABYLON {
         /**
          * This function will normalize every animation in the group to make sure they all go from beginFrame to endFrame
          * It can add constant keys at begin or end
-         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to 0)
+         * @param beginFrame defines the new begin frame for all animations or the smallest begin frame of all animations if null (defaults to null)
          * @param endFrame defines the new end frame for all animations or the largest end frame of all animations if null (defaults to null)
          */
-        public normalize(beginFrame: Nullable<number> = 0, endFrame: Nullable<number> = null): AnimationGroup {
+        public normalize(beginFrame: Nullable<number> = null, endFrame: Nullable<number> = null): AnimationGroup {
             if (beginFrame == null) beginFrame = this._from;
             if (endFrame == null) endFrame = this._to;
 

+ 1 - 1
src/Engine/babylon.engine.ts

@@ -726,7 +726,7 @@
          * Returns the current version of the framework
          */
         public static get Version(): string {
-            return "3.2.0-rc.3";
+            return "3.2.0-rc.4";
         }
 
         // Updatable statics so stick with vars here