Updating package and increasing name checks for playback.

rorygames · rorygames · commit a1cb18c43cb5 · 2023-07-20T11:19:47.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rotation statistic recording
 - Option to flatten multipart statistics (e.g. XYZ) into a single line during CSV export
 
+### Changed
+- Playback file checks are more aggressive to ensure file changes are accounted for
+
 ## [1.1.2] - 11/07/23
 
 ### Added
diff --git a/Core/Editor/Scripts/PlaybackManagerEditor.cs b/Core/Editor/Scripts/PlaybackManagerEditor.cs
@@ -30,6 +30,8 @@ public class PlaybackManagerEditor : Editor
         private SerializedProperty _timeCounter;
         private SerializedProperty _ignoreFile;
 
+        private bool _awaitingRefreshVal = false;
+
         private string _componentFilter = "";
 
         private GUIContent _recordFoldoutGUI = new GUIContent("", "You can drag files onto this header to add them to the files list.");
@@ -53,6 +55,14 @@ private void Awake()
             }
         }
 
+        private void OnDestroy()
+        {
+            if (_awaitingRefreshVal)
+            {
+                Debug.LogWarning("Playback Manager needs to Update Files before you can enter play mode.", serializedObject.targetObject);
+            }
+        }
+
         public override bool RequiresConstantRepaint()
         {
             return false;
@@ -65,6 +75,7 @@ private void SetProperties()
             _binders = serializedObject.FindProperty("_binders");
             _currentFile = serializedObject.FindProperty("_currentFile");
             _awaitingRefresh = serializedObject.FindProperty("_awaitingFileRefresh");
+            _awaitingRefreshVal = _awaitingRefresh.boolValue;
             _oldFileIndex = serializedObject.FindProperty("_oldFileIndex");
             _playing = serializedObject.FindProperty("_playing");
             _changingFiles = serializedObject.FindProperty("_changingFiles");
@@ -248,19 +259,15 @@ private void RecordedFilesList()
             if (_recordedFiles.isExpanded)
             {
                 _fileScrollPos = EditorGUILayout.BeginScrollView(_fileScrollPos, GUILayout.Height(Sizes.Playback.heightFileScroll));
+                EditorGUI.BeginChangeCheck();
                 for (int i = 0; i < _recordedFiles.arraySize; i++)
                 {
-                    if (!(_fileScrollPos.y - ((Sizes.heightLine + Sizes.padding)*2) <= ((Sizes.heightLine+Sizes.padding) * (i - 1)) && _fileScrollPos.y + Sizes.Playback.heightFileScroll > ((Sizes.heightLine + Sizes.padding) * i)))
+                    if (!(_fileScrollPos.y - ((Sizes.heightLine + Sizes.padding) * 2) <= ((Sizes.heightLine + Sizes.padding) * (i - 1)) && _fileScrollPos.y + Sizes.Playback.heightFileScroll > ((Sizes.heightLine + Sizes.padding) * i)))
                     {
                         EditorGUILayout.LabelField("");
                         continue;
                     }
 
-                    if (_recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue == null)
-                    {
-                        _awaitingRefresh.boolValue = true;
-                    }
-
                     EditorGUILayout.BeginHorizontal();
 
                     EditorGUI.BeginDisabledGroup(_awaitingRefresh.boolValue);
@@ -283,7 +290,6 @@ private void RecordedFilesList()
                     {
                         _recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue = null;
                         _recordedFiles.DeleteArrayElementAtIndex(i);
-                        _awaitingRefresh.boolValue = true;
                         if (_currentFile.intValue >= _recordedFiles.arraySize)
                         {
                             _currentFile.intValue = _recordedFiles.arraySize - 1;
@@ -294,6 +300,10 @@ private void RecordedFilesList()
 
                     EditorGUILayout.EndHorizontal();
                 }
+                if (EditorGUI.EndChangeCheck())
+                {
+                    _awaitingRefresh.boolValue = true;
+                }
                 EditorGUILayout.EndScrollView();
             }
         }
@@ -324,13 +334,13 @@ private void Playlists()
                     for (int i = 0; i < _recordedFiles.arraySize; i++)
                     {
                         TextAsset t = (TextAsset)_recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue;
-                        if(t == null)
+                        if (t == null)
                         {
                             continue;
                         }
                         string guid = "";
                         long local = 0;
-                        if(AssetDatabase.TryGetGUIDAndLocalFileIdentifier(t, out guid, out local))
+                        if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(t, out guid, out local))
                         {
                             playlist.Add(new PlaylistItem(t.name, AssetDatabase.GUIDToAssetPath(guid), guid));
                         }
@@ -343,10 +353,10 @@ private void Playlists()
 
             EditorGUI.EndDisabledGroup();
 
-            if (GUILayout.Button(new GUIContent("Load Playlist","Loading a playlist will overwrite your current set of loaded files. Playlist order is determined on how files are found, not the order they are present within the file.")))
+            if (GUILayout.Button(new GUIContent("Load Playlist", "Loading a playlist will overwrite your current set of loaded files. Playlist order is determined on how files are found, not the order they are present within the file.")))
             {
                 var path = EditorUtility.OpenFilePanel("Load Playlist", "", "json");
-                if(path.Length != 0)
+                if (path.Length != 0)
                 {
                     try
                     {
@@ -357,7 +367,7 @@ private void Playlists()
                         for (int i = 0; i < playlist.Count; i++)
                         {
                             temp = AssetDatabase.GUIDToAssetPath(playlist[i].guid.ToString());
-                            if(temp.Contains(playlist[i].name + ".bytes"))
+                            if (temp.Contains(playlist[i].name + ".bytes"))
                             {
                                 textAssets.Add(AssetDatabase.LoadAssetAtPath<TextAsset>(temp));
                                 playlist.RemoveAt(i);
@@ -370,19 +380,19 @@ private void Playlists()
                             for (int i = 0; i < assets.Length; i++)
                             {
                                 temp = AssetDatabase.GUIDToAssetPath(assets[i]);
-                                if(temp.EndsWith("bytes"))
+                                if (temp.EndsWith("bytes"))
                                 {
                                     for (int j = 0; j < playlist.Count; j++)
                                     {
-                                        if(temp.Contains(playlist[j].name))
+                                        if (temp.Contains(playlist[j].name))
                                         {
                                             textAssets.Add(AssetDatabase.LoadAssetAtPath<TextAsset>(temp));
                                             playlist.RemoveAt(j);
                                             break;
                                         }
                                     }
                                 }
-                                if(playlist.Count == 0)
+                                if (playlist.Count == 0)
                                 {
                                     break;
                                 }
@@ -433,7 +443,7 @@ private void RecordComponents()
                 }
             }
 
-            GUIContent recordComponents = new GUIContent("Recorded Items (" + _binders.arraySize+")", EditorMessages.playbackRecordItemInfo);
+            GUIContent recordComponents = new GUIContent("Recorded Items (" + _binders.arraySize + ")", EditorMessages.playbackRecordItemInfo);
 
             EditorGUILayout.BeginHorizontal();
 
@@ -444,19 +454,19 @@ private void RecordComponents()
             GUIContent redLabel = new GUIContent(EditorGUIUtility.IconContent("redLight"));
             redLabel.tooltip = EditorMessages.playbackRecordItemInfo;
 
-            _binders.isExpanded = EditorGUI.Foldout(foldoutRect,_binders.isExpanded, recordComponents, true, Styles.foldoutBold);
+            _binders.isExpanded = EditorGUI.Foldout(foldoutRect, _binders.isExpanded, recordComponents, true, Styles.foldoutBold);
 
-            EditorGUILayout.LabelField(greenLabel,Styles.textIconBold,GUILayout.Width(Sizes.widthIcon));
+            EditorGUILayout.LabelField(greenLabel, Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));
 
             GUIContent gcLabel = new GUIContent(assignedCount.ToString(), EditorMessages.playbackRecordItemInfo);
 
-            EditorGUILayout.LabelField(gcLabel,Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(gcLabel).x));
+            EditorGUILayout.LabelField(gcLabel, Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(gcLabel).x));
 
-            EditorGUILayout.LabelField(redLabel,Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));
+            EditorGUILayout.LabelField(redLabel, Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));
 
             GUIContent rcLabel = new GUIContent(unassignedCount.ToString(), EditorMessages.playbackRecordItemInfo);
 
-            EditorGUILayout.LabelField(rcLabel, Styles.textBold,GUILayout.Width(Styles.textBold.CalcSize(rcLabel).x));
+            EditorGUILayout.LabelField(rcLabel, Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(rcLabel).x));
 
             EditorGUILayout.EndHorizontal();
 
