Merge pull request #62 from Unity-Technologies/dev

jasonm-unity · web-flow · commit 0fffbdaa6a50 · 2018-01-17T11:28:30.000-05:00
bug fixes and cleanup
diff --git a/source/FrameRecorder/Core/Editor/RecorderWindow.cs b/source/FrameRecorder/Core/Editor/RecorderWindow.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine.Recorder;
 using UnityEngine;
+using UnityEngine.Recorder.Input;
 
 namespace UnityEditor.Recorder
 {
@@ -257,6 +258,7 @@ void UpdateRecordingProgress( GameObject go)
         void StartRecording()
         {
             m_State = EState.WaitingForPlayModeToStartRecording;
+            GameViewSize.DisableMaxOnPlay();
             EditorApplication.isPlaying = true;
             m_FrameCount = Time.frameCount;
             return;
diff --git a/source/FrameRecorder/Core/Engine/RecorderVersion.cs b/source/FrameRecorder/Core/Engine/RecorderVersion.cs
@@ -8,7 +8,7 @@ namespace UnityEditor.Recorder
     public class RecorderVersion : ScriptableObject
     {
         public const string Version = "0.2";  // major.minor.build
-        public static int BuildNumber = 27;
+        public static int BuildNumber = 30;
         public static string Tag
         {
             get { return string.Format("{0}.{1:0000}", Version, BuildNumber); }
diff --git a/source/FrameRecorder/Core/Engine/RecordingSession.cs b/source/FrameRecorder/Core/Engine/RecordingSession.cs
@@ -1,4 +1,5 @@
 using System;
+using UnityEngine.Recorder.Input;
 
 namespace UnityEngine.Recorder
 {
diff --git a/source/FrameRecorder/Inputs/CBRenderTexture/Engine/GameViewSize.cs b/source/FrameRecorder/Inputs/CBRenderTexture/Engine/GameViewSize.cs
@@ -22,6 +22,17 @@ public static EditorWindow GetMainGameView()
         }
 
 
+        public static void DisableMaxOnPlay()
+        {
+            var gameView = GetMainGameView();
+
+            if ((gameView.GetType().GetField("m_MaximizeOnPlay", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(gameView)  as bool? )== true)
+            {
+                Debug.LogWarning("'Maximize on Play' not compatible wit recorder: disabling it!");
+                gameView.GetType().GetField("m_MaximizeOnPlay", BindingFlags.NonPublic | BindingFlags.Instance).SetValue(gameView, false);
+            }
+        }
+
         public static void GetGameRenderSize(out int width, out int height)
         {
             var gameView = GetMainGameView();
diff --git a/source/FrameRecorder/Inputs/RenderTextureSampler/Editor/RenderTextureSamplerEditor.cs b/source/FrameRecorder/Inputs/RenderTextureSampler/Editor/RenderTextureSamplerEditor.cs
@@ -79,6 +79,8 @@ public override void OnInspectorGUI()
             AddProperty(m_FinalSize, () =>
             {
                 m_ResSelector.OnInspectorGUI( (target as ImageInputSettings).maxSupportedSize, m_FinalSize );
+                if (m_FinalSize.intValue == (int)EImageDimension.Window)
+                    m_FinalSize.intValue = (int)EImageDimension.x720p_HD;
                 if (m_FinalSize.intValue > renderSize.intValue)
                     renderSize.intValue = m_FinalSize.intValue;
             });
diff --git a/source/FrameRecorder/Inputs/ScreenCapture/Engine/ScreenCaptureInput.cs b/source/FrameRecorder/Inputs/ScreenCapture/Engine/ScreenCaptureInput.cs
@@ -59,21 +59,27 @@ public override void BeginRecording(RecordingSession session)
                         outputHeight = (outputHeight + 1) & ~1;
                     }
 
-                    var size = GameViewSize.SetCustomSize(outputWidth, outputHeight) ?? GameViewSize.AddSize(outputWidth, outputHeight);
-                    if (GameViewSize.m_ModifiedResolutionCount == 0)
-                        GameViewSize.BackupCurrentSize();
-                    else
+                    break;
+                }
+            }
+
+            int w, h;
+            GameViewSize.GetGameRenderSize(out w, out h);
+            if (w != outputWidth || h != outputHeight)
+            {
+                var size = GameViewSize.SetCustomSize(outputWidth, outputHeight) ?? GameViewSize.AddSize(outputWidth, outputHeight);
+                if (GameViewSize.m_ModifiedResolutionCount == 0)
+                    GameViewSize.BackupCurrentSize();
+                else
+                {
+                    if (size != GameViewSize.currentSize)
                     {
-                        if (size != GameViewSize.currentSize)
-                        {
-                            Debug.LogError("Requestion a resultion change while a recorder's input has already requested one! Undefined behaviour.");
-                        }
+                        Debug.LogError("Requestion a resultion change while a recorder's input has already requested one! Undefined behaviour.");
                     }
-                    GameViewSize.m_ModifiedResolutionCount++;
-                    m_ModifiedResolution = true;
-                    GameViewSize.SelectSize(size);
-                    break;
                 }
+                GameViewSize.m_ModifiedResolutionCount++;
+                m_ModifiedResolution = true;
+                GameViewSize.SelectSize(size);
             }
 #endif
 
diff --git a/source/FrameRecorder/Packager/Private/Editor/FRPackager.cs b/source/FrameRecorder/Packager/Private/Editor/FRPackager.cs
@@ -23,13 +23,6 @@ static void DecrementVersion()
         static void GenerateAssetStorePackage()
         {
             var rootPath = FRPackagerPaths.GetRecorderRootPath();
-            var type = Type.GetType("UnityEditor.Recorder.MovieRecorderPackager");
-            if (type != null)
-            {
-                var method = type.GetMethod("GeneratePackage");
-                method.Invoke(null, null);
-                AssetDatabase.Refresh();
-            }
 
             UpdateVersion(1);
 
@@ -43,7 +36,7 @@ static void GenerateAssetStorePackage()
                 Path.Combine(rootPath, "Framework/Packager/Editor" ),
                 Path.Combine(rootPath, "Extensions/UTJ" ),
                 Path.Combine(rootPath, "Extensions/FCIntegration" ),
-                Path.Combine(rootPath, "Extensions/MovieRecorder/Packaging" ),
+                Path.Combine(rootPath, "Extensions/MovieRecorder" ),
             };
             var destFile = k_PackageName + " " + RecorderVersion.Stage + " v"+ RecorderVersion.Tag +  ".unitypackage";
             AssetDatabase.ExportPackage(files, destFile, ExportPackageOptions.Recurse);
diff --git a/source/FrameRecorder/Recorders/AnimationRecorder/Editor/AnimationRecorder.cs b/source/FrameRecorder/Recorders/AnimationRecorder/Editor/AnimationRecorder.cs
@@ -8,7 +8,7 @@
 
 namespace UnityEditor.Experimental.Recorder
 {
-    [Recorder(typeof(AnimationRecorderSettings), "Animation", "Unity/Animation Recording")]
+    [Recorder(typeof(AnimationRecorderSettings), "Animation Clips", "Unity/Animation Recording")]
     public class AnimationRecorder : GenericRecorder<AnimationRecorderSettings>
     {
         public override void RecordFrame(RecordingSession session)
diff --git a/source/FrameRecorder/Recorders/AnimationRecorder/Editor/AnimationRecorderSettingsEditor.cs b/source/FrameRecorder/Recorders/AnimationRecorder/Editor/AnimationRecorderSettingsEditor.cs
@@ -14,12 +14,11 @@ public class AnimationRecorderSettingsEditor: RecorderEditor
     {
         private bool recorderSettings = false;
         
-        [MenuItem("Tools/Recorder/Animation")]
+        [MenuItem("Tools/Recorder/Animation Clips")]
         private static void ShowRecorderWindow()
         {
-            RecorderWindow.ShowAndPreselectCategory("Animation");
+            RecorderWindow.ShowAndPreselectCategory("Animation Clips");
         }
-        
 
         protected override void OnInputGui()
         {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using UnityEngine.Recorder;`
`4`	`4`	`using UnityEngine;`
	`5`	`+using UnityEngine.Recorder.Input;`
`5`	`6`
`6`	`7`	`namespace UnityEditor.Recorder`
`7`	`8`	`{`
`@@ -257,6 +258,7 @@ void UpdateRecordingProgress( GameObject go)`
`257`	`258`	`void StartRecording()`
`258`	`259`	`{`
`259`	`260`	`m_State = EState.WaitingForPlayModeToStartRecording;`
	`261`	`+ GameViewSize.DisableMaxOnPlay();`
`260`	`262`	`EditorApplication.isPlaying = true;`
`261`	`263`	`m_FrameCount = Time.frameCount;`
`262`	`264`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace UnityEditor.Recorder`
`8`	`8`	`public class RecorderVersion : ScriptableObject`
`9`	`9`	`{`
`10`	`10`	`public const string Version = "0.2"; // major.minor.build`
`11`		`- public static int BuildNumber = 27;`
	`11`	`+ public static int BuildNumber = 30;`
`12`	`12`	`public static string Tag`
`13`	`13`	`{`
`14`	`14`	`get { return string.Format("{0}.{1:0000}", Version, BuildNumber); }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using UnityEngine.Recorder.Input;`
`2`	`3`
`3`	`4`	`namespace UnityEngine.Recorder`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ public override void OnInspectorGUI()`
`79`	`79`	`AddProperty(m_FinalSize, () =>`
`80`	`80`	`{`
`81`	`81`	`m_ResSelector.OnInspectorGUI( (target as ImageInputSettings).maxSupportedSize, m_FinalSize );`
	`82`	`+ if (m_FinalSize.intValue == (int)EImageDimension.Window)`
	`83`	`+ m_FinalSize.intValue = (int)EImageDimension.x720p_HD;`
`82`	`84`	`if (m_FinalSize.intValue > renderSize.intValue)`
`83`	`85`	`renderSize.intValue = m_FinalSize.intValue;`
`84`	`86`	`});`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace UnityEditor.Experimental.Recorder`
`10`	`10`	`{`
`11`		`- [Recorder(typeof(AnimationRecorderSettings), "Animation", "Unity/Animation Recording")]`
	`11`	`+ [Recorder(typeof(AnimationRecorderSettings), "Animation Clips", "Unity/Animation Recording")]`
`12`	`12`	`public class AnimationRecorder : GenericRecorder<AnimationRecorderSettings>`
`13`	`13`	`{`
`14`	`14`	`public override void RecordFrame(RecordingSession session)`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,11 @@ public class AnimationRecorderSettingsEditor: RecorderEditor`
`14`	`14`	`{`
`15`	`15`	`private bool recorderSettings = false;`
`16`	`16`
`17`		`- [MenuItem("Tools/Recorder/Animation")]`
	`17`	`+ [MenuItem("Tools/Recorder/Animation Clips")]`
`18`	`18`	`private static void ShowRecorderWindow()`
`19`	`19`	`{`
`20`		`- RecorderWindow.ShowAndPreselectCategory("Animation");`
	`20`	`+ RecorderWindow.ShowAndPreselectCategory("Animation Clips");`
`21`	`21`	`}`
`22`		`-`
`23`	`22`
`24`	`23`	`protected override void OnInputGui()`
`25`	`24`	`{`