From edda79c703d8a2a808ec92d5e04a9e9c4b48cc74 Mon Sep 17 00:00:00 2001 From: sunzhuoshi Date: Wed, 12 Jun 2013 14:12:43 +0800 Subject: [PATCH 1/3] Added config macro for "spine" extension --- extensions/cocos-ext.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h index 8d6171d9c9..dabd1a92c8 100644 --- a/extensions/cocos-ext.h +++ b/extensions/cocos-ext.h @@ -63,7 +63,9 @@ #include "physics_nodes/CCPhysicsSprite.h" #endif +#if CC_ENABLE_SPINE_INTEGRATION #include "spine/spine-cocos2dx.h" +#endif #include "Components/CCComAttribute.h" #include "Components/CCComAudio.h" From 8cad37a8d8b48a966b1ec53e54f363e6591750af Mon Sep 17 00:00:00 2001 From: sunzhuoshi Date: Tue, 16 Jul 2013 14:47:47 +0800 Subject: [PATCH 2/3] Fixed javascript constant names auto-generated --- .../bindings/js/jsb_cocos2d_constants.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripting/javascript/bindings/js/jsb_cocos2d_constants.js b/scripting/javascript/bindings/js/jsb_cocos2d_constants.js index de5f804e61..b3b8ba7db6 100644 --- a/scripting/javascript/bindings/js/jsb_cocos2d_constants.js +++ b/scripting/javascript/bindings/js/jsb_cocos2d_constants.js @@ -93,17 +93,17 @@ cc.TMX_TILE_VERTICAL_FLAG = 0x40000000; cc.TEXT_ALIGNMENT_CENTER = 0x1; cc.TEXT_ALIGNMENT_LEFT = 0x0; cc.TEXT_ALIGNMENT_RIGHT = 0x2; -cc.TEXTURE2_D_PIXEL_FORMAT_A8 = 0x3; -cc.TEXTURE2_D_PIXEL_FORMAT_A_I88 = 0x5; -cc.TEXTURE2_D_PIXEL_FORMAT_DEFAULT = 0x0; -cc.TEXTURE2_D_PIXEL_FORMAT_I8 = 0x4; -cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC2 = 0x9; -cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC4 = 0x8; -cc.TEXTURE2_D_PIXEL_FORMAT_RG_B565 = 0x2; -cc.TEXTURE2_D_PIXEL_FORMAT_RGB5_A1 = 0x7; -cc.TEXTURE2_D_PIXEL_FORMAT_RG_B888 = 0x1; -cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A4444 = 0x6; -cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A8888 = 0x0; +cc.TEXTURE_2D_PIXEL_FORMAT_A8 = 0x3; +cc.TEXTURE_2D_PIXEL_FORMAT_AI88 = 0x5; +cc.TEXTURE_2D_PIXEL_FORMAT_DEFAULT = 0x0; +cc.TEXTURE_2D_PIXEL_FORMAT_I8 = 0x4; +cc.TEXTURE_2D_PIXEL_FORMAT_PVRTC2 = 0x9; +cc.TEXTURE_2D_PIXEL_FORMAT_PVRTC4 = 0x8; +cc.TEXTURE_2D_PIXEL_FORMAT_RGB565 = 0x2; +cc.TEXTURE_2D_PIXEL_FORMAT_RGB5A1 = 0x7; +cc.TEXTURE_2D_PIXEL_FORMAT_RGB888 = 0x1; +cc.TEXTURE_2D_PIXEL_FORMAT_RGBA4444 = 0x6; +cc.TEXTURE_2D_PIXEL_FORMAT_RGBA8888 = 0x0; cc.TOUCHES_ALL_AT_ONCE = 0x0; cc.TOUCHES_ONE_BY_ONE = 0x1; cc.TRANSITION_ORIENTATION_DOWN_OVER = 0x1; From ec7456a43c4564a7af6a5912f28e8d6aa056d4d6 Mon Sep 17 00:00:00 2001 From: sunzhuoshi Date: Tue, 16 Jul 2013 16:19:20 +0800 Subject: [PATCH 3/3] Removed config macro for "spine" extension --- extensions/cocos-ext.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/extensions/cocos-ext.h b/extensions/cocos-ext.h index b0c4818bb6..1958e4286b 100644 --- a/extensions/cocos-ext.h +++ b/extensions/cocos-ext.h @@ -46,10 +46,8 @@ #include "physics_nodes/CCPhysicsDebugNode.h" #include "physics_nodes/CCPhysicsSprite.h" #endif - -#if CC_ENABLE_SPINE_INTEGRATION + #include "spine/spine-cocos2dx.h" -#endif #include "Components/CCComAttribute.h" #include "Components/CCComAudio.h"