@@ -507,7 +517,7 @@ private void PlaybackIgnoreItems()
             EditorGUILayout.LabelField(new GUIContent("Playback Ignore File", "This file controls which components on a RecordComponent's object are NOT disabled when playback begins. If no file is assigned then the default values for each RecordComponent will be used."), Styles.textBold);
             _ignoreFile.objectReferenceValue = EditorGUILayout.ObjectField(_ignoreFile.objectReferenceValue, typeof(PlaybackIgnoreComponentsObject), false);
             EditorGUILayout.EndHorizontal();
-            if(_ignoreFile.objectReferenceValue == null)
+            if (_ignoreFile.objectReferenceValue == null)
             {
                 EditorGUILayout.HelpBox("To create an Ignore File, go to your project assets, right click -> Create -> PlayRecorder -> Playback Ignore Asset. If no file is selected, default values are used.", MessageType.Info);
             }
@@ -569,8 +579,5 @@ private void PlaybackControls()
 
             EditorGUI.EndDisabledGroup();
         }
-
-        
     }
-
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.ultraleap.playrecorder",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Unity scene logic recorder tool for editor and builds.",
   "displayName": "Ultraleap PlayRecorder",
   "unity": "2020.3",

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public class PlaybackManagerEditor : Editor`
`30`	`30`	`private SerializedProperty _timeCounter;`
`31`	`31`	`private SerializedProperty _ignoreFile;`
`32`	`32`
	`33`	`+ private bool _awaitingRefreshVal = false;`
	`34`	`+`
`33`	`35`	`private string _componentFilter = "";`
`34`	`36`
`35`	`37`	`private GUIContent _recordFoldoutGUI = new GUIContent("", "You can drag files onto this header to add them to the files list.");`
`@@ -53,6 +55,14 @@ private void Awake()`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`
	`58`	`+ private void OnDestroy()`
	`59`	`+ {`
	`60`	`+ if (_awaitingRefreshVal)`
	`61`	`+ {`
	`62`	`+ Debug.LogWarning("Playback Manager needs to Update Files before you can enter play mode.", serializedObject.targetObject);`
	`63`	`+ }`
	`64`	`+ }`
	`65`	`+`
