Merge pull request #3484 from pandamicro/develop

Improve image loader and fix issues

Author: pandamicro

CCBoot.js

@@ -903,6 +903,12 @@ cc.loader = (function () {
             else if (option !== undefined)
                 callback = option;
 
+            var texture = this.getRes(url);
+            if (texture) {
+                callback && callback(null, texture);
+                return null;
+            }
+
             var queue = _queue[url];
             if (queue) {
                 queue.callbacks.push(callback);

cocos2d/core/platform/CCLoaders.js

@@ -54,12 +54,8 @@ cc._imgLoader = {
             callback = function (err, img) {
                 if (err)
                     return cb(err);
-                
-                var tex = cc.textureCache.getTextureForKey(url) || new cc.Texture2D();
-                tex.url = url;
-                tex.initWithElement(img);
-                tex.handleLoadedTexture();
-                cc.textureCache.cacheImage(url, tex);
+
+                var tex = cc.textureCache.handleLoadedTexture(url, img);
                 cb(null, tex);
             };
         }

cocos2d/core/textures/CCTexture2D.js

@@ -227,6 +227,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
             },
 
             releaseTexture: function () {
+                this._htmlElementObj = null;
                 cc.loader.release(this.url);
             },
 

cocos2d/core/textures/CCTextureCache.js

@@ -323,6 +323,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
             }
             tex.initWithElement(img);
             tex.handleLoadedTexture();
+            return tex;
         };
 
         /**
@@ -366,12 +367,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
                 if (err)
                     return cb && cb.call(target, err);
 
-                cc.textureCache.handleLoadedTexture(url, img);
-                var texResult = locTexs[url];
-                if (!cc.loader.cache[url]) {
-                    cc.loader.cache[url] = texResult;
-                }
-
+                var texResult = cc.textureCache.handleLoadedTexture(url, img);
                 cb && cb.call(target, texResult);
             });
 

cocos2d/core/textures/TexturesWebGL.js

@@ -83,6 +83,7 @@ cc._tmp.WebGLTexture2D = function () {
         releaseTexture: function () {
             if (this._webTextureObj)
                 cc._renderContext.deleteTexture(this._webTextureObj);
+            this._htmlElementObj = null;
             cc.loader.release(this.url);
         },
 
@@ -871,6 +872,7 @@ cc._tmp.WebGLTextureCache = function () {
         else {
             tex.handleLoadedTexture();
         }
+        return tex;
     };
 
     /**
@@ -916,12 +918,7 @@ cc._tmp.WebGLTextureCache = function () {
             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];
+            var texResult = cc.textureCache.handleLoadedTexture(url, img);
             cb && cb.call(target, texResult);
         });