From 02226c6a26ca5c6072e1c394e9d24564e4beeb17 Mon Sep 17 00:00:00 2001 From: Vincent Yang Date: Thu, 9 Jul 2015 16:49:26 +0800 Subject: [PATCH 01/32] Fix bug: Clipping node doesn't work on Android 5.0. --- .../org/cocos2dx/lib/Cocos2dxActivity.java | 213 ++++++++++-------- 1 file changed, 123 insertions(+), 90 deletions(-) diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java index cf8d82670f..4df8e959aa 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -46,6 +46,9 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.opengl.GLSurfaceView; +import java.util.Arrays; +import java.util.Comparator; + public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelperListener { // =========================================================== // Constants @@ -75,31 +78,6 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe { configAttribs = attribs; } - - public EGLConfig selectConfig(EGL10 egl, EGLDisplay display, EGLConfig[] configs, int[] attribs) - { - for (EGLConfig config : configs) { - int d = findConfigAttrib(egl, display, config, - EGL10.EGL_DEPTH_SIZE, 0); - int s = findConfigAttrib(egl, display, config, - EGL10.EGL_STENCIL_SIZE, 0); - if ((d >= attribs[4]) && (s >= attribs[5])) { - int r = findConfigAttrib(egl, display, config, - EGL10.EGL_RED_SIZE, 0); - int g = findConfigAttrib(egl, display, config, - EGL10.EGL_GREEN_SIZE, 0); - int b = findConfigAttrib(egl, display, config, - EGL10.EGL_BLUE_SIZE, 0); - int a = findConfigAttrib(egl, display, config, - EGL10.EGL_ALPHA_SIZE, 0); - if ((r >= attribs[0]) && (g >= attribs[1]) - && (b >= attribs[2]) && (a >= attribs[3])) { - return config; - } - } - } - return null; - } private int findConfigAttrib(EGL10 egl, EGLDisplay display, EGLConfig config, int attribute, int defaultValue) { @@ -109,76 +87,131 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe } return defaultValue; } - + + class ConfigValue implements Comparable { + + public EGLConfig config = null; + public int[] configAttribs = null; + public int value = 0; + private void calcValue() { + // depth factor 29bit and [6,12)bit + if (configAttribs[4] > 0) { + value = value + (1 << 29) + ((configAttribs[4]%64) << 6); + } + // stencil factor 28bit and [0, 6)bit + if (configAttribs[5] > 0) { + value = value + (1 << 28) + ((configAttribs[5]%64)); + } + // alpha factor 30bit and [24, 28)bit + if (configAttribs[3] > 0) { + value = value + (1 << 30) + ((configAttribs[3]%16) << 24); + } + // green factor [20, 24)bit + if (configAttribs[1] > 0) { + value = value + ((configAttribs[1]%16) << 20); + } + // blue factor [16, 20)bit + if (configAttribs[2] > 0) { + value = value + ((configAttribs[2]%16) << 16); + } + // red factor [12, 16)bit + if (configAttribs[0] > 0) { + value = value + ((configAttribs[0]%16) << 12); + } + } + + public ConfigValue(int[] attribs) { + configAttribs = attribs; + calcValue(); + } + + public ConfigValue(EGL10 egl, EGLDisplay display, EGLConfig config) { + this.config = config; + configAttribs = new int[6]; + configAttribs[0] = findConfigAttrib(egl, display, config, EGL10.EGL_RED_SIZE, 0); + configAttribs[1] = findConfigAttrib(egl, display, config, EGL10.EGL_GREEN_SIZE, 0); + configAttribs[2] = findConfigAttrib(egl, display, config, EGL10.EGL_BLUE_SIZE, 0); + configAttribs[3] = findConfigAttrib(egl, display, config, EGL10.EGL_ALPHA_SIZE, 0); + configAttribs[4] = findConfigAttrib(egl, display, config, EGL10.EGL_DEPTH_SIZE, 0); + configAttribs[5] = findConfigAttrib(egl, display, config, EGL10.EGL_STENCIL_SIZE, 0); + calcValue(); + } + + @Override + public int compareTo(ConfigValue another) { + if (value < another.value) { + return -1; + } else if (value > another.value) { + return 1; + } else { + return 0; + } + } + + @Override + public String toString() { + return "{ color: " + configAttribs[3] + configAttribs[2] + configAttribs[1] + configAttribs[0] + + "; depth: " + configAttribs[4] + "; stencil: " + configAttribs[5] + ";}"; + } + } + @Override public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) { + int[] EGLattribs = { + EGL10.EGL_RED_SIZE, configAttribs[0], + EGL10.EGL_GREEN_SIZE, configAttribs[1], + EGL10.EGL_BLUE_SIZE, configAttribs[2], + EGL10.EGL_ALPHA_SIZE, configAttribs[3], + EGL10.EGL_DEPTH_SIZE, configAttribs[4], + EGL10.EGL_STENCIL_SIZE,configAttribs[5], + EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT + EGL10.EGL_NONE + }; + EGLConfig[] configs = new EGLConfig[1]; int[] numConfigs = new int[1]; - if(egl.eglGetConfigs(display, null, 0, numConfigs)) - { - EGLConfig[] configs = new EGLConfig[numConfigs[0]]; - int[] EGLattribs = { - EGL10.EGL_RED_SIZE, configAttribs[0], - EGL10.EGL_GREEN_SIZE, configAttribs[1], - EGL10.EGL_BLUE_SIZE, configAttribs[2], - EGL10.EGL_ALPHA_SIZE, configAttribs[3], - EGL10.EGL_DEPTH_SIZE, configAttribs[4], - EGL10.EGL_STENCIL_SIZE,configAttribs[5], - EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT - EGL10.EGL_NONE - }; - int[] choosedConfigNum = new int[1]; - - egl.eglChooseConfig(display, EGLattribs, configs, numConfigs[0], choosedConfigNum); - if(choosedConfigNum[0]>0) - { - return selectConfig(egl, display, configs, configAttribs); - } - else - { - int[] defaultEGLattribs = { - EGL10.EGL_RED_SIZE, 5, - EGL10.EGL_GREEN_SIZE, 6, - EGL10.EGL_BLUE_SIZE, 5, - EGL10.EGL_ALPHA_SIZE, 0, - EGL10.EGL_DEPTH_SIZE, 0, - EGL10.EGL_STENCIL_SIZE,0, - EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT - EGL10.EGL_NONE - }; - int[] defaultEGLattribsAlpha = { - EGL10.EGL_RED_SIZE, 4, - EGL10.EGL_GREEN_SIZE, 4, - EGL10.EGL_BLUE_SIZE, 4, - EGL10.EGL_ALPHA_SIZE, 4, - EGL10.EGL_DEPTH_SIZE, 0, - EGL10.EGL_STENCIL_SIZE,0, - EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT - EGL10.EGL_NONE - }; - int[] attribs = null; - //choose one can use - if(this.configAttribs[3] == 0) - { - egl.eglChooseConfig(display, defaultEGLattribs, configs, numConfigs[0], choosedConfigNum); - attribs = new int[]{5,6,5,0,0,0}; - } - else - { - egl.eglChooseConfig(display, defaultEGLattribsAlpha, configs, numConfigs[0], choosedConfigNum); - attribs = new int[]{4,4,4,4,0,0}; - } - if(choosedConfigNum[0] > 0) - { - return selectConfig(egl, display, configs, attribs); - } - else - { - Log.e(DEVICE_POLICY_SERVICE, "Can not select an EGLConfig for rendering."); - return null; - } - } + + if (egl.eglChooseConfig(display, EGLattribs, configs, 1, numConfigs)) { + return configs[0]; } + + // there's no config match the specific configAttribs, we should choose a closest one + int[] EGLV2attribs = { + EGL10.EGL_RENDERABLE_TYPE, 4, //EGL_OPENGL_ES2_BIT + EGL10.EGL_NONE + }; + + if(egl.eglChooseConfig(display, EGLV2attribs, null, 0, numConfigs)) { + int num = numConfigs[0]; + ConfigValue[] cfgVals = new ConfigValue[num]; + + // convert all config to ConfigValue + configs = new EGLConfig[num]; + egl.eglChooseConfig(display, EGLV2attribs, configs, num, numConfigs); + for (int i = 0; i < num; ++i) { + cfgVals[i] = new ConfigValue(egl, display, configs[i]); + } + + ConfigValue e = new ConfigValue(configAttribs); + // bin search + int lo = 0; + int hi = num; + int mi; + while (lo < hi - 1) { + mi = (lo + hi) / 2; + if (e.compareTo(cfgVals[mi]) < 0) { + hi = mi; + } else { + lo = mi; + } + } + if (lo != num - 1) { + lo = lo + 1; + } + Log.w("cocos2d", "Can't find EGLConfig match: " + e + ", instead of closest one:" + cfgVals[lo]); + return cfgVals[lo].config; + } + Log.e(DEVICE_POLICY_SERVICE, "Can not select an EGLConfig for rendering."); return null; } From 2f31f6baa68c7cd423dc66188ae9315ae9c1b3c0 Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 15 Jul 2015 14:35:13 +0800 Subject: [PATCH 02/32] fixed Scale9Sprite gray state issue. When call `setCapInsets`, the Scale9Sprite's inner sprite will be rebuild and it's state will be lose. This commit reset the shader state. --- cocos/ui/UIScale9Sprite.cpp | 11 +++++++++-- cocos/ui/UIScale9Sprite.h | 8 ++++++++ .../CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp index bc5ad0843e..5f694a05e6 100644 --- a/cocos/ui/UIScale9Sprite.cpp +++ b/cocos/ui/UIScale9Sprite.cpp @@ -58,6 +58,7 @@ namespace ui { ,_flippedX(false) ,_flippedY(false) ,_isPatch9(false) + ,_brightState(State::NORMAL) { this->setAnchorPoint(Vec2(0.5,0.5)); @@ -556,6 +557,7 @@ namespace ui { } applyBlendFunc(); + this->setState(_brightState); if(this->_isPatch9) { size.width = size.width - 2; @@ -1051,7 +1053,11 @@ namespace ui { CC_SAFE_DELETE(pReturn); return NULL; } - + + Scale9Sprite::State Scale9Sprite::getState()const + { + return _brightState; + } void Scale9Sprite::setState(cocos2d::ui::Scale9Sprite::State state) { @@ -1070,7 +1076,7 @@ namespace ui { default: break; } - + if (nullptr != _scale9Image) { _scale9Image->setGLProgramState(glState); @@ -1083,6 +1089,7 @@ namespace ui { sp->setGLProgramState(glState); } } + _brightState = state; } /** sets the opacity. diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h index 076f241281..c70bde0a53 100644 --- a/cocos/ui/UIScale9Sprite.h +++ b/cocos/ui/UIScale9Sprite.h @@ -466,6 +466,13 @@ namespace ui { */ void setState(State state); + /** + * Query the current bright state. + * @return @see `State` + * @since v3.7 + */ + State getState()const; + /** * @brief Query the sprite's original size. * @@ -743,6 +750,7 @@ namespace ui { bool _flippedX; bool _flippedY; bool _isPatch9; + State _brightState; }; }} //end of namespace diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp index 3db6191344..3a047854b9 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp @@ -1009,6 +1009,8 @@ bool UIButtonDisableDefaultTest::init() button->setZoomScale(0.4f); button->setPressedActionEnabled(true); button->setBright(false); + button->setScale9Enabled(true); + button->setCapInsets(Rect(3,3,5,5)); button->addClickEventListener([=](Ref*){ button->setBright(true); }); From be71b6d563453bb49d12852ec1c8abbd6bb19a06 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Wed, 15 Jul 2015 08:23:23 +0000 Subject: [PATCH 03/32] [ci skip][AUTO]: updating luabinding & jsbinding automatically --- .../auto/api/jsb_cocos2dx_ui_auto_api.js | 10 ++++ .../js-bindings/auto/jsb_cocos2dx_ui_auto.cpp | 19 ++++++++ .../js-bindings/auto/jsb_cocos2dx_ui_auto.hpp | 1 + .../lua-bindings/auto/api/Scale9Sprite.lua | 8 ++++ .../auto/lua_cocos2dx_ui_auto.cpp | 48 +++++++++++++++++++ .../auto/lua_cocos2dx_ui_auto.hpp | 1 + 6 files changed, 87 insertions(+) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js index 902900ccf7..168349277a 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js @@ -4861,6 +4861,16 @@ disableCascadeOpacity : function ( { }, +/** + * @method getState + * @return {ccui.Scale9Sprite::State} + */ +getState : function ( +) +{ + return 0; +}, + /** * @method setState * @param {ccui.Scale9Sprite::State} arg0 diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp index c3b5ced0d7..06baa7ca13 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp @@ -12919,6 +12919,24 @@ bool js_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity(JSContext *cx, uint32_t a JS_ReportError(cx, "js_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity : wrong number of arguments: %d, was expecting %d", argc, 0); return false; } +bool js_cocos2dx_ui_Scale9Sprite_getState(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::ui::Scale9Sprite* cobj = (cocos2d::ui::Scale9Sprite *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_ui_Scale9Sprite_getState : Invalid Native Object"); + if (argc == 0) { + int ret = (int)cobj->getState(); + jsval jsret = JSVAL_NULL; + jsret = int32_to_jsval(cx, ret); + args.rval().set(jsret); + return true; + } + + JS_ReportError(cx, "js_cocos2dx_ui_Scale9Sprite_getState : wrong number of arguments: %d, was expecting %d", argc, 0); + return false; +} bool js_cocos2dx_ui_Scale9Sprite_setState(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -13926,6 +13944,7 @@ void js_register_cocos2dx_ui_Scale9Sprite(JSContext *cx, JS::HandleObject global JS_FN("setFlippedX", js_cocos2dx_ui_Scale9Sprite_setFlippedX, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("resizableSpriteWithCapInsets", js_cocos2dx_ui_Scale9Sprite_resizableSpriteWithCapInsets, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("disableCascadeOpacity", js_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), + JS_FN("getState", js_cocos2dx_ui_Scale9Sprite_getState, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setState", js_cocos2dx_ui_Scale9Sprite_setState, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setInsetBottom", js_cocos2dx_ui_Scale9Sprite_setInsetBottom, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("initWithSpriteFrameName", js_cocos2dx_ui_Scale9Sprite_initWithSpriteFrameName, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp index bf5380e81f..33fa81447e 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp @@ -667,6 +667,7 @@ bool js_cocos2dx_ui_Scale9Sprite_setFlippedY(JSContext *cx, uint32_t argc, jsval bool js_cocos2dx_ui_Scale9Sprite_setFlippedX(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_Scale9Sprite_resizableSpriteWithCapInsets(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_ui_Scale9Sprite_getState(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_Scale9Sprite_setState(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_Scale9Sprite_setInsetBottom(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_ui_Scale9Sprite_initWithSpriteFrameName(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua index 305da3bf3a..bc5f866c1f 100644 --- a/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua +++ b/cocos/scripting/lua-bindings/auto/api/Scale9Sprite.lua @@ -78,6 +78,14 @@ -- @param self -- @return Scale9Sprite#Scale9Sprite self (return value: ccui.Scale9Sprite) +-------------------------------- +-- Query the current bright state.
+-- return @see `State`
+-- since v3.7 +-- @function [parent=#Scale9Sprite] getState +-- @param self +-- @return int#int ret (return value: int) + -------------------------------- -- Change the state of 9-slice sprite.
-- see `State`
diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index 418e5c2556..509d9893e5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -21412,6 +21412,53 @@ int lua_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Scale9Sprite_getState(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Scale9Sprite* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Scale9Sprite",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Scale9Sprite*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Scale9Sprite_getState'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + { + tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_ui_Scale9Sprite_getState'", nullptr); + return 0; + } + int ret = (int)cobj->getState(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + luaL_error(tolua_S, "%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Scale9Sprite:getState",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Scale9Sprite_getState'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Scale9Sprite_setState(lua_State* tolua_S) { int argc = 0; @@ -22972,6 +23019,7 @@ int lua_register_cocos2dx_ui_Scale9Sprite(lua_State* tolua_S) tolua_function(tolua_S,"setFlippedX",lua_cocos2dx_ui_Scale9Sprite_setFlippedX); tolua_function(tolua_S,"resizableSpriteWithCapInsets",lua_cocos2dx_ui_Scale9Sprite_resizableSpriteWithCapInsets); tolua_function(tolua_S,"disableCascadeOpacity",lua_cocos2dx_ui_Scale9Sprite_disableCascadeOpacity); + tolua_function(tolua_S,"getState",lua_cocos2dx_ui_Scale9Sprite_getState); tolua_function(tolua_S,"setState",lua_cocos2dx_ui_Scale9Sprite_setState); tolua_function(tolua_S,"setInsetBottom",lua_cocos2dx_ui_Scale9Sprite_setInsetBottom); tolua_function(tolua_S,"initWithSpriteFrameName",lua_cocos2dx_ui_Scale9Sprite_initWithSpriteFrameName); diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index f6e49f0ad1..4cac215451 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -562,6 +562,7 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + #endif // __cocos2dx_ui_h__ From 04fd171e77602fc18927320bec8ccffc1a62f2ce Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 15 Jul 2015 22:36:28 +0800 Subject: [PATCH 04/32] Update web ref --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index dd8735056c..c865cb4cdc 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit dd8735056c87ffb22502e7178c01d92d9b8cdc65 +Subproject commit c865cb4cdcde2dc5b59bced02f54892654bfb06c From ef70e1f9966ef669f18d0d7381845ecafc81c0b7 Mon Sep 17 00:00:00 2001 From: VisualSj Date: Thu, 16 Jul 2015 10:30:22 +0800 Subject: [PATCH 05/32] Fixed a bug that is Armature parser --- .../studio/parsers/timelineParser-2.x.js | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js index c0e4f7ecfa..28d6367c49 100644 --- a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js +++ b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js @@ -349,8 +349,8 @@ positionXPercent = PrePosition["X"] || 0; positionYPercent = PrePosition["Y"] || 0; } - var sizeXPercentEnable = json["PercentWidthEnable"] || false; - var sizeYPercentEnable = json["PercentHeightEnable"] || false; + var sizeXPercentEnable = json["PercentWidthEnable"] || json["PercentWidthEnabled"] || false; + var sizeYPercentEnable = json["PercentHeightEnable"]|| json["PercentHeightEnabled"] || false; var sizeXPercent = 0, sizeYPercent = 0, PreSize = json["PreSize"]; @@ -548,7 +548,7 @@ if (cc.sys.isNative) { fontName = cc.path.join(cc.loader.resPath, resourcePath, path); } else { - fontName = path.match(/([^\/]+)\.ttf/); + fontName = path.match(/([^\/]+)\.(\S+)/); fontName = fontName ? fontName[1] : ""; } widget.setFontName(fontName); @@ -632,7 +632,7 @@ if (cc.sys.isNative) { fontName = cc.path.join(cc.loader.resPath, resourcePath, path); } else { - fontName = path.match(/([^\/]+)\.ttf/); + fontName = path.match(/([^\/]+)\.(\S+)/); fontName = fontName ? fontName[1] : ""; } widget.setTitleFontName(fontName); @@ -1101,7 +1101,7 @@ if (cc.sys.isNative) { fontName = cc.path.join(cc.loader.resPath, resourcePath, path); } else { - fontName = path.match(/([^\/]+)\.ttf/); + fontName = path.match(/([^\/]+)\.(\S+)/); fontName = fontName ? fontName[1] : ""; } widget.setFontName(fontName); @@ -1217,8 +1217,6 @@ var currentAnimationName = json["CurrentAnimationName"]; - parser.generalAttributes(node, json); - loadTexture(json["FileData"], resourcePath, function(path, type){ var plists, pngs; var armJson = cc.loader.getRes(path); @@ -1236,8 +1234,15 @@ node.init(getFileName(path)); if(isAutoPlay) node.getAnimation().play(currentAnimationName, -1, isLoop); + else{ + node.getAnimation().play(currentAnimationName); + node.getAnimation().gotoAndPause(0); + } }); + + parser.generalAttributes(node, json); + node.setColor(getColor(json["CColor"])); return node; }; @@ -1257,7 +1262,7 @@ loadedPlist[resourcePath + plist] = true; cc.spriteFrameCache.addSpriteFrames(resourcePath + plist); }else{ - if(!loadedPlist[resourcePath + plist]) + if(!loadedPlist[resourcePath + plist] && !cc.spriteFrameCache.getSpriteFrame(path)) cc.log("%s need to be preloaded", resourcePath + plist); } } From 0bb385f37c200457af75761d36d0d735b4f3aa48 Mon Sep 17 00:00:00 2001 From: VisualSj Date: Thu, 16 Jul 2015 11:54:45 +0800 Subject: [PATCH 06/32] Check texture for existence --- .../script/studio/parsers/timelineParser-2.x.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js index 28d6367c49..c70f68f094 100644 --- a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js +++ b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js @@ -1266,9 +1266,12 @@ cc.log("%s need to be preloaded", resourcePath + plist); } } - if(type !== 0) - cb(path, type); - else + if(type !== 0){ + if(cc.spriteFrameCache.getSpriteFrame(path)) + cb(path, type); + else + cc.log("failed to get spriteFrame: %s", path); + }else cb(resourcePath + path, type); } }; From 490d5a37474d6f789364a76f8e2574b0b98198e2 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 16 Jul 2015 14:09:26 +0800 Subject: [PATCH 07/32] Remove cleanup from auto bindings add made it support override in JS --- cocos/2d/CCNode.cpp | 22 ++++++++++--------- cocos/2d/CCProtectedNode.cpp | 8 +++++++ cocos/2d/CCTransition.cpp | 8 +++++++ .../js-bindings/manual/cocos2d_specifics.cpp | 15 +++++++++++++ .../js-bindings/manual/cocos2d_specifics.hpp | 1 + cocos/ui/UIScale9Sprite.cpp | 8 +++++++ tools/tojs/cocos2dx.ini | 2 +- 7 files changed, 53 insertions(+), 11 deletions(-) diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 2cff686d9c..94a868d8de 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -221,20 +221,22 @@ bool Node::init() void Node::cleanup() { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJS(this, kNodeOnCleanup)) + return; + } + else if (_scriptType == kScriptTypeLua) + { + ScriptEngineManager::sendNodeEventToLua(this, kNodeOnCleanup); + } +#endif // #if CC_ENABLE_SCRIPT_BINDING + // actions this->stopAllActions(); this->unscheduleAllCallbacks(); -#if CC_ENABLE_SCRIPT_BINDING - if ( _scriptType != kScriptTypeNone) - { - int action = kNodeOnCleanup; - BasicScriptData data(this,(void*)&action); - ScriptEvent scriptEvent(kNodeEvent,(void*)&data); - ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(&scriptEvent); - } -#endif // #if CC_ENABLE_SCRIPT_BINDING - // timers for( const auto &child: _children) child->cleanup(); diff --git a/cocos/2d/CCProtectedNode.cpp b/cocos/2d/CCProtectedNode.cpp index 3acb2cd79a..8e60d825d5 100644 --- a/cocos/2d/CCProtectedNode.cpp +++ b/cocos/2d/CCProtectedNode.cpp @@ -63,6 +63,14 @@ ProtectedNode * ProtectedNode::create(void) void ProtectedNode::cleanup() { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJS(this, kNodeOnCleanup)) + return; + } +#endif // #if CC_ENABLE_SCRIPT_BINDING + Node::cleanup(); // timers for( const auto &child: _protectedChildren) diff --git a/cocos/2d/CCTransition.cpp b/cocos/2d/CCTransition.cpp index 15287df224..bc70e1d59a 100644 --- a/cocos/2d/CCTransition.cpp +++ b/cocos/2d/CCTransition.cpp @@ -191,6 +191,14 @@ void TransitionScene::onExit() // custom cleanup void TransitionScene::cleanup() { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJS(this, kNodeOnCleanup)) + return; + } +#endif // #if CC_ENABLE_SCRIPT_BINDING + Scene::cleanup(); if( _isSendCleanupToScene ) diff --git a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp index 87603e33ed..ccc383f274 100644 --- a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp +++ b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp @@ -2456,6 +2456,20 @@ bool js_cocos2dx_Node_onExitTransitionDidStart(JSContext *cx, uint32_t argc, jsv return false; } +bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp) +{ + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_cleanup : Invalid Native Object"); + + ScriptingCore::getInstance()->setCalledFromScript(true); + cobj->cleanup(); + args.rval().setUndefined(); + return true; +} + bool js_cocos2dx_CCNode_setPosition(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -6145,6 +6159,7 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global) JS_DefineFunction(cx, tmpObj, "onExit", js_cocos2dx_Node_onExit, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); JS_DefineFunction(cx, tmpObj, "onEnterTransitionDidFinish", js_cocos2dx_Node_onEnterTransitionDidFinish, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); JS_DefineFunction(cx, tmpObj, "onExitTransitionDidStart", js_cocos2dx_Node_onExitTransitionDidStart, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); + JS_DefineFunction(cx, tmpObj, "cleanup", js_cocos2dx_Node_cleanup, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT); JS_DefineFunction(cx, tmpObj, "schedule", js_CCNode_schedule, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT); JS_DefineFunction(cx, tmpObj, "scheduleOnce", js_CCNode_scheduleOnce, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT); JS_DefineFunction(cx, tmpObj, "scheduleUpdateWithPriority", js_cocos2dx_CCNode_scheduleUpdateWithPriority, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT); diff --git a/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp b/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp index fa8c6ff9e9..5bad0a7d62 100644 --- a/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp +++ b/cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp @@ -262,6 +262,7 @@ bool js_cocos2dx_Node_onEnter(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_onExit(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_onEnterTransitionDidFinish(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_onExitTransitionDidStart(JSContext *cx, uint32_t argc, jsval *vp); +bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Component_onEnter(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Component_onExit(JSContext *cx, uint32_t argc, jsval *vp); diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp index bc5ad0843e..3890ecd772 100644 --- a/cocos/ui/UIScale9Sprite.cpp +++ b/cocos/ui/UIScale9Sprite.cpp @@ -1385,6 +1385,14 @@ namespace ui { void Scale9Sprite::cleanup() { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJS(this, kNodeOnCleanup)) + return; + } +#endif // #if CC_ENABLE_SCRIPT_BINDING + Node::cleanup(); // timers for( const auto &child: _protectedChildren) diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index da1e96417d..1423a4ada8 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -103,7 +103,7 @@ skip = Node::[^setPosition$ setGLServerState description getUserObject .*UserDat CardinalSpline.*::[create actionWithDuration setPoints initWithDuration], Scheduler::[pause resume ^unschedule$ unscheduleUpdate unscheduleAllForTarget schedule isTargetPaused isScheduled], TextureCache::[addPVRTCImage], - *::[copyWith.* onEnter.* onExit.* ^description$ getObjectType onTouch.* onAcc.* onKey.* onRegisterTouchListener operator.+], + *::[copyWith.* ^cleanup$ onEnter.* onExit.* ^description$ getObjectType onTouch.* onAcc.* onKey.* onRegisterTouchListener operator.+], FileUtils::[getFileData getDataFromFile setFilenameLookupDictionary destroyInstance getFullPathCache], Application::[^application.* ^run$ getCurrentLanguageCode setAnimationInterval], Camera::[getEyeXYZ getCenterXYZ getUpXYZ], From 949eca2846c32efbc65d7a9505012595e5023df2 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 16 Jul 2015 14:34:14 +0800 Subject: [PATCH 08/32] Improve some manual binding code --- .../js-bindings/manual/cocos2d_specifics.cpp | 122 +++++++++--------- 1 file changed, 58 insertions(+), 64 deletions(-) diff --git a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp index ccc383f274..697c079157 100644 --- a/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp +++ b/cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp @@ -2370,90 +2370,84 @@ bool js_forceGC(JSContext *cx, uint32_t argc, jsval *vp) { bool js_cocos2dx_retain(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ((Ref *)proxy->ptr)->retain(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Ref* cobj = (cocos2d::Ref *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_retain : Invalid Native Object"); + + cobj->retain(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_release(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ((Ref *)proxy->ptr)->release(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Ref* cobj = (cocos2d::Ref *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_release : Invalid Native Object"); + + cobj->release(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_Node_onEnter(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ScriptingCore::getInstance()->setCalledFromScript(true); - static_cast(proxy->ptr)->onEnter(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_onEnter : Invalid Native Object"); + + ScriptingCore::getInstance()->setCalledFromScript(true); + cobj->onEnter(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_Node_onExit(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ScriptingCore::getInstance()->setCalledFromScript(true); - static_cast(proxy->ptr)->onExit(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_onExit : Invalid Native Object"); + + ScriptingCore::getInstance()->setCalledFromScript(true); + cobj->onExit(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_Node_onEnterTransitionDidFinish(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ScriptingCore::getInstance()->setCalledFromScript(true); - static_cast(proxy->ptr)->onEnterTransitionDidFinish(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_onEnterTransitionDidFinish : Invalid Native Object"); + + ScriptingCore::getInstance()->setCalledFromScript(true); + cobj->onEnterTransitionDidFinish(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_Node_onExitTransitionDidStart(JSContext *cx, uint32_t argc, jsval *vp) { - JSObject *thisObj = JS_THIS_OBJECT(cx, vp); - if (thisObj) { - js_proxy_t *proxy = jsb_get_js_proxy(thisObj); - if (proxy) { - ScriptingCore::getInstance()->setCalledFromScript(true); - static_cast(proxy->ptr)->onExitTransitionDidStart(); - return true; - } - } - JS_ReportError(cx, "Invalid Native Object."); - return false; + JS::CallArgs args = JS::CallArgsFromVp(argc, vp); + JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); + js_proxy_t *proxy = jsb_get_js_proxy(obj); + cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); + JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_onExitTransitionDidStart : Invalid Native Object"); + + ScriptingCore::getInstance()->setCalledFromScript(true); + cobj->onExitTransitionDidStart(); + args.rval().setUndefined(); + return true; } bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp) From ae2d955955e0d3ccb92eed463ecc43b2f21a730d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 16 Jul 2015 14:39:09 +0800 Subject: [PATCH 09/32] Update web engine ref --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index c865cb4cdc..581b04be4d 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit c865cb4cdcde2dc5b59bced02f54892654bfb06c +Subproject commit 581b04be4d1dac001de1136f93a6166f344143c1 From f2567f498cded4edb41fa2e7ebba100f725a1827 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 16 Jul 2015 08:22:58 +0000 Subject: [PATCH 10/32] [ci skip][AUTO]: updating luabinding & jsbinding automatically --- .../auto/api/jsb_cocos2dx_auto_api.js | 8 -------- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 17 ----------------- .../js-bindings/auto/jsb_cocos2dx_auto.hpp | 1 - 3 files changed, 26 deletions(-) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index 9897478966..eb17b93ccc 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -1709,14 +1709,6 @@ char { }, -/** - * @method cleanup - */ -cleanup : function ( -) -{ -}, - /** * @method getComponent * @param {String} arg0 diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 13ac0994ad..8717e27753 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -4173,22 +4173,6 @@ bool js_cocos2dx_Node_setOpacity(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Node_setOpacity : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } -bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_cleanup : Invalid Native Object"); - if (argc == 0) { - cobj->cleanup(); - args.rval().setUndefined(); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_Node_cleanup : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} bool js_cocos2dx_Node_getComponent(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -4987,7 +4971,6 @@ void js_register_cocos2dx_Node(JSContext *cx, JS::HandleObject global) { JS_FN("setLocalZOrder", js_cocos2dx_Node_setLocalZOrder, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setCascadeColorEnabled", js_cocos2dx_Node_setCascadeColorEnabled, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setOpacity", js_cocos2dx_Node_setOpacity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("cleanup", js_cocos2dx_Node_cleanup, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getComponent", js_cocos2dx_Node_getComponent, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getContentSize", js_cocos2dx_Node_getContentSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("stopAllActionsByTag", js_cocos2dx_Node_stopAllActionsByTag, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index b35d64be77..4fe3798777 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -205,7 +205,6 @@ bool js_cocos2dx_Node_getScaleX(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setCascadeColorEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getComponent(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getContentSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_stopAllActionsByTag(JSContext *cx, uint32_t argc, jsval *vp); From 96f6c44281bea800cd3696e6aa3028b61e7c619f Mon Sep 17 00:00:00 2001 From: andyque Date: Thu, 16 Jul 2015 16:50:47 +0800 Subject: [PATCH 11/32] fix auto scrolling and curPageIdx issue --- cocos/ui/UIPageView.cpp | 14 ++++++++++++-- .../UIPageViewTest/UIPageViewTest.cpp | 17 +++++++++++------ .../UIPageViewTest/UIPageViewTest_Editor.cpp | 13 +++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/cocos/ui/UIPageView.cpp b/cocos/ui/UIPageView.cpp index c227a4c824..1975507858 100644 --- a/cocos/ui/UIPageView.cpp +++ b/cocos/ui/UIPageView.cpp @@ -165,6 +165,7 @@ void PageView::insertPage(Layout* page, int idx) _doLayoutDirty = true; } + void PageView::removePage(Layout* page) { if (!page) @@ -172,8 +173,14 @@ void PageView::removePage(Layout* page) return; } removeChild(page); + auto pageCount = _pages.size(); _pages.eraseObject(page); - + + if (_curPageIdx >= pageCount) + { + _curPageIdx = pageCount - 1; + } + _doLayoutDirty = true; } @@ -194,6 +201,7 @@ void PageView::removeAllPages() removeChild(node); } _pages.clear(); + _curPageIdx = 0; } void PageView::updateBoundaryPages() @@ -249,7 +257,9 @@ void PageView::updateAllPagesPosition() { _curPageIdx = pageCount-1; } - + // If the layout is dirty, don't trigger auto scroll + _isAutoScrolling = false; + float pageWidth = getContentSize().width; for (int i=0; isetName(StringUtils::format("button %d", j)); - innerBox->addChild(btn); } LinearLayoutParameter *parameter = LinearLayoutParameter::create(); parameter->setMargin(Margin(0,0,100,0)); innerBox->setLayoutParameter(parameter); - outerBox->addChild(innerBox); - } pageView->addPage(outerBox); _displayValueLabel->setString(StringUtils::format("page count = %ld", pageView->getPages().size())); - + CCLOG("current page index = %zd", pageView->getCurPageIndex()); }); _uiLayer->addChild(button); @@ -649,6 +645,7 @@ bool UIPageViewDynamicAddAndRemoveTest::init() CCLOG("There is no page to remove!"); } _displayValueLabel->setString(StringUtils::format("page count = %ld", pageView->getPages().size())); + CCLOG("current page index = %zd", pageView->getCurPageIndex()); }); _uiLayer->addChild(button2); @@ -663,11 +660,19 @@ bool UIPageViewDynamicAddAndRemoveTest::init() { pageView->removeAllPages(); _displayValueLabel->setString(StringUtils::format("page count = %ld", pageView->getPages().size())); + CCLOG("current page index = %zd", pageView->getCurPageIndex()); }); _uiLayer->addChild(button3); - + auto button4 = (ui::Button*)button3->clone(); + button4->setTitleText("Scroll to Page4"); + button4->setNormalizedPosition(Vec2(0.85,0.5)); + button4->addClickEventListener([=](Ref* sender){ + pageView->scrollToPage(3); + CCLOG("current page index = %zd", pageView->getCurPageIndex()); + }); + _uiLayer->addChild(button4); return true; } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp index ed903376b4..135171de28 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest_Editor.cpp @@ -32,8 +32,21 @@ bool UIPageViewTest_Editor::init() _layout = static_cast(child); _touchGroup->addChild(_layout); + auto pageView = (PageView*)(ui::Helper::seekWidgetByName(_layout, "PageView_1269")); + pageView->scrollToPage(1); // 1->2 + this->configureGUIScene(); + auto button1 = Button::create(); + button1->setTitleText("scrollToPage 3"); + button1->setNormalizedPosition(Vec2(0.8,0.2)); + button1->addClickEventListener([=](Ref*){ + pageView->scrollToPage(2); + }); + _touchGroup->addChild(button1); + + + return true; } From e2068ab84a559b54b8c2ec65439378ed46a96c7b Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 16 Jul 2015 16:53:43 +0800 Subject: [PATCH 12/32] Update versions and docs for v3.7 --- README.md | 57 +++++++++++++++++-- cocos/cocos2d.cpp | 2 +- .../js-bindings/manual/ScriptingCore.h | 2 +- .../js-bindings/script/jsb_cocos2d.js | 2 +- docs/RELEASE_NOTES.md | 1 + web | 2 +- 6 files changed, 56 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 862ee49c2c..f2718595dd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ cocos2d-x [cocos2d-x][1] is a multi-platform framework for building 2d games, interactive books, demos and other graphical applications. It is based on [cocos2d-iphone][2], but instead of using Objective-C, it uses C++. -It works on iOS, Android, Windows Phone and Store Apps, OS X, Windows and Linux. +It works on iOS, Android, Windows Phone and Store Apps, OS X, Windows, Linux and Web platforms. cocos2d-x is: @@ -38,6 +38,12 @@ Git user attention cocos2d-x $ git submodule update --init +Download stable versions +----------------------- + +[Cocos2d-x stable versions](http://www.cocos2d-x.org/download) +[Cocos2d-JS Lite version](http://www.cocos2d-x.org/filecenter/jsbuilder) + How to start a new game ----------------------- @@ -53,6 +59,8 @@ Example: $ cocos new MyGame -p com.your_company.mygame -l cpp -d NEW_PROJECTS_DIR $ cd NEW_PROJECTS_DIR/MyGame +You can also create a JS project or Lua project with `-l js` or `-l lua`. + ### Build and run a new project for Android ### $ cocos run -p android -j 4 @@ -67,7 +75,7 @@ Example: ### Build and run a new project for Linux ### -if you never run cocos2d-x on Linux, you need to install all dependencies by the +If you never run cocos2d-x on Linux, you need to install all dependencies by the script in **cocos2d/build/install-deps-linux.sh** $ cd cocos2d-x/build @@ -100,6 +108,29 @@ Starting with Cocos2d-x v3.6 there will no longer be support for Windows Phone 8 See more info on How to install and Create games on Windows RT (Windows and Windows Phone 8.1) at http://msopentech.github.io/cocos2d-x/ +### Build and run new project for web ### + +Only JS project can be published to web platforms, so you will need to create a JS project first: + + $ cocos new -l js WebGame + +Then you can run your game in a web browser: + + $ cocos run -p web + +Or you can publish your game to `publish/html5/` folder: + + $ cocos run -p web -m release [--advanced] + +Documentations and samples +------------- + +* [Online API Reference](http://cocos2d-x.org/wiki/Reference) _Note that Cocos2d-x and Cocos2d-JS have different API set_ +* [Programmers Guide](http://cocos2d-x.org/programmersguide/) +* [Temporary Cocos2d-JS documents](http://cocos2d-x.org/docs/manual/framework/html5/en) +* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v3/docs/RELEASE_NOTES.md) +* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG) +* [Cocos2d sample games](https://github.com/cocos2d/cocos2d-x-samples) _More samples will be added in v3.8_ Main features ------------- @@ -141,9 +172,8 @@ Build Requirements * or Windows 7+, VS 2013+ * Python 2.7.5 * NDK r10c+ is required to build Android games -* Windows Phone/Store 8.0 VS 2013+ -* Windows Phone/Store 8.1 VS 2013 Update 3+ - +* Windows Phone/Store 8.1 VS 2013 Update 4+ +* JRE or JDK 1.6+ is required for web publishing Runtime Requirements -------------------- @@ -153,13 +183,28 @@ Runtime Requirements * Windows 10.0 for Windows Phone/Store 10.0 games * OS X v10.6+ for Mac games * Windows 7+ for Win games - + * Modern browsers and IE 9+ for web games Running Tests -------------------- Select the test you want from Xcode Scheme chooser. +* Cocos Console + +``` +// Enter cpp test folder +cd tests/cpp-tests +// Or enter js test folder +cd tests/js-tests +// Or enter lua test folder +cd tests/lua-tests + +// Compile or run test case +cocos compile -p ios|mac|android|win32|win8_1|metro|web -m debug|release +cocos run -p ios|mac|android|win32|win8_1|metro|web -m debug|release +``` + * For OS X / iOS ``` diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index 6025f37084..7ddafddb44 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -31,7 +31,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "cocos2d-x-3.7rc1"; + return "cocos2d-x-3.7"; } NS_CC_END diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h index bbd324032e..ddcf8a70cc 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.h +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.h @@ -39,7 +39,7 @@ #include #include -#define ENGINE_VERSION "Cocos2d-JS v3.7 RC1" +#define ENGINE_VERSION "Cocos2d-JS v3.7" void js_log(const char *format, ...); diff --git a/cocos/scripting/js-bindings/script/jsb_cocos2d.js b/cocos/scripting/js-bindings/script/jsb_cocos2d.js index 3cd454e0fb..79d7a826a0 100644 --- a/cocos/scripting/js-bindings/script/jsb_cocos2d.js +++ b/cocos/scripting/js-bindings/script/jsb_cocos2d.js @@ -26,7 +26,7 @@ // CCConfig.js // -cc.ENGINE_VERSION = "Cocos2d-JS v3.7 RC1"; +cc.ENGINE_VERSION = "Cocos2d-JS v3.7"; cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0; cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0}; diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 8d1a3d3549..fffa6c0685 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -48,6 +48,7 @@ * Windows 7 or newer * Windows Phone 8.1 * Linux Ubuntu 14.04 or newer +* Mordern browsers and IE 9+ (On mobile platforms, only iOS and Android 5 activated WebGL support) ## Compiler Requirements diff --git a/web b/web index 581b04be4d..c1d11554d4 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 581b04be4d1dac001de1136f93a6166f344143c1 +Subproject commit c1d11554d435f884a0f922b6d47edb75e84dcf0d From 047d3dd398c40b44e17e720d8922af591adf44bb Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 16 Jul 2015 09:02:35 +0000 Subject: [PATCH 13/32] [ci skip][AUTO]: updating luabinding & jsbinding automatically --- .../auto/api/jsb_cocos2dx_auto_api.js | 8 -------- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 17 ----------------- .../js-bindings/auto/jsb_cocos2dx_auto.hpp | 1 - 3 files changed, 26 deletions(-) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index 9897478966..eb17b93ccc 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -1709,14 +1709,6 @@ char { }, -/** - * @method cleanup - */ -cleanup : function ( -) -{ -}, - /** * @method getComponent * @param {String} arg0 diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 13ac0994ad..8717e27753 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -4173,22 +4173,6 @@ bool js_cocos2dx_Node_setOpacity(JSContext *cx, uint32_t argc, jsval *vp) JS_ReportError(cx, "js_cocos2dx_Node_setOpacity : wrong number of arguments: %d, was expecting %d", argc, 1); return false; } -bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp) -{ - JS::CallArgs args = JS::CallArgsFromVp(argc, vp); - JS::RootedObject obj(cx, args.thisv().toObjectOrNull()); - js_proxy_t *proxy = jsb_get_js_proxy(obj); - cocos2d::Node* cobj = (cocos2d::Node *)(proxy ? proxy->ptr : NULL); - JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Node_cleanup : Invalid Native Object"); - if (argc == 0) { - cobj->cleanup(); - args.rval().setUndefined(); - return true; - } - - JS_ReportError(cx, "js_cocos2dx_Node_cleanup : wrong number of arguments: %d, was expecting %d", argc, 0); - return false; -} bool js_cocos2dx_Node_getComponent(JSContext *cx, uint32_t argc, jsval *vp) { JS::CallArgs args = JS::CallArgsFromVp(argc, vp); @@ -4987,7 +4971,6 @@ void js_register_cocos2dx_Node(JSContext *cx, JS::HandleObject global) { JS_FN("setLocalZOrder", js_cocos2dx_Node_setLocalZOrder, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setCascadeColorEnabled", js_cocos2dx_Node_setCascadeColorEnabled, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("setOpacity", js_cocos2dx_Node_setOpacity, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), - JS_FN("cleanup", js_cocos2dx_Node_cleanup, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getComponent", js_cocos2dx_Node_getComponent, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("getContentSize", js_cocos2dx_Node_getContentSize, 0, JSPROP_PERMANENT | JSPROP_ENUMERATE), JS_FN("stopAllActionsByTag", js_cocos2dx_Node_stopAllActionsByTag, 1, JSPROP_PERMANENT | JSPROP_ENUMERATE), diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp index b35d64be77..4fe3798777 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp @@ -205,7 +205,6 @@ bool js_cocos2dx_Node_getScaleX(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setLocalZOrder(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setCascadeColorEnabled(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_setOpacity(JSContext *cx, uint32_t argc, jsval *vp); -bool js_cocos2dx_Node_cleanup(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getComponent(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_getContentSize(JSContext *cx, uint32_t argc, jsval *vp); bool js_cocos2dx_Node_stopAllActionsByTag(JSContext *cx, uint32_t argc, jsval *vp); From 2507673c5af57bbb4e697132b014c8df8fbad200 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 16 Jul 2015 23:32:18 +0800 Subject: [PATCH 14/32] Fix download section in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f2718595dd..00ec4b9623 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Git user attention Download stable versions ----------------------- -[Cocos2d-x stable versions](http://www.cocos2d-x.org/download) -[Cocos2d-JS Lite version](http://www.cocos2d-x.org/filecenter/jsbuilder) +* [Cocos2d-x stable versions](http://www.cocos2d-x.org/download) +* [Cocos2d-JS Lite version](http://www.cocos2d-x.org/filecenter/jsbuilder) How to start a new game ----------------------- From a5e3267c98415b1700a8a3604f43b19938ed14ba Mon Sep 17 00:00:00 2001 From: Bin Zhang Date: Fri, 17 Jul 2015 10:08:35 +0800 Subject: [PATCH 15/32] Update the reference of submodule cocos2d-console. --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 84620bef69..f3768083be 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 84620bef6981ab8641b4bc7a755f75c4a83a3436 +Subproject commit f3768083be951e019a2983703847e05b2e284e7d From c9ca8d9ce8028860c548ac879f2606b8e7154af0 Mon Sep 17 00:00:00 2001 From: andyque Date: Fri, 17 Jul 2015 10:39:01 +0800 Subject: [PATCH 16/32] fix PageView cur index issue --- cocos/ui/UIPageView.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cocos/ui/UIPageView.cpp b/cocos/ui/UIPageView.cpp index 1975507858..62e4c1ec2c 100644 --- a/cocos/ui/UIPageView.cpp +++ b/cocos/ui/UIPageView.cpp @@ -35,7 +35,7 @@ _isAutoScrolling(false), _autoScrollDistance(0.0f), _autoScrollSpeed(0.0f), _autoScrollDirection(AutoScrollDirection::LEFT), -_curPageIdx(0), +_curPageIdx(-1), _touchMoveDirection(TouchDirection::LEFT), _leftBoundaryChild(nullptr), _rightBoundaryChild(nullptr), @@ -138,7 +138,10 @@ void PageView::addPage(Layout* page) addChild(page); _pages.pushBack(page); - + if (_curPageIdx == -1) + { + _curPageIdx = 0; + } _doLayoutDirty = true; } @@ -159,7 +162,10 @@ void PageView::insertPage(Layout* page, int idx) { _pages.insert(idx, page); addChild(page); - + if(_curPageIdx == -1) + { + _curPageIdx = 0; + } } _doLayoutDirty = true; @@ -173,9 +179,8 @@ void PageView::removePage(Layout* page) return; } removeChild(page); - auto pageCount = _pages.size(); _pages.eraseObject(page); - + auto pageCount = _pages.size(); if (_curPageIdx >= pageCount) { _curPageIdx = pageCount - 1; @@ -201,7 +206,7 @@ void PageView::removeAllPages() removeChild(node); } _pages.clear(); - _curPageIdx = 0; + _curPageIdx = -1; } void PageView::updateBoundaryPages() @@ -249,7 +254,7 @@ void PageView::updateAllPagesPosition() if (pageCount <= 0) { - _curPageIdx = 0; + _curPageIdx = -1; return; } From cb5e2d59c3eec1957606d65783c4e1c8479df422 Mon Sep 17 00:00:00 2001 From: Vincent Yang Date: Mon, 20 Jul 2015 17:50:02 +0800 Subject: [PATCH 17/32] Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. --- cocos/ui/UIListView.cpp | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/cocos/ui/UIListView.cpp b/cocos/ui/UIListView.cpp index d127585303..6f685c8b06 100644 --- a/cocos/ui/UIListView.cpp +++ b/cocos/ui/UIListView.cpp @@ -35,7 +35,7 @@ ListView::ListView(): _model(nullptr), _gravity(Gravity::CENTER_VERTICAL), _itemsMargin(0.0f), -_curSelectedIndex(0), +_curSelectedIndex(-1), _refreshViewDirty(true), _listViewEventListener(nullptr), _listViewEventSelector(nullptr), @@ -230,14 +230,7 @@ void ListView::insertDefaultItem(ssize_t index) { return; } - Widget* newItem = _model->clone(); - - _items.insert(index, newItem); - ScrollView::addChild(newItem); - - remedyLayoutParameter(newItem); - - _refreshViewDirty = true; + insertCustomItem(_model->clone(), index); } @@ -285,6 +278,18 @@ void ListView::removeChild(cocos2d::Node *child, bool cleaup) Widget* widget = dynamic_cast(child); if (nullptr != widget) { + if (-1 != _curSelectedIndex) + { + auto removedIndex = getIndex(widget); + if (_curSelectedIndex > removedIndex) + { + _curSelectedIndex -= 1; + } + else if (_curSelectedIndex == removedIndex) + { + _curSelectedIndex = -1; + } + } _items.eraseObject(widget); } @@ -300,10 +305,18 @@ void ListView::removeAllChildrenWithCleanup(bool cleanup) { ScrollView::removeAllChildrenWithCleanup(cleanup); _items.clear(); + _curSelectedIndex = -1; } void ListView::insertCustomItem(Widget* item, ssize_t index) { + if (-1 != _curSelectedIndex) + { + if (_curSelectedIndex >= index) + { + _curSelectedIndex += 1; + } + } _items.insert(index, item); ScrollView::addChild(item); From 14c1862f7e47e8072499a5e10408e1d8774c49d5 Mon Sep 17 00:00:00 2001 From: ZhangMenghe Date: Mon, 20 Jul 2015 17:05:28 +0800 Subject: [PATCH 18/32] Modify testCase for UITextFieldTest --- .../src/GUITest/UITextFieldTest/UITextFieldTest.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/js-tests/src/GUITest/UITextFieldTest/UITextFieldTest.js b/tests/js-tests/src/GUITest/UITextFieldTest/UITextFieldTest.js index a2d8c3590c..7de655e441 100644 --- a/tests/js-tests/src/GUITest/UITextFieldTest/UITextFieldTest.js +++ b/tests/js-tests/src/GUITest/UITextFieldTest/UITextFieldTest.js @@ -29,9 +29,15 @@ var UITextFieldTest = UIScene.extend({ var widgetSize = this._widget.getContentSize(); //init text this._topDisplayLabel.setString("No Event"); + this._topDisplayLabel.setAnchorPoint(cc.vertex2(0.5, -1)); + this._topDisplayLabel.setPosition(cc.vertex2(widgetSize.width / 2.0, widgetSize.height / 2.0 + this._topDisplayLabel.getContentSize().height * 1.5)); + this._bottomDisplayLabel.setString("TextField"); + this._bottomDisplayLabel.setPosition(cc.vertex2(widgetSize.width / 2.0, widgetSize.height / 2.0 - this._bottomDisplayLabel.getContentSize().height * 3.4)); + this._bottomDisplayLabel.setColor(cc.color(255, 255, 255, 255)); // Create the textfield + cc.director.getOpenGLView().setIMEKeyboardState(true); var textField = new ccui.TextField("PlaceHolder", "Marker Felt", 30); textField.x = widgetSize.width / 2.0; textField.y = widgetSize.height / 2.0; @@ -48,7 +54,7 @@ var UITextFieldTest = UIScene.extend({ case ccui.TextField.EVENT_ATTACH_WITH_IME: var widgetSize = this._widget.getContentSize(); textField.runAction(cc.moveTo(0.225, - cc.p(widgetSize.width / 2, widgetSize.height / 2 + textField.height / 2))); + cc.p(widgetSize.width / 2, widgetSize.height / 2 + 30))); this._topDisplayLabel.setString("attach with IME"); break; case ccui.TextField.EVENT_DETACH_WITH_IME: @@ -65,7 +71,6 @@ var UITextFieldTest = UIScene.extend({ default: break; } - this._bottomDisplayLabel.setString(textField.getString()); } }); From ed6d759145170bdbef2b3c73103f61a7a37bcdd5 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 21 Jul 2015 09:24:31 +0800 Subject: [PATCH 19/32] Update html5 engine ref --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index c1d11554d4..a8e922bb5e 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit c1d11554d435f884a0f922b6d47edb75e84dcf0d +Subproject commit a8e922bb5efdeeb98faeab6eb87869c7918e2846 From f98e9495feaa57aad2c7b9c6ec49a50ace7344de Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 21 Jul 2015 09:49:41 +0800 Subject: [PATCH 20/32] Update release docs for v3.7 --- CHANGELOG | 11 +++++++++++ docs/RELEASE_NOTES.md | 6 +++--- web | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7fb3782b9c..d5c020b8a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,17 @@ cocos2d-x-3.8 ?? [FIX] renderer: UI component can't click correctly by moving UI and camera far away of origin. [FIX] JS: Fixed issue of iOS/JS reflection `callStaticMethod` with bool arg +cocos2d-x-3.7final July.21 2015 + [REFINE] JS: Improve manual binding code for `retain`, `release`, `onEnter`, `onExit`, `onEnterTransitionDidFinish` and `onExitTransitionDidStart` + [REFINE] web: Add compatible Uint16Array defintion + + [FIX] Scale9Sprite: Fixed Scale9Sprite gray state issue while `setCapInsets` called + [FIX] studio: Fixed parser issue by checking texture existance + [FIX] studio: Fixed Armature parser issue + [FIX] JS: Fixed cleanup overriding issue in JS that it will cause `too much recursion` error + [FIX] web: Fixed url check regular expression not supporting localhost issue + [FIX] web: Fixed issue that sprite doesn't update texture rect correctly in some condition + cocos2d-x-3.7rc1 July.14 2015 [REFINE] framework: Used msbuild to generating engine prebuilt libs on win32. [REFINE] 3d: Used shader with normal while creating mesh with normals diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index fffa6c0685..88170c3dbc 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -2,7 +2,7 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* -- [Cocos2d-x v3.7 RC1 Release Notes](#cocos2d-x-v37-rc0-release-notes) +- [Cocos2d-x v3.7 Release Notes](#cocos2d-x-v37-release-notes) - [Misc Information](#misc-information) - [Requirements](#requirements) - [Runtime Requirements](#runtime-requirements) @@ -32,7 +32,7 @@ -# Cocos2d-x v3.7 RC1 Release Notes # +# Cocos2d-x v3.7 Release Notes # # Misc Information @@ -173,7 +173,7 @@ cocos new -l cpp|js|lua MyGame ## Download -[Cocos2d-x v3.7 RC1](http://www.cocos2d-x.org/filedown/cocos2d-x-3.7rc1.zip) including : C++, Lua & JS +[Cocos2d-x v3.7](http://www.cocos2d-x.org/filedown/cocos2d-x-3.7.zip) including : C++, Lua & JS ## The main features in detail: diff --git a/web b/web index a8e922bb5e..adc53d0b4f 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit a8e922bb5efdeeb98faeab6eb87869c7918e2846 +Subproject commit adc53d0b4fd8f8730da5905713e4c29fe052a5a7 From 6630157377dbe32b71d24d10406a030adfa908e3 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Tue, 21 Jul 2015 04:40:43 +0000 Subject: [PATCH 21/32] [ci skip][AUTO]: updating luabinding & jsbinding automatically --- cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index 2cfe8e498a..e50f0ff4dd 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -573,6 +573,7 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + #endif // __cocos2dx_ui_h__ From 94aa3826698e640265ae427a587dd576df557a34 Mon Sep 17 00:00:00 2001 From: ZhangMenghe Date: Tue, 21 Jul 2015 15:18:19 +0800 Subject: [PATCH 22/32] Add testCase for setClearColor --- templates/js-template-default/index.html | 2 +- tests/js-tests/index.html | 2 +- tests/js-tests/src/SysTest/SysTest.js | 38 +++++++++++++++++++++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/templates/js-template-default/index.html b/templates/js-template-default/index.html index 42074ad179..fe2f8b8ad6 100644 --- a/templates/js-template-default/index.html +++ b/templates/js-template-default/index.html @@ -19,7 +19,7 @@ } - + diff --git a/tests/js-tests/index.html b/tests/js-tests/index.html index 06941312d9..897981fcb8 100644 --- a/tests/js-tests/index.html +++ b/tests/js-tests/index.html @@ -10,7 +10,7 @@
-
+
diff --git a/tests/js-tests/src/SysTest/SysTest.js b/tests/js-tests/src/SysTest/SysTest.js index 2406db697d..2f3fcfe313 100644 --- a/tests/js-tests/src/SysTest/SysTest.js +++ b/tests/js-tests/src/SysTest/SysTest.js @@ -34,9 +34,8 @@ var SysTestBase = BaseTestLayer.extend({ _subtitle:"", ctor:function() { - this._super(cc.color(0,0,0,255), cc.color(98,99,117,255)); + this._super(cc.color(0,0,0,0), cc.color(98,99,117,0)); }, - onRestartCallback:function (sender) { var s = new SysTestScene(); s.addChild(restartSysTest()); @@ -63,6 +62,35 @@ var SysTestBase = BaseTestLayer.extend({ }); +//------------------------------------------------------------------ +// +// setClearColorTest +// +//------------------------------------------------------------------ +var setClearColorTest = SysTestBase.extend({ + _title:"Set clearColor to red with alpha = 0 ", + ctor:function() + { + this._super(); + var bg = new cc.Sprite(s_back,cc.rect(0,0, 200, 200)); + bg.x = winSize.width/2; + bg.y = winSize.height/2; + this.addChild(bg); + return true; + }, + onEnter:function() + { + this._super(); + var clearColor = cc.color(255, 0, 0, 0); + director.setClearColor(clearColor); + }, + onExit:function() + { + director.setClearColor(cc.color(0, 0, 0, 255)); + this._super(); + } +}); + //------------------------------------------------------------------ // // LocalStorageTest @@ -136,7 +164,8 @@ var SysTestScene = TestScene.extend({ sysTestSceneIdx = (num || num == 0) ? (num - 1) : -1; var layer = nextSysTest(); this.addChild(layer); - + //var clearColor = cc.color(255, 0, 0, 255); + //director.setClearColor(clearColor); director.runScene(this); } }); @@ -321,7 +350,8 @@ var OpenURLTest = SysTestBase.extend({ var arrayOfSysTest = [ LocalStorageTest, CapabilitiesTest, - OpenURLTest + OpenURLTest, + setClearColorTest ]; if (cc.sys.isNative && cc.sys.OS_WINDOWS != cc.sys.os) { From 2e72179b91f2c37fa6945073356ddaffdbf812c9 Mon Sep 17 00:00:00 2001 From: ZhangMenghe Date: Tue, 21 Jul 2015 15:22:03 +0800 Subject: [PATCH 23/32] Remove a space --- tests/js-tests/src/SysTest/SysTest.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/js-tests/src/SysTest/SysTest.js b/tests/js-tests/src/SysTest/SysTest.js index 2f3fcfe313..c650612bed 100644 --- a/tests/js-tests/src/SysTest/SysTest.js +++ b/tests/js-tests/src/SysTest/SysTest.js @@ -164,8 +164,6 @@ var SysTestScene = TestScene.extend({ sysTestSceneIdx = (num || num == 0) ? (num - 1) : -1; var layer = nextSysTest(); this.addChild(layer); - //var clearColor = cc.color(255, 0, 0, 255); - //director.setClearColor(clearColor); director.runScene(this); } }); From d0d481fd67108e715c6de8cf4cb6e968c9faa466 Mon Sep 17 00:00:00 2001 From: WenhaiLin Date: Tue, 21 Jul 2015 16:43:47 +0800 Subject: [PATCH 24/32] updated version to v3-deps-70 --- cocos/2d/cocos2dx.props | 2 +- external/config.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/2d/cocos2dx.props b/cocos/2d/cocos2dx.props index f1a0af1cd4..d098bbd07f 100644 --- a/cocos/2d/cocos2dx.props +++ b/cocos/2d/cocos2dx.props @@ -7,7 +7,7 @@ - opengl32.lib;glew32.lib;libzlib.lib;libwebp.lib;libiconv.lib;freetype250.lib;winmm.lib;ws2_32.lib;libbox2d.lib;libSpine.lib;%(AdditionalDependencies) + opengl32.lib;glew32.lib;libzlib.lib;libwebp.lib;libiconv.lib;freetype.lib;winmm.lib;ws2_32.lib;libbox2d.lib;libSpine.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) false diff --git a/external/config.json b/external/config.json index 594ffa0352..5232c01d53 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version":"v3-deps-69", - "zip_file_size":"131253061", + "version":"v3-deps-70", + "zip_file_size":"130531291", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", "move_dirs":{ From 979a9be1f5b25ea90b44aa1593751794863129d4 Mon Sep 17 00:00:00 2001 From: WenhaiLin Date: Tue, 21 Jul 2015 17:09:27 +0800 Subject: [PATCH 25/32] Add test case for test font supported by FullType. --- .../cpp-tests/Classes/LabelTest/LabelTestNew.cpp | 15 +++++++++++++++ tests/cpp-tests/Classes/LabelTest/LabelTestNew.h | 10 ++++++++++ tests/cpp-tests/Resources/ccs-res | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index 5590a1086a..5dd632b440 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -83,6 +83,7 @@ NewLabelTests::NewLabelTests() ADD_TEST_CASE(LabelAddChildTest); ADD_TEST_CASE(LabelIssue12775Test); ADD_TEST_CASE(LabelIssue11585Test); + ADD_TEST_CASE(LabelFullTypeFontTest); }; LabelTTFAlignmentNew::LabelTTFAlignmentNew() @@ -2070,3 +2071,17 @@ std::string LabelIssue11585Test::subtitle() const { return "The color of letter should not be overridden by fade action."; } + +LabelFullTypeFontTest::LabelFullTypeFontTest() +{ + auto center = VisibleRect::center(); + + auto label = Label::createWithTTF("Hello 中国", "XueJ2312F.ttf", 30); + label->setPosition(center.x, center.y); + addChild(label); +} + +std::string LabelFullTypeFontTest::title() const +{ + return "Test font supported by FullType"; +} diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h index e92e7e062d..9c5943394d 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.h @@ -641,4 +641,14 @@ public: virtual std::string subtitle() const override; }; +class LabelFullTypeFontTest : public AtlasDemoNew +{ +public: + CREATE_FUNC(LabelFullTypeFontTest); + + LabelFullTypeFontTest(); + + virtual std::string title() const override; +}; + #endif diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res index 37b53805de..a9a4475cbb 160000 --- a/tests/cpp-tests/Resources/ccs-res +++ b/tests/cpp-tests/Resources/ccs-res @@ -1 +1 @@ -Subproject commit 37b53805dedbfb1df8549a3e2417df5c47c134ff +Subproject commit a9a4475cbbcc613c3c964a09495a25d652f062f8 From c260783fd0ee0b1143b1602f069579af524cba5d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 21 Jul 2015 18:23:57 +0800 Subject: [PATCH 26/32] [JS] Revert const to var to avoid issues on web compilation --- tests/js-tests/src/Particle3DTest/Particle3DTest.js | 2 +- tests/js-tests/src/Physics3DTest/Physics3DTest.js | 12 ++++++------ tests/js-tests/src/TerrainTest/TerrainTest.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/js-tests/src/Particle3DTest/Particle3DTest.js b/tests/js-tests/src/Particle3DTest/Particle3DTest.js index e5e5a0c663..f8b80e08f3 100644 --- a/tests/js-tests/src/Particle3DTest/Particle3DTest.js +++ b/tests/js-tests/src/Particle3DTest/Particle3DTest.js @@ -27,7 +27,7 @@ if(cc.sys.isNative)(function(){ var Particle3DTestIdx = -1; -const PARTICLE_SYSTEM_TAG = 0x0001; +var PARTICLE_SYSTEM_TAG = 0x0001; jsb.fileUtils.addSearchPath("res/Sprite3DTest"); jsb.fileUtils.addSearchPath("res/Particle3D/materials"); diff --git a/tests/js-tests/src/Physics3DTest/Physics3DTest.js b/tests/js-tests/src/Physics3DTest/Physics3DTest.js index 1f238406ce..886970aa74 100644 --- a/tests/js-tests/src/Physics3DTest/Physics3DTest.js +++ b/tests/js-tests/src/Physics3DTest/Physics3DTest.js @@ -27,13 +27,13 @@ var Physics3DTestIdx = -1; var physicsScene = null; -const START_POS_X = -0.5; -const START_POS_Y = -2.5; -const START_POS_Z = -0.5; +var START_POS_X = -0.5; +var START_POS_Y = -2.5; +var START_POS_Z = -0.5; -const ARRAY_SIZE_X = 4; -const ARRAY_SIZE_Y = 3; -const ARRAY_SIZE_Z = 4; +var ARRAY_SIZE_X = 4; +var ARRAY_SIZE_Y = 3; +var ARRAY_SIZE_Z = 4; var Physics3DTestDemo = cc.Layer.extend({ _title:"Physics3D Test", diff --git a/tests/js-tests/src/TerrainTest/TerrainTest.js b/tests/js-tests/src/TerrainTest/TerrainTest.js index 3f7759cb74..6c3a5dc679 100644 --- a/tests/js-tests/src/TerrainTest/TerrainTest.js +++ b/tests/js-tests/src/TerrainTest/TerrainTest.js @@ -189,7 +189,7 @@ var TerrainSimple = TerrainTestDemo.extend({ }); var TerrainWalkThru = (function(){ - const PlayerState = { + var PlayerState = { LEFT : 0, RIGHT : 1, IDLE : 2, @@ -197,8 +197,8 @@ var TerrainWalkThru = (function(){ BACKWARD : 4 }; - const PLAYER_HEIGHT = 0; - const camera_offset = cc.math.vec3(0, 45, 60); + var PLAYER_HEIGHT = 0; + var camera_offset = cc.math.vec3(0, 45, 60); var Player = jsb.Sprite3D.extend({ _targetPos:null, From 9b11e32252df3d1730fddcf8bc105aa4217accaf Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 22 Jul 2015 10:41:04 +0800 Subject: [PATCH 27/32] Gen bindings for v3.7.1 branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index de54549003..539d4be9e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,5 +37,5 @@ before_install: # whitelist branches: only: - - v3.7-release + - v3.7.1 - v3 From fbfb3a9dac049711d4fe07c8757c704eddeaaff9 Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 22 Jul 2015 10:45:18 +0800 Subject: [PATCH 28/32] update ccs-res submodule --- tests/cpp-tests/Resources/ccs-res | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cpp-tests/Resources/ccs-res b/tests/cpp-tests/Resources/ccs-res index 37b53805de..a9a4475cbb 160000 --- a/tests/cpp-tests/Resources/ccs-res +++ b/tests/cpp-tests/Resources/ccs-res @@ -1 +1 @@ -Subproject commit 37b53805dedbfb1df8549a3e2417df5c47c134ff +Subproject commit a9a4475cbbcc613c3c964a09495a25d652f062f8 From 8689025c5dd45bf4ecb691f7c592316911202ad5 Mon Sep 17 00:00:00 2001 From: ZhangMenghe Date: Wed, 22 Jul 2015 11:44:22 +0800 Subject: [PATCH 29/32] Modify background in index of js-template-runtime --- templates/js-template-runtime/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/js-template-runtime/index.html b/templates/js-template-runtime/index.html index 42074ad179..fe2f8b8ad6 100644 --- a/templates/js-template-runtime/index.html +++ b/templates/js-template-runtime/index.html @@ -19,7 +19,7 @@ } - + From 3addf3813445e778e4fcb13433a390659d99ec7f Mon Sep 17 00:00:00 2001 From: Vincent Yang Date: Wed, 22 Jul 2015 12:01:34 +0800 Subject: [PATCH 30/32] Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. --- build/cocos2d_libs.xcodeproj/project.pbxproj | 14 ++++++-------- build/cocos2d_tests.xcodeproj/project.pbxproj | 2 -- cocos/2d/libcocos2d.vcxproj | 6 +++--- .../libcocos2d_8_1.Windows.vcxproj | 14 +++++++------- .../libcocos2d_8_1.WindowsPhone.vcxproj | 10 +++++----- cocos/2d/libcocos2d_win10/libcocos2d.vcxproj | 14 +++++++------- cocos/base/ccConfig.h | 8 +++++++- .../cocos2d_js_bindings.xcodeproj/project.pbxproj | 2 -- .../js-bindings/proj.win32/libjscocos2d.vcxproj | 6 +++--- .../libjscocos2d.Windows.vcxproj | 14 +++++++------- .../libjscocos2d.WindowsPhone.vcxproj | 10 +++++----- .../cocos2d_lua_bindings.xcodeproj/project.pbxproj | 2 -- .../lua-bindings/proj.win32/libluacocos2d.vcxproj | 6 +++--- .../App.Windows/HelloCpp.Windows.vcxproj | 14 +++++++------- .../App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj | 10 +++++----- .../proj.android-studio/app/jni/Application.mk | 2 +- .../runtime-src/proj.android/jni/Application.mk | 2 +- .../HelloJavascript.xcodeproj/project.pbxproj | 2 -- .../App.Windows/HelloJavascript.Windows.vcxproj | 14 +++++++------- .../HelloJavascript.WindowsPhone.vcxproj | 10 +++++----- .../runtime-src/proj.android/jni/Application.mk | 2 +- .../proj.android-studio/app/jni/Application.mk | 2 +- .../runtime-src/proj.android/jni/Application.mk | 2 +- .../HelloLua.xcodeproj/project.pbxproj | 2 -- .../runtime-src/proj.win32/HelloLua.vcxproj | 4 ++-- .../proj.android-studio/app/jni/Application.mk | 2 +- tests/cpp-tests/proj.android/jni/Application.mk | 2 +- tests/cpp-tests/proj.win10/cpp-tests.vcxproj | 12 ++++++------ tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 4 ++-- .../cpp-tests.Windows/cpp-tests.Windows.vcxproj | 14 +++++++------- .../cpp-tests.WindowsPhone.vcxproj | 10 +++++----- .../proj.android-studio/app/jni/Application.mk | 2 +- .../project/proj.android/jni/Application.mk | 2 +- tests/js-tests/project/proj.win32/js-tests.vcxproj | 6 +++--- .../App.Windows/js-tests.Windows.vcxproj | 14 +++++++------- .../App.WindowsPhone/js-tests.WindowsPhone.vcxproj | 10 +++++----- .../proj.android-studio/app/jni/Application.mk | 2 +- .../project/proj.android/jni/Application.mk | 2 +- .../project/proj.win32/lua-tests.win32.vcxproj | 6 +++--- .../runtime-src/proj.android/jni/Application.mk | 2 +- .../simulator.xcodeproj/project.pbxproj | 2 -- .../runtime-src/proj.win32/simulator.vcxproj | 4 ++-- 42 files changed, 131 insertions(+), 139 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index a906d0c3d2..b19289fd1f 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -2009,6 +2009,10 @@ B29A7E3F19EE1B7700872B35 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = B29A7DC619EE1B7700872B35 /* AnimationState.h */; }; B29A7E4019EE1B7700872B35 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = B29A7DC619EE1B7700872B35 /* AnimationState.h */; }; B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; }; + B5668D7D1B3838E4003CBD5E /* UIScrollViewBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */; }; + B5668D7E1B3838E4003CBD5E /* UIScrollViewBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */; }; + B5668D7F1B3838E4003CBD5E /* UIScrollViewBar.h in Headers */ = {isa = PBXBuildFile; fileRef = B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */; }; + B5668D801B3838E4003CBD5E /* UIScrollViewBar.h in Headers */ = {isa = PBXBuildFile; fileRef = B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */; }; B5CE6DBE1B3BF2B1002B0419 /* UIAbstractCheckButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE6DBC1B3BF2B1002B0419 /* UIAbstractCheckButton.cpp */; }; B5CE6DBF1B3BF2B1002B0419 /* UIAbstractCheckButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE6DBC1B3BF2B1002B0419 /* UIAbstractCheckButton.cpp */; }; B5CE6DC01B3BF2B1002B0419 /* UIAbstractCheckButton.h in Headers */ = {isa = PBXBuildFile; fileRef = B5CE6DBD1B3BF2B1002B0419 /* UIAbstractCheckButton.h */; }; @@ -2017,10 +2021,6 @@ B5CE6DC91B3C05BA002B0419 /* UIRadioButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CE6DC61B3C05BA002B0419 /* UIRadioButton.cpp */; }; B5CE6DCA1B3C05BA002B0419 /* UIRadioButton.h in Headers */ = {isa = PBXBuildFile; fileRef = B5CE6DC71B3C05BA002B0419 /* UIRadioButton.h */; }; B5CE6DCB1B3C05BA002B0419 /* UIRadioButton.h in Headers */ = {isa = PBXBuildFile; fileRef = B5CE6DC71B3C05BA002B0419 /* UIRadioButton.h */; }; - B5668D7D1B3838E4003CBD5E /* UIScrollViewBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */; }; - B5668D7E1B3838E4003CBD5E /* UIScrollViewBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */; }; - B5668D7F1B3838E4003CBD5E /* UIScrollViewBar.h in Headers */ = {isa = PBXBuildFile; fileRef = B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */; }; - B5668D801B3838E4003CBD5E /* UIScrollViewBar.h in Headers */ = {isa = PBXBuildFile; fileRef = B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */; }; B603F1A81AC8EA0900A9579C /* CCTerrain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B603F1A61AC8EA0900A9579C /* CCTerrain.cpp */; }; B603F1A91AC8EA0900A9579C /* CCTerrain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B603F1A61AC8EA0900A9579C /* CCTerrain.cpp */; }; B603F1AA1AC8EA0900A9579C /* CCTerrain.h in Headers */ = {isa = PBXBuildFile; fileRef = B603F1A71AC8EA0900A9579C /* CCTerrain.h */; }; @@ -4704,12 +4704,12 @@ B29A7DC619EE1B7700872B35 /* AnimationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationState.h; sourceTree = ""; }; B3AF019E1842FBA400A98B85 /* b2MotorJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = b2MotorJoint.cpp; sourceTree = ""; }; B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = b2MotorJoint.h; sourceTree = ""; }; + B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScrollViewBar.cpp; sourceTree = ""; }; + B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScrollViewBar.h; sourceTree = ""; }; B5CE6DBC1B3BF2B1002B0419 /* UIAbstractCheckButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIAbstractCheckButton.cpp; sourceTree = ""; }; B5CE6DBD1B3BF2B1002B0419 /* UIAbstractCheckButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIAbstractCheckButton.h; sourceTree = ""; }; B5CE6DC61B3C05BA002B0419 /* UIRadioButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIRadioButton.cpp; sourceTree = ""; }; B5CE6DC71B3C05BA002B0419 /* UIRadioButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIRadioButton.h; sourceTree = ""; }; - B5668D7B1B3838E4003CBD5E /* UIScrollViewBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScrollViewBar.cpp; sourceTree = ""; }; - B5668D7C1B3838E4003CBD5E /* UIScrollViewBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScrollViewBar.h; sourceTree = ""; }; B603F1A61AC8EA0900A9579C /* CCTerrain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTerrain.cpp; sourceTree = ""; }; B603F1A71AC8EA0900A9579C /* CCTerrain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTerrain.h; sourceTree = ""; }; B603F1B11AC8F1FD00A9579C /* ccShader_3D_Terrain.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Terrain.frag; sourceTree = ""; }; @@ -12521,7 +12521,6 @@ "COCOS2D_DEBUG=1", USE_FILE32API, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -12556,7 +12555,6 @@ "CC_ENABLE_CHIPMUNK_INTEGRATION=1", NDEBUG, USE_FILE32API, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 0aa43d8f45..8a189c9165 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -6678,7 +6678,6 @@ "COCOS2D_DEBUG=1", USE_FILE32API, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; @@ -6707,7 +6706,6 @@ NDEBUG, USE_FILE32API, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index 4678e83df5..aa6b13d7ed 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -76,7 +76,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) - WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -131,7 +131,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\debug-lib\*.*" $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) - WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) + WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -1361,4 +1361,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.* - \ No newline at end of file + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj index 8bdcba8f73..8aa8fec652 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj @@ -163,7 +163,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -184,7 +184,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -204,7 +204,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -225,7 +225,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\OggDecoder\include;$(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -245,7 +245,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -266,7 +266,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\winrt_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\winrt_8.1\freetype2;$(EngineRoot)external\websockets\include\winrt_8.1;$(EngineRoot)external\curl\include\winrt_8.1;$(EngineRoot)external\tiff\include\winrt_8.1;$(EngineRoot)external\jpeg\include\winrt_8.1;$(EngineRoot)external\png\include\winrt_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -282,4 +282,4 @@ - \ No newline at end of file + diff --git a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj index 98c4dd686a..62984dd329 100644 --- a/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj +++ b/cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj @@ -117,7 +117,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\wp_8.1-specific\OggDecoder\include;$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -138,7 +138,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\wp_8.1-specific\OggDecoder\include;$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -158,7 +158,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\wp_8.1-specific\OggDecoder\include;$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -179,7 +179,7 @@ /Zm384 /bigobj %(AdditionalOptions) pch.h $(EngineRoot)external\wp_8.1-specific\OggDecoder\include;$(EngineRoot)external\wp_8.1-specific\zlib\include;$(EngineRoot)external\freetype2\include\wp_8.1\freetype2;$(EngineRoot)external\websockets\include\wp_8.1;$(EngineRoot)external\curl\include\wp_8.1;$(EngineRoot)external\tiff\include\wp_8.1;$(EngineRoot)external\jpeg\include\wp_8.1;$(EngineRoot)external\png\include\wp_8.1;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;%(AdditionalIncludeDirectories) - CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;_USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions) false %(DisableSpecificWarnings) @@ -195,4 +195,4 @@ - \ No newline at end of file + diff --git a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj index 2a6c5ffa59..5c24e710cb 100644 --- a/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d_win10/libcocos2d.vcxproj @@ -1525,7 +1525,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1544,7 +1544,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1563,7 +1563,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1582,7 +1582,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1602,7 +1602,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1621,7 +1621,7 @@ Use true pch.h - _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + _USRDLL;_LIB;COCOS2DXWIN32_EXPORTS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false 4458;4459;%(DisableSpecificWarnings) $(EngineRoot)external\win10-specific\zlib\include;$(EngineRoot)external\freetype2\include\win10\freetype2;$(EngineRoot)external\protobuf-lite\src;$(EngineRoot)external\protobuf-lite\win32;$(EngineRoot)external\win10-specific\OggDecoder\include;%(AdditionalIncludeDirectories) @@ -1638,4 +1638,4 @@ - \ No newline at end of file + diff --git a/cocos/base/ccConfig.h b/cocos/base/ccConfig.h index 0d32b51f54..509422f738 100644 --- a/cocos/base/ccConfig.h +++ b/cocos/base/ccConfig.h @@ -256,7 +256,13 @@ THE SOFTWARE. #ifndef CC_USE_3D_PHYSICS #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_LINUX || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) #define CC_USE_3D_PHYSICS 1 -#define CC_USE_3D_PHYSICS 1 +#endif +#endif + +#if (CC_USE_3D_PHYSICS) +/** Use bullet physics engine. */ +#ifndef CC_ENABLE_BULLET_INTEGRATION +#define CC_ENABLE_BULLET_INTEGRATION 1 #endif #endif diff --git a/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj b/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj index 0962639cb7..65e82f5cf1 100644 --- a/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj @@ -875,7 +875,6 @@ "COCOS2D_DEBUG=1", USE_FILE32API, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -911,7 +910,6 @@ "CC_ENABLE_CHIPMUNK_INTEGRATION=1", NDEBUG, USE_FILE32API, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; diff --git a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj index dedd403230..f3517a2c38 100644 --- a/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj +++ b/cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj @@ -156,7 +156,7 @@ Level3 Disabled - WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true @@ -182,7 +182,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" MinSpace true true - WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;_LIB;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) $(ProjectDir)..;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)external;$(ProjectDir)..\auto;$(ProjectDir)..\manual;$(ProjectDir)..\manual\cocostudio;$(ProjectDir)..\manual\navmesh;$(ProjectDir)..\manual\spine;$(ProjectDir)..\..\..\..\external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4068;4101;4800;4251;4244;4099;4083;4700;%(DisableSpecificWarnings) true @@ -204,4 +204,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" - \ No newline at end of file + diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj index 02d451990e..1a7926f54d 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.Windows/libjscocos2d.Windows.vcxproj @@ -129,7 +129,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true @@ -149,7 +149,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false OldStyle @@ -171,7 +171,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true @@ -191,7 +191,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false OldStyle @@ -213,7 +213,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true @@ -233,7 +233,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manua\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false OldStyle @@ -250,4 +250,4 @@ - \ No newline at end of file + diff --git a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj index f3c163ef26..f2b5f8c7f0 100644 --- a/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj +++ b/cocos/scripting/js-bindings/proj.win8.1-universal/libjscocos2d/libjscocos2d.WindowsPhone/libjscocos2d.WindowsPhone.vcxproj @@ -94,7 +94,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true @@ -114,7 +114,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false OldStyle @@ -136,7 +136,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\spine;$(ProjectDir)..\..\..\manual\navmesh;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) true @@ -156,7 +156,7 @@ $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;$(EngineRoot)external\spidermonkey\include\winrt_8.1;$(ProjectDir)..\..\..\auto;$(ProjectDir)..\..\..\manual;$(ProjectDir)..\..\..\manual\cocostudio;$(ProjectDir)..\..\..\manual\navmesh;$(ProjectDir)..\..\..\manual\spine;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) 4800;4703;4101;4083;4700;4068;4996;%(DisableSpecificWarnings) Level3 - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false OldStyle @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index d1009dc4f3..cd92ab8b83 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -1218,7 +1218,6 @@ "COCOS2D_DEBUG=1", USE_FILE32API, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -1253,7 +1252,6 @@ "CC_ENABLE_CHIPMUNK_INTEGRATION=1", NDEBUG, USE_FILE32API, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index 26423fa7d1..fc391db8da 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -280,7 +280,7 @@ Disabled $(EngineRoot);$(EngineRoot)cocos\2d;$(EngineRoot)cocos\base;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;$(EngineRoot)external\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -312,7 +312,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ MinSpace true $(EngineRoot);$(EngineRoot)cocos\base;$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\navmesh;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocostudio\ActionTimeline;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\physics3d;$(EngineRoot)cocos\navmesh;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -342,4 +342,4 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ - \ No newline at end of file + diff --git a/templates/cpp-template-default/proj.win8.1-universal/App.Windows/HelloCpp.Windows.vcxproj b/templates/cpp-template-default/proj.win8.1-universal/App.Windows/HelloCpp.Windows.vcxproj index f6e09c2923..bc33c3d0e4 100644 --- a/templates/cpp-template-default/proj.win8.1-universal/App.Windows/HelloCpp.Windows.vcxproj +++ b/templates/cpp-template-default/proj.win8.1-universal/App.Windows/HelloCpp.Windows.vcxproj @@ -123,7 +123,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -136,7 +136,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -146,7 +146,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -159,7 +159,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -169,7 +169,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -182,7 +182,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -214,4 +214,4 @@ - \ No newline at end of file + diff --git a/templates/cpp-template-default/proj.win8.1-universal/App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj b/templates/cpp-template-default/proj.win8.1-universal/App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj index 2521b89445..b2e08b08d0 100644 --- a/templates/cpp-template-default/proj.win8.1-universal/App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj +++ b/templates/cpp-template-default/proj.win8.1-universal/App.WindowsPhone/HelloCpp.WindowsPhone.vcxproj @@ -89,7 +89,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_WINDOWS_PHONE_8_1;CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -102,7 +102,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_WINDOWS_PHONE_8_1;CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -112,7 +112,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_WINDOWS_PHONE_8_1;CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -125,7 +125,7 @@ pch.h ../../Classes;%(AdditionalIncludeDirectories) false - CC_WINDOWS_PHONE_8_1;CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -158,4 +158,4 @@ - \ No newline at end of file + diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk index 9a598c3c01..81ca21b08f 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk +++ b/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic USE_ARM_MODE := 1 diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk b/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk index 9a598c3c01..81ca21b08f 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/templates/js-template-default/frameworks/runtime-src/proj.android/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic USE_ARM_MODE := 1 diff --git a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 3e813d3421..b4ef24ba01 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -836,7 +836,6 @@ "COCOS2D_DEBUG=1", USE_FILE32API, COCOS2D_JAVASCRIPT, - "CC_ENABLE_BULLET_INTEGRATION=1", CC_ENABLE_CHIPMUNK_INTEGRATION, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -861,7 +860,6 @@ USE_FILE32API, COCOS2D_JAVASCRIPT, CC_ENABLE_CHIPMUNK_INTEGRATION, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj index 00d7f4fc37..6853824db0 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.Windows/HelloJavascript.Windows.vcxproj @@ -122,7 +122,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -135,7 +135,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -145,7 +145,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -158,7 +158,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -168,7 +168,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -181,7 +181,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -219,4 +219,4 @@ - \ No newline at end of file + diff --git a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj index 6913615181..e75a91118a 100644 --- a/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj +++ b/templates/js-template-default/frameworks/runtime-src/proj.win8.1-universal/App.WindowsPhone/HelloJavascript.WindowsPhone.vcxproj @@ -89,7 +89,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -102,7 +102,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -112,7 +112,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -125,7 +125,7 @@ pch.h $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk b/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk index bbbb77dcc5..cde96a5723 100644 --- a/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic USE_ARM_MODE := 1 diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk index 18444678c9..07aa592b13 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk index 18444678c9..07aa592b13 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 4228649c4c..05d76d8ea3 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -825,7 +825,6 @@ USE_FILE32API, "CC_LUA_ENGINE_ENABLED=1", "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", GLFW_EXPOSE_NATIVE_COCOA, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -849,7 +848,6 @@ USE_FILE32API, "CC_LUA_ENGINE_ENABLED=1", "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index e500f60366..0bc39b97e9 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -77,7 +77,7 @@ EditAndContinue EnableFastChecks Disabled - WIN32;_WINDOWS;STRICT;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true $(IntDir)vc$(PlatformToolsetVersion).pdb @@ -145,7 +145,7 @@ xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /D /E / ProgramDatabase - WIN32;_WINDOWS;STRICT;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true $(IntDir)vc$(PlatformToolsetVersion).pdb diff --git a/tests/cpp-tests/proj.android-studio/app/jni/Application.mk b/tests/cpp-tests/proj.android-studio/app/jni/Application.mk index 85aaa1e860..f80e3bad04 100644 --- a/tests/cpp-tests/proj.android-studio/app/jni/Application.mk +++ b/tests/cpp-tests/proj.android-studio/app/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic ifeq ($(NDK_DEBUG),1) diff --git a/tests/cpp-tests/proj.android/jni/Application.mk b/tests/cpp-tests/proj.android/jni/Application.mk index 85aaa1e860..f80e3bad04 100644 --- a/tests/cpp-tests/proj.android/jni/Application.mk +++ b/tests/cpp-tests/proj.android/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic ifeq ($(NDK_DEBUG),1) diff --git a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj index 5a04278325..f4e5df0265 100644 --- a/tests/cpp-tests/proj.win10/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win10/cpp-tests.vcxproj @@ -152,7 +152,7 @@ ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false ProgramDatabase - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -167,7 +167,7 @@ false false ProgramDatabase - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -181,7 +181,7 @@ ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false ProgramDatabase - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -195,7 +195,7 @@ ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -209,7 +209,7 @@ ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false ProgramDatabase - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -223,7 +223,7 @@ ..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false false - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index 599f26c03b..88a232dc08 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -72,7 +72,7 @@ Disabled ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -111,7 +111,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y MaxSpeed true ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true Level3 diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj index 5b84eb0413..ed9cfcc242 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Windows/cpp-tests.Windows.vcxproj @@ -114,8 +114,8 @@ %(DisableSpecificWarnings) pch.h pch.h - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false @@ -134,8 +134,8 @@ %(DisableSpecificWarnings) pch.h pch.h - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false @@ -154,8 +154,8 @@ %(DisableSpecificWarnings) pch.h pch.h - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) - CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) false false @@ -192,4 +192,4 @@ - \ No newline at end of file + diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj index 4589917fe3..54e9b12fc8 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.WindowsPhone/cpp-tests.WindowsPhone.vcxproj @@ -84,8 +84,8 @@ pch.h %(DisableSpecificWarnings) %(DisableSpecificWarnings) - CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) - CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use Use false @@ -107,8 +107,8 @@ pch.h %(DisableSpecificWarnings) %(DisableSpecificWarnings) - CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) - CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_WINDOWS_PHONE_8_1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) Use Use false @@ -158,4 +158,4 @@ - \ No newline at end of file + diff --git a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk index 9a598c3c01..81ca21b08f 100644 --- a/tests/js-tests/project/proj.android-studio/app/jni/Application.mk +++ b/tests/js-tests/project/proj.android-studio/app/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic USE_ARM_MODE := 1 diff --git a/tests/js-tests/project/proj.android/jni/Application.mk b/tests/js-tests/project/proj.android/jni/Application.mk index 9a598c3c01..81ca21b08f 100644 --- a/tests/js-tests/project/proj.android/jni/Application.mk +++ b/tests/js-tests/project/proj.android/jni/Application.mk @@ -3,7 +3,7 @@ APP_STL := gnustl_static # Uncomment this line to compile to armeabi-v7a, your application will run faster but support less devices #APP_ABI := armeabi-v7a -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic USE_ARM_MODE := 1 diff --git a/tests/js-tests/project/proj.win32/js-tests.vcxproj b/tests/js-tests/project/proj.win32/js-tests.vcxproj index 4db3504798..7fb7e1ac10 100644 --- a/tests/js-tests/project/proj.win32/js-tests.vcxproj +++ b/tests/js-tests/project/proj.win32/js-tests.vcxproj @@ -82,7 +82,7 @@ Disabled $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -143,7 +143,7 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\resjs\" /e /Y $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\storage;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(ProjectDir)..\Classes;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)cocos\scripting\js-bindings\auto;$(EngineRoot)cocos\scripting\js-bindings\manual;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;CC_ENABLE_BULLET_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -215,4 +215,4 @@ xcopy "$(ProjectDir)..\..\resjs" "$(OutDir)\res\" /e /Y - \ No newline at end of file + diff --git a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj index a447e4da36..08d142dc33 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.Windows/js-tests.Windows.vcxproj @@ -123,7 +123,7 @@ pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -152,7 +152,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -178,7 +178,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -207,7 +207,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -233,7 +233,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) @@ -260,7 +260,7 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) echo "Copying Windows 8.1 Universal App CPP template files" @@ -311,4 +311,4 @@ xcopy "$(EngineRoot)cocos\platform\win8.1-universal\cocos2d-js\pch.h" "$(EngineR - \ No newline at end of file + diff --git a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj index e96e89ecfc..837fb632f5 100644 --- a/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj +++ b/tests/js-tests/project/proj.win8.1-universal/App.WindowsPhone/js-tests.WindowsPhone.vcxproj @@ -89,7 +89,7 @@ pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -102,7 +102,7 @@ pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -112,7 +112,7 @@ pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) MSVCRT;%(IgnoreSpecificDefaultLibraries) @@ -125,7 +125,7 @@ pch.h $(ProjectDir)..\..\Classes;$(EngineRoot)cocos\platform\win8.1-universal;%(AdditionalIncludeDirectories) false - CC_ENABLE_BULLET_INTEGRATION=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) + CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) @@ -158,4 +158,4 @@ - \ No newline at end of file + diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk b/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk index 18444678c9..07aa592b13 100644 --- a/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk +++ b/tests/lua-tests/project/proj.android-studio/app/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic diff --git a/tests/lua-tests/project/proj.android/jni/Application.mk b/tests/lua-tests/project/proj.android/jni/Application.mk index 18444678c9..07aa592b13 100644 --- a/tests/lua-tests/project/proj.android/jni/Application.mk +++ b/tests/lua-tests/project/proj.android/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index f0a60ad7db..1ffdade666 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -77,7 +77,7 @@ OldStyle EnableFastChecks Disabled - WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true @@ -130,7 +130,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y ProgramDatabase - WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true @@ -201,4 +201,4 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - \ No newline at end of file + diff --git a/tools/simulator/frameworks/runtime-src/proj.android/jni/Application.mk b/tools/simulator/frameworks/runtime-src/proj.android/jni/Application.mk index 5627a199df..18cecb0948 100644 --- a/tools/simulator/frameworks/runtime-src/proj.android/jni/Application.mk +++ b/tools/simulator/frameworks/runtime-src/proj.android/jni/Application.mk @@ -1,6 +1,6 @@ APP_STL := gnustl_static -APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCC_ENABLE_BULLET_INTEGRATION=1 -std=c++11 -fsigned-char +APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -std=c++11 -fsigned-char APP_LDFLAGS := -latomic diff --git a/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj b/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj index 18b4ea23b8..c5a2e406ed 100644 --- a/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj +++ b/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj @@ -896,7 +896,6 @@ "CC_LUA_ENGINE_ENABLED=1", "CC_ENABLE_CHIPMUNK_INTEGRATION=1", COCOS2D_JAVASCRIPT, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -925,7 +924,6 @@ "CC_ENABLE_CHIPMUNK_INTEGRATION=1", COCOS2D_JAVASCRIPT, NDEBUG, - "CC_ENABLE_BULLET_INTEGRATION=1", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj b/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj index 459256fcd9..96b2231170 100644 --- a/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj +++ b/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj @@ -76,7 +76,7 @@ ProgramDatabase EnableFastChecks Disabled - WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true $(IntDir)vc$(PlatformToolsetVersion).pdb @@ -141,7 +141,7 @@ xcopy /Y /Q "$(OutDir)lang" "$(ProjectDir)..\..\..\runtime\win32" MultiThreadedDLL Sync ProgramDatabase - COCOS2D_DEBUG=1;WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;CC_ENABLE_BULLET_INTEGRATION=1;%(PreprocessorDefinitions) + COCOS2D_DEBUG=1;WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions) 4267;4251;4244;%(DisableSpecificWarnings) true $(IntDir)vc$(PlatformToolsetVersion).pdb From 92e68cd9dcb96cba9b87b9fb75d7052744cae4d7 Mon Sep 17 00:00:00 2001 From: fusijie Date: Wed, 22 Jul 2015 13:42:10 +0800 Subject: [PATCH 31/32] add sprite frame flash line bug test case. --- build/cocos2d_tests.xcodeproj/project.pbxproj | 8 ++ tests/cpp-tests/CMakeLists.txt | 1 + .../cpp-tests/Classes/BugsTest/Bug-12847.cpp | 72 ++++++++++++++++++ tests/cpp-tests/Classes/BugsTest/Bug-12847.h | 26 +++++++ tests/cpp-tests/Classes/BugsTest/BugsTest.cpp | 2 + .../Resources/Images/bug12847_sprite.png | Bin 0 -> 4488 bytes .../Images/bug12847_spriteframe.plist | 35 +++++++++ .../Resources/Images/bug12847_spriteframe.png | Bin 0 -> 3168 bytes tests/cpp-tests/proj.android/jni/Android.mk | 1 + tests/cpp-tests/proj.win32/cpp-tests.vcxproj | 4 +- .../proj.win32/cpp-tests.vcxproj.filters | 12 ++- .../cpp-tests.Shared.vcxitems | 4 +- .../cpp-tests.Shared.vcxitems.filters | 10 ++- 13 files changed, 167 insertions(+), 8 deletions(-) create mode 100644 tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp create mode 100644 tests/cpp-tests/Classes/BugsTest/Bug-12847.h create mode 100644 tests/cpp-tests/Resources/Images/bug12847_sprite.png create mode 100644 tests/cpp-tests/Resources/Images/bug12847_spriteframe.plist create mode 100644 tests/cpp-tests/Resources/Images/bug12847_spriteframe.png diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 0aa43d8f45..cf2bac1b71 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -883,6 +883,8 @@ 688669711AE8E8B500C2CFD9 /* SpritePolygonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6886696F1AE8E8B500C2CFD9 /* SpritePolygonTest.cpp */; }; 688669721AE8E8B500C2CFD9 /* SpritePolygonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6886696F1AE8E8B500C2CFD9 /* SpritePolygonTest.cpp */; }; 826294431AAF071500CB7CF7 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; + 850F8A241B5F3A4F00780603 /* Bug-12847.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 850F8A221B5F3A4F00780603 /* Bug-12847.cpp */; }; + 850F8A251B5F3A4F00780603 /* Bug-12847.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 850F8A221B5F3A4F00780603 /* Bug-12847.cpp */; }; 94D793D91B4B7A3600F60F10 /* Bug-CCDrawNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D793D51B4B7A3600F60F10 /* Bug-CCDrawNode.cpp */; }; 94D793DA1B4B7A3600F60F10 /* Bug-CCDrawNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D793D51B4B7A3600F60F10 /* Bug-CCDrawNode.cpp */; }; 94D793DB1B4B7A3600F60F10 /* Bug-PageViewLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D793D71B4B7A3600F60F10 /* Bug-PageViewLayout.cpp */; }; @@ -1949,6 +1951,8 @@ 70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shaderTest.psh.h; sourceTree = ""; }; 70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderTest.vsh.h; sourceTree = ""; }; 826294421AAF071500CB7CF7 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 850F8A221B5F3A4F00780603 /* Bug-12847.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-12847.cpp"; sourceTree = ""; }; + 850F8A231B5F3A4F00780603 /* Bug-12847.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-12847.h"; sourceTree = ""; }; 94D793D51B4B7A3600F60F10 /* Bug-CCDrawNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-CCDrawNode.cpp"; sourceTree = ""; }; 94D793D61B4B7A3600F60F10 /* Bug-CCDrawNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-CCDrawNode.h"; sourceTree = ""; }; 94D793D71B4B7A3600F60F10 /* Bug-PageViewLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-PageViewLayout.cpp"; sourceTree = ""; }; @@ -2766,6 +2770,8 @@ 1AC3598D18CECF0B00F37B72 /* BugsTest.h */, 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */, 59620E8E1921E5CF002021B6 /* Bug-Child.h */, + 850F8A221B5F3A4F00780603 /* Bug-12847.cpp */, + 850F8A231B5F3A4F00780603 /* Bug-12847.h */, ); path = BugsTest; sourceTree = ""; @@ -5415,6 +5421,7 @@ 1AC35B2918CECF0C00F37B72 /* AppDelegate.cpp in Sources */, 29080DA1191B595E0066F8DF /* GUIEditorTest.cpp in Sources */, 1AC35B3718CECF0C00F37B72 /* Bug-1159.cpp in Sources */, + 850F8A241B5F3A4F00780603 /* Bug-12847.cpp in Sources */, A5030C3519D059DA000E78E7 /* OpenURLTest.cpp in Sources */, 29080D1C191B574B0066F8DF /* UITest.cpp in Sources */, 1AC35C3118CECF0C00F37B72 /* PerformanceRendererTest.cpp in Sources */, @@ -5768,6 +5775,7 @@ 1AC35B3018CECF0C00F37B72 /* Box2dView.cpp in Sources */, 29080DAE191B595E0066F8DF /* UIImageViewTest.cpp in Sources */, 1AC35C1018CECF0C00F37B72 /* LabelTest.cpp in Sources */, + 850F8A251B5F3A4F00780603 /* Bug-12847.cpp in Sources */, 59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */, 29080DC8191B595E0066F8DF /* UISceneManager.cpp in Sources */, 1AC35C6A18CECF0C00F37B72 /* VisibleRect.cpp in Sources */, diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index 19d0e6824e..8da973d3f2 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -41,6 +41,7 @@ set(TESTS_SRC Classes/BugsTest/Bug-886.cpp Classes/BugsTest/Bug-899.cpp Classes/BugsTest/Bug-914.cpp + Classes/BugsTest/Bug-12847.cpp Classes/BugsTest/Bug-Child.cpp Classes/BugsTest/BugsTest.cpp Classes/Camera3DTest/Camera3DTest.cpp diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp b/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp new file mode 100644 index 0000000000..141ad8e6e1 --- /dev/null +++ b/tests/cpp-tests/Classes/BugsTest/Bug-12847.cpp @@ -0,0 +1,72 @@ +// +// Bug-12847.cpp +// cocos2d_tests +// +// Issue: https://github.com/cocos2d/cocos2d-x/issues/12847 +// Please test in iPhone5 + +// +// + +#include "Bug-12847.h" + +USING_NS_CC; + +bool Bug12847Layer::init() +{ + if (BugsTestBase::init()) + { + auto _visibleSize = Director::getInstance()->getVisibleSize(); + + //Create with Sprite + { + sprite1 = Sprite::create("Images/bug12847_sprite.png"); + sprite1->getTexture()->setAliasTexParameters(); + sprite1->setPosition(Vec2(_visibleSize.width/3, 50)); + this->addChild(sprite1, 1); + + sprite2 = Sprite::create("Images/bug12847_sprite.png"); + sprite2->getTexture()->setAliasTexParameters(); + sprite2->setPosition(sprite1->getPosition() + Vec2(0.0f, sprite1->getContentSize().height)); + this->addChild(sprite2, 1); + } + //Create with SpriteFrame + { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile("Images/bug12847_spriteframe.plist"); + + sprite3 = Sprite::createWithSpriteFrameName("bug12847_sprite2.png"); + sprite3->getTexture()->setAliasTexParameters(); + sprite3->setPosition(Vec2(_visibleSize.width * 2/3, 50)); + this->addChild(sprite3, 1); + + sprite4 = Sprite::createWithSpriteFrameName("bug12847_sprite2.png"); + sprite4->getTexture()->setAliasTexParameters(); + sprite4->setPosition(sprite3->getPosition() + Vec2(0.0f, sprite3->getContentSize().height)); + this->addChild(sprite4, 1); + } + + this->scheduleUpdate(); + return true; + } + + return false; +} + +void Bug12847Layer::update(float dt) +{ + sprite1->setPositionY(sprite1->getPositionY() + 0.1f); + sprite2->setPositionY(sprite2->getPositionY() + 0.1f); + sprite3->setPositionY(sprite3->getPositionY() + 0.1f); + sprite4->setPositionY(sprite4->getPositionY() + 0.1f); +} + +void Bug12847Layer::onEnter() +{ + BugsTestBase::onEnter(); + Director::getInstance()->setClearColor(Color4F::RED); +} + +void Bug12847Layer::onExit() +{ + Director::getInstance()->setClearColor(Color4F::BLACK); + BugsTestBase::onExit(); +} \ No newline at end of file diff --git a/tests/cpp-tests/Classes/BugsTest/Bug-12847.h b/tests/cpp-tests/Classes/BugsTest/Bug-12847.h new file mode 100644 index 0000000000..2f63620f34 --- /dev/null +++ b/tests/cpp-tests/Classes/BugsTest/Bug-12847.h @@ -0,0 +1,26 @@ +#ifndef __cocos2d_tests__Bug_12847__ +#define __cocos2d_tests__Bug_12847__ + +#include "BugsTest.h" + +class Bug12847Layer : public BugsTestBase +{ +public: + CREATE_FUNC(Bug12847Layer); + + virtual bool init() override; + +protected: + virtual void update(float dt) override; + virtual void onEnter() override; + virtual void onExit() override; + +private: + + cocos2d::Sprite* sprite1; + cocos2d::Sprite* sprite2; + cocos2d::Sprite* sprite3; + cocos2d::Sprite* sprite4; +}; + +#endif /* defined(__cocos2d_tests__Bug_12847__) */ diff --git a/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp b/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp index c2323763a3..55b6a4fe10 100644 --- a/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp +++ b/tests/cpp-tests/Classes/BugsTest/BugsTest.cpp @@ -8,6 +8,7 @@ #include "Bug-914.h" #include "Bug-1159.h" #include "Bug-1174.h" +#include "Bug-12847.h" #include "Bug-Child.h" #include "Bug-CCDrawNode.h" #include "Bug-PageViewLayout.h" @@ -27,4 +28,5 @@ BugsTests::BugsTests() ADD_TEST_CASE(BugCameraMask); ADD_TEST_CASE(BugDrawNodeLayer); ADD_TEST_CASE(BugPageViewLayer); + ADD_TEST_CASE(Bug12847Layer); } diff --git a/tests/cpp-tests/Resources/Images/bug12847_sprite.png b/tests/cpp-tests/Resources/Images/bug12847_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..a4e42509a75b545422794a717f3ec6ee686f8a79 GIT binary patch literal 4488 zcmV;35qIv1P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D5gkcHK~#8N?VZ`0 z95oU~=N4>Zu)#|kY=alTtTXfe&sI|>l_&KpQd!kK40F{N=aUqhLQ+ImW4i5seE#`^ z(`TQ3etP)uVen`|lRtX&#p#PLzF5XfL z#>qYR=XO5J6-N8Vr^k=K+{SVK)xeiu9?wPDCA9tOt0&u-sFzs`=(?77r^!7Z^s_%M zanq;!Ci@)pN&8%Peb1roow|npol9rl`{w$Xo=4Az`S{fZN+;1`l z26Z(l*D0^E{YCV{8>i8d@AH&9cb&QI^`majCB3@4()=@z#&{3=yBpWuO)DnJ2Fr$n zCr_SkV=|K|uR3K%K9`uqay&x4=Ns#yow3Hq*h$K?^`2(;<$mt%y5Ik(tNuyunWSIF z$+6DG9C~f^x@tL&sIzu${H@XX6ngjW!|B&we?R^5>9^BQKYcp=_~Xxqp#S;jUj~qU z`t<8IpN&;k=QFBL?w|RjPSU38s^8H%=b3BT&t%$iClz&!GLxqd?~?13Ut{J6bq}ca z*J3G4y>r*ek<2qE-o?!R*I$0$;hxU5o%uUTwW)fjx#-7ObEy9MAUaVEMI_zMt}eQ<6?j#4gdS^f1ZB(?T=;7D9Hc#sFC1!p#Uh0mR`P`MGJ0k8s z|NQrW`z15qzl)>2bM3oddjD#3t=^98`2zC85ARRUo;`1k{@_7t^yklCoW6ba-RawJ zUoT$?W~h7f=KIt4Z{IC2hu5#)F5}xbKP+SVp~Z|I|+KFmR%Bx4@si2PFil}om> zJk(wCBTvrbnK(Cd&(EA#n=I~Sp{`eWv?Dq29odYuxfH`OeRG{Q&U2lzYL{a|-1Ipl z?gT$RloCF@a-BJYe$M|gzT27?aoux9^`|bfPC!{=%~{tKbl9ZNW`FMGmoINl-+c3| zf1=au2ySk^Ju6==A^1qJlv&1PzOWtt)%{lqnNW;=*`ap zt8rXcdF7g&d$>>Tw>1s9MFUl8T-P-&_CfOTG52 zEwKOUxYQlFtnn7z^Owtq_d%mmyp30{#-aurmw?-$*A4RU_!2{Ve1}U~Z9sp0NU}5T z-`MM#U()nl-h9j_nZ?qN(LDEibo5!yb3Wg8&UK!6{+SLe2#YccC`mi8xRSK5Ysh^l zK-XIg8m9QwJTpexfpN6UxjxR1*5qYwTTW|U#v5eo+!%@W8B(wz37GjVN@ZHHJd0=db| z^hrI`?a-&?Q1k8U?vs}@(tVODOS`J`0hb3|=i+@`B8$&rv3O)D=2bV7&vX^{5M}B! zR>ssmi@Kt%bJw#ti9XJ?wds^?O&!gwZQ8g_x%0ed=k+bNw_EFVkgqaW>Uz}^XW4(< zYx4>FjWvF+sa}h%K1aEAdx^AdP5%72(b?Eh`lbzJHBo%>B3Of)>xXPRXdJxn)4!^@ zKBnpMP1N;ukCPWN(rnGU`*nGf^{<|3%jmhbdkB1VptvkxZCO(s7NA(9Gb~(fa;>lP z+n_zMQpRY`pbjz@?Gx>oYgc1wXRM5a&Egvku3eSs!+M*qa($TR8S-6xr{&Gox?J8h z-fz)W{dwH-T=&V?+9k-c#;n0UwmJ36r}NRL`HcQ)UK*W0jJr#tL)y8{gEe{oO5_1@ zkGv@3YCHNhGG>nMFUCrFTc=ObK8?x6d@^3@GH%*CPmpJkh=sAaewvXD$19A*G4g!&zj?Tlyq+@txmnCaK& z&7Zl4HtxtQ$C2&}W7EpEULTje&6RPm36QA=i$HSiJPWiI>()?f!5*>M7TFAoeYS7S z3(Qv;Ber#~YAeP`eaax?u)od1eA(-K2fIH#U+wiJj_Z`W&i%-N*vnqN-@2cBFNAJb zuVC+)^tDzXYs=aI>gcGJo4(h+P3$^#l1<(k{n_P4H!+jx8@J6X=r~+nnj1Hpy)QnJ zdw_{+>pE?fYtu=aW_QH6Pv1WuaUmYJ-Vvm(+OW0|9BZL5W^tlptc7}4jFGXNn?ufp ze3EN&V;U>U5IHVBXW6A1 z0rb{qtHEBgsYjO$Y_n(m3OZ?xe(;H&o6XrbOM~Rvfx-Vx&=R6~&Idiql{Iq0%Fb&)o;{>B)sPVds> zuKiS>HaZ96tL3|Q{18C<%Gov^n`ERPNVr%Y#5i0swj?q0m+>NQcKPsVsrO)#aa}W# zlb;3_3NdDW<^uTTW7m9$H7f>lM2^1V{d{=;@$~V-j|=8yao(2q??1E{AAed#@97%s zlMTSRYCbjZY@Qm!ILI>&b8Pg_Sh=pC<1F|ak2QIUd6-L$febtD$QX>s(k|b320Cnr zM-IdT;^dq6+HA1amr*$}xnE*=rqqv&b?zKFKAfFc-UmK@2f(NLq|tAd%cWrad0OTq z)tlgm))XF;O^pF0V$#*`W|23D;ek0!&4)+g((uhgCmCNEXTaAu#3W9&@AQ1I^Pz~t z0~-f;e9!KPFC%{V%&2k5k64fe3^SQfC>e)h=Kg*7B;zw?qhUY1{W%UcnX~?`@vkg# z&c2xwGIaWDo3ShC^Uc8Ks&F3T`DV=BtKK#1+{^c!y_Y&*uZ+XpBe!0Tz{a|uzR0WI zHTz`kq(45?D)pX?PJXqn*~{+$7gWRtXcO9(On;&4H!?~I?~ z;{n@OEH2Z0cpz*%tOu{46XM`Q4tXweRBtZs>ze%&WIhsbKGvQ=^sR-H#m$^NjKw*L z1=*aJFkarZpAa@c+7jC_{e>^c=0i;E%#~69^bzFhhPysPTzn;MkKq2WH3sJ+j_1kq z5i4`cduNV3@0vL3A>UZ?Jz4Xn*yddmC*OQV>K%!PuW|gsqpfzGvC#z`=l5Kkk=SXo zH2P>H`fL7#?)lOvX6=>@mrh@JJq}(GS{e@b%}0 ziHVJe$USo{#$e7x8V4wVYS-v_6hipHT?{^!Z{%Bueo%_@{eczr(9~3)y1M=Edjvnu}*gmOe?1rwkurkW-D5xo9hSCUn?)-{yplhN!+X zh{s(quW`KVgqYk1@$)P|tX8|+HGcwaUAMbVoBCGlg`FU4amKpVw%S9=TRnDNi_`9! zSan}(nme$z-P1XFP>WfQ#>Ym#q0zlie&O9;U}xT)TNAjs2^h?|Ykm*5|04Y3CB8`{ z9PIeAZk8`REk^sL`xeLM+(|&3H$&;^FUG6us&!-hk`%3}ZFZ&ZWZ9UH= zC@^fv!M|L9`%(uKtk{rXqYJj&iGNuEkVE=1)|izR$FsFK ze;W^a9Paw7?XJB?Z1BlOH->uSaKFZ3PMm6IT&Qo4jIq60|H~dY+suB%I_z~qbK-A3 za`!z(`@=VDnbAhB^ge5U;R$Q~0GnN-vq1*IA(I@(4gu?kFUd>OdGOA7vBvM1EHN0} zqv`wp?&%@ZCUwSQp8MRLo~!xinA9Rt=EE{V7JOo(QP8#7ZJ^vkpB(GlwJ5XbA#K!O z<1V(>;4J;V8?$p}qo>|;%;Ka??&n+hHiBK3^_okYYrHD4jnU$?KSye|W20NMo&H@# zU$;+oM*SFBPa8c8xRVFdW>4DG`95aD3vX*+OR`gDDl-3Ib8 zU*{Bv#gv65Gg;~^vczVw$t0V+%F<41+!@uU?x9Wfo00yEqTcgfI(ubyf6CD3p88

ZB z~)Xyo5d1+(0O+6A=eqBlD47@eceYN=YS9IGkeF3mwTi=7!zHSWt}*m*A3*J zm1Z;gTl2kPW!~tu$-CdhM$aUhtTvB{RJpop)9o_0@vCfP^sn}P&%NEu{u*jt8?qQ@)Z(>il-I(Z$*awb^aJJz$P0&%(Gw7H4Af*l@Xao_5tQ zWtA*snAx+B4b4cS+w{r>-<)3}_j4_IFEvN8@v;HAZ_tNvhPI6PR_O3cecex8zVnDR zGOrb5ROT^TjO-s9-Er33tVex*>Q6q=U%X(GhMT)~)3iB4TmJuU`izH~a~nJ3W!#)s zj^uY?7C#?rDU=G2T4dO5wr9P?<_K?IpPOfGh&FFzqe%M9_J%80l8_SgDJ z?r(ybOU^US4D|`}C8xL-=g1}FZ1(5;y~pkD<7`vHet565&RDtUw%4jlj8SVM*VySl zi=$8a!PYk`+04Q^^~n0%CU1>SUvG^L{QozDWFQ0FmfYOUQl4=a{GuSCo7xBHrTWfn z7P}d%@1g$8G*0GyCLe6}h@hQgKKND~QJ@xI$~IQ}!7s;ER|{*{tLQiXGZsC#RyO2R zVipwHvzr>RB{HK`up1Vdz zaL+yW{Qt?uOwxuPz1FAdtL^r!`|K;h3?1*e=brzb{8Y~$sZE*l`bnM~+4yOX?!kkH ar~d#v6--}fea?9R0000 + + + + frames + + bug12847_sprite2.png + + frame + {{2,2},{250,30}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{250,30}} + sourceSize + {250,30} + + + metadata + + format + 2 + realTextureFileName + bug12847_spriteframe.png + size + {254,34} + smartupdate + $TexturePacker:SmartUpdate:9e0d74b54a225e0f5a8a7e0510916a4a:c598d69ef1379b3bf0a57a6a5203b0b9:fad2136b944bf4ebf0cddf5575aec720$ + textureFileName + bug12847_spriteframe.png + + + diff --git a/tests/cpp-tests/Resources/Images/bug12847_spriteframe.png b/tests/cpp-tests/Resources/Images/bug12847_spriteframe.png new file mode 100644 index 0000000000000000000000000000000000000000..b7fd950b1966d67817ad3ac52f3ef5f66070d21e GIT binary patch literal 3168 zcmV-m44?CfP)478Dc~6B85?5)%vz4G#|xEG#Z2CMX;m z9U2-O8X6lL8yp!K8yOiI78V#46&Dy78Vd^y4h|11DlI7~D;yji9UUJY9v~YV9TO83 z5D*b4C@LW#BPApzA|fOwCn+v2Fe4)*7Zw-}4h}6XFBcaXCM72r7#S}wF&`fxAs{0v zDl8x$A|N0l4-XL<85;}?4kRQc5)u>}8XO-UAs-$f5fKtFFfuGFE-^4OB_t;l6BQE@ z6c`s778VyoWBE@20004WQchCWd;cf8@0;0O$!YHe(heZ) z&+KTv`P-HF;fKHJFHJ|Uj*pMul8)b=+?{y31Lb-_Z@+*0cE8`FA$)roIyre8==hK@ z!WAMS7gh+&^JzZC?+&!o-{o@WX}Nq^zJQitaJid;cDp>!PfqeBySu5I+3jSCBM_P2 z<;v>j-1IaML;#1VfuFso{7&H?olIpClv6#CG>DV6#KDKK1rf@BC*3t=}rd1N=i~|i4CVa74KHa1T9IfrL*Xi`a5IL z1P=c3>+{Qx*GeDXgFb$K|51K;;ja)om>s8`3BCq{%70-QS;|gH_t+_x=*-oaDGa>H0s=7a`n7L;U4f82s|( zn^h|4%fCTx{r@E={>vw?g<^2JY5Q{ZUxokU@z3+36e`MYv+263>pS$SO^&3d3`B&E~y{=vhq2UHrw87(?d|B8*lfENW(3(_M=#<4gojC9RIEhSTjWKDPM)RV8F$!zi)&kF* zWam+8Y-DYerl~PeWN-z0Aoehe37w4!Zzt=m(|1k{sIwvUo^()#I@nP7{P@tK^)cry zS=St;W4v!Fx}c=?`Uv2~s$x#HBB}>{TltCR!1JG<2l#OuCxp z=IA(xMs6`1xI!FBhGG*ZNi00*B!vr*!o?Le^r zF426P3tVVCXA1YFMs884qQ-km43M_jVgw)dhy{O4_C&l6STRfq5i!%k1o*_7(&4nK z45{a7)R@*vm_7<$>OrL_H)F5+TyXd{8p-tKMlD5`12eOM1qn!d$!%WxUaSC4ED*ob zQH2^InX}+vSX>9?jkqjrnnxW62$Lv*1_fGves; zB;oo*9-C;`SBy*-znehn!QREb4+Fv4X<&C62x^hO-VkL~`%<@Y=|Mh8csdEeUhzKX zQ!yr5I3=a90kj9-WQX2&nJat-0+Lj+8j-+>gp2WOVo1=k=Sv@Dvp&ojD9nI4J17@W zqmrsr3J$7U2lzwnbFob>EpL(vc%23Wi%BoFo~t|Yz2rtE)k;lJD11D#U^#;$ zppmLfchdc-`aa7h2f;7VtB7LOkhVz$peA%I`O?P5JA5eoVx?HpjHnZ-m2AvQ#e}NA z3F$qK00{soZi2k>*Iw&f)s0B@RP4m7S}I39@3W@S3|ZDV z_)RnRzH#KT+ZIJ+S`!sU>$))xwsAqE6>oqq8y}P1y1kFP%@F(qvi*iS{S*I|TDj%y z;BCPTjpnP|rY8HxcD34W)udq9cGbbzqp;kZK}ErBJhFwVL;WljAE9r@mEV;0dR<#z z+$f}5t=Cm>H8*qeY;kWCJtSEKtA{lbpKC;N{do0oRSRxqu|>Cje60Ne#L^1oipbQ14YNPB z+f}_aNd5pnt!CHPvoh>$HZnDi$14d3^G`W6wB)%eQmr52_VNm=3RnH%>Gogwpo(}_?f+$%^oUW%UZw&)2vqbkt|N_dNzBE8ir0I zdq^79SXD}4rOiO5o6W8}IcJGV^xng4wjKw6MbT@4&jjBR-)c4!U%PMyW{94xx)FR! z(TM$8mNDK7ie}JA#N(OPQ1nWCuOSOHR@bw~QsW^N-OUzSTQn5@Pe-Q;(jSGOb#L2pF!Ot_XX$uG{4e_f>Dm)*jZ(qR(zlogU!Vw3*Ai{K#HDz6e_bOX*Bofy{x0s{Ic7fS;=Vc{mF8QeLt+h#bOREvuQRfTk~ z4#T4E>TmJ8?>7u_U;n*Ci3{10A`J<@`-#?iP_-J0#yMXrA0l9pX(Pb@hX(%`zErpL z0G~1boxe@ZL0Gt;&_s#;48DfE5AFcbe-S9@{JNHm56Mxv&xd6wAcd9Vbm6|*S$?65 z_@ZI;z(2T2YnI;-#rLdOnP6W?6&QK{;^M-Xi;JeY@YFQ74F?^C7UztcxcH{%>o^ng z31oSRq9-fg{ht3-JwHFYpnrDwC7Jnl3Y^dVcH8&Q&po+@u)rjwJU!{hlj6xnqh0k$ zo<)Nc!X{--p{Nd8_Xy|q_Eub<;l8-V+wNp>>frx$2AjxyAn;&|xaH_AD;;NVl~_1@ zL&q9FCnIEc=EP(1V?@WW6A+E1aa^7}5yX@3UxcBkU`1y@x<&08apHo9BlbQmJ zBaie*nlAW + @@ -358,6 +359,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y + @@ -624,4 +626,4 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y - + \ No newline at end of file diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters index 958fd9354f..d33db3fa36 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters @@ -792,9 +792,6 @@ Classes\UITest\CocostudioGUISceneTest\UICheckBoxTest - - Classes\UITest\CocostudioGUISceneTest\UIRadioButtonTest - Classes\UITest\CocostudioGUISceneTest\UIFocusTest @@ -975,6 +972,10 @@ Classes\BugsTest + + + Classes\BugsTest + @@ -1772,5 +1773,8 @@ Classes\BugsTest + + Classes\BugsTest + - + \ No newline at end of file diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems index 859a4dfe87..81c0426231 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems @@ -40,6 +40,7 @@ + @@ -297,6 +298,7 @@ + @@ -521,4 +523,4 @@ - + \ No newline at end of file diff --git a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters index ffc10a447a..2db52a5d8e 100644 --- a/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters +++ b/tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters @@ -1,4 +1,4 @@ - + @@ -806,6 +806,9 @@ Classes\BugsTest + + Classes\BugsTest + @@ -1789,5 +1792,8 @@ Classes\BugsTest + + Classes\BugsTest + - + \ No newline at end of file From ac9d65f3f7d34668cda03daffc045483f554be58 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Wed, 22 Jul 2015 08:19:17 +0000 Subject: [PATCH 32/32] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 13c40af93e..28df5634fb 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -2831,7 +2831,7 @@ "external/freetype2/prebuilt/mac/libfreetype.a", "external/freetype2/prebuilt/win10/arm/freetype.lib", "external/freetype2/prebuilt/win10/win32/freetype.lib", - "external/freetype2/prebuilt/win32/freetype250.lib", + "external/freetype2/prebuilt/win32/freetype.lib", "external/freetype2/prebuilt/winrt_8.1/arm/freetype.lib", "external/freetype2/prebuilt/winrt_8.1/win32/freetype.lib", "external/freetype2/prebuilt/wp_8.1/arm/freetype.lib",