|
@@ -81,7 +81,6 @@ var BABYLON;
|
|
|
_this.MORPHTARGETS_NORMAL = false;
|
|
|
_this.MORPHTARGETS_TANGENT = false;
|
|
|
_this.NUM_MORPH_INFLUENCERS = 0;
|
|
|
- _this.USERIGHTHANDEDSYSTEM = false;
|
|
|
_this.IMAGEPROCESSING = false;
|
|
|
_this.VIGNETTE = false;
|
|
|
_this.VIGNETTEBLENDMODEMULTIPLY = false;
|
|
@@ -641,7 +640,7 @@ var BABYLON;
|
|
|
"mBones",
|
|
|
"vClipPlane", "diffuseMatrix", "ambientMatrix", "opacityMatrix", "reflectionMatrix", "emissiveMatrix", "specularMatrix", "bumpMatrix", "lightmapMatrix", "refractionMatrix",
|
|
|
"diffuseLeftColor", "diffuseRightColor", "opacityParts", "reflectionLeftColor", "reflectionRightColor", "emissiveLeftColor", "emissiveRightColor", "refractionLeftColor", "refractionRightColor",
|
|
|
- "logarithmicDepthConstant", "vNormalReorderParams"
|
|
|
+ "logarithmicDepthConstant", "vTangentSpaceParams"
|
|
|
];
|
|
|
var samplers = ["diffuseSampler", "ambientSampler", "opacitySampler", "reflectionCubeSampler", "reflection2DSampler", "emissiveSampler", "specularSampler", "bumpSampler", "lightmapSampler", "refractionCubeSampler", "refraction2DSampler"];
|
|
|
var uniformBuffers = ["Material", "Scene"];
|
|
@@ -705,7 +704,7 @@ var BABYLON;
|
|
|
this._uniformBuffer.addUniform("lightmapMatrix", 16);
|
|
|
this._uniformBuffer.addUniform("specularMatrix", 16);
|
|
|
this._uniformBuffer.addUniform("bumpMatrix", 16);
|
|
|
- this._uniformBuffer.addUniform("vNormalReorderParams", 4);
|
|
|
+ this._uniformBuffer.addUniform("vTangentSpaceParams", 2);
|
|
|
this._uniformBuffer.addUniform("refractionMatrix", 16);
|
|
|
this._uniformBuffer.addUniform("vRefractionInfos", 4);
|
|
|
this._uniformBuffer.addUniform("vSpecularColor", 4);
|
|
@@ -797,10 +796,10 @@ var BABYLON;
|
|
|
this._uniformBuffer.updateFloat3("vBumpInfos", this._bumpTexture.coordinatesIndex, 1.0 / this._bumpTexture.level, this.parallaxScaleBias);
|
|
|
this._uniformBuffer.updateMatrix("bumpMatrix", this._bumpTexture.getTextureMatrix());
|
|
|
if (scene._mirroredCameraPosition) {
|
|
|
- this._uniformBuffer.updateFloat4("vNormalReorderParams", this.invertNormalMapX ? 0 : 1.0, this.invertNormalMapX ? 1.0 : -1.0, this.invertNormalMapY ? 0 : 1.0, this.invertNormalMapY ? 1.0 : -1.0);
|
|
|
+ this._uniformBuffer.updateFloat2("vTangentSpaceParams", this.invertNormalMapX ? 1.0 : -1.0, this.invertNormalMapY ? 1.0 : -1.0);
|
|
|
}
|
|
|
else {
|
|
|
- this._uniformBuffer.updateFloat4("vNormalReorderParams", this.invertNormalMapX ? 1.0 : 0, this.invertNormalMapX ? -1.0 : 1.0, this.invertNormalMapY ? 1.0 : 0, this.invertNormalMapY ? -1.0 : 1.0);
|
|
|
+ this._uniformBuffer.updateFloat2("vTangentSpaceParams", this.invertNormalMapX ? -1.0 : 1.0, this.invertNormalMapY ? -1.0 : 1.0);
|
|
|
}
|
|
|
}
|
|
|
if (this._refractionTexture && StandardMaterial_OldVer.RefractionTextureEnabled) {
|