From 01358f0b62e246507e6734a677680b601b17e1f7 Mon Sep 17 00:00:00 2001
From: huangshiwu <huangsw1@gmail.com>
Date: Fri, 5 Sep 2014 11:21:08 +0800
Subject: [PATCH] fix wp8 compile error and modify default resource path

---
 cocos/2d/cocos2d_wp8.vcxproj                  |  4 ++++
 cocos/2d/cocos2d_wp8.vcxproj.filters          | 12 ++++++++++
 cocos/platform/winrt/CCFileUtilsWinRT.cpp     |  2 +-
 extensions/proj.wp8/libExtensions.vcxproj     |  7 ------
 .../proj.wp8/libExtensions.vcxproj.filters    | 24 -------------------
 .../proj.wp8-xaml/App/HelloCpp.csproj         | 24 +++++++++++--------
 .../cpp-testsComponent.vcxproj                |  4 ----
 .../cpp-testsComponent.vcxproj.filters        | 20 ++--------------
 8 files changed, 33 insertions(+), 64 deletions(-)

diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj
index bd9eafacf0..58078bb03d 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj
+++ b/cocos/2d/cocos2d_wp8.vcxproj
@@ -230,6 +230,7 @@
     <ClCompile Include="..\3d\CCBundleReader.cpp" />
     <ClCompile Include="..\3d\CCMesh.cpp" />
     <ClCompile Include="..\3d\CCMeshSkin.cpp" />
+    <ClCompile Include="..\3d\CCMeshVertexIndexData.cpp" />
     <ClCompile Include="..\3d\CCOBB.cpp" />
     <ClCompile Include="..\3d\CCObjLoader.cpp" />
     <ClCompile Include="..\3d\CCRay.cpp" />
@@ -367,6 +368,7 @@
     <ClCompile Include="..\renderer\CCTexture2D.cpp" />
     <ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
     <ClCompile Include="..\renderer\CCTextureCache.cpp" />
+    <ClCompile Include="..\renderer\CCTrianglesCommand.cpp" />
     <ClCompile Include="..\renderer\CCVertexIndexBuffer.cpp" />
     <ClCompile Include="..\renderer\CCVertexIndexData.cpp" />
     <ClCompile Include="CCAction.cpp" />
@@ -453,6 +455,7 @@
     <ClInclude Include="..\3d\CCBundleReader.h" />
     <ClInclude Include="..\3d\CCMesh.h" />
     <ClInclude Include="..\3d\CCMeshSkin.h" />
+    <ClInclude Include="..\3d\CCMeshVertexIndexData.h" />
     <ClInclude Include="..\3d\CCOBB.h" />
     <ClInclude Include="..\3d\CCObjLoader.h" />
     <ClInclude Include="..\3d\CCRay.h" />
@@ -596,6 +599,7 @@
     <ClInclude Include="..\renderer\CCTexture2D.h" />
     <ClInclude Include="..\renderer\CCTextureAtlas.h" />
     <ClInclude Include="..\renderer\CCTextureCache.h" />
+    <ClInclude Include="..\renderer\CCTrianglesCommand.h" />
     <ClInclude Include="..\renderer\CCVertexIndexBuffer.h" />
     <ClInclude Include="..\renderer\CCVertexIndexData.h" />
     <ClInclude Include="CCAction.h" />
diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters
index 154b65da34..0634b1b385 100644
--- a/cocos/2d/cocos2d_wp8.vcxproj.filters
+++ b/cocos/2d/cocos2d_wp8.vcxproj.filters
@@ -653,6 +653,12 @@
     <ClCompile Include="..\3d\CCRay.cpp">
       <Filter>3d</Filter>
     </ClCompile>
+    <ClCompile Include="..\renderer\CCTrianglesCommand.cpp">
+      <Filter>renderer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3d\CCMeshVertexIndexData.cpp">
+      <Filter>3d</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\physics\CCPhysicsBody.h">
@@ -1334,6 +1340,12 @@
     <ClInclude Include="..\3d\CCRay.h">
       <Filter>3d</Filter>
     </ClInclude>
