跨域图像资源支持 fix #1；模型json的textures字段支持填入http(s)协议的url

journey-ad · Dec 9, 2017 · 6d06b8e · 6d06b8e
1 parent 277ac8b
commit 6d06b8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/LAppModel.js b/src/LAppModel.js
@@ -40,8 +40,15 @@ LAppModel.prototype.load = function(gl, modelSettingPath, callback)
  for (var i = 0; i < thisRef.modelSetting.getTextureNum(); i++)
  {
 
+ if( /^https?:\/\/|^\/\//i.test(thisRef.modelSetting.getTextureFile(i)) )
+ {
+ var texPaths = thisRef.modelSetting.getTextureFile(i);
+ }
+ else
+ {
  var texPaths = thisRef.modelHomeDir + 
  thisRef.modelSetting.getTextureFile(i);
+ }
 
  thisRef.loadTexture(i, texPaths, function() {
 

diff --git a/src/PlatformManager.js b/src/PlatformManager.js
@@ -74,6 +74,7 @@ PlatformManager.prototype.loadTexture = function(model/*ALive2DModel*/, no/*
  // load textures
  var loadedImage = new Image();
  loadedImage.src = path;
+ loadedImage.crossOrigin = 'Anonymous'; 
 
  var thisRef = this;
  loadedImage.onload = function() {