remove PhoneDirect3DXamlAppComponent namespace refactor

2014-10-23 07:21:48 -07:00 · 2014-10-23 07:21:48 -07:00 · f359c7285e
parent 4596417a0b
commit f359c7285e
15 changed files with 52 additions and 49 deletions
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj
@ -20,7 +20,7 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{60ec6889-c3c4-45ad-a006-47d9ee689212}</ProjectGuid>
-    <RootNamespace>PhoneDirect3DXamlAppComponent</RootNamespace>
+    <RootNamespace>cocos2d</RootNamespace>
    <DefaultLanguage>en-US</DefaultLanguage>
    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
    <WinMDAssembly>true</WinMDAssembly>
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp
@ -35,7 +35,6 @@ using namespace DirectX;
 using namespace Microsoft::WRL;
 using namespace Windows::Foundation;
 using namespace Windows::UI::Core;
-using namespace PhoneDirect3DXamlAppComponent;

 USING_NS_CC;

@ -151,7 +150,7 @@ void Cocos2dRenderer::OnCocos2dKeyEvent(Cocos2dKeyEvent event)

 }

-void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate)
+void Cocos2dRenderer::SetXamlEventDelegate(Cocos2dEventDelegate^ delegate)
 {
    m_delegate = delegate;
    GLViewImpl* eglView = GLViewImpl::sharedOpenGLView();
@ -161,7 +160,7 @@ void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2
    }
 }

-void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate)
+void Cocos2dRenderer::SetXamlMessageBoxDelegate(Cocos2dMessageBoxDelegate^ delegate)
 {
    m_messageBoxDelegate = delegate;
    GLViewImpl* eglView = GLViewImpl::sharedOpenGLView();
@ -171,7 +170,7 @@ void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::C
    }
 }

-void Cocos2dRenderer::SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ delegate)
+void Cocos2dRenderer::SetXamlEditBoxDelegate(Cocos2dEditBoxDelegate^ delegate)
 {
    m_editBoxDelegate = delegate;
    GLViewImpl* eglView = GLViewImpl::sharedOpenGLView();
@ -181,7 +180,7 @@ void Cocos2dRenderer::SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Coco
    }
 }

-void Cocos2dRenderer::SetXamlOpenURLDelegate(PhoneDirect3DXamlAppComponent::Cocos2dOpenURLDelegate^ delegate)
+void Cocos2dRenderer::SetXamlOpenURLDelegate(Cocos2dOpenURLDelegate^ delegate)
 {
    m_openURLDelegate = delegate;
    Application* app = Application::getInstance();
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.h
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.h
@ -41,11 +41,11 @@ public:

    void OnBackButton();
    void OnKeyPressed(Platform::String^ text);
-    void OnCocos2dKeyEvent(PhoneDirect3DXamlAppComponent::Cocos2dKeyEvent event);
-    void SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate);
-    void SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate);
-    void SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ delegate);
-    void SetXamlOpenURLDelegate(PhoneDirect3DXamlAppComponent::Cocos2dOpenURLDelegate^ delegate);
+    void OnCocos2dKeyEvent(cocos2d::Cocos2dKeyEvent event);
+    void SetXamlEventDelegate(cocos2d::Cocos2dEventDelegate^ delegate);
+    void SetXamlMessageBoxDelegate(cocos2d::Cocos2dMessageBoxDelegate^ delegate);
+    void SetXamlEditBoxDelegate(cocos2d::Cocos2dEditBoxDelegate^ delegate);
+    void SetXamlOpenURLDelegate(cocos2d::Cocos2dOpenURLDelegate^ delegate);

    Windows::Foundation::IAsyncAction^ OnSuspending();
    void Connect();
@ -59,10 +59,10 @@ private:
    bool m_loadingComplete;
    bool mInitialized;

-    PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ m_delegate;
-    PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ m_messageBoxDelegate;
-    PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ m_editBoxDelegate;
-    PhoneDirect3DXamlAppComponent::Cocos2dOpenURLDelegate^ m_openURLDelegate;
+    cocos2d::Cocos2dEventDelegate^ m_delegate;
+    cocos2d::Cocos2dMessageBoxDelegate^ m_messageBoxDelegate;
+    cocos2d::Cocos2dEditBoxDelegate^ m_editBoxDelegate;
+    cocos2d::Cocos2dOpenURLDelegate^ m_openURLDelegate;

 	// The AppDelegate for the Cocos2D app
 	AppDelegate* mApp;
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DContentProvider.cpp
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DContentProvider.cpp
@ -26,7 +26,7 @@ THE SOFTWARE.
 #include "Direct3DContentProvider.h"
 #include "Direct3DInterop.h"