`56`	`66`	`public override bool RequiresConstantRepaint()`
`57`	`67`	`{`
`58`	`68`	`return false;`
`@@ -65,6 +75,7 @@ private void SetProperties()`
`65`	`75`	`_binders = serializedObject.FindProperty("_binders");`
`66`	`76`	`_currentFile = serializedObject.FindProperty("_currentFile");`
`67`	`77`	`_awaitingRefresh = serializedObject.FindProperty("_awaitingFileRefresh");`
	`78`	`+ _awaitingRefreshVal = _awaitingRefresh.boolValue;`
`68`	`79`	`_oldFileIndex = serializedObject.FindProperty("_oldFileIndex");`
`69`	`80`	`_playing = serializedObject.FindProperty("_playing");`
`70`	`81`	`_changingFiles = serializedObject.FindProperty("_changingFiles");`
`@@ -248,19 +259,15 @@ private void RecordedFilesList()`
`248`	`259`	`if (_recordedFiles.isExpanded)`
`249`	`260`	`{`
`250`	`261`	`_fileScrollPos = EditorGUILayout.BeginScrollView(_fileScrollPos, GUILayout.Height(Sizes.Playback.heightFileScroll));`
	`262`	`+ EditorGUI.BeginChangeCheck();`
`251`	`263`	`for (int i = 0; i < _recordedFiles.arraySize; i++)`
`252`	`264`	`{`
`253`		`- if (!(_fileScrollPos.y - ((Sizes.heightLine + Sizes.padding)2) <= ((Sizes.heightLine+Sizes.padding) (i - 1)) && _fileScrollPos.y + Sizes.Playback.heightFileScroll > ((Sizes.heightLine + Sizes.padding) * i)))`
	`265`	`+ if (!(_fileScrollPos.y - ((Sizes.heightLine + Sizes.padding) * 2) <= ((Sizes.heightLine + Sizes.padding) * (i - 1)) && _fileScrollPos.y + Sizes.Playback.heightFileScroll > ((Sizes.heightLine + Sizes.padding) * i)))`
