Fixed up lots of Android by replacing "MONODROID" with "ANDROID"

Removed lots of dead code for old platforms.
vchelaru · Apr 6, 2024 · 87ea9cc · 87ea9cc
1 parent 72e9992
commit 87ea9cc
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 74 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs
@@ -94,7 +94,7 @@ public static float? MasterSongVolume
         static SongPlaylist Playlist;
 
         static int playlistIndex = 0;
-#if MONODROID
+#if ANDROID
         //This is for a performance issue with SoundPool
         private static SoundEffect _droidLoop;
         private static DateTime _lastPlay = DateTime.Now;
@@ -623,7 +623,7 @@ public static void Play(SoundEffect soundEffect, float volume, float pitch = 0,
 
             if (shouldPlay)
             {
-#if MONODROID
+#if ANDROID
                 _lastPlay = DateTime.Now;
 #endif
 
@@ -765,23 +765,6 @@ public static void Update()
                     TimeManager.LastSecondDifference);
             }
 #endif
-
-            // TODO [msmith] Get this working again once we add the data into the asset folder.
-            /* TODO MDS_TEMP
-#if MONODROID
-            if ((DateTime.Now - _lastPlay).Milliseconds > 200)
-            {
-                if (_droidLoop != null)
-                {
-                    _droidLoop.Play(0, 0, 0);
-                    _lastPlay = DateTime.Now;
-                }else
-                {
-                    _droidLoop = FlatRedBallServices.Load<SoundEffect>(@"performanceloop");
-                }
-            }
-#endif
-			*/
         }
 
 

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/Saves/TextSave.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/Saves/TextSave.cs
@@ -140,7 +140,6 @@ public Text ToText(string contentManagerName)
 
             text.CursorSelectable = CursorSelectable;
 
-#if !SILVERLIGHT
 
 #if !MONODROID
             if (this.mFontTextureInstance != null)
@@ -175,7 +174,6 @@ public Text ToText(string contentManagerName)
             {
                 text.Font = TextManager.DefaultFont;
             }
-#endif
 
 
             //sprite.Alpha = (255 - Fade) / valueToDivideBy;

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Content/Scene/SpriteSave.cs b/Engines/FlatRedBallXNA/FlatRedBall/Content/Scene/SpriteSave.cs
@@ -55,13 +55,12 @@ private static int AsInt(System.Xml.Linq.XElement subElement)
 
         #region Fields
 
-#if !MONODROID
         [ExternalInstance]
         internal Texture2D mTextureInstance;
 
         [ExternalInstance]
         internal AnimationChainList mAnimationChainListInstance;
-#endif
+
 
         [XmlIgnore]
         public AnimationChainListSave AnimationChains;
