Improved handling of switching files between using content pipeline a…

…nd not.
vchelaru · Dec 16, 2023 · 5f09d5c · 5f09d5c
1 parent 463c715
commit 5f09d5c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/FRBDK/Glue/Glue/Elements/AssetTypeInfo.cs b/FRBDK/Glue/Glue/Elements/AssetTypeInfo.cs
@@ -232,6 +232,12 @@ public string QualifiedSaveTypeName
 		Type mSaveType;
 
         public bool MustBeAddedToContentPipeline;
+        // This was added December 13, 2023. Prior to this date, 
+        // all objects assumed they could be added to content pipeline.
+        // Therefore, we will set this to true for now to assume that it can
+        // be, and we can set this to false over time to exclude items that cannot
+        // be in content pipeline.
+        public bool CanBeAddedToContentPipeline = true;
         public bool ShouldBeDisposed;
 
         public bool CanBeCloned;

diff --git a/FRBDK/Glue/NAudioPlugin/Embedded/NAudio_Song.Generated.cs b/FRBDK/Glue/NAudioPlugin/Embedded/NAudio_Song.Generated.cs
@@ -83,9 +83,9 @@ public bool IsRepeating
         public NAudio_Song(string fileName)
         {
             var fullFile = fileName;
-            if (FileManager.IsRelative(fullFile))
+            if (FlatRedBall.IO.FileManager.IsRelative(fullFile))
             {
-                fullFile = FileManager.RelativeDirectory + fileName;
+                fullFile = FlatRedBall.IO.FileManager.RelativeDirectory + fileName;
             }
             var extension = FlatRedBall.IO.FileManager.GetExtension(fullFile);
             if (extension == "mp3")

diff --git a/FRBDK/Glue/NAudioPlugin/Managers/AssetTypeInfoManager.cs b/FRBDK/Glue/NAudioPlugin/Managers/AssetTypeInfoManager.cs
@@ -58,6 +58,7 @@ private static AssetTypeInfo CreateSongAti(string extension)
             ati.ContentImporter = null;
             ati.ContentProcessor = null;
             ati.Extension = extension;
+            ati.CanBeAddedToContentPipeline = false;
             ati.QualifiedRuntimeTypeName = new PlatformSpecificType()
             {
                 QualifiedType = NAudioQualifiedType

diff --git a/FRBDK/Glue/OfficialPlugins/ContentPipelinePlugin/BuildLogic.cs b/FRBDK/Glue/OfficialPlugins/ContentPipelinePlugin/BuildLogic.cs
@@ -544,7 +544,13 @@ public static bool IsBuiltByContentPipeline(ReferencedFileSave file, bool forceP
         {
             var ati = file.GetAssetTypeInfo();
 
-            return IsBuiltByContentPipeline(file.Name, file.UseContentPipeline || ati?.MustBeAddedToContentPipeline == true, forcePngsToContentPipeline);
+            var supportsContentPipeline = file.UseContentPipeline || ati?.MustBeAddedToContentPipeline == true;
+            if(supportsContentPipeline && ati != null)
+            {
+                supportsContentPipeline = ati.CanBeAddedToContentPipeline;
+            }
+
+            return IsBuiltByContentPipeline(file.Name, supportsContentPipeline, forcePngsToContentPipeline);
         }
 
         private static bool IsBuiltByContentPipeline(string fileName, bool rfsUseContentPipeline, bool forcePngsToContentPipeline)