diff --git a/.travis.yml b/.travis.yml index d107a90eaa..d80b96a718 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,5 +34,4 @@ before_install: # whitelist branches: only: - - master - - develop + - v3 diff --git a/cocos/2d/Android.mk b/cocos/2d/Android.mk index 66f687e0bd..cda8fe92bc 100644 --- a/cocos/2d/Android.mk +++ b/cocos/2d/Android.mk @@ -167,7 +167,6 @@ renderer/CCRenderMaterial.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/renderer \ - $(LOCAL_PATH)/../math/kazmath \ $(LOCAL_PATH)/../math \ platform/android \ $(LOCAL_PATH)/../physics \ @@ -181,7 +180,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/renderer \ - $(LOCAL_PATH)/../math/kazmath \ $(LOCAL_PATH)/../math \ $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../physics \ diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 26bf8d1034..b2d30f348a 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -535,12 +535,9 @@ void RenderTexture::onBegin() director->setProjection(director->getProjection()); #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 - kmMat4 modifiedProjection; - kmGLGetMatrix(KM_GL_PROJECTION, &modifiedProjection); - kmMat4Multiply(&modifiedProjection, CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix(), &modifiedProjection); - kmGLMatrixMode(KM_GL_PROJECTION); - kmGLLoadMatrix(&modifiedProjection); - kmGLMatrixMode(KM_GL_MODELVIEW); + Matrix modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; + director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION,modifiedProjection); #endif const Size& texSize = _texture->getContentSizeInPixels(); diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 82ce59377b..a932465d98 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -221,316 +221,19 @@ + - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - - - false - false - false - false - CompileAsCpp - CompileAsCpp - CompileAsCpp - CompileAsCpp - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - + + + + + + @@ -655,7 +358,6 @@ - @@ -701,7 +403,6 @@ - @@ -743,21 +444,14 @@ - - - - - - - - - - - - - - - + + + + + + + + @@ -898,7 +592,6 @@ - @@ -912,4 +605,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index b528e23c7c..6033b06ccf 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -58,9 +58,6 @@ {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - {7751500e-ac9e-4604-a96d-670b30b7d8bd} - {163895ae-8a8e-46bf-bdf2-98bb2c1347fc} @@ -106,6 +103,9 @@ {5598fb0c-c012-45b6-8e43-447e7891b61d} + + {9bbf7050-757b-41b1-ab15-418db52c2023} + @@ -383,7 +383,6 @@ - support @@ -483,9 +482,6 @@ renderer - - renderer - renderer @@ -547,48 +543,6 @@ platform\winrt - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - platform\winrt @@ -619,6 +573,25 @@ platform\winrt + + + math + + + math + + + math + + + math + + + math + + + math + @@ -1048,9 +1021,6 @@ renderer - - renderer - renderer @@ -1118,51 +1088,6 @@ platform\winrt - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - - - kazmath - platform\winrt @@ -1208,5 +1133,52 @@ platform\winrt + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + + + math + + + math + + + math + + + math + + + math + + + math + + + math + \ No newline at end of file diff --git a/cocos/2d/platform/android/Android.mk b/cocos/2d/platform/android/Android.mk index 34a4dc9ddd..244d5a85f5 100644 --- a/cocos/2d/platform/android/Android.mk +++ b/cocos/2d/platform/android/Android.mk @@ -28,7 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../../../base \ - $(LOCAL_PATH)/../../../math/kazmath \ $(LOCAL_PATH)/../../../math \ $(LOCAL_PATH)/../../../physics diff --git a/cocos/2d/platform/wp8/CCGLView.cpp b/cocos/2d/platform/wp8/CCGLView.cpp index ced5ac3a50..5716466c59 100644 --- a/cocos/2d/platform/wp8/CCGLView.cpp +++ b/cocos/2d/platform/wp8/CCGLView.cpp @@ -397,10 +397,9 @@ void GLView::UpdateWindowSize() } } -const kmMat4* GLView::getOrientationMatrix() const +const Matrix& GLView::getOrientationMatrix() const { - const kmMat4* k = &m_orientationMatrix; - return &m_orientationMatrix; + return m_orientationMatrix; }; @@ -430,7 +429,7 @@ void GLView::UpdateOrientationMatrix() } } -cocos2d::Vector2 GLView::TransformToOrientation(Windows::Foundation::Vector2 p) +cocos2d::Vector2 GLView::TransformToOrientation(Windows::Foundation::Point p) { cocos2d::Vector2 returnValue; diff --git a/cocos/2d/platform/wp8/CCGLView.h b/cocos/2d/platform/wp8/CCGLView.h index 0689e28802..9dc2603b11 100644 --- a/cocos/2d/platform/wp8/CCGLView.h +++ b/cocos/2d/platform/wp8/CCGLView.h @@ -62,8 +62,8 @@ public: virtual void swapBuffers(); virtual void setViewPortInPoints(float x , float y , float w , float h); virtual void setScissorInPoints(float x , float y , float w , float h); - const kmMat4* getOrientationMatrix() const; - const kmMat4* getReverseOrientationMatrix () const {return &m_reverseOrientationMatrix;}; + const Matrix& getOrientationMatrix() const; + const Matrix& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;}; @@ -147,12 +147,12 @@ private: void UpdateWindowSize(); void UpdateOrientationMatrix(); - cocos2d::Vector2 TransformToOrientation(Windows::Foundation::Vector2 point); + cocos2d::Vector2 TransformToOrientation(Windows::Foundation::Point point); cocos2d::Vector2 GetPoint(Windows::UI::Core::PointerEventArgs^ args); Windows::Foundation::Rect m_windowBounds; Windows::Foundation::EventRegistrationToken m_eventToken; - Windows::Foundation::Vector2 m_lastPoint; + Windows::Foundation::Point m_lastPoint; float m_width; float m_height; @@ -163,8 +163,8 @@ private: bool m_lastPointValid; bool m_windowClosed; bool m_windowVisible; - kmMat4 m_orientationMatrix; - kmMat4 m_reverseOrientationMatrix; + Matrix m_orientationMatrix; + Matrix m_reverseOrientationMatrix; bool m_running; diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk index 0608ca88d4..3da9a20b15 100644 --- a/cocos/audio/android/Android.mk +++ b/cocos/audio/android/Android.mk @@ -13,7 +13,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../math/kazmath \ $(LOCAL_PATH)/../../math \ $(LOCAL_PATH)/../../2d \ $(LOCAL_PATH)/../../2d/platform/android \ diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp index d538746059..edcf5aead1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp @@ -54,6 +54,8 @@ namespace cocostudio panel->setSize(Size(w, h)); /**/ + panel->setClippingEnabled(DICTOOL->getBooleanValue_json(options, "clipAble")); + bool backGroundScale9Enable = DICTOOL->getBooleanValue_json(options, "backGroundScale9Enable"); panel->setBackGroundImageScale9Enabled(backGroundScale9Enable); int cr = DICTOOL->getIntValue_json(options, "bgColorR"); diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 36b268df56..b88f1126f1 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -61,7 +61,7 @@ include_directories( ${COCOS2D_ROOT}/cocos/deprecated ${COCOS2D_ROOT}/cocos/physics ${COCOS2D_ROOT}/cocos/editor-support - ${COCOS2D_ROOT}/cocos/math/kazmath + ${COCOS2D_ROOT}/cocos/math ${COCOS2D_ROOT}/extensions ${COCOS2D_ROOT}/external ${COCOS2D_ROOT}/external/edtaa3func @@ -89,8 +89,8 @@ link_directories( ${COCOS2D_ROOT}/external/linux-specific/fmod/prebuilt/${ARCH_DIR} ) -# kazmath -add_subdirectory(${COCOS2D_ROOT}/cocos/math/kazmath) +# math +add_subdirectory(${COCOS2D_ROOT}/cocos/math) # chipmunk library add_subdirectory(${COCOS2D_ROOT}/external/chipmunk/src) diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 83a4e2ebe7..db8316cc38 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -931,7 +931,7 @@ "$(SRCROOT)/../cocos2d/cocos", "$(SRCROOT)/../cocos2d/cocos/base", "$(SRCROOT)/../cocos2d/cocos/physics", - "$(SRCROOT)/../cocos2d/cocos/math/kazmath", + "$(SRCROOT)/../cocos2d/cocos/math", "$(SRCROOT)/../cocos2d/cocos/2d", "$(SRCROOT)/../cocos2d/cocos/ui", "$(SRCROOT)/../cocos2d/cocos/network", @@ -959,7 +959,7 @@ "$(SRCROOT)/../cocos2d/cocos", "$(SRCROOT)/../cocos2d/cocos/base", "$(SRCROOT)/../cocos2d/cocos/physics", - "$(SRCROOT)/../cocos2d/cocos/math/kazmath", + "$(SRCROOT)/../cocos2d/cocos/math", "$(SRCROOT)/../cocos2d/cocos/2d", "$(SRCROOT)/../cocos2d/cocos/ui", "$(SRCROOT)/../cocos2d/cocos/network", diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index e03fcc0c04..03d3db101f 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -272,6 +272,7 @@ + @@ -466,6 +467,7 @@ + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index f999d7fce7..b134df2fb4 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -834,6 +834,9 @@ Classes\CurlTest + + Classes\UnitTest + @@ -1545,6 +1548,9 @@ Classes\CurlTest + + Classes\UnitTest + diff --git a/tools/jenkins-scripts/ci-release-test.py b/tools/jenkins-scripts/ci-release-test.py index 80d3c13065..6e83e92519 100644 --- a/tools/jenkins-scripts/ci-release-test.py +++ b/tools/jenkins-scripts/ci-release-test.py @@ -55,7 +55,7 @@ def main(): pr_desc = '

