fixed #700 add zlib support for cc.TMXXMLParser

Author: dingpinglv

HelloHTML5World/build.xml

@@ -18,6 +18,7 @@
                 <file name="platform/CCMacro.js"/>
                 <file name="platform/CCFileUtils.js"/>
                 <file name="platform/CCTypes.js"/>
+                <file name="platform/zlib.min.js"/>
                 <file name="cocoa/CCGeometry.js"/>
                 <file name="platform/CCConfig.js"/>
                 <file name="cocoa/CCNS.js"/>

chipmunk/chipmunk.js

@@ -27,13 +27,12 @@
     };
 
 //var VERSION = CP_VERSION_MAJOR + "." + CP_VERSION_MINOR + "." + CP_VERSION_RELEASE;
-
     var cp;
     if(typeof exports === 'undefined'){
         cp = {};
 
         if(typeof window === 'object'){
-            window.cp = cp;
+            window["cp"] = cp;
         }
     } else {
         cp = exports;
@@ -3370,7 +3369,7 @@
 
     SegmentShape.prototype.collisionTable = [
         null,
-        function(seg, seg) { return NONE; }, // seg2seg
+        function(seg, seg2) { return NONE; }, // seg2seg
         seg2poly
     ];
 

cocos2d/build.xml

@@ -21,6 +21,7 @@
                 <file name="platform/CCMacro.js"/>
                 <file name="platform/CCFileUtils.js"/>
                 <file name="platform/CCTypes.js"/>
+                <file name="platform/zlib.min.js"/>
                 <file name="cocoa/CCGeometry.js"/>
                 <file name="platform/CCConfig.js"/>
                 <file name="cocoa/CCNS.js"/>

cocos2d/cocos2d_externs.js

@@ -13,3 +13,15 @@
  * @type {string}
  */
 CSSProperties.prototype._super;
+
+/**
+ * cocos2d-html5-only.
+ * @type {string}
+ */
+CSSProperties.prototype.Inflate;
+
+/**
+ * cocos2d-html5-only.
+ * @type {string}
+ */
+CSSProperties.prototype.decompress;

cocos2d/platform/base64.js

@@ -69,6 +69,7 @@ cc.Codec.Base64.decode = function Jacob__Codec__Base64__decode(input) {
  * var decodeArr = cc.Codec.Base64.decodeAsArray("U29tZSBTdHJpbmc=");
  */
 cc.Codec.Base64.decodeAsArray = function Jacob__Codec__Base64___decodeAsArray(input, bytes) {
+    bytes = bytes || 4;
     var dec = this.decode(input),
         ar = [], i, j, len;
     for (i = 0, len = dec.length / bytes; i < len; i++) {
@@ -115,3 +116,16 @@ cc.Codec.Base64.encode = function Jacob__Codec__Base64__encode(input) {
 
     return output;
 };
+
+cc.uint8ArrayToUint32Array = function(uint8Arr){
+    if(uint8Arr.length % 4 != 0)
+        return null;
+
+    var arrLen = uint8Arr.length /4;
+    var retArr = window.Uint8Array? new Uint32Array(arrLen) : [];
+    for(var i = 0; i < arrLen; i++){
+        var offset = i * 4;
+        retArr[i] = uint8Arr[offset]  + uint8Arr[offset + 1] * (1 << 8) + uint8Arr[offset + 2] * (1 << 16) + uint8Arr[offset + 3] * (1<<24);
+    }
+    return retArr;
+};

cocos2d/platform/jsloader.js

@@ -36,6 +36,7 @@
         'platform/CCMacro.js',
         'platform/CCFileUtils.js',
         'platform/CCTypes.js',
+        'platform/zlib.min.js',
         'cocoa/CCGeometry.js',
         'platform/CCConfig.js',
         'cocoa/CCSet.js',

cocos2d/platform/zlib.min.js

@@ -415,13 +415,13 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
     getPositionAt:function (pos) {
         var ret = cc.PointZero();
         switch (this._layerOrientation) {
-            case cc.TMXOrientationOrtho:
+            case cc.TMX_ORIENTATION_ORTHO:
                 ret = this._positionForOrthoAt(pos);
                 break;
-            case cc.TMXOrientationIso:
+            case cc.TMX_ORIENTATION_ISO:
                 ret = this._positionForIsoAt(pos);
                 break;
-            case cc.TMXOrientationHex:
+            case cc.TMX_ORIENTATION_HEX:
                 ret = this._positionForHexAt(pos);
                 break;
         }
@@ -550,14 +550,14 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
     _calculateLayerOffset:function (pos) {
         var ret = cc.PointZero();
         switch (this._layerOrientation) {
-            case cc.TMXOrientationOrtho:
+            case cc.TMX_ORIENTATION_ORTHO:
                 ret = cc.p(pos.x * this._mapTileSize.width, -pos.y * this._mapTileSize.height);
                 break;
-            case cc.TMXOrientationIso:
+            case cc.TMX_ORIENTATION_ISO:
                 ret = cc.p((this._mapTileSize.width / 2) * (pos.x - pos.y),
                     (this._mapTileSize.height / 2 ) * (-pos.x - pos.y));
                 break;
-            case cc.TMXOrientationHex:
+            case cc.TMX_ORIENTATION_HEX:
                 ret = cc.p(0, 0);
                 cc.log("cocos2d:offset for hexagonal map not implemented yet");
                 break;
@@ -728,14 +728,14 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         var maxVal = 0;
         if (this._useAutomaticVertexZ) {
             switch (this._layerOrientation) {
-                case cc.TMXOrientationIso:
+                case cc.TMX_ORIENTATION_ISO:
                     maxVal = this._layerSize.width + this._layerSize.height;
                     ret = -(maxVal - (pos.x + pos.y));
                     break;
-                case cc.TMXOrientationOrtho:
+                case cc.TMX_ORIENTATION_ORTHO:
                     ret = -(this._layerSize.height - pos.y);
                     break;
-                case cc.TMXOrientationHex:
+                case cc.TMX_ORIENTATION_HEX:
                     cc.Assert(0, "TMX Hexa zOrder not supported");
                     break;
                 default:

cocos2d/tileMap_parallax_nodes/CCTMXLayer.js

@@ -29,22 +29,22 @@
  * @constant
  * @type Number
  */
-cc.TMXOrientationOrtho = 0;
+cc.TMX_ORIENTATION_ORTHO = 0;
 
 /**
  * Hexagonal orientation
  * @constant
  * @type Number
  */
 
-cc.TMXOrientationHex = 1;
+cc.TMX_ORIENTATION_HEX = 1;
 
 /**
  * Isometric orientation
  * @constant
  * @type Number
  */
-cc.TMXOrientationIso = 2;
+cc.TMX_ORIENTATION_ISO = 2;
 
 /**
  * <p>cc.TMXTiledMap knows how to parse and render a TMX map.</p>