refactor of how input settings are instanciated/initalized by the recorder editors.

jasonm-unity · jasonm-unity · commit c24bf33cd884 · 2017-08-15T16:34:33.000-04:00
diff --git a/source/FrameRecorder/Core/Editor/RTInputSelector.cs b/source/FrameRecorder/Core/Editor/RTInputSelector.cs
@@ -8,13 +8,13 @@ namespace UnityEditor.FrameRecorder
     public class RTInputSelector
     {
         string title { get; set; }
-        bool enforceEvenSize { get; set; }
         string[] candidates = { "Camera output", "Offscreen rendering", "Render Texture" };
+        RecorderSettings recSettings;
 
-        public RTInputSelector(string title, bool enforceEvenSize )
+        public RTInputSelector( RecorderSettings recSettings, string title )
         {
+            this.recSettings = recSettings;
             this.title = title;
-            this.enforceEvenSize = enforceEvenSize;
         }
 
         public bool OnInputGui( ref RecorderInputSetting input)
@@ -25,28 +25,18 @@ public bool OnInputGui( ref RecorderInputSetting input)
 
             if (index != newIndex)
             {
-                Type newType = null;
                 switch (newIndex)
                 {
                     case 0:
-                        newType = typeof(CBRenderTextureInputSettings);
+                        input = recSettings.NewInputSettingsObj<CBRenderTextureInputSettings>( title );
                         break;
                     case 1:
-                        newType = typeof(AdamBeautyInputSettings);
+                        input = recSettings.NewInputSettingsObj<AdamBeautyInputSettings>( title );
                         break;
                     case 2:
-                        newType = typeof(RenderTextureInputSettings);
+                        input = recSettings.NewInputSettingsObj<RenderTextureInputSettings>( title );
                         break;
                 }
-                var newSettings = ScriptableObject.CreateInstance(newType) as RecorderInputSetting;
-                newSettings.m_DisplayName = title;
-                input = newSettings;
-
-                if (newSettings is CBRenderTextureInputSettings)
-                    (newSettings as CBRenderTextureInputSettings).m_PadSize = enforceEvenSize;
-                if (newSettings is AdamBeautyInputSettings)
-                    (newSettings as AdamBeautyInputSettings).m_ForceEvenSize = enforceEvenSize;
-
                 return true;
             }
 
diff --git a/source/FrameRecorder/Core/Editor/RecorderEditor.cs b/source/FrameRecorder/Core/Editor/RecorderEditor.cs
@@ -132,11 +132,6 @@ public override void OnInspectorGUI()
 
         protected void AddSourceSettings(RecorderInputSetting sourceSettings)
         {
-            sourceSettings.name = GUID.Generate().ToString();
-
-            AssetDatabase.AddObjectToAsset(sourceSettings, serializedObject.targetObject);
-            AssetDatabase.Refresh();
-
             m_Inputs.InsertArrayElementAtIndex(m_Inputs.arraySize);
             var arryItem = m_Inputs.GetArrayElementAtIndex(m_Inputs.arraySize-1);
             arryItem.objectReferenceValue = sourceSettings;
@@ -150,8 +145,6 @@ public void ChangeInputSettings(int atIndex, RecorderInputSetting newSettings)
         {
             if (newSettings != null)
             {
-                newSettings.name = GUID.Generate().ToString();
-
                 AssetDatabase.AddObjectToAsset(newSettings, serializedObject.targetObject);
                 AssetDatabase.Refresh();
 
@@ -167,19 +160,6 @@ public void ChangeInputSettings(int atIndex, RecorderInputSetting newSettings)
             }
         }
 
-        protected void PrepareInitialSources()
-        {
-            var recSettings = (RecorderSettings)target;
-            if (recSettings.m_SourceSettings == null || recSettings.m_SourceSettings.Length == 0)
-            {
-                var newSettings = recSettings.GetDefaultSourcesSettings();
-                foreach (var newSetting in newSettings)
-                {
-                    AddSourceSettings(newSetting);
-                }
-            }
-        }
-
         protected virtual void OnInputGui()
         {
             bool multiInputs = m_Inputs.arraySize > 1;
@@ -213,6 +193,7 @@ protected virtual void OnOutputGui()
 
         protected virtual void OnEncodingGui()
         {
+            // place holder
         }
 
         protected virtual void OnTimeGui()
@@ -295,7 +276,6 @@ protected virtual void OnInputGroupGui()
             m_FoldoutInput = EditorGUILayout.Foldout(m_FoldoutInput, "Input(s)");
             if (m_FoldoutInput)
             {
-                PrepareInitialSources();
                 ++EditorGUI.indentLevel;
                 OnInputGui();
                 --EditorGUI.indentLevel;
diff --git a/source/FrameRecorder/Core/Engine/RecorderSettings.cs b/source/FrameRecorder/Core/Engine/RecorderSettings.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor;
 
 namespace UnityEngine.FrameRecorder
 {
@@ -111,6 +112,19 @@ public virtual void OnDestroy()
         }
 
         public abstract List<RecorderInputSetting> GetDefaultSourcesSettings();
+
+        public T NewInputSettingsObj<T>( string title ) where T: class
+        {
+            return NewInputSettingsObj(typeof(T), title) as T;
+        }
+
+        public virtual RecorderInputSetting NewInputSettingsObj(Type type,string title )
+        {
+            var obj = (RecorderInputSetting)ScriptableObject.CreateInstance(type) ;
+            obj.m_DisplayName = title;
+            obj.name = GUID.Generate().ToString();
+            return obj;
+        }
         
     }
 }
diff --git a/source/FrameRecorder/Core/Engine/RecordersInventory.cs b/source/FrameRecorder/Core/Engine/RecordersInventory.cs
@@ -186,9 +186,13 @@ public static RecorderSettings GenerateNewSettingsAsset(UnityEngine.Object paren
                 settings = ScriptableObject.CreateInstance(recorderinfo.settings) as RecorderSettings;
                 settings.name = "Frame Recorder Settings";
                 settings.recorderType = recorderType;
-
+                settings.m_SourceSettings = settings.GetDefaultSourcesSettings().ToArray();
                 AssetDatabase.AddObjectToAsset(settings, parentAsset);
+                foreach (var obj in settings.m_SourceSettings)
+                    AssetDatabase.AddObjectToAsset(obj, parentAsset);
+
                 AssetDatabase.Refresh();
+
                 return settings;
             }
             else
diff --git a/source/FrameRecorder/Core/Engine/RecordingSession.cs b/source/FrameRecorder/Core/Engine/RecordingSession.cs
@@ -97,7 +97,7 @@ public void RecordFrame()
                 }
                 else if (sleep < -frameLen)
                     m_InitialFrame--;
-                else
+                else if(settings.m_Verbose)
                     Debug.Log( string.Format("Recording session info => fps: {0:F1}", frameCount / elapsed ));
 
                 // reset every 30 frames
diff --git a/source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInput.cs b/source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInput.cs
@@ -115,8 +115,8 @@ public override void BeginRecording(RecordingSession session)
             m_outputWidth = Mathf.Min(16 * 1024, Mathf.RoundToInt(m_outputHeight * aspect));
             if (adamSettings.m_ForceEvenSize)
             {
-                m_outputWidth &= ~1;
-                m_outputHeight &= ~1;
+                m_outputWidth = (m_outputWidth + 1) & ~1;
+                m_outputHeight = (m_outputHeight + 1) & ~1;
             }
 
             m_superMaterial = new Material(superShader);
diff --git a/source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInputSettings.cs b/source/FrameRecorder/Inputs/Adam/Engine/AdamBeautyInputSettings.cs
@@ -13,11 +13,6 @@ public class AdamBeautyInputSettings : InputSettings<AdamBeautyInput>
         public string m_CameraTag;
         public bool m_ForceEvenSize = false;
 
-        public AdamBeautyInputSettings()
-        {
-            m_DisplayName = "Pixels";
-        }
-
         public override bool isValid {
             get
             {
diff --git a/source/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInput.cs b/source/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInput.cs
@@ -73,7 +73,7 @@ public override void BeginRecording(RecordingSession session)
                             outputWidth = screenWidth;
                             outputHeight = screenHeight;
 
-                            if (cbSettings.m_PadSize)
+                            if (cbSettings.m_ForceEvenSize)
                             {
                                 outputWidth = (outputWidth + 1) & ~1;
                                 outputHeight = (outputHeight + 1) & ~1;
@@ -87,7 +87,7 @@ public override void BeginRecording(RecordingSession session)
                             outputHeight = (int)cbSettings.m_RenderSize;
                             outputWidth = (int)(outputHeight * AspectRatioHelper.GetRealAR(cbSettings.m_RenderAspect));
 
-                            if (cbSettings.m_PadSize)
+                            if (cbSettings.m_ForceEvenSize)
                             {
                                 outputWidth = (outputWidth + 1) & ~1;
                                 outputHeight = (outputHeight + 1) & ~1;
diff --git a/source/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInputSettings.cs b/source/FrameRecorder/Inputs/CBRenderTexture/Engine/CBRenderTextureInputSettings.cs
@@ -7,14 +7,9 @@ public class CBRenderTextureInputSettings : InputSettings<CBRenderTextureInput>
         public EImageAspect m_RenderAspect = EImageAspect.x5_4;
         public string m_CameraTag;
         public bool m_FlipVertical = false;
-        public bool m_PadSize = false;
+        public bool m_ForceEvenSize = false;
         public bool m_AllowTransparency = false;
 
-        public CBRenderTextureInputSettings()
-        {
-            m_DisplayName = "Pixels";
-        }
-
         public override bool isValid {
             get { return source != EImageSource.TaggedCamera || !string.IsNullOrEmpty(m_CameraTag); }
         }
diff --git a/source/FrameRecorder/Inputs/RenderTexture/Engine/RenderTextureInputSettings.cs b/source/FrameRecorder/Inputs/RenderTexture/Engine/RenderTextureInputSettings.cs
@@ -4,12 +4,8 @@ public class RenderTextureInputSettings : InputSettings<RenderTextureInput>
     {
         public RenderTexture m_SourceRTxtr;
 
-        public RenderTextureInputSettings()
+        public override bool isValid
         {
-            m_DisplayName = "Pixels";
-        }
-
-        public override bool isValid {
             get
             {
                 return m_SourceRTxtr != null; 
diff --git a/source/FrameRecorder/Recorders/ImageRecorder/Editor/ImageRecorderEditor.cs b/source/FrameRecorder/Recorders/ImageRecorder/Editor/ImageRecorderEditor.cs
@@ -24,7 +24,7 @@ protected override void OnEnable()
             if (target == null)
                 return;
 
-            m_RTInputSelector = new RTInputSelector("Pixels", false);
+            m_RTInputSelector = new RTInputSelector( target as RecorderSettings, "Pixels");
 
             var pf = new PropertyFinder<ImageRecorderSettings>(serializedObject);
             m_Inputs = pf.Find(w => w.m_SourceSettings);
@@ -40,12 +40,7 @@ protected override void OnInputGui( int inputIndex)
         {
             var input = m_Inputs.GetArrayElementAtIndex(inputIndex).objectReferenceValue as RecorderInputSetting;
             if (m_RTInputSelector.OnInputGui(ref input))
-            {
-                if( input is CBRenderTextureInputSettings )
-                    (input as CBRenderTextureInputSettings).m_FlipVertical = true;
-
                 ChangeInputSettings(inputIndex, input);                
-            }
 
             base.OnInputGui(inputIndex);
         }
diff --git a/source/FrameRecorder/Recorders/ImageRecorder/Engine/ImageRecorderSettings.cs b/source/FrameRecorder/Recorders/ImageRecorder/Engine/ImageRecorderSettings.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine.FrameRecorder.Input;
 
@@ -23,9 +24,10 @@ public class ImageRecorderSettings : RecorderSettings
 
         public override List<RecorderInputSetting> GetDefaultSourcesSettings()
         {
-            var defaultSettings = ScriptableObject.CreateInstance<CBRenderTextureInputSettings>();
-            defaultSettings.m_FlipVertical = true;
-            return new List<RecorderInputSetting>() { defaultSettings};
+            return new List<RecorderInputSetting>()
+            {
+                NewInputSettingsObj<CBRenderTextureInputSettings>("Pixels") 
+            };
         }
 
         public override bool isValid
@@ -35,5 +37,14 @@ public override bool isValid
                 return base.isValid && !string.IsNullOrEmpty(m_DestinationPath.GetFullPath()) && !string.IsNullOrEmpty(m_BaseFileName.pattern);
             }
         }
+
+        public override RecorderInputSetting NewInputSettingsObj(Type type, string title )
+        {
+            var obj = base.NewInputSettingsObj(type, title);
+            if (type == typeof(CBRenderTextureInputSettings))
+                (obj as CBRenderTextureInputSettings).m_FlipVertical = true;
+
+            return obj ;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,6 @@ public override void OnInspectorGUI()`
`132`	`132`
`133`	`133`	`protected void AddSourceSettings(RecorderInputSetting sourceSettings)`
`134`	`134`	`{`
`135`		`- sourceSettings.name = GUID.Generate().ToString();`
`136`		`-`
`137`		`- AssetDatabase.AddObjectToAsset(sourceSettings, serializedObject.targetObject);`
`138`		`- AssetDatabase.Refresh();`
`139`		`-`
`140`	`135`	`m_Inputs.InsertArrayElementAtIndex(m_Inputs.arraySize);`
`141`	`136`	`var arryItem = m_Inputs.GetArrayElementAtIndex(m_Inputs.arraySize-1);`
`142`	`137`	`arryItem.objectReferenceValue = sourceSettings;`
`@@ -150,8 +145,6 @@ public void ChangeInputSettings(int atIndex, RecorderInputSetting newSettings)`
`150`	`145`	`{`
`151`	`146`	`if (newSettings != null)`
`152`	`147`	`{`
`153`		`- newSettings.name = GUID.Generate().ToString();`
`154`		`-`
`155`	`148`	`AssetDatabase.AddObjectToAsset(newSettings, serializedObject.targetObject);`
`156`	`149`	`AssetDatabase.Refresh();`
`157`	`150`
`@@ -167,19 +160,6 @@ public void ChangeInputSettings(int atIndex, RecorderInputSetting newSettings)`
`167`	`160`	`}`
`168`	`161`	`}`
`169`	`162`
`170`		`- protected void PrepareInitialSources()`
`171`		`- {`
`172`		`- var recSettings = (RecorderSettings)target;`
`173`		`- if (recSettings.m_SourceSettings == null \|\| recSettings.m_SourceSettings.Length == 0)`
`174`		`- {`
`175`		`- var newSettings = recSettings.GetDefaultSourcesSettings();`
`176`		`- foreach (var newSetting in newSettings)`
`177`		`- {`
`178`		`- AddSourceSettings(newSetting);`
`179`		`- }`
`180`		`- }`
`181`		`- }`
`182`		`-`
`183`	`163`	`protected virtual void OnInputGui()`
`184`	`164`	`{`
`185`	`165`	`bool multiInputs = m_Inputs.arraySize > 1;`
`@@ -213,6 +193,7 @@ protected virtual void OnOutputGui()`
`213`	`193`
`214`	`194`	`protected virtual void OnEncodingGui()`
`215`	`195`	`{`
	`196`	`+ // place holder`
`216`	`197`	`}`
`217`	`198`
`218`	`199`	`protected virtual void OnTimeGui()`
`@@ -295,7 +276,6 @@ protected virtual void OnInputGroupGui()`
`295`	`276`	`m_FoldoutInput = EditorGUILayout.Foldout(m_FoldoutInput, "Input(s)");`
`296`	`277`	`if (m_FoldoutInput)`
`297`	`278`	`{`
`298`		`- PrepareInitialSources();`
`299`	`279`	`++EditorGUI.indentLevel;`
`300`	`280`	`OnInputGui();`
`301`	`281`	`--EditorGUI.indentLevel;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using UnityEditor;`
`4`	`5`
`5`	`6`	`namespace UnityEngine.FrameRecorder`
`6`	`7`	`{`
`@@ -111,6 +112,19 @@ public virtual void OnDestroy()`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`public abstract List<RecorderInputSetting> GetDefaultSourcesSettings();`
	`115`	`+`
	`116`	`+ public T NewInputSettingsObj<T>( string title ) where T: class`
	`117`	`+ {`
	`118`	`+ return NewInputSettingsObj(typeof(T), title) as T;`
	`119`	`+ }`
	`120`	`+`
	`121`	`+ public virtual RecorderInputSetting NewInputSettingsObj(Type type,string title )`
	`122`	`+ {`
	`123`	`+ var obj = (RecorderInputSetting)ScriptableObject.CreateInstance(type) ;`
	`124`	`+ obj.m_DisplayName = title;`
	`125`	`+ obj.name = GUID.Generate().ToString();`
	`126`	`+ return obj;`
	`127`	`+ }`
`114`	`128`
`115`	`129`	`}`
`116`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void RecordFrame()`
`97`	`97`	`}`
`98`	`98`	`else if (sleep < -frameLen)`
`99`	`99`	`m_InitialFrame--;`
`100`		`- else`
	`100`	`+ else if(settings.m_Verbose)`
`101`	`101`	`Debug.Log( string.Format("Recording session info => fps: {0:F1}", frameCount / elapsed ));`
`102`	`102`
`103`	`103`	`// reset every 30 frames`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ public override void BeginRecording(RecordingSession session)`
`115`	`115`	`m_outputWidth = Mathf.Min(16 * 1024, Mathf.RoundToInt(m_outputHeight * aspect));`
`116`	`116`	`if (adamSettings.m_ForceEvenSize)`
`117`	`117`	`{`
`118`		`- m_outputWidth &= ~1;`
`119`		`- m_outputHeight &= ~1;`
	`118`	`+ m_outputWidth = (m_outputWidth + 1) & ~1;`
	`119`	`+ m_outputHeight = (m_outputHeight + 1) & ~1;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`m_superMaterial = new Material(superShader);`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,8 @@ public class RenderTextureInputSettings : InputSettings<RenderTextureInput>`
`4`	`4`	`{`
`5`	`5`	`public RenderTexture m_SourceRTxtr;`
`6`	`6`
`7`		`- public RenderTextureInputSettings()`
	`7`	`+ public override bool isValid`
`8`	`8`	`{`
`9`		`- m_DisplayName = "Pixels";`
`10`		`- }`
`11`		`-`
`12`		`- public override bool isValid {`
`13`	`9`	`get`
`14`	`10`	`{`
`15`	`11`	`return m_SourceRTxtr != null;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using System;`
`1`	`2`	`using System.Collections.Generic;`
`2`	`3`	`using UnityEngine.FrameRecorder.Input;`
`3`	`4`
`@@ -23,9 +24,10 @@ public class ImageRecorderSettings : RecorderSettings`
`23`	`24`
`24`	`25`	`public override List<RecorderInputSetting> GetDefaultSourcesSettings()`
`25`	`26`	`{`
`26`		`- var defaultSettings = ScriptableObject.CreateInstance<CBRenderTextureInputSettings>();`
`27`		`- defaultSettings.m_FlipVertical = true;`
`28`		`- return new List<RecorderInputSetting>() { defaultSettings};`
	`27`	`+ return new List<RecorderInputSetting>()`
	`28`	`+ {`
	`29`	`+ NewInputSettingsObj<CBRenderTextureInputSettings>("Pixels")`
	`30`	`+ };`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`public override bool isValid`
`@@ -35,5 +37,14 @@ public override bool isValid`
`35`	`37`	`return base.isValid && !string.IsNullOrEmpty(m_DestinationPath.GetFullPath()) && !string.IsNullOrEmpty(m_BaseFileName.pattern);`
`36`	`38`	`}`
`37`	`39`	`}`
	`40`	`+`
	`41`	`+ public override RecorderInputSetting NewInputSettingsObj(Type type, string title )`
	`42`	`+ {`
	`43`	`+ var obj = base.NewInputSettingsObj(type, title);`
	`44`	`+ if (type == typeof(CBRenderTextureInputSettings))`
	`45`	`+ (obj as CBRenderTextureInputSettings).m_FlipVertical = true;`
	`46`	`+`
	`47`	`+ return obj ;`
	`48`	`+ }`
`38`	`49`	`}`
`39`	`50`	`}`