diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt index 24234add77..0130e52859 100644 --- a/cocos/editor-support/cocostudio/CMakeLists.txt +++ b/cocos/editor-support/cocostudio/CMakeLists.txt @@ -59,8 +59,8 @@ set(COCOS_CS_SRC editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.cpp editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.cpp editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp - editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp - editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp + editor-support/cocostudio/WidgetReader/Node3DReader/Node3DReader.cpp + editor-support/cocostudio/WidgetReader/Sprite3DReader/Sprite3DReader.cpp editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.cpp editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.cpp editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.cpp diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index a354a3013d..a73dadbedc 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -150,6 +150,7 @@ set(TESTS_SRC Classes/ParallaxTest/ParallaxTest.cpp Classes/ParticleTest/ParticleTest.cpp Classes/Particle3DTest/Particle3DTest.cpp + Classes/CocosStudio3DTest/CocosStudio3DTest.cpp Classes/PerformanceTest/PerformanceAllocTest.cpp Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp Classes/PerformanceTest/PerformanceParticleTest.cpp diff --git a/tests/cpp-tests/proj.android/jni/Android.mk b/tests/cpp-tests/proj.android/jni/Android.mk index c48ea8f1a9..bc30532323 100644 --- a/tests/cpp-tests/proj.android/jni/Android.mk +++ b/tests/cpp-tests/proj.android/jni/Android.mk @@ -154,6 +154,7 @@ LOCAL_SRC_FILES := main.cpp \ ../../Classes/ParallaxTest/ParallaxTest.cpp \ ../../Classes/ParticleTest/ParticleTest.cpp \ ../../Classes/Particle3DTest/Particle3DTest.cpp \ +../../Classes/CocosStudio3DTest/CocosStudio3DTest.cpp \ ../../Classes/PerformanceTest/PerformanceAllocTest.cpp \ ../../Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp \ ../../Classes/PerformanceTest/PerformanceParticleTest.cpp \ diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index b91421ae52..85b2c37db9 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -175,6 +175,7 @@ + @@ -373,6 +374,7 @@ + diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters index dc8cf82091..e2eb2095b9 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters @@ -343,6 +343,9 @@ {e45d4916-24d0-49b8-a864-d273ea13a248} + + {e4104916-24d0-49b8-a864-d273ea13a248} + {65be3b70-58d6-47f4-bc67-fac9ee134c42} @@ -900,6 +903,9 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest + Classes\PerformanceTest @@ -1664,6 +1670,9 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest + Classes\PerformanceTest 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 c09c4ac354..5209f637f5 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 @@ -115,6 +115,7 @@ + @@ -374,6 +375,7 @@ + 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 b70b59c46e..748129c0e0 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 @@ -769,6 +769,9 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest + @@ -1668,6 +1671,9 @@ {65d0f12d-321a-41f7-99af-de609183f206} + + {65d0104d-321a-41f7-99af-de609183f206} + @@ -1692,5 +1698,8 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest + \ No newline at end of file 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 c68227a433..5a2769426c 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 @@ -233,6 +233,7 @@ + @@ -436,6 +437,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 63a082c27c..2da7b9eaab 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 @@ -346,6 +346,9 @@ {65f864c8-5b02-4c44-ab8b-a8e7289e5c7a} + + {65f104c8-5b02-4c44-ab8b-a8e7289e5c7a} + @@ -912,6 +915,9 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest + @@ -1677,6 +1683,9 @@ Classes\Particle3DTest + + Classes\CocosStudio3DTest +