diff --git a/MonoGame.StarterKits.iOS.sln b/MonoGame.StarterKits.iOS.sln index dc2a3f5..48bceab 100644 --- a/MonoGame.StarterKits.iOS.sln +++ b/MonoGame.StarterKits.iOS.sln @@ -107,7 +107,7 @@ Global {91CF4A04-9FDC-471D-AED0-D8F057068230} = {73DDE8DB-4345-43F2-9371-0A19FC669324} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = iOS\Platformer\Platformer.csproj + StartupItem = iOS\AlienGame\AlienGame.csproj Policies = $0 $0.TextStylePolicy = $1 $1.RemoveTrailingWhitespace = True diff --git a/iOS/AlienGame/AlienGame.csproj b/iOS/AlienGame/AlienGame.csproj index feb71be..cc1b50d 100644 --- a/iOS/AlienGame/AlienGame.csproj +++ b/iOS/AlienGame/AlienGame.csproj @@ -45,7 +45,6 @@ true iPhone Developer - 4.0 false @@ -57,7 +56,6 @@ IPHONE iPhone Developer - 4.0 false diff --git a/iOS/AlienGame/GameplayScreen.cs b/iOS/AlienGame/GameplayScreen.cs index c52999c..0e09896 100644 --- a/iOS/AlienGame/GameplayScreen.cs +++ b/iOS/AlienGame/GameplayScreen.cs @@ -15,6 +15,7 @@ using Microsoft.Xna.Framework.GamerServices; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; +using Microsoft.Xna.Framework.Input.Touch; using Microsoft.Xna.Framework.Storage; using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Media; diff --git a/iOS/Marblets/Marblets.csproj b/iOS/Marblets/Marblets.csproj index 9c01e86..d130bbb 100644 --- a/iOS/Marblets/Marblets.csproj +++ b/iOS/Marblets/Marblets.csproj @@ -45,8 +45,8 @@ 4 true - 4.0 false + iPhone Developer none @@ -57,7 +57,6 @@ IPHONE iPhone Developer - 4.0 false diff --git a/iOS/Platformer/Info.plist b/iOS/Platformer/Info.plist index 6e1ddd7..533b1f3 100644 --- a/iOS/Platformer/Info.plist +++ b/iOS/Platformer/Info.plist @@ -12,8 +12,8 @@ 3.1 UIDeviceFamily - 1 - 2 + 1 + 2 UISupportedInterfaceOrientations diff --git a/iOS/Platformer/Platformer.csproj b/iOS/Platformer/Platformer.csproj index 0cfd88a..876b736 100644 --- a/iOS/Platformer/Platformer.csproj +++ b/iOS/Platformer/Platformer.csproj @@ -47,10 +47,10 @@ 4 true - 4.0 false Platformer iPhone Developer + none @@ -61,7 +61,6 @@ 4 iPhone Developer - 4.0 false Platformer diff --git a/iOS/Platformer/PlatformerGame.cs b/iOS/Platformer/PlatformerGame.cs index 17bbddb..8727aad 100644 --- a/iOS/Platformer/PlatformerGame.cs +++ b/iOS/Platformer/PlatformerGame.cs @@ -76,7 +76,7 @@ public PlatformerGame() graphics.IsFullScreen = true; graphics.SupportedOrientations = DisplayOrientation.LandscapeLeft | DisplayOrientation.LandscapeRight; #endif -#if WINDOWS_PHONE +#if WINDOWS_PHONE || ANDROID || IPHONE Accelerometer.Initialize(); #endif @@ -133,18 +133,27 @@ protected override void Update(GameTime gameTime) private void HandleInput() { // get all of our input states +#if !WINDOWS_PHONE && !ANDROID && !IPHONE keyboardState = Keyboard.GetState(); +#endif +#if !IPHONE gamePadState = GamePad.GetState(PlayerIndex.One); +#endif touchState = TouchPanel.GetState(); accelerometerState = Accelerometer.GetState(); +#if !IPHONE // Exit the game when back is pressed. if (gamePadState.Buttons.Back == ButtonState.Pressed) Exit(); - +#endif bool continuePressed = +#if !WINDOWS_PHONE && !ANDROID && !IPHONE keyboardState.IsKeyDown(Keys.Space) || +#endif +#if !IPHONE gamePadState.IsButtonDown(Buttons.A) || +#endif touchState.AnyTouch(); // Perform the appropriate action to advance the game and