Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2416_RefactorRenderer

Author: dingpinglv

CCBoot.js

@@ -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);
         };
@@ -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;

cocos2d/core/textures/CCTextureCache.js

@@ -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;
     };

cocos2d/core/textures/TexturesWebGL.js

@@ -881,24 +881,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;