|
@@ -12643,7 +12643,7 @@ var BABYLON;
|
|
this._badOS = /iPad/i.test(navigator.userAgent) || /iPhone/i.test(navigator.userAgent);
|
|
this._badOS = /iPad/i.test(navigator.userAgent) || /iPhone/i.test(navigator.userAgent);
|
|
// Detect if we are running on a faulty buggy desktop OS.
|
|
// Detect if we are running on a faulty buggy desktop OS.
|
|
this._badDesktopOS = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
|
|
this._badDesktopOS = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
|
|
- console.log("Babylon.js engine (v" + Engine.Version + ") launched");
|
|
|
|
|
|
+ console.log("Babylon.js v" + Engine.Version + " - " + this.description);
|
|
this.enableOfflineSupport = Engine.OfflineProviderFactory !== undefined;
|
|
this.enableOfflineSupport = Engine.OfflineProviderFactory !== undefined;
|
|
}
|
|
}
|
|
Object.defineProperty(Engine, "LastCreatedEngine", {
|
|
Object.defineProperty(Engine, "LastCreatedEngine", {
|
|
@@ -12699,6 +12699,20 @@ var BABYLON;
|
|
enumerable: true,
|
|
enumerable: true,
|
|
configurable: true
|
|
configurable: true
|
|
});
|
|
});
|
|
|
|
+ Object.defineProperty(Engine.prototype, "description", {
|
|
|
|
+ /**
|
|
|
|
+ * Returns a string describing the current engine
|
|
|
|
+ */
|
|
|
|
+ get: function () {
|
|
|
|
+ var description = "WebGL" + this.webGLVersion;
|
|
|
|
+ if (this._caps.parallelShaderCompile) {
|
|
|
|
+ description += " - Parallel shader compilation";
|
|
|
|
+ }
|
|
|
|
+ return description;
|
|
|
|
+ },
|
|
|
|
+ enumerable: true,
|
|
|
|
+ configurable: true
|
|
|
|
+ });
|
|
Object.defineProperty(Engine.prototype, "isInVRExclusivePointerMode", {
|
|
Object.defineProperty(Engine.prototype, "isInVRExclusivePointerMode", {
|
|
/**
|
|
/**
|
|
* Gets a boolean indicating that the engine is currently in VR exclusive mode for the pointers
|
|
* Gets a boolean indicating that the engine is currently in VR exclusive mode for the pointers
|
|
@@ -26943,7 +26957,6 @@ var BABYLON;
|
|
checkPicking = act.hasPickTriggers;
|
|
checkPicking = act.hasPickTriggers;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- var eventRaised = false;
|
|
|
|
if (checkPicking) {
|
|
if (checkPicking) {
|
|
var btn = evt.button;
|
|
var btn = evt.button;
|
|
clickInfo.hasSwiped = _this._isPointerSwiping();
|
|
clickInfo.hasSwiped = _this._isPointerSwiping();
|
|
@@ -36569,7 +36582,7 @@ var BABYLON;
|
|
if (!doNotAdd) {
|
|
if (!doNotAdd) {
|
|
this._scene.addMaterial(this);
|
|
this._scene.addMaterial(this);
|
|
}
|
|
}
|
|
- if (scene.useMaterialMeshMap) {
|
|
|
|
|
|
+ if (this._scene.useMaterialMeshMap) {
|
|
this.meshMap = {};
|
|
this.meshMap = {};
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -115550,7 +115563,7 @@ var BABYLON;
|
|
_this._caps.depthTextureExtension = false;
|
|
_this._caps.depthTextureExtension = false;
|
|
_this._caps.vertexArrayObject = false;
|
|
_this._caps.vertexArrayObject = false;
|
|
_this._caps.instancedArrays = false;
|
|
_this._caps.instancedArrays = false;
|
|
- BABYLON.Tools.Log("Babylon.js null engine (v" + BABYLON.Engine.Version + ") launched");
|
|
|
|
|
|
+ BABYLON.Tools.Log("Babylon.js v" + BABYLON.Engine.Version + " - Null engine");
|
|
// Wrappers
|
|
// Wrappers
|
|
if (typeof URL === "undefined") {
|
|
if (typeof URL === "undefined") {
|
|
URL = {
|
|
URL = {
|