MapDrawableBatch.MergeOntoThis does an early-out if all argument layers have 0 quads

vchelaru · vchelaru · commit 88ef6c6f82d7 · 2025-03-29T09:05:32.000-06:00
Added more informative error when trying to merge with null textures.
Removed 400 ms delay on variable grid.
Fixed incorrect subtext under X,Y,Z when toggling whether animation relative positions are used.
diff --git a/Engines/FlatRedBallAddOns/FlatRedBall.TileGraphics/FlatRedBall.TileGraphics/MapDrawableBatch.cs b/Engines/FlatRedBallAddOns/FlatRedBall.TileGraphics/FlatRedBall.TileGraphics/MapDrawableBatch.cs
@@ -1633,13 +1633,34 @@ public void MergeOntoThis(IEnumerable<MapDrawableBatch> mapDrawableBatches)
         {
             int quadsOnThis = QuadCount;
 
+            mapDrawableBatches = mapDrawableBatches.Where(item => item.QuadCount > 0).ToArray();
+
+            if (mapDrawableBatches.Count() == 0)
+            {
+                // no need to do anything:
+                return;
+            }
+
             // If this is empty, then this will inherit the first MDB's texture
 
             if (quadsOnThis == 0 && this.Texture == null)
             {
                 var firstWithNonNullTexture = mapDrawableBatches.FirstOrDefault(item => item.Texture != null);
 
-                this.Texture = firstWithNonNullTexture?.Texture;
+                if (firstWithNonNullTexture == null)
+                {
+                    var message = $"Merging failed because there are no layers with non-null textures. All are null. " +
+                        $"There are {mapDrawableBatches.Count()} total layers.";
+
+                    foreach (var item in mapDrawableBatches)
+                    {
+                        message += "\n" + item.Name;
+                    }
+
+                    throw new InvalidOperationException(message);
+                }
+
+                this.Texture = firstWithNonNullTexture.Texture;
             }
 
 
diff --git a/FRBDK/Glue/OfficialPlugins/PropertyGrid/NamedObjectSaveVariableDataGridItem.cs b/FRBDK/Glue/OfficialPlugins/PropertyGrid/NamedObjectSaveVariableDataGridItem.cs
@@ -334,10 +334,19 @@ private async void HandleVariableSet(object owner, SetPropertyArgs args)
                 {
 
                     // We're going to delay updating all UI, saving, and codegen for a half second to not spam the system:
-                    await System.Threading.Tasks.Task.Delay(400);
+                    // Update March 29, 2025 - why not spam the system? Let the CPU do its thing. This just makes FRB seems
+                    // less responsive. We have "throttling" in place by checking if a commit is full.
+                    // I'm taking this out so Glue is even more responsive:
+                    //await System.Threading.Tasks.Task.Delay(100);
 
                     // Set subtext before refreshing property grid
-                    NamedObjectVariableShowingLogic.AssignVariableSubtext(NamedObjectSave, categories.ToList(), NamedObjectSave.GetAssetTypeInfo());
+                    var didChange = NamedObjectVariableShowingLogic.AssignVariableSubtext(NamedObjectSave, categories.ToList(), NamedObjectSave.GetAssetTypeInfo());
+
+                    if(didChange)
+                    {
+                        // we changed subtext, so we need to refresh the grid again:
+                        GlueCommands.Self.RefreshCommands.RefreshVariables();
+                    }
 
                     IsDefault = makeDefault;
 
diff --git a/FRBDK/Glue/OfficialPlugins/PropertyGrid/NamedObjectVariableShowingLogic.cs b/FRBDK/Glue/OfficialPlugins/PropertyGrid/NamedObjectVariableShowingLogic.cs
@@ -124,18 +124,18 @@ private static Dictionary<string, VariableDefinition> GetVariableDefinitions(Nam
                 {
                     var shouldAdd = true;
 
-                    if(definition.IsVariableVisibleInEditor != null)
+                    if (definition.IsVariableVisibleInEditor != null)
                     {
                         shouldAdd = definition.IsVariableVisibleInEditor(container, instance);
                     }
 
-                    if(shouldAdd)
+                    if (shouldAdd)
                     {
                         variableDefinitions[definition.Name] = definition;
                     }
                 }
             }
-            else if(instance.SourceType == SourceType.Entity)
+            else if (instance.SourceType == SourceType.Entity)
             {
                 var instanceElement = ObjectFinder.Self.GetElement(instance);
                 if (instanceElement != null)
@@ -174,9 +174,9 @@ private static Dictionary<string, VariableDefinition> GetVariableDefinitions(Nam
                                 }
 
                                 var subtext = variableInElement?.Summary ?? baseVariable?.Summary;
-                                if(!string.IsNullOrWhiteSpace(subtext))
+                                if (!string.IsNullOrWhiteSpace(subtext))
                                 {
-                                    baseVariableDefinition.SubtextFunc = (_,_) => subtext;
+                                    baseVariableDefinition.SubtextFunc = (_, _) => subtext;
                                 }
 
                                 if (variableInElement.CustomGetForcedOptionsFunc != null)
@@ -318,17 +318,17 @@ public static void UpdateShownVariables(DataUiGrid grid, NamedObjectSave instanc
         public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave instance, GlueElement container, AssetTypeInfo ati)
         {
             var needsFullRefresh = false;
-            foreach(var category in grid.Categories)
+            foreach (var category in grid.Categories)
             {
-                foreach(var member in category.Members)
+                foreach (var member in category.Members)
                 {
-                    if(member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)
+                    if (member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)
                     {
-                        if(namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor != null)
+                        if (namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor != null)
                         {
                             // Is it true?
                             var shouldBeVisible = namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor(container, instance);
-                            if(!shouldBeVisible)
+                            if (!shouldBeVisible)
                             {
                                 // this shouldn't be here, we need a refresh
                                 needsFullRefresh = true;
@@ -338,24 +338,24 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave
                 }
             }
 
-            if(!needsFullRefresh && ati != null)
+            if (!needsFullRefresh && ati != null)
             {
-                foreach(var variableDefinition in ati.VariableDefinitions)
+                foreach (var variableDefinition in ati.VariableDefinitions)
                 {
-                    if(variableDefinition.IsVariableVisibleInEditor != null)
+                    if (variableDefinition.IsVariableVisibleInEditor != null)
                     {
                         var shouldBeShown = variableDefinition.IsVariableVisibleInEditor(container, instance);
-                        if(shouldBeShown)
+                        if (shouldBeShown)
                         {
                             var wasFound = false;
                             // This better be in one of the categories
-                            foreach(var category in grid.Categories)
+                            foreach (var category in grid.Categories)
                             {
-                                foreach(var member in category.Members)
+                                foreach (var member in category.Members)
                                 {
-                                    if(member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)
+                                    if (member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)
                                     {
-                                        if(namedObjectSaveVariableDataGridItem.VariableDefinition.Name == variableDefinition.Name)
+                                        if (namedObjectSaveVariableDataGridItem.VariableDefinition.Name == variableDefinition.Name)
                                         {
                                             // This is good, we found it
                                             wasFound = true;
@@ -364,7 +364,7 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave
                                     }
                                 }
                             }
-                            if(!wasFound)
+                            if (!wasFound)
                             {
                                 needsFullRefresh = true;
                                 break;
@@ -375,7 +375,7 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave
                 }
             }
 
-            if(needsFullRefresh)
+            if (needsFullRefresh)
             {
                 UpdateShownVariables(grid, instance, container, ati);
             }
@@ -427,7 +427,7 @@ private static MemberCategory CreateTopmostCategory(List<MemberCategory> categor
             return topmostCategory;
         }
 
-        public static void AssignVariableSubtext(NamedObjectSave instance, List<MemberCategory> categories, AssetTypeInfo assetTypeInfo)
+        public static bool AssignVariableSubtext(NamedObjectSave instance, List<MemberCategory> categories, AssetTypeInfo assetTypeInfo)
         {
             var xVariable = categories.SelectMany(item => item.Members).FirstOrDefault(item => item.DisplayName == "X");
             var yVariable = categories.SelectMany(item => item.Members).FirstOrDefault(item => item.DisplayName == "Y");
@@ -461,18 +461,36 @@ public static void AssignVariableSubtext(NamedObjectSave instance, List<MemberCa
                 setZ = true;
             }
 
-
+            var changed = false;
             if (xVariable != null)
-            { xVariable.DetailText = subtext; }
+            {
+                if (xVariable.DetailText != subtext)
+                {
+                    changed = true;
+                    xVariable.DetailText = subtext;
+                }
+            }
 
 
             if (yVariable != null)
-            { yVariable.DetailText = subtext; }
+            {
+                if (yVariable.DetailText != subtext)
+                {
+                    changed = true;
+                    yVariable.DetailText = subtext;
+                }
+            }
 
             if (zVariable != null && setZ)
             {
-                zVariable.DetailText = subtext;
+                if(zVariable.DetailText != subtext)
+                {
+                    changed = true;
+                    zVariable.DetailText = subtext;
+                }
             }
+
+            return changed;
         }
 
         private static void AddForTypedMember(NamedObjectSave instance, GlueElement container, List<MemberCategory> categories,

Original file line number	Diff line number	Diff line change
`@@ -124,18 +124,18 @@ private static Dictionary<string, VariableDefinition> GetVariableDefinitions(Nam`
`124`	`124`	`{`
`125`	`125`	`var shouldAdd = true;`
`126`	`126`
`127`		`- if(definition.IsVariableVisibleInEditor != null)`
	`127`	`+ if (definition.IsVariableVisibleInEditor != null)`
`128`	`128`	`{`
`129`	`129`	`shouldAdd = definition.IsVariableVisibleInEditor(container, instance);`
`130`	`130`	`}`
`131`	`131`
`132`		`- if(shouldAdd)`
	`132`	`+ if (shouldAdd)`
`133`	`133`	`{`
`134`	`134`	`variableDefinitions[definition.Name] = definition;`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`- else if(instance.SourceType == SourceType.Entity)`
	`138`	`+ else if (instance.SourceType == SourceType.Entity)`
`139`	`139`	`{`
`140`	`140`	`var instanceElement = ObjectFinder.Self.GetElement(instance);`
`141`	`141`	`if (instanceElement != null)`
`@@ -174,9 +174,9 @@ private static Dictionary<string, VariableDefinition> GetVariableDefinitions(Nam`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`var subtext = variableInElement?.Summary ?? baseVariable?.Summary;`
`177`		`- if(!string.IsNullOrWhiteSpace(subtext))`
	`177`	`+ if (!string.IsNullOrWhiteSpace(subtext))`
`178`	`178`	`{`
`179`		`- baseVariableDefinition.SubtextFunc = (_,_) => subtext;`
	`179`	`+ baseVariableDefinition.SubtextFunc = (_, _) => subtext;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`if (variableInElement.CustomGetForcedOptionsFunc != null)`
`@@ -318,17 +318,17 @@ public static void UpdateShownVariables(DataUiGrid grid, NamedObjectSave instanc`
`318`	`318`	`public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave instance, GlueElement container, AssetTypeInfo ati)`
`319`	`319`	`{`
`320`	`320`	`var needsFullRefresh = false;`
`321`		`- foreach(var category in grid.Categories)`
	`321`	`+ foreach (var category in grid.Categories)`
`322`	`322`	`{`
`323`		`- foreach(var member in category.Members)`
	`323`	`+ foreach (var member in category.Members)`
`324`	`324`	`{`
`325`		`- if(member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)`
	`325`	`+ if (member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)`
`326`	`326`	`{`
`327`		`- if(namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor != null)`
	`327`	`+ if (namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor != null)`
`328`	`328`	`{`
`329`	`329`	`// Is it true?`
`330`	`330`	`var shouldBeVisible = namedObjectSaveVariableDataGridItem.VariableDefinition.IsVariableVisibleInEditor(container, instance);`
`331`		`- if(!shouldBeVisible)`
	`331`	`+ if (!shouldBeVisible)`
`332`	`332`	`{`
`333`	`333`	`// this shouldn't be here, we need a refresh`
`334`	`334`	`needsFullRefresh = true;`
`@@ -338,24 +338,24 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`- if(!needsFullRefresh && ati != null)`
	`341`	`+ if (!needsFullRefresh && ati != null)`
`342`	`342`	`{`
`343`		`- foreach(var variableDefinition in ati.VariableDefinitions)`
	`343`	`+ foreach (var variableDefinition in ati.VariableDefinitions)`
`344`	`344`	`{`
`345`		`- if(variableDefinition.IsVariableVisibleInEditor != null)`
	`345`	`+ if (variableDefinition.IsVariableVisibleInEditor != null)`
`346`	`346`	`{`
`347`	`347`	`var shouldBeShown = variableDefinition.IsVariableVisibleInEditor(container, instance);`
`348`		`- if(shouldBeShown)`
	`348`	`+ if (shouldBeShown)`
`349`	`349`	`{`
`350`	`350`	`var wasFound = false;`
`351`	`351`	`// This better be in one of the categories`
`352`		`- foreach(var category in grid.Categories)`
	`352`	`+ foreach (var category in grid.Categories)`
`353`	`353`	`{`
`354`		`- foreach(var member in category.Members)`
	`354`	`+ foreach (var member in category.Members)`
`355`	`355`	`{`
`356`		`- if(member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)`
	`356`	`+ if (member is NamedObjectSaveVariableDataGridItem namedObjectSaveVariableDataGridItem)`
`357`	`357`	`{`
`358`		`- if(namedObjectSaveVariableDataGridItem.VariableDefinition.Name == variableDefinition.Name)`
	`358`	`+ if (namedObjectSaveVariableDataGridItem.VariableDefinition.Name == variableDefinition.Name)`
`359`	`359`	`{`
`360`	`360`	`// This is good, we found it`
`361`	`361`	`wasFound = true;`
`@@ -364,7 +364,7 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`	`}`
`367`		`- if(!wasFound)`
	`367`	`+ if (!wasFound)`
`368`	`368`	`{`
`369`	`369`	`needsFullRefresh = true;`
`370`	`370`	`break;`
`@@ -375,7 +375,7 @@ public static void UpdateConditionalVisibility(DataUiGrid grid, NamedObjectSave`
`375`	`375`	`}`
`376`	`376`	`}`
`377`	`377`
`378`		`- if(needsFullRefresh)`
	`378`	`+ if (needsFullRefresh)`
`379`	`379`	`{`
`380`	`380`	`UpdateShownVariables(grid, instance, container, ati);`
`381`	`381`	`}`
`@@ -427,7 +427,7 @@ private static MemberCategory CreateTopmostCategory(List<MemberCategory> categor`
`427`	`427`	`return topmostCategory;`
`428`	`428`	`}`
`429`	`429`
`430`		`- public static void AssignVariableSubtext(NamedObjectSave instance, List<MemberCategory> categories, AssetTypeInfo assetTypeInfo)`
	`430`	`+ public static bool AssignVariableSubtext(NamedObjectSave instance, List<MemberCategory> categories, AssetTypeInfo assetTypeInfo)`
`431`	`431`	`{`
`432`	`432`	`var xVariable = categories.SelectMany(item => item.Members).FirstOrDefault(item => item.DisplayName == "X");`
`433`	`433`	`var yVariable = categories.SelectMany(item => item.Members).FirstOrDefault(item => item.DisplayName == "Y");`
`@@ -461,18 +461,36 @@ public static void AssignVariableSubtext(NamedObjectSave instance, List<MemberCa`
`461`	`461`	`setZ = true;`
`462`	`462`	`}`
`463`	`463`
`464`		`-`
	`464`	`+ var changed = false;`
`465`	`465`	`if (xVariable != null)`
`466`		`- { xVariable.DetailText = subtext; }`
	`466`	`+ {`
	`467`	`+ if (xVariable.DetailText != subtext)`
	`468`	`+ {`
	`469`	`+ changed = true;`
	`470`	`+ xVariable.DetailText = subtext;`
	`471`	`+ }`
	`472`	`+ }`
`467`	`473`
`468`	`474`
`469`	`475`	`if (yVariable != null)`
`470`		`- { yVariable.DetailText = subtext; }`
	`476`	`+ {`
	`477`	`+ if (yVariable.DetailText != subtext)`
	`478`	`+ {`
	`479`	`+ changed = true;`
	`480`	`+ yVariable.DetailText = subtext;`
	`481`	`+ }`
	`482`	`+ }`
`471`	`483`
`472`	`484`	`if (zVariable != null && setZ)`
`473`	`485`	`{`
`474`		`- zVariable.DetailText = subtext;`
	`486`	`+ if(zVariable.DetailText != subtext)`
	`487`	`+ {`
	`488`	`+ changed = true;`
	`489`	`+ zVariable.DetailText = subtext;`
	`490`	`+ }`
`475`	`491`	`}`
	`492`	`+`
	`493`	`+ return changed;`
`476`	`494`	`}`
`477`	`495`
`478`	`496`	`private static void AddForTypedMember(NamedObjectSave instance, GlueElement container, List<MemberCategory> categories,`