`254`	`266`	`{`
`255`	`267`	`EditorGUILayout.LabelField("");`
`256`	`268`	`continue;`
`257`	`269`	`}`
`258`	`270`
`259`		`- if (_recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue == null)`
`260`		`- {`
`261`		`- _awaitingRefresh.boolValue = true;`
`262`		`- }`
`263`		`-`
`264`	`271`	`EditorGUILayout.BeginHorizontal();`
`265`	`272`
`266`	`273`	`EditorGUI.BeginDisabledGroup(_awaitingRefresh.boolValue);`
`@@ -283,7 +290,6 @@ private void RecordedFilesList()`
`283`	`290`	`{`
`284`	`291`	`_recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue = null;`
`285`	`292`	`_recordedFiles.DeleteArrayElementAtIndex(i);`
`286`		`- _awaitingRefresh.boolValue = true;`
`287`	`293`	`if (_currentFile.intValue >= _recordedFiles.arraySize)`
`288`	`294`	`{`
`289`	`295`	`_currentFile.intValue = _recordedFiles.arraySize - 1;`
`@@ -294,6 +300,10 @@ private void RecordedFilesList()`
`294`	`300`
`295`	`301`	`EditorGUILayout.EndHorizontal();`
`296`	`302`	`}`
	`303`	`+ if (EditorGUI.EndChangeCheck())`
	`304`	`+ {`
	`305`	`+ _awaitingRefresh.boolValue = true;`
	`306`	`+ }`
`297`	`307`	`EditorGUILayout.EndScrollView();`
`298`	`308`	`}`
`299`	`309`	`}`
`@@ -324,13 +334,13 @@ private void Playlists()`
`324`	`334`	`for (int i = 0; i < _recordedFiles.arraySize; i++)`
`325`	`335`	`{`
`326`	`336`	`TextAsset t = (TextAsset)_recordedFiles.GetArrayElementAtIndex(i).objectReferenceValue;`
`327`		`- if(t == null)`
	`337`	`+ if (t == null)`
`328`	`338`	`{`
`329`	`339`	`continue;`
`330`	`340`	`}`
`331`	`341`	`string guid = "";`
`332`	`342`	`long local = 0;`
`333`		`- if(AssetDatabase.TryGetGUIDAndLocalFileIdentifier(t, out guid, out local))`
	`343`	`+ if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(t, out guid, out local))`
`334`	`344`	`{`
`335`	`345`	`playlist.Add(new PlaylistItem(t.name, AssetDatabase.GUIDToAssetPath(guid), guid));`
`336`	`346`	`}`
`@@ -343,10 +353,10 @@ private void Playlists()`
`343`	`353`
`344`	`354`	`EditorGUI.EndDisabledGroup();`
`345`	`355`
`346`		`- if (GUILayout.Button(new GUIContent("Load Playlist","Loading a playlist will overwrite your current set of loaded files. Playlist order is determined on how files are found, not the order they are present within the file.")))`
	`356`	`+ if (GUILayout.Button(new GUIContent("Load Playlist", "Loading a playlist will overwrite your current set of loaded files. Playlist order is determined on how files are found, not the order they are present within the file.")))`
`347`	`357`	`{`
`348`	`358`	`var path = EditorUtility.OpenFilePanel("Load Playlist", "", "json");`
`349`		`- if(path.Length != 0)`
	`359`	`+ if (path.Length != 0)`
`350`	`360`	`{`
`351`	`361`	`try`
`352`	`362`	`{`
`@@ -357,7 +367,7 @@ private void Playlists()`
`357`	`367`	`for (int i = 0; i < playlist.Count; i++)`
`358`	`368`	`{`
`359`	`369`	`temp = AssetDatabase.GUIDToAssetPath(playlist[i].guid.ToString());`
`360`		`- if(temp.Contains(playlist[i].name + ".bytes"))`
	`370`	`+ if (temp.Contains(playlist[i].name + ".bytes"))`
`361`	`371`	`{`
`362`	`372`	`textAssets.Add(AssetDatabase.LoadAssetAtPath<TextAsset>(temp));`
`363`	`373`	`playlist.RemoveAt(i);`
`@@ -370,19 +380,19 @@ private void Playlists()`
`370`	`380`	`for (int i = 0; i < assets.Length; i++)`
`371`	`381`	`{`
`372`	`382`	`temp = AssetDatabase.GUIDToAssetPath(assets[i]);`
`373`		`- if(temp.EndsWith("bytes"))`
	`383`	`+ if (temp.EndsWith("bytes"))`
`374`	`384`	`{`
`375`	`385`	`for (int j = 0; j < playlist.Count; j++)`
`376`	`386`	`{`
`377`		`- if(temp.Contains(playlist[j].name))`
	`387`	`+ if (temp.Contains(playlist[j].name))`
`378`	`388`	`{`
`379`	`389`	`textAssets.Add(AssetDatabase.LoadAssetAtPath<TextAsset>(temp));`
`380`	`390`	`playlist.RemoveAt(j);`
`381`	`391`	`break;`
`382`	`392`	`}`
`383`	`393`	`}`
`384`	`394`	`}`
`385`		`- if(playlist.Count == 0)`
	`395`	`+ if (playlist.Count == 0)`