@@ -464,14 +463,12 @@ public void SetSprite(string contentManagerName, Sprite sprite, bool setTextures
             // overrides it if it's different.
             if (setTextures)
             {
-#if !MONODROID
                 if (mTextureInstance != null)
                 {
                     sprite.Texture = mTextureInstance;
                 }
 
                 else
-#endif
                     // Sprites can have NULL textures as of April 18, 2009    
                     if (!string.IsNullOrEmpty(Texture))
                     {
@@ -522,11 +519,9 @@ public void SetSprite(string contentManagerName, Sprite sprite, bool setTextures
             if (setTextures)
             {
                 SetRuntimeAnimationChain(contentManagerName, sprite,
-#if !MONODROID
+
  mAnimationChainListInstance,
-#else
-                null,
-#endif
+
  CurrentChain,
                     AnimationChains, AnimationChainsFile
 

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/FlatRedBallServices.cs b/Engines/FlatRedBallXNA/FlatRedBall/FlatRedBallServices.cs
@@ -426,7 +426,6 @@ private static void PreInitialization(Game game, GraphicsDeviceManager graphics)
 
             }
         }
-#if !MONODROID
         public static void InitializeCommandLine()
         {
             InitializeCommandLine(null);
@@ -440,11 +439,8 @@ public static void InitializeCommandLine()
         #endregion
         public static void InitializeCommandLine(Game game)
         {
-#if UWP
-                mPrimaryThreadId = Environment.CurrentManagedThreadId;
-#else
+
             mPrimaryThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
-#endif
 
 
             mIsCommandLine = true;
@@ -478,7 +474,6 @@ public static void InitializeCommandLine(Game game)
 
             mIsInitialized = true;
         }
-#endif
 
         #region XML Docs
         /// <summary>

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Graphics/GraphicsOptions.cs b/Engines/FlatRedBallXNA/FlatRedBall/Graphics/GraphicsOptions.cs
@@ -329,7 +329,7 @@ public GraphicsOptions(Game game, GraphicsDeviceManager graphics)
             if (game != null)
             {
 
-#if IOS || UWP || DESKTOP_GL
+#if IOS || DESKTOP_GL
                 // For UWP and WindowsGL projects the game.Window.ClientBounds is not accurate until after initialize, as explained here:
                 // http://community.monogame.net/t/graphicsdevice-viewport-doesnt-return-the-real-size-of-uwp-game-window/7314/5
                 ResolutionWidth = graphics.PreferredBackBufferWidth;

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Graphics/Renderer.cs b/Engines/FlatRedBallXNA/FlatRedBall/Graphics/Renderer.cs
@@ -9,9 +9,7 @@
 
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-#if MONODROID
-using OpenTK.Graphics.ES11;
-#endif
+
 using ShapeManager = FlatRedBall.Math.Geometry.ShapeManager;
 using FlatRedBall.Math;
 using FlatRedBall.Graphics;
@@ -29,11 +27,7 @@
 using FlatRedBall.Math.Geometry;
 using FlatRedBall.Performance.Measurement;
 
-#if UWP
-using Windows.System.Threading;
-#else
 
-#endif
 
 
 namespace FlatRedBall.Graphics

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Gui/Cursor.TouchScreen.cs b/Engines/FlatRedBallXNA/FlatRedBall/Gui/Cursor.TouchScreen.cs
@@ -50,6 +50,10 @@ private bool TryHandleCursorPositionSetByTouchScreen()
 
         private void GetPushDownClickFromTouchScreen()
         {
+            if(InputManager.TouchScreen.ScreenDown)
+            {
+                int m = 3;
+            }
             PrimaryClick |= InputManager.TouchScreen.ScreenReleased && ignoreNextFrameInput == false;
             PrimaryPush |= InputManager.TouchScreen.ScreenPushed;
 

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Gui/Cursor.cs b/Engines/FlatRedBallXNA/FlatRedBall/Gui/Cursor.cs
@@ -692,7 +692,7 @@ public IStaticPositionable ObjectGrabbed
         /// <param name="cameraToUse">The camera that the cursor will belong to.</param>
         public Cursor(Camera cameraToUse)
         {
-#if MONODROID || IOS
+#if ANDROID || IOS
             SupportedInputDevices = Gui.InputDevice.TouchScreen;
 #else
             SupportedInputDevices = Gui.InputDevice.Mouse;
@@ -1792,7 +1792,6 @@ public bool IsOn3D(ShapeCollection shapeCollection, Layer layer)
 
         #endregion
 
-#if !SILVERLIGHT
 
         #region XML Docs
         /// <summary>
@@ -1806,7 +1805,7 @@ public bool IsInWindow()
         }
 
 
-#if !MONODROID && !MONOGAME && !FNA
+#if !MONOGAME && !FNA
         public bool IsInWindow(System.Windows.Forms.Control control)
         {
             if (!mUsingWindowsCursor)
@@ -1961,7 +1960,6 @@ public void UpdateObjectGrabbedPosition(Layer layer, int xOffset = 0, int yOffse
 
         }
 
-#endif
         /// <summary>
         /// Returns the X world coordinate of the cursor at the argument Z position. 
         /// This method requires a Z value to properly work with perspective cameras.
@@ -2056,7 +2054,7 @@ public float WorldXChangeAt(float zPosition, Layer layer)
 
         float WorldXChangeAt(float zPosition, bool orthogonal, float orthogonalWidth)
         {
-#if MONODROID || IOS
+#if ANDROID || IOS
             if(PrimaryPush || InputManager.TouchScreen.NumberOfTouchesChanged)
             {
                 return 0;
@@ -2142,7 +2140,7 @@ public float WorldYChangeAt(float zPosition, Layer layer)
 
         float WorldYChangeAt(float zPosition, bool orthogonal, float orthogonalHeight)
         {
-#if MONODROID || IOS
+#if ANDROID || IOS
             if (PrimaryPush || InputManager.TouchScreen.NumberOfTouchesChanged)
             {
                 return 0;
@@ -2522,7 +2520,7 @@ public bool UpdateValuesFromMouse()
                     {
                         UpdatePositionToMouse();
 
-#if MONODROID || IOS
+#if ANDROID || IOS
                         float xVelocity;
                         float yVelocity;
                         MathFunctions.ScreenToAbsoluteDistance(

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Gui/GuiManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Gui/GuiManager.cs
@@ -489,15 +489,13 @@ static public void ElementActivity()
             }
         }
 
-#if !MONODROID
         static public Cursor GetCursorNum(int index)
         {
             if (index > -1 && index < mCursors.Count)
                 return mCursors[index];
             else
                 return null;
         }
-#endif
 
 
         [Obsolete("Use AddDominantWindow instead, even if the window has already been added. This method will go away soon")]

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/IO/Csv/CsvReader.cs b/Engines/FlatRedBallXNA/FlatRedBall/IO/Csv/CsvReader.cs
@@ -23,7 +23,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#if !WINDOWS_PHONE && !XBOX360 && !MONODROID && !MONOGAME
+#if !MONOGAME
 using System.Data;
 
 #endif
@@ -34,7 +34,7 @@
 using System.IO;
 
 
-#if !MONODROID && !MONOGAME
+#if !MONOGAME
 using System.Data.Common;
 #endif
 

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/IO/FileManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/IO/FileManager.cs
@@ -1,8 +1,8 @@
-#if WINDOWS_8 || MONODROID || UWP
+#if  ANDROID || IOS
 #define USE_ISOLATED_STORAGE
 #endif
 
-#if  MONODROID || IOS || UWP || ANDROID
+#if IOS || ANDROID
 #define USES_DOT_SLASH_ABOLUTE_FILES
 #endif
 
@@ -470,7 +470,7 @@ public static bool FileExists(string fileName)
                     {
                         stream = TitleContainer.OpenStream(fileName);
                     }
-#if MONODROID || ANDROID
+#if ANDROID
                     catch (Java.IO.FileNotFoundException)
                     {
                         return false;
@@ -1363,14 +1363,9 @@ public static void ThrowExceptionIfFileDoesntExist(string fileName)
                 }
                 else
                 {
-#if MONODROID
 
-                    throw new FileNotFoundException("Could not find the " +
-                        "file " + fileName + " or the directory " + directory);
-#else
                     throw new FileNotFoundException("Could not find the " +
                         "file " + fileName + " or the directory " + directory, fileName);
-#endif
                 }
 
 #endif
@@ -1618,19 +1613,17 @@ public static string Standardize(string fileNameToFix, string relativePath, bool
                 //#endif
             }
 
-#if !XBOX360
             fileNameToFix = RemoveDotDotSlash(fileNameToFix);
 
             if (fileNameToFix.StartsWith("..") && makeAbsolute)
             {
                 throw new InvalidOperationException("Tried to remove all ../ but ended up with this: " + fileNameToFix);
             }
 
-#endif
             // It's possible that there will be double forward slashes.
             fileNameToFix = fileNameToFix.Replace("//", "/");
 
-#if !MONODROID && !IOS
+#if !ANDROID && !IOS
             if (!PreserveCase)
             {
                 fileNameToFix = fileNameToFix.ToLowerInvariant();
@@ -1743,7 +1736,7 @@ public static T XmlDeserialize<T>(string fileName)
         {
             T objectToReturn = default(T);
 
-#if MONODROID
+#if ANDROID || IOS
             if (fileName.Contains(FileManager.IsolatedStoragePrefix) && mHasUserFolderBeenInitialized == false)
             {
                 throw new InvalidOperationException("The user folder hasn't been initialized.  Call FileManager.InitializeUserFolder first");

diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Input/InputManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Input/InputManager.cs
@@ -268,7 +268,7 @@ public static void CheckControllerConnectionChange()
         {
             int padNumber;
 
-#if !MONODROID
+#if !ANDROID
             padNumber = 4;
 #else
             padNumber = 1;
@@ -480,7 +480,7 @@ private static void PerformGamePadUpdate()
     #if SUPPORTS_XBOX_GAMEPADS
 
                 mXbox360GamePads[0].Update();
-    #if !MONODROID
+    #if !ANDROID
                 mXbox360GamePads[1].Update();
                 mXbox360GamePads[2].Update();
                 mXbox360GamePads[3].Update();