FrameRecorder detects FrameCapturer presence and auto-imports FC integration package.

Author: jasonm-unity

source/FrameRecorder/Integrations/FrameCapturer/Editor/FrameCapturerPackager.cs

@@ -13,8 +13,8 @@ class FrameCapturerPackager : ScriptableObject {}
     class FrameCapturerPackagerInternal : ScriptableObject
     {
         const string k_PackageName = "FrameCapturerRecorders";
-        const string k_WitnessClass = "Recorder";
-        const string k_WitnessNamespace = "UnityEngine.FrameRecorder";
+        const string k_WitnessClass = "fcAPI";
+        const string k_WitnessNamespace = "UTJ.FrameCapturer";
 
         static string m_PkgFile;
         static string m_ScriptFile;
@@ -25,26 +25,38 @@ public static string GeneratePackage()
             {
                 Path.Combine(FRPackagerPaths.GetIntegrationPath(), "FrameCapturer/Recorders"),
             };
-            var destFile = Path.Combine(FRPackagerPaths.GetIntegrationPackagePath(), k_PackageName + ".unitypackage");
+
+            var destDir = FRPackagerPaths.GetIntegrationPackagePath();
+            if (!Directory.Exists(destDir))
+                Directory.CreateDirectory(destDir);
+
+            var destFile = Path.Combine(destDir, k_PackageName + ".unitypackage");
             AssetDatabase.ExportPackage(files, destFile, ExportPackageOptions.Recurse);
             Debug.Log("Generated package: " + destFile);
 
             return destFile;
         }
+
+        static bool AutoExtractAllowed
+        {
+            get { return !AppDomain.CurrentDomain.GetAssemblies().Any(x => x.GetTypes().Any(y => y.Name == "FRPackager" && y.Namespace == "UnityEditor.FrameRecorder")); }
+        }
+
+        static bool FrameCapturerPresent
+        {
+            get { return AppDomain.CurrentDomain.GetAssemblies().Any(x => x.GetTypes().Any(y => y.Name == k_WitnessClass && y.Namespace == k_WitnessNamespace)); }
+        }
 
         static FrameCapturerPackagerInternal() // auto extracts
         {
-            var havePostProcessing = AppDomain.CurrentDomain.GetAssemblies()
-                .Any(x => x.GetTypes().Any(y => y.Name == k_WitnessClass && y.Namespace == k_WitnessNamespace));
-
-            if (havePostProcessing)
+            if(AutoExtractAllowed && FrameCapturerPresent )
             {
-                m_PkgFile = Path.Combine( FRPackagerPaths.GetIntegrationPackagePath(),  "../" + k_PackageName + ".unityPackage" );
+                m_PkgFile = Path.Combine( FRPackagerPaths.GetIntegrationPackagePath(),  k_PackageName + ".unityPackage" );
                 m_ScriptFile = Path.Combine(FRPackagerPaths.GetIntegrationPath(), "FrameCapturer/Recorders/BaseFCRecorderSettings.cs");
                 if ( File.Exists(m_PkgFile) && 
                     (!File.Exists(m_ScriptFile) || File.GetLastWriteTime(m_PkgFile) > File.GetLastWriteTime(m_ScriptFile)))
                 {
-                    Debug.Log("PostProcessing asset detected - Importing FrameCapturer's Recorders");
+                    Debug.Log("Importing FrameCapturer's Recorders: Processing...");
                     AssetDatabase.importPackageCompleted += AssetDatabase_importPackageCompleted;
                     AssetDatabase.importPackageFailed += AssetDatabase_importPackageFailed;
                     AssetDatabase.importPackageCancelled += RemovePackageImportCallbacks;
@@ -59,7 +71,7 @@ static void AssetDatabase_importPackageCompleted(string packageName)
             {
                 File.SetLastWriteTime(m_ScriptFile, File.GetLastWriteTime(m_PkgFile));
                 RemovePackageImportCallbacks(k_PackageName);
-                Debug.LogError("FrameRecorder enabled/updated integration package" + k_PackageName );
+                Debug.Log("Importing FrameCapturer's Recorders: Done.");
             }
         }
 

source/FrameRecorder/Packager/Editor/FRPackager.cs

@@ -0,0 +1,30 @@
+using System.IO;
+using UnityEngine;
+
+namespace UnityEditor.FrameRecorder
+{
+    class FRPackagerPaths : ScriptableObject
+    {
+        public static string GetFrameRecorderRootPath()
+        {
+            ScriptableObject dummy = ScriptableObject.CreateInstance<FRPackagerPaths>();
+            string path = Application.dataPath + AssetDatabase.GetAssetPath(MonoScript.FromScriptableObject(dummy)).Substring("Assets".Length);
+
+            path = path.Substring(path.IndexOf("Assets"));
+            path = path.Substring(0, path.LastIndexOf('/'));
+            path = path.Substring(0, path.LastIndexOf('/'));
+            path = path.Substring(0, path.LastIndexOf('/'));
+            return path;
+        }
+
+        public static string GetIntegrationPath()
+        {
+            return Path.Combine(GetFrameRecorderRootPath(), "Integrations");
+        }
+
+        public static string GetIntegrationPackagePath()
+        {
+            return Path.Combine(GetIntegrationPath(), "SelfExtractPackages");
+        }
+    }
+}

source/FrameRecorder/Packager/Editor/FRPackagerPaths.cs

@@ -0,0 +1,29 @@
+using System.IO;
+using UnityEngine;
+
+
+namespace UnityEditor.FrameRecorder
+{
+    static class FRPackager
+    {
+        const string k_PackageName = "GenericFrameFrameRecorder";
+
+        [MenuItem("Assets/FrameRecorder - Generate Package")]
+        static void GeneratePackage()
+        {
+            var rootPath = FRPackagerPaths.GetFrameRecorderRootPath();
+
+            string[] files = new string[]
+            {
+                Path.Combine(rootPath, "Core" ),
+                Path.Combine(rootPath, "Inputs" ),
+                Path.Combine(rootPath, "Recorders" ),
+                Path.Combine(rootPath, "Packager/Editor" ),
+                Path.Combine(rootPath, "Integrations/FrameCapturer/Editor" ), FRPackagerPaths.GetIntegrationPackagePath(),
+            };
+            var destFile = k_PackageName + ".unitypackage";
+            AssetDatabase.ExportPackage(files, destFile, ExportPackageOptions.Recurse);
+            Debug.Log("Generated package: " + destFile);
+        }
+    }
+}