|
|
@@ -841,12 +841,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
return new Vector2(0, 0);
|
|
|
};
|
|
|
/**
|
|
|
- * Returns a new Vector2(1, 1)
|
|
|
- */
|
|
|
- Vector2.One = function () {
|
|
|
- return new Vector2(1, 1);
|
|
|
- };
|
|
|
- /**
|
|
|
* Returns a new Vector2 set from the passed index element of the passed array.
|
|
|
*/
|
|
|
Vector2.FromArray = function (array, offset) {
|
|
|
@@ -1384,12 +1378,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
return new Vector3(0.0, 0.0, 0.0);
|
|
|
};
|
|
|
/**
|
|
|
- * Returns a new Vector3 set to (1.0, 1.0, 1.0).
|
|
|
- */
|
|
|
- Vector3.One = function () {
|
|
|
- return new Vector3(1.0, 1.0, 1.0);
|
|
|
- };
|
|
|
- /**
|
|
|
* Returns a new Vector3 set to (0.0, 1.0, 0.0)
|
|
|
*/
|
|
|
Vector3.Up = function () {
|
|
|
@@ -2053,12 +2041,6 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
return new Vector4(0.0, 0.0, 0.0, 0.0);
|
|
|
};
|
|
|
/**
|
|
|
- * Returns a new Vector4 set to (1.0, 1.0, 1.0, 1.0)
|
|
|
- */
|
|
|
- Vector4.One = function () {
|
|
|
- return new Vector4(1.0, 1.0, 1.0, 1.0);
|
|
|
- };
|
|
|
- /**
|
|
|
* Returns a new normalized Vector4 from the passed one.
|
|
|
*/
|
|
|
Vector4.Normalize = function (vector) {
|
|
|
@@ -8927,13 +8909,7 @@ var BABYLON;
|
|
|
}
|
|
|
}
|
|
|
// Z offset
|
|
|
- this.setZOffset(zOffset);
|
|
|
- };
|
|
|
- Engine.prototype.setZOffset = function (value) {
|
|
|
- this._depthCullingState.zOffset = value;
|
|
|
- };
|
|
|
- Engine.prototype.getZOffset = function () {
|
|
|
- return this._depthCullingState.zOffset;
|
|
|
+ this._depthCullingState.zOffset = zOffset;
|
|
|
};
|
|
|
Engine.prototype.setDepthBuffer = function (enable) {
|
|
|
this._depthCullingState.depthTest = enable;
|
|
|
@@ -11205,9 +11181,9 @@ var BABYLON;
|
|
|
_this.onAfterWorldMatrixUpdateObservable = new BABYLON.Observable();
|
|
|
// Properties
|
|
|
_this.definedFacingForward = true; // orientation for POV movement & rotation
|
|
|
- _this.position = BABYLON.Vector3.Zero();
|
|
|
- _this._rotation = BABYLON.Vector3.Zero();
|
|
|
- _this._scaling = BABYLON.Vector3.One();
|
|
|
+ _this.position = new BABYLON.Vector3(0.0, 0.0, 0.0);
|
|
|
+ _this._rotation = new BABYLON.Vector3(0.0, 0.0, 0.0);
|
|
|
+ _this._scaling = new BABYLON.Vector3(1.0, 1.0, 1.0);
|
|
|
_this.billboardMode = AbstractMesh.BILLBOARDMODE_NONE;
|
|
|
_this.visibility = 1.0;
|
|
|
_this.alphaIndex = Number.MAX_VALUE;
|
|
|
@@ -19106,6 +19082,10 @@ var BABYLON;
|
|
|
_this._deleteBuffer = deleteBuffer;
|
|
|
_this._format = format;
|
|
|
scene = _this.getScene();
|
|
|
+ if (!url) {
|
|
|
+ return _this;
|
|
|
+ }
|
|
|
+ _this._texture = _this._getFromCache(url, noMipmap, samplingMode);
|
|
|
var load = function () {
|
|
|
if (_this._onLoadObservarble && _this._onLoadObservarble.hasObservers()) {
|
|
|
_this.onLoadObservable.notifyObservers(true);
|
|
|
@@ -19117,12 +19097,6 @@ var BABYLON;
|
|
|
scene.resetCachedMaterial();
|
|
|
}
|
|
|
};
|
|
|
- if (!url) {
|
|
|
- _this._delayedOnLoad = load;
|
|
|
- _this._delayedOnError = onError;
|
|
|
- return _this;
|
|
|
- }
|
|
|
- _this._texture = _this._getFromCache(url, noMipmap, samplingMode);
|
|
|
if (!_this._texture) {
|
|
|
if (!scene.useDelayedTextureLoading) {
|
|
|
_this._texture = scene.getEngine().createTexture(url, noMipmap, invertY, scene, _this._samplingMode, load, onError, _this._buffer, null, _this._format);
|
|
|
@@ -19163,13 +19137,7 @@ var BABYLON;
|
|
|
enumerable: true,
|
|
|
configurable: true
|
|
|
});
|
|
|
- Texture.prototype.updateURL = function (url) {
|
|
|
- this.url = url;
|
|
|
- this.delayLoadState = BABYLON.Engine.DELAYLOADSTATE_NOTLOADED;
|
|
|
- this.delayLoad();
|
|
|
- };
|
|
|
Texture.prototype.delayLoad = function () {
|
|
|
- var _this = this;
|
|
|
if (this.delayLoadState !== BABYLON.Engine.DELAYLOADSTATE_NOTLOADED) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -19181,14 +19149,6 @@ var BABYLON;
|
|
|
delete this._buffer;
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
- if (this._texture.isReady) {
|
|
|
- BABYLON.Tools.SetImmediate(function () { return _this._delayedOnLoad(); });
|
|
|
- }
|
|
|
- else {
|
|
|
- this._texture.onLoadedCallbacks.push(this._delayedOnLoad);
|
|
|
- }
|
|
|
- }
|
|
|
};
|
|
|
Texture.prototype.updateSamplingMode = function (samplingMode) {
|
|
|
if (!this._texture) {
|
|
|
@@ -20199,7 +20159,7 @@ var BABYLON;
|
|
|
* Please note that the mesh must have normals vertex data already.
|
|
|
* Returns the Mesh.
|
|
|
*/
|
|
|
- Mesh.prototype.recomputeNormals = function (markDataAsUpdatable) {
|
|
|
+ Mesh.prototype.recomputeNormals = function () {
|
|
|
var positions = this.getVerticesData(BABYLON.VertexBuffer.PositionKind);
|
|
|
var indices = this.getIndices();
|
|
|
var normals;
|
|
|
@@ -20210,7 +20170,7 @@ var BABYLON;
|
|
|
normals = [];
|
|
|
}
|
|
|
BABYLON.VertexData.ComputeNormals(positions, indices, normals);
|
|
|
- this.setVerticesData(BABYLON.VertexBuffer.NormalKind, normals, markDataAsUpdatable);
|
|
|
+ this.updateVerticesData(BABYLON.VertexBuffer.NormalKind, normals, false, false);
|
|
|
return this;
|
|
|
};
|
|
|
/**
|
|
|
@@ -24755,7 +24715,6 @@ var BABYLON;
|
|
|
if (flag & BABYLON.Material.MiscDirtyFlag) {
|
|
|
this._markAllSubMeshesAsMiscDirty();
|
|
|
}
|
|
|
- this.getScene().resetCachedMaterial();
|
|
|
};
|
|
|
PushMaterial.prototype._markAllSubMeshesAsDirty = function (func) {
|
|
|
for (var _i = 0, _a = this.getScene().meshes; _i < _a.length; _i++) {
|
|
|
@@ -29670,7 +29629,7 @@ var BABYLON;
|
|
|
var normals = sourceMesh.getVerticesData(BABYLON.VertexBuffer.NormalKind);
|
|
|
var position = options.position || BABYLON.Vector3.Zero();
|
|
|
var normal = options.normal || BABYLON.Vector3.Up();
|
|
|
- var size = options.size || BABYLON.Vector3.One();
|
|
|
+ var size = options.size || new BABYLON.Vector3(1, 1, 1);
|
|
|
var angle = options.angle || 0;
|
|
|
// Getting correct rotation
|
|
|
if (!normal) {
|
|
|
@@ -33266,9 +33225,8 @@ var BABYLON;
|
|
|
_this.mirrorPlane = new BABYLON.Plane(0, 1, 0, 1);
|
|
|
_this._transformMatrix = BABYLON.Matrix.Zero();
|
|
|
_this._mirrorMatrix = BABYLON.Matrix.Zero();
|
|
|
- _this._blurKernelX = 0;
|
|
|
- _this._blurKernelY = 0;
|
|
|
- _this._blurRatio = 1.0;
|
|
|
+ _this._blurKernel = 0;
|
|
|
+ _this._blurRatio = 0.6;
|
|
|
_this.onBeforeRenderObservable.add(function () {
|
|
|
BABYLON.Matrix.ReflectionToRef(_this.mirrorPlane, _this._mirrorMatrix);
|
|
|
_this._savedViewMatrix = scene.getViewMatrix();
|
|
|
@@ -33301,36 +33259,14 @@ var BABYLON;
|
|
|
configurable: true
|
|
|
});
|
|
|
Object.defineProperty(MirrorTexture.prototype, "blurKernel", {
|
|
|
- set: function (value) {
|
|
|
- this.blurKernelX = value;
|
|
|
- this.blurKernelY = value;
|
|
|
- },
|
|
|
- enumerable: true,
|
|
|
- configurable: true
|
|
|
- });
|
|
|
- Object.defineProperty(MirrorTexture.prototype, "blurKernelX", {
|
|
|
- get: function () {
|
|
|
- return this._blurKernelX;
|
|
|
- },
|
|
|
- set: function (value) {
|
|
|
- if (this._blurKernelX === value) {
|
|
|
- return;
|
|
|
- }
|
|
|
- this._blurKernelX = value;
|
|
|
- this._preparePostProcesses();
|
|
|
- },
|
|
|
- enumerable: true,
|
|
|
- configurable: true
|
|
|
- });
|
|
|
- Object.defineProperty(MirrorTexture.prototype, "blurKernelY", {
|
|
|
get: function () {
|
|
|
- return this._blurKernelY;
|
|
|
+ return this._blurKernel;
|
|
|
},
|
|
|
set: function (value) {
|
|
|
- if (this._blurKernelY === value) {
|
|
|
+ if (this._blurKernel === value) {
|
|
|
return;
|
|
|
}
|
|
|
- this._blurKernelY = value;
|
|
|
+ this._blurKernel = value;
|
|
|
this._preparePostProcesses();
|
|
|
},
|
|
|
enumerable: true,
|
|
|
@@ -33338,20 +33274,15 @@ var BABYLON;
|
|
|
});
|
|
|
MirrorTexture.prototype._preparePostProcesses = function () {
|
|
|
this.clearPostProcesses(true);
|
|
|
- if (this._blurKernelX && this._blurKernelY) {
|
|
|
+ if (this._blurKernel) {
|
|
|
var engine = this.getScene().getEngine();
|
|
|
var textureType = engine.getCaps().textureFloatRender ? BABYLON.Engine.TEXTURETYPE_FLOAT : BABYLON.Engine.TEXTURETYPE_HALF_FLOAT;
|
|
|
- this._blurX = new BABYLON.BlurPostProcess("horizontal blur", new BABYLON.Vector2(1.0, 0), this._blurKernelX, this._blurRatio, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, engine, false, textureType);
|
|
|
+ this._blurX = new BABYLON.BlurPostProcess("horizontal blur", new BABYLON.Vector2(1.0, 0), this._blurKernel, this._blurRatio, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, engine, false, textureType);
|
|
|
this._blurX.autoClear = false;
|
|
|
- if (this._blurRatio === 1) {
|
|
|
- this._blurX.outputTexture = this._texture;
|
|
|
- }
|
|
|
- else {
|
|
|
- this._blurX.alwaysForcePOT = true;
|
|
|
- }
|
|
|
- this._blurY = new BABYLON.BlurPostProcess("vertical blur", new BABYLON.Vector2(0, 1.0), this._blurKernelY, this._blurRatio, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, engine, false, textureType);
|
|
|
+ this._blurX.alwaysForcePOT = false;
|
|
|
+ this._blurY = new BABYLON.BlurPostProcess("vertical blur", new BABYLON.Vector2(0, 1.0), this._blurKernel, this._blurRatio, null, BABYLON.Texture.BILINEAR_SAMPLINGMODE, engine, false, textureType);
|
|
|
this._blurY.autoClear = false;
|
|
|
- this._blurY.alwaysForcePOT = this._blurRatio !== 1;
|
|
|
+ this._blurY.alwaysForcePOT = true;
|
|
|
this.addPostProcess(this._blurX);
|
|
|
this.addPostProcess(this._blurY);
|
|
|
}
|
|
|
@@ -35330,9 +35261,11 @@ var BABYLON;
|
|
|
if (defines._areFresnelDirty) {
|
|
|
if (StandardMaterial.FresnelEnabled) {
|
|
|
// Fresnel
|
|
|
- if (this._diffuseFresnelParameters || this._opacityFresnelParameters ||
|
|
|
- this._emissiveFresnelParameters || this._refractionFresnelParameters ||
|
|
|
- this._reflectionFresnelParameters) {
|
|
|
+ if (this._diffuseFresnelParameters && this._diffuseFresnelParameters.isEnabled ||
|
|
|
+ this._opacityFresnelParameters && this._opacityFresnelParameters.isEnabled ||
|
|
|
+ this._emissiveFresnelParameters && this._emissiveFresnelParameters.isEnabled ||
|
|
|
+ this._refractionFresnelParameters && this._refractionFresnelParameters.isEnabled ||
|
|
|
+ this._reflectionFresnelParameters && this._reflectionFresnelParameters.isEnabled) {
|
|
|
defines.DIFFUSEFRESNEL = (this._diffuseFresnelParameters && this._diffuseFresnelParameters.isEnabled);
|
|
|
defines.OPACITYFRESNEL = (this._opacityFresnelParameters && this._opacityFresnelParameters.isEnabled);
|
|
|
defines.REFLECTIONFRESNEL = (this._reflectionFresnelParameters && this._reflectionFresnelParameters.isEnabled);
|
|
|
@@ -41347,8 +41280,6 @@ var BABYLON;
|
|
|
}
|
|
|
else if (this._forcedOutputTexture) {
|
|
|
target = this._forcedOutputTexture;
|
|
|
- this.width = this._forcedOutputTexture._width;
|
|
|
- this.height = this._forcedOutputTexture._height;
|
|
|
}
|
|
|
else {
|
|
|
target = this.outputTexture;
|
David Catuhe