|
@@ -51252,33 +51252,9 @@ var BABYLON;
|
|
// Statics
|
|
// Statics
|
|
/**
|
|
/**
|
|
* Returns a new AnimationGroup object parsed from the source provided.
|
|
* Returns a new AnimationGroup object parsed from the source provided.
|
|
- * @param {Object} parsedAnimationGroup - is the source.
|
|
|
|
- * @param {Scene} scene - is the scene that will receive the animationGroup
|
|
|
|
- * Example of an expected source
|
|
|
|
- * {
|
|
|
|
- "name": "Run",
|
|
|
|
- "from": 0.0,
|
|
|
|
- "to": 1.0,
|
|
|
|
- "targetedAnimations": [{
|
|
|
|
- "animation": {
|
|
|
|
- "name": "rotationQuaternion animation",
|
|
|
|
- "property": "rotationQuaternion",
|
|
|
|
- "dataType": 2,
|
|
|
|
- "enableBlending": false,
|
|
|
|
- "blendingSpeed": 0.01,
|
|
|
|
- "loopBehavior": 1,
|
|
|
|
- "framePerSecond": 30,
|
|
|
|
- "keys": [{
|
|
|
|
- "frame": 0,
|
|
|
|
- "values": [-0.7071, -0.002, 0.0022, 0.7071]
|
|
|
|
- }, {
|
|
|
|
- "frame": 1,
|
|
|
|
- "values": [-0.7082, -0.0485, 0.0026, 0.7043]
|
|
|
|
- }]
|
|
|
|
- },
|
|
|
|
- "targetId": "d64f9288-d06a-4a70-872f-edbb5a3779c6"
|
|
|
|
- }]
|
|
|
|
- }
|
|
|
|
|
|
+ * @param parsedAnimationGroup defines the source
|
|
|
|
+ * @param scene defines the scene that will receive the animationGroup
|
|
|
|
+ * @returns a new AnimationGroup
|
|
*/
|
|
*/
|
|
AnimationGroup.Parse = function (parsedAnimationGroup, scene) {
|
|
AnimationGroup.Parse = function (parsedAnimationGroup, scene) {
|
|
var animationGroup = new BABYLON.AnimationGroup(parsedAnimationGroup.name, scene);
|
|
var animationGroup = new BABYLON.AnimationGroup(parsedAnimationGroup.name, scene);
|
|
@@ -51294,11 +51270,17 @@ var BABYLON;
|
|
animationGroup.normalize(parsedAnimationGroup.from, parsedAnimationGroup.to);
|
|
animationGroup.normalize(parsedAnimationGroup.from, parsedAnimationGroup.to);
|
|
return animationGroup;
|
|
return animationGroup;
|
|
};
|
|
};
|
|
|
|
+ /**
|
|
|
|
+ * Returns the string "AnimationGroup"
|
|
|
|
+ * @returns "AnimationGroup"
|
|
|
|
+ */
|
|
AnimationGroup.prototype.getClassName = function () {
|
|
AnimationGroup.prototype.getClassName = function () {
|
|
return "AnimationGroup";
|
|
return "AnimationGroup";
|
|
};
|
|
};
|
|
/**
|
|
/**
|
|
- * @param {boolean} fullDetails - support for multiple levels of logging within scene loading
|
|
|
|
|
|
+ * Creates a detailled string about the object
|
|
|
|
+ * @param fullDetails defines if the output string will support multiple levels of logging within scene loading
|
|
|
|
+ * @returns a string representing the object
|
|
*/
|
|
*/
|
|
AnimationGroup.prototype.toString = function (fullDetails) {
|
|
AnimationGroup.prototype.toString = function (fullDetails) {
|
|
var ret = "Name: " + this.name;
|
|
var ret = "Name: " + this.name;
|
|
@@ -57999,6 +57981,10 @@ var BABYLON;
|
|
this.noiseTexture.dispose();
|
|
this.noiseTexture.dispose();
|
|
this.noiseTexture = null;
|
|
this.noiseTexture = null;
|
|
}
|
|
}
|
|
|
|
+ if (this._rampGradientsTexture) {
|
|
|
|
+ this._rampGradientsTexture.dispose();
|
|
|
|
+ this._rampGradientsTexture = null;
|
|
|
|
+ }
|
|
this._removeFromRoot();
|
|
this._removeFromRoot();
|
|
if (this._disposeEmitterOnDispose && !this.emitter.isDisposed) {
|
|
if (this._disposeEmitterOnDispose && !this.emitter.isDisposed) {
|
|
this.emitter.dispose();
|
|
this.emitter.dispose();
|
|
@@ -65245,7 +65231,9 @@ var BABYLON;
|
|
plane.translate(options.sourcePlane.normal, options.sourcePlane.d);
|
|
plane.translate(options.sourcePlane.normal, options.sourcePlane.d);
|
|
var product = Math.acos(BABYLON.Vector3.Dot(options.sourcePlane.normal, BABYLON.Axis.Z));
|
|
var product = Math.acos(BABYLON.Vector3.Dot(options.sourcePlane.normal, BABYLON.Axis.Z));
|
|
var vectorProduct = BABYLON.Vector3.Cross(BABYLON.Axis.Z, options.sourcePlane.normal);
|
|
var vectorProduct = BABYLON.Vector3.Cross(BABYLON.Axis.Z, options.sourcePlane.normal);
|
|
- plane.rotate(vectorProduct, product);
|
|
|
|
|
|
+ if (vectorProduct.lengthSquared() > BABYLON.Epsilon) {
|
|
|
|
+ plane.rotate(vectorProduct, product);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return plane;
|
|
return plane;
|
|
};
|
|
};
|