From 299769ecba0a96ca8dc9551a639b9e5e6d23b3d2 Mon Sep 17 00:00:00 2001 From: Ian C Date: Sat, 26 May 2012 22:13:26 +0000 Subject: Copmpleted reorganisation of input into a single assembly. --- WindowsPhone/JoystickTest.sln | 12 +-- .../JoystickTest/JoystickTest/JoystickTest.csproj | 6 +- WindowsPhone/KeyboardTest.sln | 24 +++--- WindowsPhone/KeyboardTest.suo | Bin 48128 -> 50176 bytes WindowsPhone/KeyboardTest/KeyboardTest/Game1.cs | 2 +- .../KeyboardTest/KeyboardTest/KeyboardTest.csproj | 6 +- .../Noddybox.Emulation.Xna.Input.csproj | 89 +++++++++++++++++++++ .../Properties/AssemblyInfo.cs | 36 +++++++++ .../Noddybox.Emulation.Xna.Joystick.csproj | 80 ------------------ .../Properties/AssemblyInfo.cs | 36 --------- .../Noddybox.Emulation.Xna.Keyboard.csproj | 83 ------------------- .../Properties/AssemblyInfo.cs | 36 --------- 12 files changed, 150 insertions(+), 260 deletions(-) create mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Input/Noddybox.Emulation.Xna.Input.csproj create mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Input/Properties/AssemblyInfo.cs delete mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Joystick/Noddybox.Emulation.Xna.Joystick.csproj delete mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Joystick/Properties/AssemblyInfo.cs delete mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Noddybox.Emulation.Xna.Keyboard.csproj delete mode 100644 WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Properties/AssemblyInfo.cs diff --git a/WindowsPhone/JoystickTest.sln b/WindowsPhone/JoystickTest.sln index f0a0b38..39c5724 100644 --- a/WindowsPhone/JoystickTest.sln +++ b/WindowsPhone/JoystickTest.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Express for Windows Phone Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoystickTest", "JoystickTest\JoystickTest\JoystickTest.csproj", "{A709A813-BB79-4D69-B698-9EAD2FC58ADF}" EndProject -Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "JoystickTestContent", "JoystickTest\JoystickTestContent\JoystickTestContent.contentproj", "{0EDE15C8-F99E-45C6-837A-D35607A9DC10}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoystickTestContent", "JoystickTest\JoystickTestContent\JoystickTestContent.contentproj", "{0EDE15C8-F99E-45C6-837A-D35607A9DC10}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.Xna.Joystick", "Noddybox.Emulation.Xna.Joystick\Noddybox.Emulation.Xna.Joystick.csproj", "{0DFFE208-C204-4E95-8D09-7A0C08F06680}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.Xna.Input", "Noddybox.Emulation.Xna.Input\Noddybox.Emulation.Xna.Input.csproj", "{0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,10 +21,10 @@ Global {A709A813-BB79-4D69-B698-9EAD2FC58ADF}.Release|Windows Phone.Deploy.0 = Release|Windows Phone {0EDE15C8-F99E-45C6-837A-D35607A9DC10}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone {0EDE15C8-F99E-45C6-837A-D35607A9DC10}.Release|Windows Phone.ActiveCfg = Release|Windows Phone - {0DFFE208-C204-4E95-8D09-7A0C08F06680}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone - {0DFFE208-C204-4E95-8D09-7A0C08F06680}.Debug|Windows Phone.Build.0 = Debug|Windows Phone - {0DFFE208-C204-4E95-8D09-7A0C08F06680}.Release|Windows Phone.ActiveCfg = Release|Windows Phone - {0DFFE208-C204-4E95-8D09-7A0C08F06680}.Release|Windows Phone.Build.0 = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Windows Phone.Build.0 = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Windows Phone.ActiveCfg = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Windows Phone.Build.0 = Release|Windows Phone EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WindowsPhone/JoystickTest/JoystickTest/JoystickTest.csproj b/WindowsPhone/JoystickTest/JoystickTest/JoystickTest.csproj index 37cdf3e..7f43d5a 100644 --- a/WindowsPhone/JoystickTest/JoystickTest/JoystickTest.csproj +++ b/WindowsPhone/JoystickTest/JoystickTest/JoystickTest.csproj @@ -85,9 +85,9 @@ - - {0DFFE208-C204-4E95-8D09-7A0C08F06680} - Noddybox.Emulation.Xna.Joystick + + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20} + Noddybox.Emulation.Xna.Input JoystickTestContent diff --git a/WindowsPhone/KeyboardTest.sln b/WindowsPhone/KeyboardTest.sln index 199f13f..7a21850 100644 --- a/WindowsPhone/KeyboardTest.sln +++ b/WindowsPhone/KeyboardTest.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Express for Windows Phone Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardTest", "KeyboardTest\KeyboardTest\KeyboardTest.csproj", "{A645334A-FABE-49EF-85EB-5A13871C266D}" EndProject -Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "KeyboardTestContent", "KeyboardTest\KeyboardTestContent\KeyboardTestContent.contentproj", "{6BA269E1-4B99-43F2-A140-3454D78F4D17}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardTestContent", "KeyboardTest\KeyboardTestContent\KeyboardTestContent.contentproj", "{6BA269E1-4B99-43F2-A140-3454D78F4D17}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.Keyboard.Schema", "Noddybox.Emulation.Keyboard.Schema\Noddybox.Emulation.Keyboard.Schema.csproj", "{0F5AA96A-9253-4E06-A3F9-5517A2A9C558}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.Xna.Keyboard", "Noddybox.Emulation.Xna.Keyboard\Noddybox.Emulation.Xna.Keyboard.csproj", "{3B034AAA-A9FD-4307-95F2-D87BE0A51990}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noddybox.Emulation.Xna.Input", "Noddybox.Emulation.Xna.Input\Noddybox.Emulation.Xna.Input.csproj", "{0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,16 +49,16 @@ Global {0F5AA96A-9253-4E06-A3F9-5517A2A9C558}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {0F5AA96A-9253-4E06-A3F9-5517A2A9C558}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0F5AA96A-9253-4E06-A3F9-5517A2A9C558}.Release|Windows Phone.ActiveCfg = Release|Any CPU - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Debug|Any CPU.ActiveCfg = Debug|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Debug|Mixed Platforms.Build.0 = Debug|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Debug|Windows Phone.Build.0 = Debug|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Release|Any CPU.ActiveCfg = Release|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Release|Mixed Platforms.ActiveCfg = Release|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Release|Mixed Platforms.Build.0 = Release|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Release|Windows Phone.ActiveCfg = Release|Windows Phone - {3B034AAA-A9FD-4307-95F2-D87BE0A51990}.Release|Windows Phone.Build.0 = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Any CPU.ActiveCfg = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Mixed Platforms.ActiveCfg = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Mixed Platforms.Build.0 = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Windows Phone.ActiveCfg = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Debug|Windows Phone.Build.0 = Debug|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Any CPU.ActiveCfg = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Mixed Platforms.ActiveCfg = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Mixed Platforms.Build.0 = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Windows Phone.ActiveCfg = Release|Windows Phone + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20}.Release|Windows Phone.Build.0 = Release|Windows Phone EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WindowsPhone/KeyboardTest.suo b/WindowsPhone/KeyboardTest.suo index cf0b493..2887aa6 100644 Binary files a/WindowsPhone/KeyboardTest.suo and b/WindowsPhone/KeyboardTest.suo differ diff --git a/WindowsPhone/KeyboardTest/KeyboardTest/Game1.cs b/WindowsPhone/KeyboardTest/KeyboardTest/Game1.cs index 882ef72..ccd991c 100644 --- a/WindowsPhone/KeyboardTest/KeyboardTest/Game1.cs +++ b/WindowsPhone/KeyboardTest/KeyboardTest/Game1.cs @@ -9,7 +9,7 @@ using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input.Touch; using Microsoft.Xna.Framework.Media; -using Noddybox.Emulation.Xna.Keyboard; +using Noddybox.Emulation.Xna.Input.Keyboard; using Noddybox.Emulation.Keyboard.Schema; using System.IO; diff --git a/WindowsPhone/KeyboardTest/KeyboardTest/KeyboardTest.csproj b/WindowsPhone/KeyboardTest/KeyboardTest/KeyboardTest.csproj index fedeed5..3dc0fcb 100644 --- a/WindowsPhone/KeyboardTest/KeyboardTest/KeyboardTest.csproj +++ b/WindowsPhone/KeyboardTest/KeyboardTest/KeyboardTest.csproj @@ -92,9 +92,9 @@ {0F5AA96A-9253-4E06-A3F9-5517A2A9C558} Noddybox.Emulation.Keyboard.Schema - - {3B034AAA-A9FD-4307-95F2-D87BE0A51990} - Noddybox.Emulation.Xna.Keyboard + + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20} + Noddybox.Emulation.Xna.Input KeyboardTestContent diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Input/Noddybox.Emulation.Xna.Input.csproj b/WindowsPhone/Noddybox.Emulation.Xna.Input/Noddybox.Emulation.Xna.Input.csproj new file mode 100644 index 0000000..42babf6 --- /dev/null +++ b/WindowsPhone/Noddybox.Emulation.Xna.Input/Noddybox.Emulation.Xna.Input.csproj @@ -0,0 +1,89 @@ + + + + {0F95CAB2-B79A-45B5-B5F2-14F4CED2EF20} + {6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Debug + Windows Phone + Library + Properties + Noddybox.Emulation.Xna.Input + Noddybox.Emulation.Xna.Input + v4.0 + Client + v4.0 + Windows Phone + Reach + 4245144f-bb62-48bc-ae08-29f23ebf94d4 + Library + 1 + + + true + full + false + bin\Windows Phone\Debug + DEBUG;TRACE;WINDOWS_PHONE + prompt + 4 + true + false + false + + + pdbonly + true + bin\Windows Phone\Release + TRACE;WINDOWS_PHONE + prompt + 4 + true + false + false + + + + + + + + + + + + 4.0 + + + 4.0 + + + + + + Joystick\JoystickDriver.cs + + + Joystick\JoystickState.cs + + + Keyboard\KeyboardDriver.cs + + + + + + {0F5AA96A-9253-4E06-A3F9-5517A2A9C558} + Noddybox.Emulation.Keyboard.Schema + + + + + + \ No newline at end of file diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Input/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation.Xna.Input/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..48f0c22 --- /dev/null +++ b/WindowsPhone/Noddybox.Emulation.Xna.Input/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +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("Noddybox.Emulation.Xna.Input")] +[assembly: AssemblyProduct("Noddybox.Emulation.Xna.Input")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyCopyright("Copyright © 2012")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. Only Windows +// assemblies support COM. +[assembly: ComVisible(false)] + +// On Windows, the following GUID is for the ID of the typelib if this +// project is exposed to COM. On other platforms, it unique identifies the +// title storage container when deploying this assembly to the device. +[assembly: Guid("323f6d4a-e65b-41c3-82a1-091c5b45270c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: NeutralResourcesLanguageAttribute("en-US")] \ No newline at end of file diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Noddybox.Emulation.Xna.Joystick.csproj b/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Noddybox.Emulation.Xna.Joystick.csproj deleted file mode 100644 index bd97932..0000000 --- a/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Noddybox.Emulation.Xna.Joystick.csproj +++ /dev/null @@ -1,80 +0,0 @@ - - - - {0DFFE208-C204-4E95-8D09-7A0C08F06680} - {6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - Windows Phone - Library - Properties - Noddybox.Emulation.Xna.Joystick - Noddybox.Emulation.Xna.Joystick - v4.0 - Client - v4.0 - Windows Phone - Reach - 20897ae2-4e23-452c-9b11-3a423d7ecaae - Library - 1 - - - true - full - false - bin\Windows Phone\Debug - DEBUG;TRACE;WINDOWS_PHONE - prompt - 4 - true - false - false - - - pdbonly - true - bin\Windows Phone\Release - TRACE;WINDOWS_PHONE - prompt - 4 - true - false - false - - - - - - - - - - - - 4.0 - - - 4.0 - - - - - - JoystickDriver.cs - - - JoystickState.cs - - - - - - - \ No newline at end of file diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Properties/AssemblyInfo.cs deleted file mode 100644 index 747acbc..0000000 --- a/WindowsPhone/Noddybox.Emulation.Xna.Joystick/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -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("Noddybox.Emulation.Xna.Joystick")] -[assembly: AssemblyProduct("Noddybox.Emulation.Xna.Joystick")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. Only Windows -// assemblies support COM. -[assembly: ComVisible(false)] - -// On Windows, the following GUID is for the ID of the typelib if this -// project is exposed to COM. On other platforms, it unique identifies the -// title storage container when deploying this assembly to the device. -[assembly: Guid("570d1cb2-07b0-4b3d-bf45-d387c7aeb817")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] \ No newline at end of file diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Noddybox.Emulation.Xna.Keyboard.csproj b/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Noddybox.Emulation.Xna.Keyboard.csproj deleted file mode 100644 index 92eefd7..0000000 --- a/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Noddybox.Emulation.Xna.Keyboard.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - {3B034AAA-A9FD-4307-95F2-D87BE0A51990} - {6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Debug - Windows Phone - Library - Properties - Noddybox.Emulation.Xna.Keyboard - Noddybox.Emulation.Xna.Keyboard - v4.0 - Client - v4.0 - Windows Phone - Reach - 2f332963-aa65-41d2-a897-d8dba47bb8f4 - Library - 1 - - - true - full - false - bin\Windows Phone\Debug - DEBUG;TRACE;WINDOWS_PHONE - prompt - 4 - true - false - false - - - pdbonly - true - bin\Windows Phone\Release - TRACE;WINDOWS_PHONE - prompt - 4 - true - false - false - - - - - - - - - - - - 4.0 - - - 4.0 - - - - - - KeyboardDriver.cs - - - - - - {0F5AA96A-9253-4E06-A3F9-5517A2A9C558} - Noddybox.Emulation.Keyboard.Schema - - - - - - \ No newline at end of file diff --git a/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Properties/AssemblyInfo.cs b/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Properties/AssemblyInfo.cs deleted file mode 100644 index 6579f5a..0000000 --- a/WindowsPhone/Noddybox.Emulation.Xna.Keyboard/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -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("Noddybox.Emulation.Xna.Keyboard")] -[assembly: AssemblyProduct("Noddybox.Emulation.Xna.Keyboard")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. Only Windows -// assemblies support COM. -[assembly: ComVisible(false)] - -// On Windows, the following GUID is for the ID of the typelib if this -// project is exposed to COM. On other platforms, it unique identifies the -// title storage container when deploying this assembly to the device. -[assembly: Guid("c95f04eb-9a91-4c45-8b47-9a60b904e7f3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] \ No newline at end of file -- cgit v1.2.3