Misc fixes (#357)

* Fix for some invalid compounded csg operations on surfaces

* Improved addition material data GUI in Chisel

Author: LogicalError

Assets/Sample Scene/sample scene.unity

@@ -6,7 +6,7 @@ namespace Chisel.Core
     /// <seealso cref="Chisel.Core.CSGTreeBrush"/>
     /// <seealso cref="Chisel.Core.CSGTreeBranch"/>
     [Serializable]
-    public enum CSGOperationType : byte
+    public enum CSGOperationType : byte // Note: DO NOT CHANGE THE ORDER OF THESE VALUES
     {
         /// <summary>The given <see cref="Chisel.Core.CSGTreeBrush"/> or <see cref="Chisel.Core.CSGTreeBranch"/> is added to the <see cref="Chisel.Core.CSGTree"/> and removes all the geometry inside it.</summary>
         Additive = 0,

Assets/Test cases/test_case_21.unity

@@ -11,11 +11,38 @@ namespace Chisel.Core
 	[Serializable]
 	public struct ChiselMaterial
 	{
-        public const string kMaterialFieldName		 = nameof(material);
+        public const string kMaterialFieldName		  = nameof(material);
 		public const string kSurfaceMetadataFieldName = nameof(surfaceMetadata);
 
 		public Material				 material;
 		public ChiselSurfaceMetadata surfaceMetadata;
+
+		public static ChiselMaterial Create(Material material)
+		{
+			ChiselMaterial chiselMaterial = new() { material = material };
+			chiselMaterial.Update();
+			return chiselMaterial;
+		}
+
+		public bool Update()
+		{
+			if (material == null)
+			{
+				if (surfaceMetadata != null)
+				{
+					surfaceMetadata = null;
+					return true;
+				}
+				return false;
+			}
+			var newSurfaceMetadata = material.GetMetadataOfType<ChiselSurfaceMetadata>();
+			if (surfaceMetadata != newSurfaceMetadata)
+			{
+				surfaceMetadata = newSurfaceMetadata;
+				return true;
+			}
+			return false;
+		}
 	}
 
 	/// <summary>Defines a surface on a <see cref="Chisel.Core.BrushMesh"/>. 
@@ -44,19 +71,15 @@ public sealed class ChiselSurface
 		public void SetMaterial(Material material)
 		{
 			chiselMaterial.material = material;
-			chiselMaterial.surfaceMetadata = (material == null) ? null : chiselMaterial.material.GetMetadataOfType<ChiselSurfaceMetadata>();
+			chiselMaterial.Update();
 		}
 
 		public static ChiselSurface Create(Material material, SurfaceDetails details) 
 		{ 
 			return new ChiselSurface
 			{
-				chiselMaterial = new ChiselMaterial
-				{
-					material        = material,
-					surfaceMetadata = (material == null) ? null : material.GetMetadataOfType<ChiselSurfaceMetadata>(),
-				},
-				surfaceDetails	= details
+				chiselMaterial = ChiselMaterial.Create(material),
+				surfaceDetails = details
 			};
 		}
 

Packages/com.chisel.core/Chisel/Core/1.Input/Nodes/CSGOperationType.cs

@@ -42,5 +42,10 @@ public override int GetHashCode()
 				return (int)hash;
 			}
 		}
+
+		public override void OnReset()
+		{
+			physicsMaterial = ChiselDefaultMaterials.DefaultPhysicsMaterial;
+		}
 	}
 }

Packages/com.chisel.core/Chisel/Core/1.Input/Surfaces/ChiselBrushMaterial.cs

@@ -1,6 +1,6 @@
+#define HAVE_SELF_CATEGORIES
 #define USE_OPTIMIZATIONS
 //#define SHOW_DEBUG_MESSAGES 
-#define HAVE_SELF_CATEGORIES
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -263,7 +263,7 @@ static int GetStackNodes(CompactNodeID processedNodeID,
                                 output[outputLength] = new CategoryStackNode { NodeIDValue = currentNodeID.value, routingRow = CategoryRoutingRow.AllSelfAligned };
                                 outputLength++;
                                 break;
-                            }
+                            }  
 
                             if (haveGoneBeyondSelf > 0)
                                 haveGoneBeyondSelf = 2; // We're now definitely beyond our brush
@@ -504,8 +504,9 @@ static void Combine([NoAlias] ref NativeArray<CategoryStackNode> leftStack, int
 #if HAVE_SELF_CATEGORIES
                 var operationTableOffset = (int)operation;
 #else
-                var operationTableOffset = (leftHaveGoneBeyondSelf >= 1 && rightStackLength == 1 ?
-                                            CategoryRoutingRow.RemoveOverlappingOffset : 0) +
+                var operationTableOffset = //(leftHaveGoneBeyondSelf >= 1 ?//&& rightStackLength == 1 ?
+                                            //CategoryRoutingRow.RemoveOverlappingOffset : 0) +
+                                            (leftHaveGoneBeyondSelf * CategoryRoutingRow.OperationCount) +
                                             (int)operation;
 #endif
 
@@ -574,7 +575,7 @@ static void Combine([NoAlias] ref NativeArray<CategoryStackNode> leftStack, int
                         {
                             // Fix up output of last node to include operation between last left and last right.
                             // We don't add a routingOffset here since this is last node & we don't have a destination beyond this point
-                            var routingRow = new CategoryRoutingRow(operationTableOffset, leftCategoryIndex, rightStack[rightStackRowIndex].routingRow); // applies operation
+							var routingRow = new CategoryRoutingRow(operationTableOffset, leftCategoryIndex, rightStack[rightStackRowIndex].routingRow); // applies operation
                             var skip = !combineUsedIndices.IsSet(vIndex);
 #if USE_OPTIMIZATIONS
                             combineIndexRemap[vIndex] = skip ? (byte)0 : 
@@ -626,7 +627,7 @@ static void Combine([NoAlias] ref NativeArray<CategoryStackNode> leftStack, int
         }
 
 
-        [BurstDiscard]
+		[BurstDiscard]
         static void FailureMessage()
         {
             Debug.LogError("Unity Burst Compiler is broken");
@@ -676,6 +677,7 @@ static void RemapIndices([NoAlias] NativeArray<CategoryStackNode> stack, [NoAlia
                     if (key >= remap.Length || remap[key] == 0) { FailureMessage(); return; }
 				}
 
+#if HAVE_SELF_CATEGORIES
 				{
 					var key = (int)routingRow.selfAligned;
 					if (key >= remap.Length || remap[key] == 0) { FailureMessage(); return; }
@@ -685,6 +687,7 @@ static void RemapIndices([NoAlias] NativeArray<CategoryStackNode> stack, [NoAlia
 					var key = (int)routingRow.selfReverseAligned;
 					if (key >= remap.Length || remap[key] == 0) { FailureMessage(); return; }
 				}
+#endif
 
 				{
                     var key = (int)routingRow.reverseAligned;
@@ -738,4 +741,4 @@ static void Dump(int processedNodeID, NativeArray<CategoryStackNode> stack, int
         }
 #endif
             }
-}
+		}