From 9ff4fcc9b10514600ff8066461db9f7c5cfbc9d6 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Wed, 14 Dec 2011 20:25:54 +0000 Subject: [PATCH] fixed Namespaces, Build-Scripts etc. --- ANX.Framework.sln | 52 ++++++++--------- ....csproj => ANX.InputDevices.OpenTK.csproj} | 4 +- .../ANX.InputDevices.OpenTK/Creator.cs | 2 +- .../ANX.InputDevices.OpenTK/GamePad.cs | 2 +- .../ANX.InputDevices.OpenTK/Keyboard.cs | 2 +- .../Metadata.Designer.cs | 4 +- InputSystems/ANX.InputDevices.OpenTK/Mouse.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- ...=> ANX.InputDevices.Windows.Kinect.csproj} | 5 +- .../Creator.cs | 2 +- .../ANX.InputDevices.Windows.Kinect/Kinect.cs | 2 +- .../Metadata.Designer.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 56 ++++++++----------- .../Properties/Settings.Designer.cs | 28 ++++------ Samples/Kinect/Kinect.csproj | 4 -- Samples/WindowsGame/WindowsGame.csproj | 8 --- build/ANX.Framework.build | 23 ++++---- 18 files changed, 93 insertions(+), 115 deletions(-) rename InputSystems/ANX.InputDevices.OpenTK/{ANX.InputSystem.OpenTK.csproj => ANX.InputDevices.OpenTK.csproj} (94%) rename InputSystems/ANX.InputDevices.Windows.Kinect/{ANX.InputSystem.Windows.Kinect.csproj => ANX.InputDevices.Windows.Kinect.csproj} (93%) diff --git a/ANX.Framework.sln b/ANX.Framework.sln index 249f4989..f36979d2 100644 --- a/ANX.Framework.sln +++ b/ANX.Framework.sln @@ -77,8 +77,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XNA", "XNA", "{BD648BB8-EF2 shader\XNA\Structures.fxh = shader\XNA\Structures.fxh EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Windows.Kinect", "InputSystems\ANX.InputSystem.Windows.Kinect\ANX.InputSystem.Windows.Kinect.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Windows.DX10", "RenderSystems\ANX.Framework.Windows.DX10\ANX.Framework.Windows.DX10.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Windows.GL3", "RenderSystems\ANX.Framework.Windows.GL3\ANX.Framework.Windows.GL3.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}" @@ -105,8 +103,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StencilBuffer", "Samples\St EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "Samples\Primitives\Primitives.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.OpenTK", "InputSystems\ANX.InputSystem.OpenTK\ANX.InputSystem.OpenTK.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}" @@ -130,6 +126,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Standard", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.XInput", "InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput.csproj", "{60D08399-244F-46A3-91F1-4CFD26D961A3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.OpenTK", "InputSystems\ANX.InputDevices.OpenTK\ANX.InputDevices.OpenTK.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.Kinect", "InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}" +EndProject Global GlobalSection(SubversionScc) = preSolution Svn-Managed = True @@ -282,16 +282,6 @@ Global {D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Mixed Platforms.Build.0 = Release|x86 {D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86 {D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.Build.0 = Release|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.ActiveCfg = Debug|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.ActiveCfg = Debug|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.Build.0 = Debug|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Any CPU.ActiveCfg = Release|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.Build.0 = Release|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.ActiveCfg = Release|x86 - {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.Build.0 = Release|x86 {5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU {5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -362,16 +352,6 @@ Global {57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Mixed Platforms.Build.0 = Release|x86 {57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.ActiveCfg = Release|x86 {57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.Build.0 = Release|x86 - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x86.ActiveCfg = Debug|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.Build.0 = Release|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x86.ActiveCfg = Release|Any CPU {14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU {14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -432,6 +412,26 @@ Global {60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|x86.ActiveCfg = Release|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x86.ActiveCfg = Debug|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.Build.0 = Release|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x86.ActiveCfg = Release|Any CPU + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.ActiveCfg = Debug|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.Build.0 = Debug|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Any CPU.ActiveCfg = Release|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.Build.0 = Release|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.ActiveCfg = Release|x86 + {E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -456,11 +456,11 @@ Global {41E6C2CF-51EA-4D8E-96AE-739CA3951766} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {57097B7A-A283-4409-8AAC-35BF0F458657} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {160150D5-38E6-482D-97F5-2624F322A854} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} - {E5D69E75-D77C-493F-BBDA-6F9E73B82549} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} {49066074-3B7B-4A55-B122-6BD33AB73558} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} {60D08399-244F-46A3-91F1-4CFD26D961A3} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} + {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} + {E5D69E75-D77C-493F-BBDA-6F9E73B82549} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64} {6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} {14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} {CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF} diff --git a/InputSystems/ANX.InputDevices.OpenTK/ANX.InputSystem.OpenTK.csproj b/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK.csproj similarity index 94% rename from InputSystems/ANX.InputDevices.OpenTK/ANX.InputSystem.OpenTK.csproj rename to InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK.csproj index 3b9568fb..8a59fad5 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/ANX.InputSystem.OpenTK.csproj +++ b/InputSystems/ANX.InputDevices.OpenTK/ANX.InputDevices.OpenTK.csproj @@ -8,8 +8,8 @@ {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75} Library Properties - ANX.InputSystem.OpenTK - ANX.InputSystem.OpenTK + ANX.InputDevices.OpenTK + ANX.InputDevices.OpenTK v4.0 512 diff --git a/InputSystems/ANX.InputDevices.OpenTK/Creator.cs b/InputSystems/ANX.InputDevices.OpenTK/Creator.cs index 0f9f8796..0df68d97 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/Creator.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/Creator.cs @@ -57,7 +57,7 @@ using NLog; #endregion // License -namespace ANX.InputSystem.OpenTK +namespace ANX.InputDevices.OpenTK { public class Creator : IInputSystemCreator { diff --git a/InputSystems/ANX.InputDevices.OpenTK/GamePad.cs b/InputSystems/ANX.InputDevices.OpenTK/GamePad.cs index 41b9278f..8b0c3edb 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/GamePad.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/GamePad.cs @@ -54,7 +54,7 @@ using ANX.Framework.NonXNA; #endregion // License -namespace ANX.InputSystem.OpenTK +namespace ANX.InputDevices.OpenTK { public class GamePad : IGamePad { diff --git a/InputSystems/ANX.InputDevices.OpenTK/Keyboard.cs b/InputSystems/ANX.InputDevices.OpenTK/Keyboard.cs index 1eda3445..7835e918 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/Keyboard.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/Keyboard.cs @@ -54,7 +54,7 @@ using ANX.Framework.NonXNA; #endregion // License -namespace ANX.InputSystem.OpenTK +namespace ANX.InputDevices.OpenTK { public class Keyboard : IKeyboard { diff --git a/InputSystems/ANX.InputDevices.OpenTK/Metadata.Designer.cs b/InputSystems/ANX.InputDevices.OpenTK/Metadata.Designer.cs index e1be905f..d8a0363b 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/Metadata.Designer.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/Metadata.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ANX.InputSystem.OpenTK { +namespace ANX.InputDevices.OpenTK { using System; @@ -39,7 +39,7 @@ namespace ANX.InputSystem.OpenTK { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputSystem.OpenTK.Metadata", typeof(Metadata).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputDevices.OpenTK.Metadata", typeof(Metadata).Assembly); resourceMan = temp; } return resourceMan; diff --git a/InputSystems/ANX.InputDevices.OpenTK/Mouse.cs b/InputSystems/ANX.InputDevices.OpenTK/Mouse.cs index a71bb8bd..0bb03fc2 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/Mouse.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/Mouse.cs @@ -54,7 +54,7 @@ using ANX.Framework.NonXNA; #endregion // License -namespace ANX.InputSystem.OpenTK +namespace ANX.InputDevices.OpenTK { public class Mouse : IMouse { diff --git a/InputSystems/ANX.InputDevices.OpenTK/Properties/AssemblyInfo.cs b/InputSystems/ANX.InputDevices.OpenTK/Properties/AssemblyInfo.cs index 3874dd34..c55c5cc1 100644 --- a/InputSystems/ANX.InputDevices.OpenTK/Properties/AssemblyInfo.cs +++ b/InputSystems/ANX.InputDevices.OpenTK/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("ANX.InputSystem.OpenTK")] +[assembly: AssemblyTitle("ANX.InputDevices.OpenTK")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ANX.Framework Team")] -[assembly: AssemblyProduct("ANX.InputSystem.OpenTK")] +[assembly: AssemblyProduct("ANX.InputDevices.OpenTK")] [assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputSystem.Windows.Kinect.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect.csproj similarity index 93% rename from InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputSystem.Windows.Kinect.csproj rename to InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect.csproj index 3c57a416..9715dcdb 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputSystem.Windows.Kinect.csproj +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect.csproj @@ -8,8 +8,8 @@ {E5D69E75-D77C-493F-BBDA-6F9E73B82549} Library Properties - ANX.InputSystem.Windows.Kinect - ANX.InputSystem.Windows.Kinect + ANX.InputDevices.Windows.Kinect + ANX.InputDevices.Windows.Kinect v4.0 Client 512 @@ -73,6 +73,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Creator.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Creator.cs index 1f14f40d..dd8844d8 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Creator.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Creator.cs @@ -53,7 +53,7 @@ using ANX.Framework.NonXNA; #endregion // License -namespace ANX.InputSystem.Windows.Kinect +namespace ANX.InputDevices.Windows.Kinect { public class Creator : IInputSystemCreator { diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Kinect.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Kinect.cs index f7f89d32..fc3ffde6 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Kinect.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Kinect.cs @@ -58,7 +58,7 @@ using ANX.Framework.Input.MotionSensing; #endregion // License -namespace ANX.InputSystem.Windows.Kinect +namespace ANX.InputDevices.Windows.Kinect { public class Kinect : IMotionSensingDevice diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Metadata.Designer.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Metadata.Designer.cs index 7f23c917..ff9e75de 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Metadata.Designer.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Metadata.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ANX.Framework.Windows.DX10 { +namespace ANX.InputDevices.Windows.Kinect { using System; @@ -39,7 +39,7 @@ namespace ANX.Framework.Windows.DX10 { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.Framework.Windows.DX10.Metadata", typeof(Metadata).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputDevices.Windows.Kinect.Metadata", typeof(Metadata).Assembly); resourceMan = temp; } return resourceMan; diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/AssemblyInfo.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/AssemblyInfo.cs index 2be16cc8..29d38834 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/AssemblyInfo.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("ANX.InputSystem.Windows.Kinect")] +[assembly: AssemblyTitle("ANX.InputDevices.Windows.Kinect")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ANX.Framework Team")] -[assembly: AssemblyProduct("ANX.InputSystem.Windows.Kinect")] +[assembly: AssemblyProduct("ANX.InputDevices.Windows.Kinect")] [assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Resources.Designer.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Resources.Designer.cs index 6099e6bd..78fb4f02 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Resources.Designer.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Resources.Designer.cs @@ -3,67 +3,59 @@ // Dieser Code wurde von einem Tool generiert. // Laufzeitversion:4.0.30319.239 // -// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn -// der Code neu generiert wird. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace ANX.InputSystem.Windows.Kinect.Properties -{ - - +namespace ANX.InputDevices.Windows.Kinect.Properties { + using System; + + /// /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// - // Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse - // über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen - // mit der Option /str erneut aus, oder erstellen Sie Ihr VS-Projekt neu. + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputSystem.Windows.Kinect.Properties.Resources", typeof(Resources).Assembly); + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputDevices.Windows.Kinect.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Settings.Designer.cs b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Settings.Designer.cs index a82b1e66..477b71fc 100644 --- a/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Settings.Designer.cs +++ b/InputSystems/ANX.InputDevices.Windows.Kinect/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.239 +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.239 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // //------------------------------------------------------------------------------ -namespace ANX.InputSystem.Windows.Kinect.Properties -{ - - +namespace ANX.InputDevices.Windows.Kinect.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Samples/Kinect/Kinect.csproj b/Samples/Kinect/Kinect.csproj index 205d1a6a..8de77fab 100644 --- a/Samples/Kinect/Kinect.csproj +++ b/Samples/Kinect/Kinect.csproj @@ -110,10 +110,6 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework - - {E5D69E75-D77C-493F-BBDA-6F9E73B82549} - ANX.InputSystem.Windows.Kinect - {5BE49183-2F6F-4527-AC90-D816911FCF90} ANX.Framework.Windows.DX10 diff --git a/Samples/WindowsGame/WindowsGame.csproj b/Samples/WindowsGame/WindowsGame.csproj index becc7657..5bce082d 100644 --- a/Samples/WindowsGame/WindowsGame.csproj +++ b/Samples/WindowsGame/WindowsGame.csproj @@ -99,10 +99,6 @@ {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} ANX.Framework - - {5CA3CDF5-4D2C-42AC-AD08-641BD3992B75} - ANX.InputSystem.OpenTK - {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} ANX.InputSystem.Recording @@ -111,10 +107,6 @@ {49066074-3B7B-4A55-B122-6BD33AB73558} ANX.InputSystem.Standard - - {E5D69E75-D77C-493F-BBDA-6F9E73B82549} - ANX.InputSystem.Windows.Kinect - {5BE49183-2F6F-4527-AC90-D816911FCF90} ANX.Framework.Windows.DX10 diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build index 316dc5f3..b518160c 100644 --- a/build/ANX.Framework.build +++ b/build/ANX.Framework.build @@ -16,10 +16,10 @@ - - - - + + + + @@ -52,10 +52,11 @@ - - + - + + + @@ -224,7 +225,7 @@ - + @@ -234,12 +235,12 @@ - + - + @@ -249,7 +250,7 @@ - +