`386`	`396`	`{`
`387`	`397`	`break;`
`388`	`398`	`}`
`@@ -433,7 +443,7 @@ private void RecordComponents()`
`433`	`443`	`}`
`434`	`444`	`}`
`435`	`445`
`436`		`- GUIContent recordComponents = new GUIContent("Recorded Items (" + _binders.arraySize+")", EditorMessages.playbackRecordItemInfo);`
	`446`	`+ GUIContent recordComponents = new GUIContent("Recorded Items (" + _binders.arraySize + ")", EditorMessages.playbackRecordItemInfo);`
`437`	`447`
`438`	`448`	`EditorGUILayout.BeginHorizontal();`
`439`	`449`
`@@ -444,19 +454,19 @@ private void RecordComponents()`
`444`	`454`	`GUIContent redLabel = new GUIContent(EditorGUIUtility.IconContent("redLight"));`
`445`	`455`	`redLabel.tooltip = EditorMessages.playbackRecordItemInfo;`
`446`	`456`
`447`		`- _binders.isExpanded = EditorGUI.Foldout(foldoutRect,_binders.isExpanded, recordComponents, true, Styles.foldoutBold);`
	`457`	`+ _binders.isExpanded = EditorGUI.Foldout(foldoutRect, _binders.isExpanded, recordComponents, true, Styles.foldoutBold);`
`448`	`458`
`449`		`- EditorGUILayout.LabelField(greenLabel,Styles.textIconBold,GUILayout.Width(Sizes.widthIcon));`
	`459`	`+ EditorGUILayout.LabelField(greenLabel, Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));`
`450`	`460`
`451`	`461`	`GUIContent gcLabel = new GUIContent(assignedCount.ToString(), EditorMessages.playbackRecordItemInfo);`
`452`	`462`
`453`		`- EditorGUILayout.LabelField(gcLabel,Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(gcLabel).x));`
	`463`	`+ EditorGUILayout.LabelField(gcLabel, Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(gcLabel).x));`
`454`	`464`
`455`		`- EditorGUILayout.LabelField(redLabel,Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));`
	`465`	`+ EditorGUILayout.LabelField(redLabel, Styles.textIconBold, GUILayout.Width(Sizes.widthIcon));`
`456`	`466`
`457`	`467`	`GUIContent rcLabel = new GUIContent(unassignedCount.ToString(), EditorMessages.playbackRecordItemInfo);`
`458`	`468`
`459`		`- EditorGUILayout.LabelField(rcLabel, Styles.textBold,GUILayout.Width(Styles.textBold.CalcSize(rcLabel).x));`
	`469`	`+ EditorGUILayout.LabelField(rcLabel, Styles.textBold, GUILayout.Width(Styles.textBold.CalcSize(rcLabel).x));`
`460`	`470`
`461`	`471`	`EditorGUILayout.EndHorizontal();`
`462`	`472`
`@@ -507,7 +517,7 @@ private void PlaybackIgnoreItems()`
`507`	`517`	`EditorGUILayout.LabelField(new GUIContent("Playback Ignore File", "This file controls which components on a RecordComponent's object are NOT disabled when playback begins. If no file is assigned then the default values for each RecordComponent will be used."), Styles.textBold);`
`508`	`518`	`_ignoreFile.objectReferenceValue = EditorGUILayout.ObjectField(_ignoreFile.objectReferenceValue, typeof(PlaybackIgnoreComponentsObject), false);`
`509`	`519`	`EditorGUILayout.EndHorizontal();`
`510`		`- if(_ignoreFile.objectReferenceValue == null)`
	`520`	`+ if (_ignoreFile.objectReferenceValue == null)`
`511`	`521`	`{`
`512`	`522`	`EditorGUILayout.HelpBox("To create an Ignore File, go to your project assets, right click -> Create -> PlayRecorder -> Playback Ignore Asset. If no file is selected, default values are used.", MessageType.Info);`
`513`	`523`	`}`
`@@ -569,8 +579,5 @@ private void PlaybackControls()`
`569`	`579`
`570`	`580`	`EditorGUI.EndDisabledGroup();`
`571`	`581`	`}`
`572`		`-`
`573`		`-`
`574`	`582`	`}`
`575`		`-`
`576`	`583`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.ultraleap.playrecorder",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.1.3",`
`4`	`4`	`"description": "Unity scene logic recorder tool for editor and builds.",`
`5`	`5`	`"displayName": "Ultraleap PlayRecorder",`
`6`	`6`	`"unity": "2020.3",`