diff --git a/ANX.Framework.sln b/ANX.Framework.sln index 50242d71..968eaa04 100644 --- a/ANX.Framework.sln +++ b/ANX.Framework.sln @@ -113,6 +113,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL", "S EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.Metro", "RenderSystems\ANX.RenderSystem.Windows.Metro\ANX.RenderSystem.Windows.Metro.csproj", "{FF0AB665-2796-4354-9630-76C2751DB3C2}" +EndProject Global GlobalSection(SubversionScc) = preSolution Svn-Managed = True @@ -385,6 +387,16 @@ Global {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|x86.ActiveCfg = Release|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|x86.ActiveCfg = Debug|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.Build.0 = Release|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -396,6 +408,7 @@ Global {5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028} {EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028} {B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028} + {FF0AB665-2796-4354-9630-76C2751DB3C2} = {D421509A-9AE3-4D7E-881B-EAFED598B028} {F945515B-394D-4ED4-80E0-98EB59B69D24} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {AAA20E99-A897-4C91-A23E-D02B8F08ACA5} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} {BC79B021-10E4-4D01-945A-7048FFF53A22} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9} diff --git a/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs b/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs index 8ebd7bf8..4281f4c7 100644 --- a/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs +++ b/RenderSystems/ANX.Framework.Windows.GL3/GraphicsDeviceWindowsGL3.cs @@ -249,6 +249,10 @@ namespace ANX.Framework.Windows.GL3 nativeWindowInfo = Utilities.CreateX11WindowInfo(display, screen, presentationParameters.DeviceWindowHandle, rootWindow, infoPtr); } + else if (OpenTK.Configuration.RunningOnMacOS) + { + nativeWindowInfo = Utilities.CreateMacOSCarbonWindowInfo(presentationParameters.DeviceWindowHandle, false, true); + } else { throw new NotImplementedException(); diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj new file mode 100644 index 00000000..a1abd356 --- /dev/null +++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj @@ -0,0 +1,71 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {FF0AB665-2796-4354-9630-76C2751DB3C2} + Library + Properties + ANX.RenderSystem.Windows.Metro + ANX.RenderSystem.Windows.Metro + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\..\lib\SharpDX-Win8\Bin\SharpDX.dll + + + ..\..\lib\SharpDX-Win8\Bin\SharpDX.D3DCompiler.dll + + + ..\..\lib\SharpDX-Win8\Bin\SharpDX.Direct3D11.dll + + + ..\..\lib\SharpDX-Win8\Bin\SharpDX.DXGI.dll + + + + + + + + + + + + + + + {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} + ANX.Framework + + + + + \ No newline at end of file diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/Properties/AssemblyInfo.cs b/RenderSystems/ANX.RenderSystem.Windows.Metro/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..e61f5ae7 --- /dev/null +++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +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.RenderSystem.Windows.Metro")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ANX.RenderSystem.Windows.Metro")] +[assembly: AssemblyCopyright("Copyright © 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar +// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von +// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("1cdd13f3-d2c6-4f5b-8a08-41c34d364cf6")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern +// übernehmen, indem Sie "*" eingeben: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build index 5402088e..c88fe276 100644 --- a/build/ANX.Framework.build +++ b/build/ANX.Framework.build @@ -27,6 +27,8 @@ + + @@ -140,6 +142,21 @@ + + + + + + + + + + + + + + +