' + tag + ' is release' + '

' #get pr target branch - branch = 'develop' + branch = 'v3' #set parent build description jenkins_url = os.environ['JENKINS_URL'] @@ -65,10 +65,10 @@ def main(): set_description(pr_desc, target_url) - #pull origin develop + #pull origin v3 os.system('git reset --hard') os.system("git clean -xdf -f") - os.system("git checkout develop") + os.system("git checkout v3") os.system("git branch -D " + tag) os.system("git clean -xdf -f") #fetch tag to local repo @@ -106,7 +106,7 @@ def main(): os.system('git reset --hard') os.system("git clean -xdf -f") make_temp_dir() - if(branch == 'develop'): + if(branch == 'v3'): # Generate binding glue codes ret = os.system("python tools/jenkins-scripts/gen_jsb.py") if(ret != 0): @@ -139,7 +139,7 @@ def main(): os.system("cd " + os.environ['WORKSPACE']) os.system("git reset --hard") os.system("git clean -xdf -f") - os.system("git checkout develop") + os.system("git checkout v3") return(exit_code) diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index a77ac64c70..9941349e7a 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -76,7 +76,7 @@ def main(): #reset path to workspace root os.system("cd " + os.environ['WORKSPACE']); - os.system("git checkout develop") + os.system("git checkout v3") os.system("git branch -D pull" + str(pr_num)) #clean workspace print "Before checkout: git clean -xdf -f" @@ -102,9 +102,9 @@ def main(): return(2) # Generate binding glue codes - if(branch == 'develop'): + if(branch == 'v3'): ret = os.system("python tools/jenkins-scripts/gen_jsb.py") - elif(branch == 'master'): + elif(branch == 'v2'): os.chdir('tools/tojs') if(platform.system() == 'Windows'): os.environ['NDK_ROOT'] = os.environ['NDK_ROOT_R8E'] @@ -139,7 +139,7 @@ def main(): #TODO: add android-linux build #TODO: add mac build node_name = os.environ['NODE_NAME'] - if(branch == 'develop'): + if(branch == 'v3'): if(node_name == 'android_mac') or (node_name == 'android_win7'): #modify tests/cpp-empty-test/Classes/AppDelegate.cpp to support Console modify_file = 'tests/cpp-empty-test/Classes/AppDelegate.cpp' @@ -171,7 +171,7 @@ def main(): ret = os.system("cmake ../") ret = os.system("make -j10") os.chdir("../") - elif(branch == 'master'): + elif(branch == 'v2'): SAMPLES_DIRS = ['Cpp/HelloCpp', 'Cpp/SimpleGame', 'Cpp/TestCpp', 'Javascript/TestJavascript', 'Lua/HelloLua', 'Lua/TestLua'] SAMPLES_NAMES = ['HelloCpp', 'SimpleGame', 'TestCpp', 'TestJavascript', 'HelloLua', 'TestLua'] if(node_name == 'android_mac'): @@ -215,7 +215,7 @@ def main(): os.system("cd " + os.environ['WORKSPACE']) os.system("git reset --hard") os.system("git clean -xdf -f") - os.system("git checkout develop") + os.system("git checkout v3") os.system("git branch -D pull" + str(pr_num)) return(exit_code) diff --git a/tools/travis-scripts/generate-bindings.sh b/tools/travis-scripts/generate-bindings.sh index 0a2b428b57..304c8d641e 100755 --- a/tools/travis-scripts/generate-bindings.sh +++ b/tools/travis-scripts/generate-bindings.sh @@ -23,7 +23,7 @@ ELAPSEDSECS=`date +%s` COCOS_BRANCH="update_lua_bindings_$ELAPSEDSECS" COCOS_ROBOT_REMOTE="https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git" PULL_REQUEST_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls" -FETCH_REMOTE_BRANCH="develop" +FETCH_REMOTE_BRANCH="v3" COMMIT_PATH="cocos/scripting/lua-bindings/auto" # Exit on error diff --git a/tools/travis-scripts/generate-cocosfiles.sh b/tools/travis-scripts/generate-cocosfiles.sh index 82837b2a6d..d946787499 100755 --- a/tools/travis-scripts/generate-cocosfiles.sh +++ b/tools/travis-scripts/generate-cocosfiles.sh @@ -6,7 +6,7 @@ PROJECT_ROOT="$DIR"/../.. COMMITTAG="[AUTO][ci skip]: updating cocos2dx_files.json" PUSH_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls" OUTPUT_FILE_PATH="${PROJECT_ROOT}/templates/cocos2dx_files.json" -FETCH_REMOTE_BRANCH="develop" +FETCH_REMOTE_BRANCH="v3" COMMIT_PATH="templates/cocos2dx_files.json" # Exit on error