+    <ClInclude Include="..\renderer\CCTrianglesCommand.h">
+      <Filter>renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3d\CCMeshVertexIndexData.h">
+      <Filter>3d</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\math\Mat4.inl">
diff --git a/cocos/platform/winrt/CCFileUtilsWinRT.cpp b/cocos/platform/winrt/CCFileUtilsWinRT.cpp
index a5b0e7214c..736a597504 100644
--- a/cocos/platform/winrt/CCFileUtilsWinRT.cpp
+++ b/cocos/platform/winrt/CCFileUtilsWinRT.cpp
@@ -53,7 +53,7 @@ static void _checkPath()
     if (s_pszResourcePath.empty())
     {
 		// TODO: needs to be tested
-		s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\res" + '\\');
+		s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\Resources" + '\\');
     }
 }
 
diff --git a/extensions/proj.wp8/libExtensions.vcxproj b/extensions/proj.wp8/libExtensions.vcxproj
index 451b0d11ef..72380f216e 100644
--- a/extensions/proj.wp8/libExtensions.vcxproj
+++ b/extensions/proj.wp8/libExtensions.vcxproj
@@ -176,9 +176,6 @@
     <ClCompile Include="..\GUI\CCControlExtension\CCControlSwitch.cpp" />
     <ClCompile Include="..\GUI\CCControlExtension\CCControlUtils.cpp" />
     <ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp" />
-    <ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp" />
-    <ClCompile Include="..\GUI\CCEditBox\CCEditBox.cpp" />
-    <ClCompile Include="..\GUI\CCEditBox\CCEditBoxImplWp8.cpp" />
     <ClCompile Include="..\GUI\CCScrollView\CCScrollView.cpp" />
     <ClCompile Include="..\GUI\CCScrollView\CCTableView.cpp" />
     <ClCompile Include="..\GUI\CCScrollView\CCTableViewCell.cpp" />
@@ -208,10 +205,6 @@
     <ClInclude Include="..\GUI\CCControlExtension\CCControlSwitch.h" />
     <ClInclude Include="..\GUI\CCControlExtension\CCControlUtils.h" />
     <ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h" />
-    <ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h" />
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBox.h" />
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBoxImpl.h" />
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBoxImplWp8.h" />
     <ClInclude Include="..\GUI\CCScrollView\CCScrollView.h" />
     <ClInclude Include="..\cocos-ext.h" />
     <ClInclude Include="..\ExtensionMacros.h" />
