fixed Namespaces, Build-Scripts etc.

This commit is contained in:
Glatzemann 2011-12-14 20:25:54 +00:00
parent 2a7dbe64e3
commit 9ff4fcc9b1
18 changed files with 93 additions and 115 deletions

View File

@ -77,8 +77,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XNA", "XNA", "{BD648BB8-EF2
shader\XNA\Structures.fxh = shader\XNA\Structures.fxh shader\XNA\Structures.fxh = shader\XNA\Structures.fxh
EndProjectSection EndProjectSection
EndProject 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}" 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 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}" 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 EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "Samples\Primitives\Primitives.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "Samples\Primitives\Primitives.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}"
EndProject 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}" 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 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}" 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 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 Global
GlobalSection(SubversionScc) = preSolution GlobalSection(SubversionScc) = preSolution
Svn-Managed = True 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|Mixed Platforms.Build.0 = Release|x86
{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86 {D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86
{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.Build.0 = 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.ActiveCfg = Debug|Any CPU
{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = 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 {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|Mixed Platforms.Build.0 = Release|x86
{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.ActiveCfg = Release|x86 {57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.ActiveCfg = Release|x86
{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.Build.0 = 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.ActiveCfg = Debug|Any CPU
{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.Build.0 = 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 {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.ActiveCfg = Release|Any CPU
{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.Build.0 = 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 {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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -456,11 +456,11 @@ Global
{41E6C2CF-51EA-4D8E-96AE-739CA3951766} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {41E6C2CF-51EA-4D8E-96AE-739CA3951766} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
{57097B7A-A283-4409-8AAC-35BF0F458657} = {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} {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} {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
{49066074-3B7B-4A55-B122-6BD33AB73558} = {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} {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} {6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {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} {CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}

View File

@ -8,8 +8,8 @@
<ProjectGuid>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</ProjectGuid> <ProjectGuid>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ANX.InputSystem.OpenTK</RootNamespace> <RootNamespace>ANX.InputDevices.OpenTK</RootNamespace>
<AssemblyName>ANX.InputSystem.OpenTK</AssemblyName> <AssemblyName>ANX.InputDevices.OpenTK</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>

View File

@ -57,7 +57,7 @@ using NLog;
#endregion // License #endregion // License
namespace ANX.InputSystem.OpenTK namespace ANX.InputDevices.OpenTK
{ {
public class Creator : IInputSystemCreator public class Creator : IInputSystemCreator
{ {

View File

@ -54,7 +54,7 @@ using ANX.Framework.NonXNA;
#endregion // License #endregion // License
namespace ANX.InputSystem.OpenTK namespace ANX.InputDevices.OpenTK
{ {
public class GamePad : IGamePad public class GamePad : IGamePad
{ {

View File

@ -54,7 +54,7 @@ using ANX.Framework.NonXNA;
#endregion // License #endregion // License
namespace ANX.InputSystem.OpenTK namespace ANX.InputDevices.OpenTK
{ {
public class Keyboard : IKeyboard public class Keyboard : IKeyboard
{ {

View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace ANX.InputSystem.OpenTK { namespace ANX.InputDevices.OpenTK {
using System; using System;
@ -39,7 +39,7 @@ namespace ANX.InputSystem.OpenTK {
public static global::System.Resources.ResourceManager ResourceManager { public static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -54,7 +54,7 @@ using ANX.Framework.NonXNA;
#endregion // License #endregion // License
namespace ANX.InputSystem.OpenTK namespace ANX.InputDevices.OpenTK
{ {
public class Mouse : IMouse public class Mouse : IMouse
{ {

View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind. // die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("ANX.InputSystem.OpenTK")] [assembly: AssemblyTitle("ANX.InputDevices.OpenTK")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ANX.Framework Team")] [assembly: AssemblyCompany("ANX.Framework Team")]
[assembly: AssemblyProduct("ANX.InputSystem.OpenTK")] [assembly: AssemblyProduct("ANX.InputDevices.OpenTK")]
[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011")] [assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2011")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

View File

@ -8,8 +8,8 @@
<ProjectGuid>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</ProjectGuid> <ProjectGuid>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ANX.InputSystem.Windows.Kinect</RootNamespace> <RootNamespace>ANX.InputDevices.Windows.Kinect</RootNamespace>
<AssemblyName>ANX.InputSystem.Windows.Kinect</AssemblyName> <AssemblyName>ANX.InputDevices.Windows.Kinect</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
@ -73,6 +73,7 @@
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>

View File

@ -53,7 +53,7 @@ using ANX.Framework.NonXNA;
#endregion // License #endregion // License
namespace ANX.InputSystem.Windows.Kinect namespace ANX.InputDevices.Windows.Kinect
{ {
public class Creator : IInputSystemCreator public class Creator : IInputSystemCreator
{ {

View File

@ -58,7 +58,7 @@ using ANX.Framework.Input.MotionSensing;
#endregion // License #endregion // License
namespace ANX.InputSystem.Windows.Kinect namespace ANX.InputDevices.Windows.Kinect
{ {
public class Kinect : IMotionSensingDevice public class Kinect : IMotionSensingDevice

View File

@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace ANX.Framework.Windows.DX10 { namespace ANX.InputDevices.Windows.Kinect {
using System; using System;
@ -39,7 +39,7 @@ namespace ANX.Framework.Windows.DX10 {
public static global::System.Resources.ResourceManager ResourceManager { public static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { 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; resourceMan = temp;
} }
return resourceMan; return resourceMan;

View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind. // die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("ANX.InputSystem.Windows.Kinect")] [assembly: AssemblyTitle("ANX.InputDevices.Windows.Kinect")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ANX.Framework Team")] [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: AssemblyCopyright("Copyright © ANX.Framework Team 2011")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

View File

@ -3,67 +3,59 @@
// Dieser Code wurde von einem Tool generiert. // Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.239 // Laufzeitversion:4.0.30319.239
// //
// Änderungen an dieser Datei können fehlerhaftes Verhalten verursachen und gehen verloren, wenn // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code neu generiert wird. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace ANX.InputSystem.Windows.Kinect.Properties namespace ANX.InputDevices.Windows.Kinect.Properties {
{ using System;
/// <summary> /// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary> /// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder-Klasse // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// über ein Tool wie ResGen oder Visual Studio 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 // 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.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources internal class Resources {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
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);
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ANX.InputSystem.Windows.Kinect.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
} }
} }
/// <summary> /// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenlookups, die diese stark typisierte Ressourcenklasse verwenden. /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture internal static global::System.Globalization.CultureInfo Culture {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }

View File

@ -1,28 +1,24 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Dieser Code wurde von einem Tool generiert.
// Runtime Version:4.0.30319.239 // Laufzeitversion:4.0.30319.239
// //
// Changes to this file may cause incorrect behavior and will be lost if // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// the code is regenerated. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace ANX.InputSystem.Windows.Kinect.Properties namespace ANX.InputDevices.Windows.Kinect.Properties {
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] [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()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }

View File

@ -110,10 +110,6 @@
<Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project> <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
<Name>ANX.Framework</Name> <Name>ANX.Framework</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Windows.Kinect\ANX.InputSystem.Windows.Kinect.csproj">
<Project>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</Project>
<Name>ANX.InputSystem.Windows.Kinect</Name>
</ProjectReference>
<ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.Framework.Windows.DX10.csproj"> <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.Framework.Windows.DX10.csproj">
<Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project> <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
<Name>ANX.Framework.Windows.DX10</Name> <Name>ANX.Framework.Windows.DX10</Name>

View File

@ -99,10 +99,6 @@
<Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project> <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
<Name>ANX.Framework</Name> <Name>ANX.Framework</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\InputSystems\ANX.InputSystem.OpenTK\ANX.InputSystem.OpenTK.csproj">
<Project>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</Project>
<Name>ANX.InputSystem.OpenTK</Name>
</ProjectReference>
<ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording.csproj"> <ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording.csproj">
<Project>{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}</Project> <Project>{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}</Project>
<Name>ANX.InputSystem.Recording</Name> <Name>ANX.InputSystem.Recording</Name>
@ -111,10 +107,6 @@
<Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project> <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
<Name>ANX.InputSystem.Standard</Name> <Name>ANX.InputSystem.Standard</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Windows.Kinect\ANX.InputSystem.Windows.Kinect.csproj">
<Project>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</Project>
<Name>ANX.InputSystem.Windows.Kinect</Name>
</ProjectReference>
<ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.Framework.Windows.DX10.csproj"> <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.Framework.Windows.DX10.csproj">
<Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project> <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
<Name>ANX.Framework.Windows.DX10</Name> <Name>ANX.Framework.Windows.DX10</Name>

View File

@ -16,10 +16,10 @@
<property name="project.anx.path.inputdevices.xinput" value="../InputSystems/ANX.InputDevices.Windows.XInput" /> <property name="project.anx.path.inputdevices.xinput" value="../InputSystems/ANX.InputDevices.Windows.XInput" />
<property name="project.anx.name.inputdevices.xinput" value="ANX.InputDevices.Windows.XInput" /> <property name="project.anx.name.inputdevices.xinput" value="ANX.InputDevices.Windows.XInput" />
<property name="project.anx.path.inputsystem.kinect" value="../InputSystems/ANX.InputSystem.Windows.Kinect" /> <property name="project.anx.path.inputdevices.kinect" value="../InputSystems/ANX.InputDevices.Windows.Kinect" />
<property name="project.anx.name.inputsystem.kinect" value="ANX.InputSystem.Windows.Kinect" /> <property name="project.anx.name.inputdevices.kinect" value="ANX.InputDevices.Windows.Kinect" />
<property name="project.anx.path.inputsystem.opentk" value="../InputSystems/ANX.InputSystem.OpenTK" /> <property name="project.anx.path.inputdevices.opentk" value="../InputSystems/ANX.InputDevices.OpenTK" />
<property name="project.anx.name.inputsystem.opentk" value="ANX.InputSystem.OpenTK" /> <property name="project.anx.name.inputdevices.opentk" value="ANX.InputDevices.OpenTK" />
<property name="project.anx.path.soundsystem.xaudio" value="../SoundSystems/ANX.SoundSystem.Windows.XAudio" /> <property name="project.anx.path.soundsystem.xaudio" value="../SoundSystems/ANX.SoundSystem.Windows.XAudio" />
<property name="project.anx.name.soundsystem.xaudio" value="ANX.SoundSystem.Windows.XAudio" /> <property name="project.anx.name.soundsystem.xaudio" value="ANX.SoundSystem.Windows.XAudio" />
@ -52,10 +52,11 @@
<include name="../bin/**" /> <include name="../bin/**" />
<include name="${build.dir}/${build.configuration}/installer/**" /> <include name="${build.dir}/${build.configuration}/installer/**" />
<include name="${project.anx.path}/obj/**" /> <include name="${project.anx.path}/obj/**" />
<include name="${project.anx.path.inputdevices.xinput}/obj/**" /> <include name="${project.anx.path.inputsystem.standard}/obj/**" />
<include name="${project.anx.path.inputsystem.kinect}/obj/**" />
<include name="${project.anx.path.inputsystem.recording}/obj/**" /> <include name="${project.anx.path.inputsystem.recording}/obj/**" />
<include name="${project.anx.path.inputsystem.opentk}/obj/**" /> <include name="${project.anx.path.inputdevices.xinput}/obj/**" />
<include name="${project.anx.path.inputdevices.kinect}/obj/**" />
<include name="${project.anx.path.inputdevices.opentk}/obj/**" />
<include name="${project.anx.path.soundsystem.xaudio}/obj/**" /> <include name="${project.anx.path.soundsystem.xaudio}/obj/**" />
<include name="${project.anx.path.soundsystem.openal}/obj/**" /> <include name="${project.anx.path.soundsystem.openal}/obj/**" />
<include name="${project.anx.path.rendersystem.dx10}/obj/**" /> <include name="${project.anx.path.rendersystem.dx10}/obj/**" />
@ -224,7 +225,7 @@
</exec> </exec>
<echo message="===================================================" /> <echo message="===================================================" />
<echo message="Now building: ANX.Framework InputSystem OpenTK" /> <echo message="Now building: ANX.Framework InputDevices OpenTK" />
<echo message="===================================================" /> <echo message="===================================================" />
<exec program="msbuild.exe" > <exec program="msbuild.exe" >
@ -234,12 +235,12 @@
<arg value="/p:OutputPath=../${build.dir}/${build.configuration}" /> <arg value="/p:OutputPath=../${build.dir}/${build.configuration}" />
<arg value='/p:DefineConstants="${project.anx.directives}"' /> <arg value='/p:DefineConstants="${project.anx.directives}"' />
<arg value="/clp:ErrorsOnly" /> <arg value="/clp:ErrorsOnly" />
<arg value="${project.anx.path.inputsystem.opentk}/${project.anx.name.inputsystem.opentk}.csproj" /> <arg value="${project.anx.path.inputdevices.opentk}/${project.anx.name.inputdevices.opentk}.csproj" />
</exec> </exec>
<if test="${project.anx.extended}"> <if test="${project.anx.extended}">
<echo message="===================================================" /> <echo message="===================================================" />
<echo message="Now building: ANX.Framework InputSystem Kinect" /> <echo message="Now building: ANX.Framework InputDevices Kinect" />
<echo message="===================================================" /> <echo message="===================================================" />
<exec program="msbuild.exe" > <exec program="msbuild.exe" >
@ -249,7 +250,7 @@
<arg value="/p:OutputPath=../${build.dir}/${build.configuration}" /> <arg value="/p:OutputPath=../${build.dir}/${build.configuration}" />
<arg value='/p:DefineConstants="${project.anx.directives}"' /> <arg value='/p:DefineConstants="${project.anx.directives}"' />
<arg value="/clp:ErrorsOnly" /> <arg value="/clp:ErrorsOnly" />
<arg value="${project.anx.path.inputsystem.kinect}/${project.anx.name.inputsystem.kinect}.csproj" /> <arg value="${project.anx.path.inputdevices.kinect}/${project.anx.name.inputdevices.kinect}.csproj" />
</exec> </exec>
</if> </if>
</target> </target>