Merge branch 'master' of github.com:CartBlanche/MonoGame-Samples

Samples/MacOS/Primitives/PrimitiveBatch.cs

@@ -82,10 +82,10 @@ namespace PrimitivesSample
 
             // projection uses CreateOrthographicOffCenter to create 2d projection
             // matrix with 0,0 in the upper left.
-            //basicEffect.Projection = Matrix.CreateOrthographicOffCenter
-            //    (0, graphicsDevice.Viewport.Width,
-            //    graphicsDevice.Viewport.Height, 0,
-            //    0, 1);
+            basicEffect.Projection = Matrix.CreateOrthographicOffCenter
+                (0, graphicsDevice.Viewport.Width,
+                graphicsDevice.Viewport.Height, 0,
+                0, 1);
             this.basicEffect.World = Matrix.Identity;
             this.basicEffect.View = Matrix.CreateLookAt(Vector3.Zero, Vector3.Forward,
                 Vector3.Up);

Samples/MacOS/TexturedQuad/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0"/>
+  </startup>
+</configuration>

Samples/MacOS/TexturedQuad/Info.plist

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.TexturedQuad</string>
+	<key>CFBundleName</key>
+	<string>TexturedQuad</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.6</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

Samples/MacOS/TexturedQuad/TexturedQuad.csproj

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{ECD1D53E-F50A-4299-9B0F-2F64D6063513}</ProjectGuid>
+    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TexturedQuad</RootNamespace>
+    <AssemblyName>TexturedQuad</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;MAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="MonoMac" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="App.config" />
+    <None Include="Game.ico" />
+    <None Include="GameThumbnail.png" />
+    <None Include="Content\GlassPane.png" />
+    <None Include="Content\GlassPane1.png" />
+    <None Include="Content\Glass.png" />
+    <None Include="Content\GlassPane2.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.MacOS.csproj">
+      <Project>{36C538E6-C32A-4A8D-A39C-566173D7118E}</Project>
+      <Name>MonoGame.Framework.MacOS</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Game1.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Quad.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Glass.xnb" />
+    <Content Include="Content\GlassPane.xnb" />
+    <Content Include="Content\GlassPane1.xnb" />
+    <Content Include="Content\GlassPane2.xnb" />
+  </ItemGroup>
+</Project>

Samples/MonoGame.Samples.MacOS.sln

@@ -73,6 +73,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackgroundThreadTester", "M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InputReporter", "MacOS\InputReporter\InputReporter.csproj", "{A0669F3D-AB7C-43BB-9423-506E24629EF0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturedQuad", "MacOS\TexturedQuad\TexturedQuad.csproj", "{ECD1D53E-F50A-4299-9B0F-2F64D6063513}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -438,6 +440,24 @@ Global
 		{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}.Release|x86.ActiveCfg = Release|Any CPU
 		{D03F3BAF-E4D0-4B6B-A567-9A0E2F882335}.Release|x86.Build.0 = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|iPhone.Build.0 = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|x86.Build.0 = Release|Any CPU
 		{F3115910-E6D1-450D-97FB-A8168A5D622E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3115910-E6D1-450D-97FB-A8168A5D622E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3115910-E6D1-450D-97FB-A8168A5D622E}.Debug|x86.ActiveCfg = Debug|Any CPU

StarterKits/MacOS/VectorRumble/Rendering/LineBatch.cs

@@ -88,7 +88,7 @@ namespace VectorRumble
             this.effect.World = Matrix.Identity;
             this.effect.View = Matrix.CreateLookAt(Vector3.Zero, Vector3.Forward,
                 Vector3.Up);
-            
+
 			var vd = VertexPositionColor.VertexDeclaration.GetVertexElements();
             // create the vertex declaration
             this.vertexDeclaration = new VertexDeclaration(vd);

StarterKits/iOS/Platformer/PlatformerGame.cs

@@ -201,7 +201,7 @@ namespace Platformer
 
             DrawHud();
 
-            GamePad.Draw(gameTime, spriteBatch);
+            //GamePad.Draw(gameTime, spriteBatch);
 
             spriteBatch.End();
 

Tests/MonoGame.Tests.MacOS.sln

@@ -11,6 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GamePadTest", "MacOS\GamePa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrimitivesTest", "MacOS\PrimitivesTest\PrimitivesTest.csproj", "{9704681E-C6DB-4946-9F31-0EF9BE63090A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VectorRumble", "..\StarterKits\MacOS\VectorRumble\VectorRumble.csproj", "{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "..\Samples\MacOS\Primitives\Primitives.csproj", "{2DDBFED4-9955-4F02-9937-B9AE82836329}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TexturedQuad", "..\Samples\MacOS\TexturedQuad\TexturedQuad.csproj", "{ECD1D53E-F50A-4299-9B0F-2F64D6063513}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -18,6 +24,12 @@ Global
 		Distribution|Any CPU = Distribution|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DDBFED4-9955-4F02-9937-B9AE82836329}.Release|x86.Build.0 = Release|Any CPU
 		{36C538E6-C32A-4A8D-A39C-566173D7118E}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{36C538E6-C32A-4A8D-A39C-566173D7118E}.Debug|x86.Build.0 = Debug|Any CPU
 		{36C538E6-C32A-4A8D-A39C-566173D7118E}.Distribution|Any CPU.ActiveCfg = Distribution|Any CPU
@@ -42,14 +54,37 @@ Global
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Distribution|Any CPU.Build.0 = Debug|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
 		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.Build.0 = Release|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB7B2B69-7640-4225-89F3-CE3BF428F2F3}.Release|x86.Build.0 = Release|Any CPU
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Debug|x86.ActiveCfg = Debug|x86
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Debug|x86.Build.0 = Debug|x86
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Distribution|Any CPU.ActiveCfg = Debug|x86
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Distribution|Any CPU.Build.0 = Debug|x86
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Release|x86.ActiveCfg = Release|x86
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Release|x86.Build.0 = Release|x86
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Distribution|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Distribution|Any CPU.Build.0 = Debug|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECD1D53E-F50A-4299-9B0F-2F64D6063513}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = MacOS\PrimitivesTest\PrimitivesTest.csproj
+		StartupItem = ..\Samples\MacOS\TexturedQuad\TexturedQuad.csproj
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.FileWidth = 120
+		$1.RemoveTrailingWhitespace = True
+		$1.inheritsSet = Mono
+		$1.inheritsScope = text/plain
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.inheritsSet = Mono
+		$2.inheritsScope = text/x-csharp
+		$2.scope = text/x-csharp
 	EndGlobalSection
 EndGlobal