|
@@ -52719,10 +52719,6 @@ var BABYLON;
|
|
var camLeft = this._rigCameras[0];
|
|
var camLeft = this._rigCameras[0];
|
|
var camRight = this._rigCameras[1];
|
|
var camRight = this._rigCameras[1];
|
|
camLeft.beta = camRight.beta = this.beta;
|
|
camLeft.beta = camRight.beta = this.beta;
|
|
- // This looks like being an issue in rig mode. Should be looked if
|
|
|
|
- // further issues are found. but was modifying the view matrix twice
|
|
|
|
- // Line below commented in order to fix http://www.html5gamedevs.com/topic/41454-confusion-about-camera-positions/
|
|
|
|
- // camLeft.radius = camRight.radius = this.radius;
|
|
|
|
switch (this.cameraRigMode) {
|
|
switch (this.cameraRigMode) {
|
|
case BABYLON.Camera.RIG_MODE_STEREOSCOPIC_ANAGLYPH:
|
|
case BABYLON.Camera.RIG_MODE_STEREOSCOPIC_ANAGLYPH:
|
|
case BABYLON.Camera.RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL:
|
|
case BABYLON.Camera.RIG_MODE_STEREOSCOPIC_SIDEBYSIDE_PARALLEL:
|
|
@@ -69762,7 +69758,7 @@ var BABYLON;
|
|
// place and scale the particle bouding sphere in the SPS local system, then update it
|
|
// place and scale the particle bouding sphere in the SPS local system, then update it
|
|
var minBbox = modelBoundingInfo.minimum.multiplyToRef(particleScaling, tempVectors[1]);
|
|
var minBbox = modelBoundingInfo.minimum.multiplyToRef(particleScaling, tempVectors[1]);
|
|
var maxBbox = modelBoundingInfo.maximum.multiplyToRef(particleScaling, tempVectors[2]);
|
|
var maxBbox = modelBoundingInfo.maximum.multiplyToRef(particleScaling, tempVectors[2]);
|
|
- var bSphereCenter = maxBbox.addToRef(minBbox, tempVectors[3]).scaleInPlace(0.5);
|
|
|
|
|
|
+ var bSphereCenter = maxBbox.addToRef(minBbox, tempVectors[3]).scaleInPlace(0.5).addInPlace(particleGlobalPosition);
|
|
var halfDiag = maxBbox.subtractToRef(minBbox, tempVectors[4]).scaleInPlace(0.5 * this._bSphereRadiusFactor);
|
|
var halfDiag = maxBbox.subtractToRef(minBbox, tempVectors[4]).scaleInPlace(0.5 * this._bSphereRadiusFactor);
|
|
var bSphereMinBbox = bSphereCenter.subtractToRef(halfDiag, tempVectors[1]);
|
|
var bSphereMinBbox = bSphereCenter.subtractToRef(halfDiag, tempVectors[1]);
|
|
var bSphereMaxBbox = bSphereCenter.addToRef(halfDiag, tempVectors[2]);
|
|
var bSphereMaxBbox = bSphereCenter.addToRef(halfDiag, tempVectors[2]);
|