fix test project

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

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

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 \

tests/cpp-tests/proj.win32/cpp-tests.vcxproj

@@ -175,6 +175,7 @@
     <ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
     <ClCompile Include="..\Classes\NewRendererTest\NewRendererTest.cpp" />
     <ClCompile Include="..\Classes\Particle3DTest\Particle3DTest.cpp" />
+    <ClCompile Include="..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp" />    
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceAllocTest.cpp" />
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceContainerTest.cpp" />
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceEventDispatcherTest.cpp" />
@@ -373,6 +374,7 @@
     <ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
     <ClInclude Include="..\Classes\NewRendererTest\NewRendererTest.h" />
     <ClInclude Include="..\Classes\Particle3DTest\Particle3DTest.h" />
+    <ClInclude Include="..\Classes\CocosStudio3DTest\CocosStudio3DTest.h" />    
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceAllocTest.h" />
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceContainerTest.h" />
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceEventDispatcherTest.h" />

tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters

@@ -343,6 +343,9 @@
     <Filter Include="Classes\Particle3DTest">
       <UniqueIdentifier>{e45d4916-24d0-49b8-a864-d273ea13a248}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\CocosStudio3DTest">
+      <UniqueIdentifier>{e4104916-24d0-49b8-a864-d273ea13a248}</UniqueIdentifier>
+    </Filter>    
     <Filter Include="Classes\UITest\CocostudioGUISceneTest\CustomTest\CustomWidgetCallbackBindTest">
       <UniqueIdentifier>{65be3b70-58d6-47f4-bc67-fac9ee134c42}</UniqueIdentifier>
     </Filter>
@@ -900,6 +903,9 @@
     <ClCompile Include="..\Classes\Particle3DTest\Particle3DTest.cpp">
       <Filter>Classes\Particle3DTest</Filter>
     </ClCompile>
+    <ClCompile Include="..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClCompile>    
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceMathTest.cpp">
       <Filter>Classes\PerformanceTest</Filter>
     </ClCompile>
@@ -1664,6 +1670,9 @@
     <ClInclude Include="..\Classes\Particle3DTest\Particle3DTest.h">
       <Filter>Classes\Particle3DTest</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\CocosStudio3DTest\CocosStudio3DTest.h">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClInclude>    
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceMathTest.h">
       <Filter>Classes\PerformanceTest</Filter>
     </ClInclude>

tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems

@@ -115,6 +115,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\OpenURLTest\OpenURLTest.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ParallaxTest\ParallaxTest.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp" />    
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ParticleTest\ParticleTest.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceAllocTest.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceCallbackTest.cpp" />
@@ -374,6 +375,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\OpenURLTest\OpenURLTest.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ParallaxTest\ParallaxTest.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.h" />    
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\ParticleTest\ParticleTest.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceAllocTest.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\PerformanceTest\PerformanceCallbackTest.h" />

tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters

@@ -769,6 +769,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.cpp">
       <Filter>Classes\Particle3DTest</Filter>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClCompile>    
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Classes\ActionManagerTest\ActionManagerTest.cpp">
@@ -1668,6 +1671,9 @@
     <Filter Include="Classes\Particle3DTest">
       <UniqueIdentifier>{65d0f12d-321a-41f7-99af-de609183f206}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\CocosStudio3DTest">
+      <UniqueIdentifier>{65d0104d-321a-41f7-99af-de609183f206}</UniqueIdentifier>
+    </Filter>    
   </ItemGroup>
   <ItemGroup>
     <Page Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos\platform\win8.1-universal\OpenGLESPage.xaml" />
@@ -1692,5 +1698,8 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\Particle3DTest\Particle3DTest.h">
       <Filter>Classes\Particle3DTest</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.h">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClInclude>    
   </ItemGroup>
 </Project>

tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj

@@ -233,6 +233,7 @@
     <ClCompile Include="..\..\Classes\NewRendererTest\NewRendererTest.cpp" />
     <ClCompile Include="..\..\Classes\OpenURLTest\OpenURLTest.cpp" />
     <ClCompile Include="..\..\Classes\Particle3DTest\Particle3DTest.cpp" />
+    <ClCompile Include="..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp" />    
     <ClCompile Include="..\..\Classes\PerformanceTest\PerformanceAllocTest.cpp" />
     <ClCompile Include="..\..\Classes\PerformanceTest\PerformanceContainerTest.cpp" />
     <ClCompile Include="..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.cpp" />
@@ -436,6 +437,7 @@
     <ClInclude Include="..\..\Classes\NewRendererTest\NewRendererTest.h" />
     <ClInclude Include="..\..\Classes\OpenURLTest\OpenURLTest.h" />
     <ClInclude Include="..\..\Classes\Particle3DTest\Particle3DTest.h" />
+    <ClInclude Include="..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.h" />    
     <ClInclude Include="..\..\Classes\PerformanceTest\PerformanceAllocTest.h" />
     <ClInclude Include="..\..\Classes\PerformanceTest\PerformanceContainerTest.h" />
     <ClInclude Include="..\..\Classes\PerformanceTest\PerformanceEventDispatcherTest.h" />

tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters

@@ -346,6 +346,9 @@
     <Filter Include="Classes\Particle3DTest">
       <UniqueIdentifier>{65f864c8-5b02-4c44-ab8b-a8e7289e5c7a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\CocosStudio3DTest">
+      <UniqueIdentifier>{65f104c8-5b02-4c44-ab8b-a8e7289e5c7a}</UniqueIdentifier>
+    </Filter>    
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Classes\AppDelegate.cpp">
@@ -912,6 +915,9 @@
     <ClCompile Include="..\..\Classes\Particle3DTest\Particle3DTest.cpp">
       <Filter>Classes\Particle3DTest</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.cpp">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Classes\AppDelegate.h">
@@ -1677,6 +1683,9 @@
     <ClInclude Include="..\..\Classes\Particle3DTest\Particle3DTest.h">
       <Filter>Classes\Particle3DTest</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Classes\CocosStudio3DTest\CocosStudio3DTest.h">
+      <Filter>Classes\CocosStudio3DTest</Filter>
+    </ClInclude>    
   </ItemGroup>
   <ItemGroup>
     <None Include="$(AngleBinPath)libEGL_phone.dll" />