|
@@ -4,49 +4,31 @@ var __extends=this&&this.__extends||function(){var t=Object.setPrototypeOf||{__p
|
|
|
|
|
|
(function universalModuleDefinition(root, factory) {
|
|
(function universalModuleDefinition(root, factory) {
|
|
var amdDependencies = [];
|
|
var amdDependencies = [];
|
|
- var CANNON = root. CANNON;
|
|
|
|
- if(!CANNON) {
|
|
|
|
- if(typeof exports === 'object') {
|
|
|
|
- try { CANNON = require("cannon"); } catch(e) {}
|
|
|
|
- } else if(typeof define === 'function' && define.amd) {
|
|
|
|
- if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- if(typeof define === 'function' && define.amd) {
|
|
|
|
- if(!(require.specified && require.specified("' + dep.module + '"))) {
|
|
|
|
- try { define("cannon", [], function () { return CANNON; }); } catch(e) { }
|
|
|
|
- }
|
|
|
|
- amdDependencies.push("cannon");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ var CANNON = root.CANNON;
|
|
|
|
+ var OIMO = root.OIMO;
|
|
|
|
+ if(typeof exports === 'object' && typeof module === 'object') {
|
|
|
|
+ try { CANNON = CANNON || require("cannon"); } catch(e) {}
|
|
|
|
+ try { OIMO = OIMO || require("oimo"); } catch(e) {}
|
|
|
|
|
|
- var OIMO = root. OIMO;
|
|
|
|
- if(!OIMO) {
|
|
|
|
- if(typeof exports === 'object') {
|
|
|
|
- try { OIMO = require("oimo"); } catch(e) {}
|
|
|
|
- } else if(typeof define === 'function' && define.amd) {
|
|
|
|
- if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- if(typeof define === 'function' && define.amd) {
|
|
|
|
- if(!(require.specified && require.specified("' + dep.module + '"))) {
|
|
|
|
- try { define("oimo", [], function () { return OIMO; }); } catch(e) { }
|
|
|
|
- }
|
|
|
|
- amdDependencies.push("oimo");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if(typeof exports === 'object' && typeof module === 'object')
|
|
|
|
module.exports = factory(CANNON,OIMO);
|
|
module.exports = factory(CANNON,OIMO);
|
|
- else if(typeof define === 'function' && define.amd)
|
|
|
|
|
|
+ } else if(typeof define === 'function' && define.amd) {
|
|
|
|
+ if(require.specified && require.specified("cannon")) amdDependencies.push("cannon");
|
|
|
|
+ if(require.specified && require.specified("oimo")) amdDependencies.push("oimo");
|
|
|
|
+
|
|
define("babylonjs", amdDependencies, factory);
|
|
define("babylonjs", amdDependencies, factory);
|
|
- else if(typeof exports === 'object')
|
|
|
|
|
|
+ } else if(typeof exports === 'object') {
|
|
|
|
+ try { CANNON = CANNON || require("cannon"); } catch(e) {}
|
|
|
|
+ try { OIMO = OIMO || require("oimo"); } catch(e) {}
|
|
|
|
+
|
|
exports["babylonjs"] = factory(CANNON,OIMO);
|
|
exports["babylonjs"] = factory(CANNON,OIMO);
|
|
- else {
|
|
|
|
|
|
+ } else {
|
|
root["BABYLON"] = factory(CANNON,OIMO);
|
|
root["BABYLON"] = factory(CANNON,OIMO);
|
|
}
|
|
}
|
|
})(this, function(CANNON,OIMO) {
|
|
})(this, function(CANNON,OIMO) {
|
|
- "use strict";
|
|
|
|
|
|
+ CANNON = CANNON || this.CANNON;
|
|
|
|
+ OIMO = OIMO || this.OIMO;
|
|
|
|
+
|
|
|
|
+"use strict";
|
|
var BABYLON;
|
|
var BABYLON;
|
|
(function (BABYLON) {
|
|
(function (BABYLON) {
|
|
/**
|
|
/**
|
|
@@ -15120,6 +15102,7 @@ var BABYLON;
|
|
this.releaseEffects();
|
|
this.releaseEffects();
|
|
// Unbind
|
|
// Unbind
|
|
this.unbindAllAttributes();
|
|
this.unbindAllAttributes();
|
|
|
|
+ this._boundUniforms = [];
|
|
if (this._dummyFramebuffer) {
|
|
if (this._dummyFramebuffer) {
|
|
this._gl.deleteFramebuffer(this._dummyFramebuffer);
|
|
this._gl.deleteFramebuffer(this._dummyFramebuffer);
|
|
}
|
|
}
|
|
@@ -31069,7 +31052,7 @@ var BABYLON;
|
|
return this;
|
|
return this;
|
|
};
|
|
};
|
|
SubMesh.prototype._checkCollision = function (collider) {
|
|
SubMesh.prototype._checkCollision = function (collider) {
|
|
- var boundingInfo = this._renderingMesh.getBoundingInfo();
|
|
|
|
|
|
+ var boundingInfo = this.getBoundingInfo();
|
|
return boundingInfo._checkCollision(collider);
|
|
return boundingInfo._checkCollision(collider);
|
|
};
|
|
};
|
|
/**
|
|
/**
|
|
@@ -47863,8 +47846,11 @@ var BABYLON;
|
|
* Start all animations on given targets
|
|
* Start all animations on given targets
|
|
* @param loop defines if animations must loop
|
|
* @param loop defines if animations must loop
|
|
* @param speedRatio defines the ratio to apply to animation speed (1 by default)
|
|
* @param speedRatio defines the ratio to apply to animation speed (1 by default)
|
|
|
|
+ * @param from defines the from key (optional)
|
|
|
|
+ * @param to defines the to key (optional)
|
|
|
|
+ * @returns the current animation group
|
|
*/
|
|
*/
|
|
- AnimationGroup.prototype.start = function (loop, speedRatio) {
|
|
|
|
|
|
+ AnimationGroup.prototype.start = function (loop, speedRatio, from, to) {
|
|
var _this = this;
|
|
var _this = this;
|
|
if (loop === void 0) { loop = false; }
|
|
if (loop === void 0) { loop = false; }
|
|
if (speedRatio === void 0) { speedRatio = 1; }
|
|
if (speedRatio === void 0) { speedRatio = 1; }
|
|
@@ -47873,7 +47859,13 @@ var BABYLON;
|
|
}
|
|
}
|
|
var _loop_1 = function () {
|
|
var _loop_1 = function () {
|
|
var targetedAnimation = this_1._targetedAnimations[index];
|
|
var targetedAnimation = this_1._targetedAnimations[index];
|
|
- this_1._animatables.push(this_1._scene.beginDirectAnimation(targetedAnimation.target, [targetedAnimation.animation], this_1._from, this_1._to, loop, speedRatio, function () {
|
|
|
|
|
|
+ if (!targetedAnimation.target.animations) {
|
|
|
|
+ targetedAnimation.target.animations = [];
|
|
|
|
+ }
|
|
|
|
+ if (targetedAnimation.target.animations.indexOf(targetedAnimation.animation) === -1) {
|
|
|
|
+ targetedAnimation.target.animations.push(targetedAnimation.animation);
|
|
|
|
+ }
|
|
|
|
+ this_1._animatables.push(this_1._scene.beginDirectAnimation(targetedAnimation.target, [targetedAnimation.animation], from !== undefined ? from : this_1._from, to !== undefined ? to : this_1._to, loop, speedRatio, function () {
|
|
_this.onAnimationEndObservable.notifyObservers(targetedAnimation);
|
|
_this.onAnimationEndObservable.notifyObservers(targetedAnimation);
|
|
}));
|
|
}));
|
|
};
|
|
};
|