From fcbe0f9e5a8886f6bc4e7e6c5ceddf640a12a258 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 26 May 2016 16:11:22 +0800 Subject: [PATCH] Fix loading remote image without extension issue --- cocos2d/core/textures/CCTextureCache.js | 7 +++++-- cocos2d/core/textures/TexturesWebGL.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/textures/CCTextureCache.js b/cocos2d/core/textures/CCTextureCache.js index 3e80519bb3..a0763e209d 100644 --- a/cocos2d/core/textures/CCTextureCache.js +++ b/cocos2d/core/textures/CCTextureCache.js @@ -358,10 +358,13 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () { tex = locTexs[url] = new cc.Texture2D(); tex.url = url; - var loadFunc = cc.loader._checkIsImageURL(url) ? cc.loader.load : cc.loader.loadImg; - loadFunc.call(cc.loader, url, function (err, img) { + cc.loader.loadImg(url, function (err, img) { if (err) return cb && cb.call(target, err); + + if (!cc.loader.cache[url]) { + cc.loader.cache[url] = img; + } cc.textureCache.handleLoadedTexture(url); var texResult = locTexs[url]; diff --git a/cocos2d/core/textures/TexturesWebGL.js b/cocos2d/core/textures/TexturesWebGL.js index f96d42ef40..21a1097724 100644 --- a/cocos2d/core/textures/TexturesWebGL.js +++ b/cocos2d/core/textures/TexturesWebGL.js @@ -914,10 +914,13 @@ cc._tmp.WebGLTextureCache = function () { tex = locTexs[url] = new cc.Texture2D(); tex.url = url; - var loadFunc = cc.loader._checkIsImageURL(url) ? cc.loader.load : cc.loader.loadImg; - loadFunc.call(cc.loader, url, function (err, img) { + cc.loader.loadImg(url, function (err, img) { if (err) return cb && cb.call(target, err); + + if (!cc.loader.cache[url]) { + cc.loader.cache[url] = img; + } cc.textureCache.handleLoadedTexture(url); var texResult = locTexs[url];