Added better handling of partitioning in derived screens

fixes #1298
vchelaru · Dec 10, 2023 · 2818d8b · 2818d8b
1 parent 22fb0e0
commit 2818d8b
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 18 deletions.
diff --git a/FRBDK/Glue/OfficialPlugins/CollisionPlugin/CodeGenerators/CollisionCodeGenerator.cs b/FRBDK/Glue/OfficialPlugins/CollisionPlugin/CodeGenerators/CollisionCodeGenerator.cs
@@ -606,7 +606,7 @@ private static void GenerateStackingCollision(ICodeBlock codeBlock,
 
             if (isSecondTileShapeCollection == false)
             {
-                // return stackable vs stackable
+                // return stackable vs stackable    
                 block.Line($"return FlatRedBall.Math.Geometry.IStackableExtensionMethods.CollideAgainstBounceStackable(first, second, 1, 1);");
             }
             else
@@ -624,16 +624,38 @@ private static void GenerateStackingCollision(ICodeBlock codeBlock,
 
         public static bool CanBePartitioned(NamedObjectSave nos)
         {
-            if (nos.IsList)
+            var canBePartitioned = true;
+            if(nos.IsList == false)
+            {
+                canBePartitioned = false;
+            }
+
+            if(canBePartitioned)
             {
                 var genericType = nos.SourceClassGenericType;
 
                 var entity = ObjectFinder.Self.GetEntitySave(genericType);
 
-                return entity?.IsICollidableRecursive() == true;
+                var isCollidable = entity?.IsICollidableRecursive() == true;
+                // If not collidable, then we don't need to partition...at least not now. Maybe in the future
+                // we could support this if people want manual partitioning?
+                canBePartitioned = isCollidable;
+            }
+
+            if(canBePartitioned)
+            {
+                if (nos.DefinedByBase)
+                {
+                    var baseNos = ObjectFinder.Self.GetRootDefiningObject(nos);
+                    if (baseNos != null)
+                    {
+                        canBePartitioned = false;
+                    }
+                }
             }
+
 
-            return false;
+            return canBePartitioned;
         }
 
         public override ICodeBlock GenerateAddToManagers(ICodeBlock codeBlock, IElement element)

diff --git a/FRBDK/Glue/OfficialPlugins/CollisionPlugin/Controllers/CollidableNamedObjectController.cs b/FRBDK/Glue/OfficialPlugins/CollisionPlugin/Controllers/CollidableNamedObjectController.cs
@@ -60,6 +60,7 @@ public static void RefreshViewModelTo(IElement container,
             // Set this before updating from Glue object so that we don't persist values which 
             // don't apply
             viewModel.CanBePartitioned = CollisionCodeGenerator.CanBePartitioned(thisNamedObject);
+            viewModel.DefinedByBase = thisNamedObject.DefinedByBase;
             viewModel.UpdateFromGlueObject();
             if(viewModel.CanBePartitioned)
             {

diff --git a/.../OfficialPlugins/CollisionPlugin/ViewModels/CollidableNamedObjectRelationshipViewModel.cs b/.../OfficialPlugins/CollisionPlugin/ViewModels/CollidableNamedObjectRelationshipViewModel.cs
@@ -1,5 +1,6 @@
 using FlatRedBall.Glue.MVVM;
 using FlatRedBall.Math;
+using Localization;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -30,9 +31,20 @@ public bool CanBePartitioned
         [DependsOn(nameof(CanBePartitioned))]
         public Visibility PartitioningControlUiVisibility => CanBePartitioned.ToVisibility();
 
+        public bool DefinedByBase
+        {
+            get => Get<bool>();
+            set => Set(value);
+        }
+
         [DependsOn(nameof(CanBePartitioned))]
         public Visibility AlreadyOrCantBePartitionedVisibility => (!CanBePartitioned).ToVisibility();
 
+        [DependsOn(nameof(NoPartitioningText))]
+        public string NoPartitioningText =>
+            DefinedByBase ? "Partitioning properties are not available on derived objects"
+            : "Partitioning not available for this object";
+
         [SyncedProperty(SyncingConditionProperty = nameof(CanBePartitioned))]
         public bool PerformCollisionPartitioning
         {
@@ -203,6 +215,6 @@ public ObservableCollection<NamedObjectPairRelationshipViewModel> NamedObjectPai
         public CollidableNamedObjectRelationshipViewModel()
         {
             NamedObjectPairs = new ObservableCollection<NamedObjectPairRelationshipViewModel>();
-}
+        }
     }
 }
diff --git a/.../Glue/OfficialPlugins/CollisionPlugin/Views/CollidableNamedObjectRelationshipDisplay.xaml b/.../Glue/OfficialPlugins/CollisionPlugin/Views/CollidableNamedObjectRelationshipDisplay.xaml
@@ -55,7 +55,11 @@
                         <CheckBox IsChecked="{Binding IsSortListEveryFrameChecked}" VerticalContentAlignment="Center" Content="{x:Static localization:Texts.ListSortEveryFrame}" />
                     </StackPanel>
                 </StackPanel>
-                <Label Visibility="{Binding AlreadyOrCantBePartitionedVisibility}"  Content="{x:Static localization:Texts.ObjectNoPartitioning}" />
+                <TextBlock Visibility="{Binding AlreadyOrCantBePartitionedVisibility}"  
+                       TextWrapping="Wrap"
+                       Width="{Binding ElementName=ScrollViewerInstance, Path=ViewportWidth}"
+
+                       Text="{Binding NoPartitioningText}" />
 
                 <!--Source https://stackoverflow.com/questions/1981137/c-sharp-wpf-scrollviewer-textblock-troubles-->
                 <TextBlock

diff --git a/FRBDK/Localization/Texts.Designer.cs b/FRBDK/Localization/Texts.Designer.cs
diff --git a/FRBDK/Localization/Texts.resx b/FRBDK/Localization/Texts.resx
@@ -1459,9 +1459,6 @@ for {1}?</value>
   <data name="ListSortEveryFrame" xml:space="preserve">
     <value>Sort List every frame</value>
   </data>
-  <data name="ObjectNoPartitioning" xml:space="preserve">
-    <value>This object has no partitioning options available.</value>
-  </data>
   <data name="HintObjectAutoPartition" xml:space="preserve">
     <value>This object is automatically partitioned, or it does not need partitioning</value>
   </data>