diff --git a/extensions/proj.wp8/libExtensions.vcxproj.filters b/extensions/proj.wp8/libExtensions.vcxproj.filters
index 57969f624b..2a3c131354 100644
--- a/extensions/proj.wp8/libExtensions.vcxproj.filters
+++ b/extensions/proj.wp8/libExtensions.vcxproj.filters
@@ -13,9 +13,6 @@
     <Filter Include="physics_nodes">
       <UniqueIdentifier>{d5806151-7ae1-4fef-af5a-2fa1d1c7377b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="GUI\CCEditBox">
-      <UniqueIdentifier>{5d186e3d-0aaf-4904-a5d8-e5cb0f35f4cc}</UniqueIdentifier>
-    </Filter>
     <Filter Include="AssetsManager">
       <UniqueIdentifier>{49487dbe-5758-436a-b014-8e2edc6b33ae}</UniqueIdentifier>
     </Filter>
@@ -57,27 +54,18 @@
     <ClCompile Include="..\GUI\CCControlExtension\CCInvocation.cpp">
       <Filter>GUI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\GUI\CCControlExtension\CCScale9Sprite.cpp">
-      <Filter>GUI\CCControlExtension</Filter>
-    </ClCompile>
     <ClCompile Include="..\GUI\CCControlExtension\CCControl.cpp">
       <Filter>GUI\CCControlExtension</Filter>
     </ClCompile>
     <ClCompile Include="..\GUI\CCControlExtension\CCControlButton.cpp">
       <Filter>GUI\CCControlExtension</Filter>
     </ClCompile>
-    <ClCompile Include="..\GUI\CCEditBox\CCEditBox.cpp">
-      <Filter>GUI\CCEditBox</Filter>
-    </ClCompile>
     <ClCompile Include="..\physics-nodes\CCPhysicsDebugNode.cpp">
       <Filter>physics_nodes</Filter>
     </ClCompile>
     <ClCompile Include="..\physics-nodes\CCPhysicsSprite.cpp">
       <Filter>physics_nodes</Filter>
     </ClCompile>
-    <ClCompile Include="..\GUI\CCEditBox\CCEditBoxImplWp8.cpp">
-      <Filter>GUI\CCEditBox</Filter>
-    </ClCompile>
     <ClCompile Include="pch.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -125,27 +113,15 @@
     <ClInclude Include="..\GUI\CCControlExtension\CCInvocation.h">
       <Filter>GUI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\GUI\CCControlExtension\CCScale9Sprite.h">
-      <Filter>GUI\CCControlExtension</Filter>
-    </ClInclude>
     <ClInclude Include="..\GUI\CCControlExtension\CCControl.h">
       <Filter>GUI\CCControlExtension</Filter>
     </ClInclude>
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBox.h">
-      <Filter>GUI\CCEditBox</Filter>
-    </ClInclude>
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBoxImpl.h">
-      <Filter>GUI\CCEditBox</Filter>
-    </ClInclude>
     <ClInclude Include="..\physics-nodes\CCPhysicsDebugNode.h">
       <Filter>physics_nodes</Filter>
     </ClInclude>
     <ClInclude Include="..\physics-nodes\CCPhysicsSprite.h">
       <Filter>physics_nodes</Filter>
     </ClInclude>
-    <ClInclude Include="..\GUI\CCEditBox\CCEditBoxImplWp8.h">
-      <Filter>GUI\CCEditBox</Filter>
-    </ClInclude>
     <ClInclude Include="pch.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj
index 19d93505a5..2f4cec563c 100644
--- a/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj
+++ b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj
@@ -102,12 +102,24 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\res\fonts\Marker Felt.ttf">
+      <Link>Assets\Resources\fonts\Marker Felt.ttf</Link>
+    </None>
     <None Include="Properties\AppManifest.xml" />
     <None Include="Properties\WMAppManifest.xml">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\..\res\CloseNormal.png">
+      <Link>Assets\Resources\CloseNormal.png</Link>
+    </Content>
+    <Content Include="..\..\res\CloseSelected.png">
+      <Link>Assets\Resources\CloseSelected.png</Link>
+    </Content>
+    <Content Include="..\..\res\HelloWorld.png">
+      <Link>Assets\Resources\HelloWorld.png</Link>
+    </Content>
     <Content Include="Assets\AlignmentGrid.png" />
     <Content Include="Assets\ApplicationIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -154,14 +166,7 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="..\..\res\**\*">
-      <Link>Assets\res\%(RecursiveDir)%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -172,6 +177,5 @@
   <Target Name="AfterBuild">
   </Target>
     -->
-<ProjectExtensions />
- 
+  <ProjectExtensions />
 </Project>
\ 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 60ea821193..b1c32cce74 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
@@ -207,11 +207,9 @@
     <ClCompile Include="..\..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\cons.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.cpp" />
-    <ClCompile Include="..\..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\NetworkTest\SocketIOTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\NetworkTest\WebSocketTest.cpp" />
-    <ClCompile Include="..\..\Classes\ExtensionsTest\Scale9SpriteTest\Scale9SpriteTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp" />
     <ClCompile Include="..\..\Classes\FileUtilsTest\FileUtilsTest.cpp" />
@@ -411,11 +409,9 @@
     <ClInclude Include="..\..\Classes\ExtensionsTest\CocoStudioSceneTest\TriggerCode\EventDef.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.h" />
-    <ClInclude Include="..\..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\NetworkTest\HttpClientTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\NetworkTest\SocketIOTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\NetworkTest\WebSocketTest.h" />
-    <ClInclude Include="..\..\Classes\ExtensionsTest\Scale9SpriteTest\Scale9SpriteTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\TableViewTest\CustomTableViewCell.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h" />
     <ClInclude Include="..\..\Classes\FileUtilsTest\FileUtilsTest.h" />
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 44d9ce5bea..3a2638f4ef 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
@@ -199,9 +199,6 @@
     <Filter Include="Classes\FileUtilsTest">
       <UniqueIdentifier>{a4c2111f-cf9f-492c-884d-3de24715adce}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\ExtensionsTest\EditBoxTest">
-      <UniqueIdentifier>{18a69e7e-8ca7-475a-bfbb-7296baab16ce}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest">
       <UniqueIdentifier>{0ef55f53-411a-4661-b5d5-13930da52e68}</UniqueIdentifier>
     </Filter>
@@ -217,9 +214,6 @@
     <Filter Include="Classes\ConfigurationTest">
       <UniqueIdentifier>{81ec2355-7efd-49e0-b6cb-b1bba23fbbc8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\ExtensionsTest\Scale9SpriteTest">
-      <UniqueIdentifier>{3d73aa04-d66e-43d3-921f-b867a753c113}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\ExtensionsTest\CocoStudioArmatureTest">
       <UniqueIdentifier>{a6e7d28e-46a3-46c4-9735-b39e96f776f0}</UniqueIdentifier>
     </Filter>
@@ -582,9 +576,6 @@
     <ClCompile Include="..\..\Classes\FileUtilsTest\FileUtilsTest.cpp">
       <Filter>Classes\FileUtilsTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.cpp">
-      <Filter>Classes\ExtensionsTest\EditBoxTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.cpp">
       <Filter>Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest</Filter>
     </ClCompile>
@@ -600,9 +591,6 @@
     <ClCompile Include="..\..\Classes\BaseTest.cpp">
       <Filter>Classes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Classes\ExtensionsTest\Scale9SpriteTest\Scale9SpriteTest.cpp">
-      <Filter>Classes\ExtensionsTest\Scale9SpriteTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Classes\LabelTest\LabelTestNew.cpp">
       <Filter>Classes\LabelTest</Filter>
     </ClCompile>
@@ -867,6 +855,7 @@
     <ClCompile Include="..\..\Classes\Camera3DTest\Camera3DTest.cpp">
       <Filter>Classes\Camera3DTest</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Classes\AppDelegate.h">
@@ -1298,9 +1287,6 @@
     <ClInclude Include="..\..\Classes\FileUtilsTest\FileUtilsTest.h">
       <Filter>Classes\FileUtilsTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Classes\ExtensionsTest\EditBoxTest\EditBoxTest.h">
-      <Filter>Classes\ExtensionsTest\EditBoxTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackLayerLoader.h">
       <Filter>Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest</Filter>
     </ClInclude>
@@ -1322,9 +1308,6 @@
     <ClInclude Include="..\..\Classes\BaseTest.h">
       <Filter>Classes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Classes\ExtensionsTest\Scale9SpriteTest\Scale9SpriteTest.h">
-      <Filter>Classes\ExtensionsTest\Scale9SpriteTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Classes\LabelTest\LabelTestNew.h">
       <Filter>Classes\LabelTest</Filter>
     </ClInclude>
@@ -1605,6 +1588,7 @@
     <ClInclude Include="..\..\Classes\Camera3DTest\Camera3DTest.h">
       <Filter>Classes\Camera3DTest</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Classes\UITest\CocoStudioGUITest\UIEditBoxTest.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\external\curl\prebuilt\wp8\arm\libcurl.dll" />