code clean-up

Author: jasonm-unity

source/FrameRecorder/Core/Editor/RecorderWindow.cs

@@ -185,10 +185,10 @@ void UpdateRecordingProgress( GameObject go)
                     break;
                 case DurationMode.FrameInterval:
                 {
-                    var label = (session.m_FrameIndex < settings.m_StartFrame) ? 
+                    var label = (session.frameIndex < settings.m_StartFrame) ? 
                             string.Format("Skipping first {0} frames..", settings.m_StartFrame) : 
                             string.Format("{0} Frames recorded", session.m_Recorder.recordedFramesCount);
-                    EditorGUI.ProgressBar(rect, (session.m_FrameIndex +1) / (float)(settings.m_EndFrame +1), label );
+                    EditorGUI.ProgressBar(rect, (session.frameIndex +1) / (float)(settings.m_EndFrame +1), label );
                     break;
                 }
                 case DurationMode.TimeInterval:
@@ -224,8 +224,6 @@ void StartRecording(bool autoExitPlayMode)
             {
                 m_Recorder = RecordersInventory.GenerateNewRecorder(m_recorderSelector.selectedRecorder, settings),
                 m_RecorderGO = go,
-                m_RecordingStartTS = Time.unscaledTime,
-                m_FrameIndex = 0
             };
 
             var component = go.AddComponent<RecorderComponent>();

source/FrameRecorder/Core/Engine/Recorder.cs

@@ -96,7 +96,7 @@ public virtual void PrepareNewFrame(RecordingSession ctx)
 
         public virtual bool SkipFrame(RecordingSession ctx)
         {
-            return !recording || (ctx.m_FrameIndex % settings.m_CaptureEveryNthFrame) != 0 || ctx.m_CurrentFrameStartTS < settings.m_StartTime;
+            return !recording || (ctx.frameIndex % settings.m_CaptureEveryNthFrame) != 0 || ctx.m_CurrentFrameStartTS < settings.m_StartTime;
         }
 
         public bool recording { get; protected set; }

source/FrameRecorder/Core/Engine/RecorderComponent.cs

@@ -18,12 +18,7 @@ public class RecorderComponent : MonoBehaviour
         public void Update()
         {
             if (session != null && session.recording)
-            {
-                session.m_CurrentFrameStartTS = Time.unscaledTime - session.m_RecordingStartTS;
-                session.m_FrameIndex++;
-
                 session.PrepareNewFrame();
-            }
         }
 
         IEnumerator RecordFrame()
@@ -41,7 +36,7 @@ IEnumerator RecordFrame()
                         enabled = false;
                         break;
                     case DurationMode.FrameInterval:
-                        if (session.m_FrameIndex >= session.settings.m_EndFrame)
+                        if (session.frameIndex >= session.settings.m_EndFrame)
                             enabled = false;
                         break;
                     case DurationMode.TimeInterval:
@@ -67,7 +62,7 @@ public void LateUpdate()
         {
             if (session != null && session.recording)
             {
-                if (session.m_FrameIndex >= session.settings.m_StartFrame)
+                if (session.frameIndex >= session.settings.m_StartFrame)
                 {
                     StartCoroutine(RecordFrame());
                 }

source/FrameRecorder/Core/Engine/RecordingSession.cs

@@ -12,9 +12,10 @@ public class RecordingSession : IDisposable
     {
         public Recorder m_Recorder;
         public GameObject m_RecorderGO;
-        public int m_FrameIndex; // count starts at 0.
+        
         public double m_CurrentFrameStartTS;
         public double m_RecordingStartTS;
+        int     m_FrameIndex = 0;
         int     m_InitialFrame = 0;
         int     m_FirstRecordedFrameCount = -1;
         float   m_FPSTimeStart;
@@ -23,6 +24,7 @@ public class RecordingSession : IDisposable
 
         public RecorderSettings settings { get { return m_Recorder.settings; } }
         public bool recording { get { return m_Recorder.recording; } }
+        public int frameIndex {get { return m_FrameIndex; }}
 
         public int RecordedFrameSpan
         {
@@ -95,10 +97,12 @@ public void RecordFrame()
                 }
             }
 
+            m_FrameIndex++;
         }
 
         public void PrepareNewFrame()
         {
+            m_CurrentFrameStartTS = Time.unscaledTime - m_RecordingStartTS;
             m_Recorder.SignalSourcesOfStage(ERecordingSessionStage.NewFrameStarting, this);
             m_Recorder.PrepareNewFrame(this);
         }

source/FrameRecorder/Core/Engine/Timeline/FrameRecorderClip.cs

@@ -35,7 +35,6 @@ public override Playable CreatePlayable(PlayableGraph graph, GameObject owner)
                 {
                     m_Recorder = RecordersInventory.GenerateNewRecorder(recorderType, m_Settings),
                     m_RecorderGO = FrameRecorderGOControler.HookupRecorder(),
-                    m_FrameIndex = 0
                 };
             }
             return playable;

source/FrameRecorder/Core/Engine/Timeline/RecorderPlayableBehaviour.cs

@@ -38,7 +38,6 @@ public override void PrepareFrame(Playable playable, FrameData info)
         {
             if (session != null && session.recording)
             {
-                session.m_CurrentFrameStartTS = Time.unscaledTime - session.m_RecordingStartTS;
                 session.PrepareNewFrame();
             }
         }
@@ -52,9 +51,6 @@ public override void ProcessFrame(Playable playable, FrameData info, object play
                     endOfFrameComp = session.m_RecorderGO.AddComponent<WaitForEndOfFrameComponent>();
                     endOfFrameComp.m_playable = this;
                 }
-
-                if (session.recording)
-                    session.m_FrameIndex++;
             }
         }