|
@@ -13669,7 +13669,7 @@ var BABYLON;
|
|
}
|
|
}
|
|
else if (isDDS) {
|
|
else if (isDDS) {
|
|
if (files && files.length === 6) {
|
|
if (files && files.length === 6) {
|
|
- this._cascadeLoadFiles(rootUrl, scene, function (imgs) {
|
|
|
|
|
|
+ this._cascadeLoadFiles(scene, function (imgs) {
|
|
var info;
|
|
var info;
|
|
var loadMipmap = false;
|
|
var loadMipmap = false;
|
|
var width = 0;
|
|
var width = 0;
|
|
@@ -15013,7 +15013,7 @@ var BABYLON;
|
|
};
|
|
};
|
|
this._loadFile(url, onload, undefined, undefined, true, onerror);
|
|
this._loadFile(url, onload, undefined, undefined, true, onerror);
|
|
};
|
|
};
|
|
- Engine.prototype._cascadeLoadFiles = function (rootUrl, scene, onfinish, files, onError) {
|
|
|
|
|
|
+ Engine.prototype._cascadeLoadFiles = function (scene, onfinish, files, onError) {
|
|
if (onError === void 0) { onError = null; }
|
|
if (onError === void 0) { onError = null; }
|
|
var loadedFiles = [];
|
|
var loadedFiles = [];
|
|
loadedFiles._internalCount = 0;
|
|
loadedFiles._internalCount = 0;
|
|
@@ -57584,7 +57584,9 @@ var BABYLON;
|
|
configurable: true
|
|
configurable: true
|
|
});
|
|
});
|
|
CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
|
|
CubeTexture.CreateFromImages = function (files, scene, noMipmap) {
|
|
- return new CubeTexture("", scene, null, noMipmap, files);
|
|
|
|
|
|
+ var rootUrlKey = "";
|
|
|
|
+ files.forEach(function (url) { return rootUrlKey += url; });
|
|
|
|
+ return new CubeTexture(rootUrlKey, scene, null, noMipmap, files);
|
|
};
|
|
};
|
|
CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
|
|
CubeTexture.CreateFromPrefilteredData = function (url, scene, forcedExtension) {
|
|
if (forcedExtension === void 0) { forcedExtension = null; }
|
|
if (forcedExtension === void 0) { forcedExtension = null; }
|