Skip to content

Remote Texture Loading Fix #2486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 9, 2014
Merged

Remote Texture Loading Fix #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a19dd93
Remote Texture Loading Fix
man2 Dec 6, 2014
ea75174
Remove comment
man2 Dec 6, 2014
05c7123
cocos2d/cocos2d-js#1171: Fixed cc.texutreCache's addImage logic
pandamicro Dec 9, 2014
5908d14
Merge pull request #1 from pandamicro/fix_texcache_addImage
man2 Dec 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions CCBoot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,21 @@ cc.loader = /** @lends cc.loader# */{
else if (option !== undefined)
cb = option;

var img = new Image();
var img = this.getRes(url);
if (img) {
cb && cb(null, img);
return img;
}

img = new Image();
if (opt.isCrossOrigin && location.origin != "file://")
img.crossOrigin = "Anonymous";

var lcb = function () {
this.removeEventListener('load', lcb, false);
this.removeEventListener('error', ecb, false);

cc.loader.cache[url] = img;
if (cb)
cb(null, img);
};
Expand Down Expand Up @@ -802,7 +810,7 @@ cc.loader = /** @lends cc.loader# */{
type = cc.path.extname(url);
}

var obj = self.cache[url];
var obj = self.getRes(url);
if (obj)
return cb(null, obj);
var loader = null;
Expand Down
27 changes: 9 additions & 18 deletions cocos2d/core/textures/CCTextureCache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,24 +349,15 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {

tex = locTexs[url] = new cc.Texture2D();
tex.url = url;
if (!cc.loader.getRes(url)) {
if (cc.loader._checkIsImageURL(url)) {
cc.loader.load(url, function (err) {
cb && cb.call(target);
});
} else {
cc.loader.loadImg(url, function (err, img) {
if (err)
return cb ? cb(err) : err;
cc.loader.cache[url] = img;
cc.textureCache.handleLoadedTexture(url);
cb && cb.call(target, tex);
});
}
}
else {
tex.handleLoadedTexture();
}
var loadFunc = cc.loader._checkIsImageURL(url) ? cc.loader.load : cc.loader.loadImg;
loadFunc.call(cc.loader, url, function (err, img) {
if (err)
return cb && cb.call(target, err);
cc.textureCache.handleLoadedTexture(url);

var texResult = locTexs[url];
cb && cb.call(target, texResult);
});

return tex;
};
Expand Down
26 changes: 10 additions & 16 deletions cocos2d/core/textures/TexturesWebGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,24 +882,18 @@ cc._tmp.WebGLTextureCache = function () {
return tex;
}

if (!cc.loader.getRes(url)) {
if (cc.loader._checkIsImageURL(url)) {
cc.loader.load(url, function (err) {
cb && cb.call(target);
});
} else {
cc.loader.loadImg(url, function (err, img) {
if (err)
return cb ? cb(err) : err;
cc.loader.cache[url] = img;
cc.textureCache.handleLoadedTexture(url);
cb && cb.call(target, tex);
});
}
}

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) {
if (err)
return cb && cb.call(target, err);
cc.textureCache.handleLoadedTexture(url);

var texResult = locTexs[url];
cb && cb.call(target, texResult);
});

return tex;
};
_p = null;
Expand Down