|
|
@@ -20386,7 +20386,6 @@ var BABYLON;
|
|
|
*/
|
|
|
AbstractMesh.prototype.isCompletelyInFrustum = function (frustumPlanes) {
|
|
|
return this._boundingInfo !== null && this._boundingInfo.isCompletelyInFrustum(frustumPlanes);
|
|
|
- ;
|
|
|
};
|
|
|
/**
|
|
|
* True if the mesh intersects another mesh or a SolidParticle object
|
|
|
@@ -35474,7 +35473,6 @@ var BABYLON;
|
|
|
}
|
|
|
var materialType = BABYLON.Tools.Instantiate(parsedMaterial.customType);
|
|
|
return materialType.Parse(parsedMaterial, scene, rootUrl);
|
|
|
- ;
|
|
|
};
|
|
|
// Triangle views
|
|
|
Material._TriangleFillMode = 0;
|
|
|
@@ -42921,23 +42919,6 @@ var BABYLON;
|
|
|
};
|
|
|
return _this;
|
|
|
}
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
- ;
|
|
|
Object.defineProperty(StandardMaterial.prototype, "imageProcessingConfiguration", {
|
|
|
/**
|
|
|
* Gets the image processing configuration used either in this material.
|
|
|
@@ -50083,7 +50064,6 @@ var BABYLON;
|
|
|
enumerable: true,
|
|
|
configurable: true
|
|
|
});
|
|
|
- ;
|
|
|
Object.defineProperty(SpotLight.prototype, "projectionTextureLightNear", {
|
|
|
/**
|
|
|
* Gets the near clip of the Spotlight for texture projection.
|
|
|
@@ -56950,13 +56930,9 @@ var BABYLON;
|
|
|
var serializationObject = {};
|
|
|
serializationObject.type = this.getClassName();
|
|
|
serializationObject.direction1 = this.direction1.asArray();
|
|
|
- ;
|
|
|
serializationObject.direction2 = this.direction2.asArray();
|
|
|
- ;
|
|
|
serializationObject.minEmitBox = this.minEmitBox.asArray();
|
|
|
- ;
|
|
|
serializationObject.maxEmitBox = this.maxEmitBox.asArray();
|
|
|
- ;
|
|
|
return serializationObject;
|
|
|
};
|
|
|
/**
|
|
|
@@ -57324,11 +57300,8 @@ var BABYLON;
|
|
|
*/
|
|
|
SphereDirectedParticleEmitter.prototype.serialize = function () {
|
|
|
var serializationObject = _super.prototype.serialize.call(this);
|
|
|
- ;
|
|
|
serializationObject.direction1 = this.direction1.asArray();
|
|
|
- ;
|
|
|
serializationObject.direction2 = this.direction2.asArray();
|
|
|
- ;
|
|
|
return serializationObject;
|
|
|
};
|
|
|
/**
|
|
|
@@ -58435,11 +58408,10 @@ var BABYLON;
|
|
|
vertexData.indices = (this._depthSort) ? this._indices : this._indices32;
|
|
|
vertexData.set(this._positions32, BABYLON.VertexBuffer.PositionKind);
|
|
|
vertexData.set(this._normals32, BABYLON.VertexBuffer.NormalKind);
|
|
|
- if (this._uvs32) {
|
|
|
+ if (this._uvs32.length > 0) {
|
|
|
vertexData.set(this._uvs32, BABYLON.VertexBuffer.UVKind);
|
|
|
- ;
|
|
|
}
|
|
|
- if (this._colors32) {
|
|
|
+ if (this._colors32.length > 0) {
|
|
|
vertexData.set(this._colors32, BABYLON.VertexBuffer.ColorKind);
|
|
|
}
|
|
|
var mesh = new BABYLON.Mesh(this.name, this._scene);
|
|
|
@@ -61312,7 +61284,6 @@ var BABYLON;
|
|
|
var step = pi2 / tessellation * arc;
|
|
|
var rotated;
|
|
|
var path = new Array();
|
|
|
- ;
|
|
|
for (i = 0; i <= tessellation; i++) {
|
|
|
var path = [];
|
|
|
if (cap == BABYLON.Mesh.CAP_START || cap == BABYLON.Mesh.CAP_ALL) {
|
|
|
@@ -64655,7 +64626,6 @@ var BABYLON;
|
|
|
}
|
|
|
if (y === null || y === undefined) {
|
|
|
var fontSize = parseInt((font.replace(/\D/g, '')));
|
|
|
- ;
|
|
|
y = (size.height / 2) + (fontSize / 3.65);
|
|
|
}
|
|
|
this._context.fillStyle = color;
|
|
|
@@ -69293,8 +69263,8 @@ var BABYLON;
|
|
|
var transaction = this.db.transaction(["versions"]);
|
|
|
transaction.oncomplete = function (event) {
|
|
|
if (version) {
|
|
|
- // If the version in the JSON file is > than the version in DB
|
|
|
- if (_this.manifestVersionFound > version.data) {
|
|
|
+ // If the version in the JSON file is different from the version in DB
|
|
|
+ if (_this.manifestVersionFound !== version.data) {
|
|
|
_this.mustUpdateRessources = true;
|
|
|
updateInDBCallback();
|
|
|
}
|
|
|
@@ -87987,6 +87957,8 @@ var BABYLON;
|
|
|
this._isActionableMesh = false;
|
|
|
this._teleportationRequestInitiated = false;
|
|
|
this._teleportationBackRequestInitiated = false;
|
|
|
+ this._rotationRightAsked = false;
|
|
|
+ this._rotationLeftAsked = false;
|
|
|
this._dpadPressed = true;
|
|
|
this._activePointer = false;
|
|
|
this._id = VRExperienceHelperGazer._idCounter++;
|
|
|
@@ -88028,10 +88000,14 @@ var BABYLON;
|
|
|
this._activePointer = false;
|
|
|
};
|
|
|
VRExperienceHelperGazer.prototype._updatePointerDistance = function (distance) {
|
|
|
+ if (distance === void 0) { distance = 100; }
|
|
|
};
|
|
|
VRExperienceHelperGazer.prototype.dispose = function () {
|
|
|
this._interactionsEnabled = false;
|
|
|
this._teleportationEnabled = false;
|
|
|
+ if (this._gazeTracker) {
|
|
|
+ this._gazeTracker.dispose();
|
|
|
+ }
|
|
|
};
|
|
|
VRExperienceHelperGazer._idCounter = 0;
|
|
|
return VRExperienceHelperGazer;
|
|
|
@@ -88098,6 +88074,7 @@ var BABYLON;
|
|
|
this._laserPointer.parent = mesh;
|
|
|
};
|
|
|
VRExperienceHelperControllerGazer.prototype._updatePointerDistance = function (distance) {
|
|
|
+ if (distance === void 0) { distance = 100; }
|
|
|
this._laserPointer.scaling.y = distance;
|
|
|
this._laserPointer.position.z = -distance / 2;
|
|
|
};
|
|
|
@@ -88171,8 +88148,6 @@ var BABYLON;
|
|
|
this._floorMeshesCollection = [];
|
|
|
this._rotationAllowed = true;
|
|
|
this._teleportBackwardsVector = new BABYLON.Vector3(0, -1, -1);
|
|
|
- this._rotationRightAsked = false;
|
|
|
- this._rotationLeftAsked = false;
|
|
|
this._isDefaultTeleportationTarget = true;
|
|
|
this._teleportationFillColor = "#444444";
|
|
|
this._teleportationBorderColor = "#FFFFFF";
|
|
|
@@ -88606,7 +88581,7 @@ var BABYLON;
|
|
|
if (this.rightController) {
|
|
|
this.rightController._activatePointer();
|
|
|
}
|
|
|
- else if (this.leftController) {
|
|
|
+ if (this.leftController) {
|
|
|
this.leftController._activatePointer();
|
|
|
}
|
|
|
}
|
|
|
@@ -89007,9 +88982,9 @@ var BABYLON;
|
|
|
if (gazer._teleportationRequestInitiated) {
|
|
|
return;
|
|
|
}
|
|
|
- if (!this._rotationLeftAsked) {
|
|
|
+ if (!gazer._rotationLeftAsked) {
|
|
|
if (stateObject.x < -this._padSensibilityUp && gazer._dpadPressed) {
|
|
|
- this._rotationLeftAsked = true;
|
|
|
+ gazer._rotationLeftAsked = true;
|
|
|
if (this._rotationAllowed) {
|
|
|
this._rotateCamera(false);
|
|
|
}
|
|
|
@@ -89017,12 +88992,12 @@ var BABYLON;
|
|
|
}
|
|
|
else {
|
|
|
if (stateObject.x > -this._padSensibilityDown) {
|
|
|
- this._rotationLeftAsked = false;
|
|
|
+ gazer._rotationLeftAsked = false;
|
|
|
}
|
|
|
}
|
|
|
- if (!this._rotationRightAsked) {
|
|
|
+ if (!gazer._rotationRightAsked) {
|
|
|
if (stateObject.x > this._padSensibilityUp && gazer._dpadPressed) {
|
|
|
- this._rotationRightAsked = true;
|
|
|
+ gazer._rotationRightAsked = true;
|
|
|
if (this._rotationAllowed) {
|
|
|
this._rotateCamera(true);
|
|
|
}
|
|
|
@@ -89030,7 +89005,7 @@ var BABYLON;
|
|
|
}
|
|
|
else {
|
|
|
if (stateObject.x < this._padSensibilityDown) {
|
|
|
- this._rotationRightAsked = false;
|
|
|
+ gazer._rotationRightAsked = false;
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -89088,8 +89063,8 @@ var BABYLON;
|
|
|
controller.webVRController.onPadStateChangedObservable.add(function (stateObject) {
|
|
|
controller._dpadPressed = stateObject.pressed;
|
|
|
if (!controller._dpadPressed) {
|
|
|
- _this._rotationLeftAsked = false;
|
|
|
- _this._rotationRightAsked = false;
|
|
|
+ controller._rotationLeftAsked = false;
|
|
|
+ controller._rotationRightAsked = false;
|
|
|
controller._teleportationBackRequestInitiated = false;
|
|
|
}
|
|
|
});
|
|
|
@@ -89395,6 +89370,7 @@ var BABYLON;
|
|
|
gazer._updatePointerDistance(hit.distance);
|
|
|
}
|
|
|
else {
|
|
|
+ gazer._updatePointerDistance();
|
|
|
gazer._gazeTracker.isVisible = false;
|
|
|
}
|
|
|
if (hit && hit.pickedMesh) {
|
David Catuhe