Merge pull request #3441 from pandamicro/develop

Fix cc.textureCache.removeTextureForKey not releasing texture issue

Author: pandamicro

cocos2d/core/CCDirector.js

@@ -939,7 +939,7 @@ cc.Director.PROJECTION_3D = 1;
 cc.Director.PROJECTION_CUSTOM = 3;
 
 /**
- * Constant for default projection of cc.Director, default projection is 3D projection
+ * Constant for default projection of cc.Director, default projection is 2D projection
  * @constant
  * @type {Number}
  */

cocos2d/core/CCDirectorWebGL.js

@@ -177,7 +177,7 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
     };
 
     _p.getZEye = function () {
-        return (this._winSizeInPoints.height / 1.1566 );
+        return (this._winSizeInPoints.height / 1.15469993750 );
     };
 
     _p.setViewport = function () {

cocos2d/core/platform/CCConfig.js

@@ -56,7 +56,7 @@ window["CocosEngine"] = cc.ENGINE_VERSION = "Cocos2d-JS v3.14";
  * @constant
  * @type {Number}
  */
-cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 1;
+cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
 
 /**
  * Position of the FPS (Default: 0,0 (bottom-left corner))<br/>

cocos2d/core/platform/CCEGLView.js

@@ -303,7 +303,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.view# */{
      */
     setOrientation: function (orientation) {
         orientation = orientation & cc.ORIENTATION_AUTO;
-        if (orientation) {
+        if (orientation && this._orientation !== orientation) {
             this._orientation = orientation;
             var designWidth = this._originalDesignResolutionSize.width;
             var designHeight = this._originalDesignResolutionSize.height;

cocos2d/core/textures/CCTextureCache.js

@@ -214,8 +214,11 @@ cc.textureCache = /** @lends cc.textureCache# */{
     removeTextureForKey: function (textureKeyName) {
         if (textureKeyName == null)
             return;
-        if (this._textures[textureKeyName])
+        var tex = this._textures[textureKeyName];
+        if (tex) {
+            tex.releaseTexture();
             delete(this._textures[textureKeyName]);
+        }
     },
 
     //addImage move to Canvas/WebGL