Merge branch 'NetStandard' of https://github.com/vchelaru/FlatRedBall …

…into NetStandard
vchelaru · Apr 5, 2024 · 47db0ed · 47db0ed
2 parents 62f521e + dd9348d
commit 47db0ed
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/FRBDK/Glue/Glue/CodeGeneration/PauseCodeGenerator.cs b/FRBDK/Glue/Glue/CodeGeneration/PauseCodeGenerator.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using FlatRedBall.Glue.SaveClasses;
 using FlatRedBall.Glue.CodeGeneration.CodeBuilder;
+using FlatRedBall.Glue.Elements;
 
 namespace FlatRedBall.Glue.CodeGeneration
 {
@@ -86,8 +87,12 @@ private static CodeBuilder.ICodeBlock GenerateSetToIgnorePausing(CodeBuilder.ICo
                     }
 
 
+                    var ati = nos.GetAssetTypeInfo();
 
-                    if (nos.GetAssetTypeInfo() != null && nos.GetAssetTypeInfo().CanIgnorePausing)
+                    var canIgnorePausing = ati != null && ati.CanIgnorePausing &&
+                        (ati.IsPositionedObject || nos.IsList || ati == AvailableAssetTypes.CommonAtis.ShapeCollection);
+
+                    if (canIgnorePausing)
                     {
                         codeBlock.Line("FlatRedBall.Instructions.InstructionManager.IgnorePausingFor(" + nos.InstanceName + ");");
                     }

diff --git a/FRBDK/Glue/Glue/VSHelpers/Projects/DesktopGlLinuxProject.cs b/FRBDK/Glue/Glue/VSHelpers/Projects/DesktopGlLinuxProject.cs
@@ -21,14 +21,14 @@ public override string ProcessInclude(string path)
         {
             var returnValue = base.ProcessInclude(path);
 
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
 
         public override string ProcessLink(string path)
         {
             var returnValue = base.ProcessLink(path);
             // Linux is case-sensitive
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
     }
 }
diff --git a/FRBDK/Glue/Glue/VSHelpers/Projects/FnaDesktopProject.cs b/FRBDK/Glue/Glue/VSHelpers/Projects/FnaDesktopProject.cs
@@ -29,14 +29,14 @@ public override string ProcessInclude(string path)
         {
             var returnValue = base.ProcessInclude(path);
 
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
 
         public override string ProcessLink(string path)
         {
             var returnValue = base.ProcessLink(path);
             // Linux is case-sensitive
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
 
         public override bool IsFrbSourceLinked()

diff --git a/FRBDK/Glue/Glue/VSHelpers/Projects/IosMonogameProject.cs b/FRBDK/Glue/Glue/VSHelpers/Projects/IosMonogameProject.cs
@@ -30,14 +30,14 @@ public override string ProcessInclude(string path)
     {
         var returnValue = base.ProcessInclude(path);
 
-        return returnValue.ToLowerInvariant();
+        return returnValue;
     }
 
     public override string ProcessLink(string path)
     {
         var returnValue = base.ProcessLink(path);
         // iOS is case-sensitive
-        return returnValue.ToLowerInvariant();
+        return returnValue;
     }
     // Is this valid?
     public override string NeededVisualStudioVersion => "10.0"; 

diff --git a/FRBDK/Glue/Glue/VSHelpers/Projects/MonoGameDesktopGlBaseProject.cs b/FRBDK/Glue/Glue/VSHelpers/Projects/MonoGameDesktopGlBaseProject.cs
@@ -29,14 +29,14 @@ public override string ProcessInclude(string path)
         {
             var returnValue = base.ProcessInclude(path);
 
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
 
         public override string ProcessLink(string path)
         {
             var returnValue = base.ProcessLink(path);
             // Linux is case-sensitive
-            return returnValue.ToLowerInvariant();
+            return returnValue;
         }
     }
 }