|
@@ -160,8 +160,22 @@ var BABYLON;
|
|
|
Tools.LoadImage = function (url, onload, onerror, database) {
|
|
|
url = Tools.CleanUrl(url);
|
|
|
var img = new Image();
|
|
|
- if (url.substr(0, 5) !== "data:")
|
|
|
- img.crossOrigin = 'anonymous';
|
|
|
+ if (url.substr(0, 5) !== "data:") {
|
|
|
+ if (Tools.CorsBehavior) {
|
|
|
+ switch (typeof (Tools.CorsBehavior)) {
|
|
|
+ case "function":
|
|
|
+ var result = Tools.CorsBehavior(url);
|
|
|
+ if (result) {
|
|
|
+ img.crossOrigin = result;
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ case "string":
|
|
|
+ default:
|
|
|
+ img.crossOrigin = Tools.CorsBehavior;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
img.onload = function () {
|
|
|
onload(img);
|
|
|
};
|
|
@@ -734,6 +748,7 @@ var BABYLON;
|
|
|
configurable: true
|
|
|
});
|
|
|
Tools.BaseUrl = "";
|
|
|
+ Tools.CorsBehavior = "anonymous";
|
|
|
// Logs
|
|
|
Tools._NoneLogLevel = 0;
|
|
|
Tools._MessageLogLevel = 1;
|