Browse Source

Small changes for Tests

Kenneth Pouncey 13 years ago
parent
commit
2fe2166b60

+ 4 - 4
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);

+ 1 - 1
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);

+ 1 - 1
StarterKits/iOS/Platformer/PlatformerGame.cs

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

BIN
Tests/MacOS/PrimitivesTest/Game1.cs


+ 28 - 1
Tests/MonoGame.Tests.MacOS.sln

@@ -11,6 +11,10 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -18,6 +22,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,6 +52,12 @@ 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
@@ -50,6 +66,17 @@ Global
 		{E251B0C1-ED74-4210-A0D5-9E4710FEA61F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = MacOS\PrimitivesTest\PrimitivesTest.csproj
+		StartupItem = ..\StarterKits\MacOS\VectorRumble\VectorRumble.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