-using namespace PhoneDirect3DXamlAppComponent;
+using namespace cocos2d;

 Direct3DContentProvider::Direct3DContentProvider(Direct3DInterop^ controller) :
 	m_controller(controller)
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DContentProvider.h
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DContentProvider.h
@ -37,7 +37,7 @@ class Direct3DContentProvider : public Microsoft::WRL::RuntimeClass<
 		IDrawingSurfaceBackgroundContentProviderNative>
 {
 public:
-	Direct3DContentProvider(PhoneDirect3DXamlAppComponent::Direct3DInterop^ controller);
+	Direct3DContentProvider(cocos2d::Direct3DInterop^ controller);

 	// IDrawingSurfaceContentProviderNative
 	HRESULT STDMETHODCALLTYPE Connect(_In_ IDrawingSurfaceRuntimeHostNative* host, _In_ ID3D11Device1* device);
@ -47,6 +47,6 @@ public:
 	HRESULT STDMETHODCALLTYPE Draw(_In_ ID3D11Device1* device, _In_ ID3D11DeviceContext1* context, _In_ ID3D11RenderTargetView* renderTargetView);

 private:
-	PhoneDirect3DXamlAppComponent::Direct3DInterop^ m_controller;
+	cocos2d::Direct3DInterop^ m_controller;
 	Microsoft::WRL::ComPtr<IDrawingSurfaceRuntimeHostNative> m_host;
 };
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp
@ -35,9 +35,8 @@ using namespace Windows::Phone::Graphics::Interop;
 using namespace Windows::Phone::Input::Interop;
 using namespace Windows::Graphics::Display;
 using namespace DirectX;
-using namespace PhoneDirect3DXamlAppComponent;

