lookdev: Thumbnail generator updates.

- Refactoring
- Don't generate thumbs for combis with duplicate override names.

Author: freezy

LookDev~/Assets/Runtime/ThumbGenerator.cs

@@ -39,7 +39,7 @@ public class ThumbGenerator : MonoBehaviour
 		public int NumProcessed { get; private set; }
 
 
-		private List<AssetMaterialCombination> _assets;
+		private List<AssetMaterialCombination> _combinations;
 		private GameObject _currentGo;
 		private ThumbGeneratorComponent _currentTbc;
 		private AssetMaterialCombination _currentAmc;
@@ -50,7 +50,7 @@ public void StartProcessing(bool newOnly = false, bool selectedOnly = false)
 		{
 			_camera = Camera.main;
 
-			var bgParent = SceneManager.GetActiveScene().GetRootGameObjects().FirstOrDefault(go => go.name == "_BackgroundObjects");
+			var bgParent = DefaultEnvironment.transform.parent.gameObject;
 			_environmentObjects.Clear();
 			if (bgParent != null) {
 				foreach (var mr in bgParent.GetComponentsInChildren<MeshRenderer>(true)) {
@@ -73,21 +73,21 @@ public void StartProcessing(bool newOnly = false, bool selectedOnly = false)
 					return;
 				}
 
-				_assets = new List<AssetMaterialCombination>(assets
-					.SelectMany(a => AssetMaterialCombination.GetCombinations(a.Asset))
+				_combinations = new List<AssetMaterialCombination>(assets
+					.SelectMany(a => AssetMaterialCombination.GetCombinations(a.Asset, true))
 				);
 
 				if (newOnly) {
-					_assets = _assets.Where(a => !a.HasThumbnail).ToList();
+					_combinations = _combinations.Where(a => !a.HasThumbnail).ToList();
 				}
 				if (selectedOnly) {
 					var selectedAssets = new HashSet<Asset>(EditorWindow.GetWindow<AssetBrowser>().SelectedAssets);
-					_assets = _assets.Where(a => selectedAssets.Contains(a.Asset)).ToList();
+					_combinations = _combinations.Where(a => selectedAssets.Contains(a.Asset)).ToList();
 				}
 
 				NumProcessed = 0;
-				TotalProcessing = _assets.Count;
-				if (_assets.Count > 0) {
+				TotalProcessing = _combinations.Count;
+				if (_combinations.Count > 0) {
 					IsProcessing = true;
 					Process(NextAsset());
 				} else {
@@ -101,7 +101,7 @@ public void StartProcessing(bool newOnly = false, bool selectedOnly = false)
 
 		public void StopProcessing()
 		{
-			_assets?.Clear();
+			_combinations?.Clear();
 			IsProcessing = false;
 		}
 
@@ -167,11 +167,15 @@ private void DoneProcessing(object sender, EventArgs e)
 
 		private AssetMaterialCombination NextAsset()
 		{
-			if (_assets.Count == 0) {
+			if (_combinations.Count == 0) {
 				return null;
 			}
-			var next = _assets.First();
-			_assets.RemoveAt(0);
+			var next = _combinations.First();
+			if (next.HasDuplicateVariations) {
+				_combinations.RemoveAt(0);
+				return NextAsset();
+			}
+			_combinations.RemoveAt(0);
 			NumProcessed++;
 			return next;
 		}

LookDev~/Assets/Runtime/ThumbGeneratorComponent.cs

@@ -48,10 +48,11 @@ private void Start()
 			ModuleInitializer.Initialize();
 			Cache.MaxFiles = 0;
 			Cache.Max = 0;
-			TriggerRender();
+			EditorApplication.update += UpdateFrame;
+			// TriggerRender();
 		}
 
-		private void OnRenderObject()
+		private void UpdateFrame()
 		{
 			if (_frame == NumPreFrames) {
 				Screenshot();