-namespace PhoneDirect3DXamlAppComponent
+namespace cocos2d
 {

 Direct3DInterop::Direct3DInterop(Windows::Graphics::Display::DisplayOrientations orientation) 
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.h
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.h
@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <DrawingSurfaceNative.h>


-namespace PhoneDirect3DXamlAppComponent
+namespace cocos2d
 {

 public delegate void RequestAdditionalFrameHandler();
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/EditBoxEvent.cpp
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/EditBoxEvent.cpp
@ -26,9 +26,9 @@ THE SOFTWARE.

 using namespace Platform;

-namespace PhoneDirect3DXamlAppComponent
+namespace cocos2d
 {
-	EditBoxEvent::EditBoxEvent( Object^ sender, Platform::String^ arg, Windows::Foundation::EventHandler<Platform::String^>^ handle ):
+	EditBoxEvent::EditBoxEvent( Platform::Object^ sender, Platform::String^ arg, Windows::Foundation::EventHandler<Platform::String^>^ handle ):
 		m_sender(sender),
 		m_args(arg),
 		m_handler(handle)
--- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/EditBoxEvent.h
+++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/EditBoxEvent.h
@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <agile.h>


-namespace PhoneDirect3DXamlAppComponent
+namespace cocos2d
 {
 	class EditBoxEvent : public cocos2d::InputEvent
 	{
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/LocalizedStrings.cs
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/LocalizedStrings.cs
@ -1,6 +1,6 @@
-using PhoneDirect3DXamlAppInterop.Resources;
+using cocos2d.Resources;

-namespace PhoneDirect3DXamlAppInterop
+namespace cocos2d
 {
    /// <summary>
    /// Provides access to string resources.
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Properties/AssemblyInfo.cs
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Properties/AssemblyInfo.cs
@ -6,11 +6,11 @@ using System.Resources;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PhoneDirect3DXamlAppInterop")]
+[assembly: AssemblyTitle("cocos2d")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PhoneDirect3DXamlAppInterop")]
+[assembly: AssemblyProduct("cocos2d")]
 [assembly: AssemblyCopyright("Copyright ©  2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Properties/WMAppManifest.xml
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Properties/WMAppManifest.xml
@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
  <DefaultLanguage xmlns="" code="en-US" />
-  <App xmlns="" ProductID="{5921fe12-7ef3-4847-8453-42ef286ddbe7}" Title="PhoneDirect3DXamlAppInterop" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal"  Author="PhoneDirect3DXamlAppInterop author" Description="Sample description" Publisher="PhoneDirect3DXamlAppInterop" PublisherID="{46fd6a47-bef7-4b7f-8454-d04a73534286}">
+  <App xmlns="" ProductID="{5921fe12-7ef3-4847-8453-42ef286ddbe7}" Title="cpp-empty-test" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="Microsoft Open Technologies, Inc." Description="Sample description" Publisher="Microsoft Open Technologies, Inc." PublisherID="{46fd6a47-bef7-4b7f-8454-d04a73534286}">
    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
    <Capabilities>
-      <Capability Name="ID_CAP_NETWORKING"/>
-      <Capability Name="ID_CAP_MEDIALIB_AUDIO"/>
-      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK"/>
-      <Capability Name="ID_CAP_SENSORS"/>
-      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT"/>
+      <Capability Name="ID_CAP_NETWORKING" />
+      <Capability Name="ID_CAP_MEDIALIB_AUDIO" />
+      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK" />
+      <Capability Name="ID_CAP_SENSORS" />
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
    </Capabilities>
    <Tasks>
-      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume"/>
+      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" ActivationPolicy="Resume" />
    </Tasks>
    <Tokens>
-      <PrimaryToken TokenID="PhoneDirect3DXamlAppInteropToken" TaskName="_default">
+      <PrimaryToken TokenID="cocos2dToken" TaskName="_default">
        <TemplateFlip>
          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
          <Count>0</Count>
          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
-          <Title>PhoneDirect3DXamlAppInterop</Title>
-          <BackContent></BackContent>
-          <BackBackgroundImageURI></BackBackgroundImageURI>
-          <BackTitle></BackTitle>
-          <DeviceLockImageURI></DeviceLockImageURI>
-          <HasLarge></HasLarge>
+          <Title>cpp-empty-test</Title>
+          <BackContent>
+          </BackContent>
+          <BackBackgroundImageURI>
+          </BackBackgroundImageURI>
+          <BackTitle>
+          </BackTitle>
+          <DeviceLockImageURI>
+          </DeviceLockImageURI>
+          <HasLarge>
+          </HasLarge>
        </TemplateFlip>
      </PrimaryToken>
    </Tokens>
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Resources/AppResources.Designer.cs
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/Resources/AppResources.Designer.cs
@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------

-namespace PhoneDirect3DXamlAppInterop.Resources {
+namespace cocos2d.Resources {
    using System;
    
    
@ -39,7 +39,7 @@ namespace PhoneDirect3DXamlAppInterop.Resources {
        public static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PhoneDirect3DXamlAppInterop.Resources.AppResources", typeof(AppResources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("cocos2d.Resources.AppResources", typeof(AppResources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj
@ -9,8 +9,8 @@
    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PhoneDirect3DXamlAppInterop</RootNamespace>
-    <AssemblyName>PhoneDirect3DXamlAppInterop</AssemblyName>
+    <RootNamespace>cocos2d</RootNamespace>
+    <AssemblyName>cpp-empty-test</AssemblyName>
    <TargetFrameworkIdentifier>WindowsPhone</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
    <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
@ -19,9 +19,9 @@
    </SupportedCultures>
    <XapOutputs>true</XapOutputs>
    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
-    <XapFilename>PhoneDirect3DXamlAppInterop_$(Configuration)_$(Platform).xap</XapFilename>
+    <XapFilename>cpp-empty-test_$(Configuration)_$(Platform).xap</XapFilename>
    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
-    <SilverlightAppEntry>PhoneDirect3DXamlAppInterop.App</SilverlightAppEntry>
+    <SilverlightAppEntry>cocos2d.App</SilverlightAppEntry>
    <ValidateXaml>true</ValidateXaml>
    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
--- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj
+++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-testComponent/cpp-empty-testComponent.vcxproj
@ -20,7 +20,7 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{f5d665f8-ae19-4f3f-99a7-230a1e8305d2}</ProjectGuid>
-    <RootNamespace>PhoneDirect3DXamlAppComponent</RootNamespace>
+    <RootNamespace>cocos2d</RootNamespace>
    <DefaultLanguage>en-US</DefaultLanguage>
    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
    <WinMDAssembly>true</WinMDAssembly>