Made extrusion work in a inverted model

Author: Sander van Rossen

RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs

@@ -2,7 +2,7 @@ namespace RealtimeCSG.Foundation
 {
     internal static class Versioning
     {
-        public const string PluginVersion       = "1_566";
+        public const string PluginVersion       = "1_567";
         public const string PluginDLLVersion    = "1_559";
     }
 }

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Bindings/NativeMethodBindings.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR
+#if UNITY_EDITOR
 using UnityEngine;
 using UnityEditor;
 using System;
@@ -371,7 +371,7 @@ private static bool RayCastMulti(int						modelCount,
 				ignoreNodeIDsPtr	= ignoreNodeIDsHandle.AddrOfPinnedObject();
 			}
 
-			GCHandle outputIntersectionsHandle	= GCHandle.Alloc(__outputIntersections, GCHandleType.Pinned);
+			GCHandle outputIntersectionsHandle = GCHandle.Alloc(__outputIntersections, GCHandleType.Pinned);
 
 			var visibleLayers	 = Tools.visibleLayers;
 			__intersectionList.Clear();
@@ -390,7 +390,7 @@ private static bool RayCastMulti(int						modelCount,
 
 				if (intersectionCount == 0)
 					continue;
-
+				
 				if (__prevIntersectionCount < intersectionCount)
 				{
 					if (outputIntersectionsHandle.IsAllocated) 
@@ -449,10 +449,9 @@ private static bool RayCastMulti(int						modelCount,
 			}
 
 			__intersectionList.Sort(delegate(LegacyBrushIntersection x, LegacyBrushIntersection y)
-				{
-					return (int)Mathf.Sign(y.distance - x.distance);
-				}
-			);
+									{
+										return (int)Mathf.Sign(y.distance - x.distance);
+									});
 
 			intersections = __intersectionList.ToArray();
 			return true;

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Data/SceneQuery/SceneQueryUtility.cs

@@ -882,7 +882,7 @@ public static bool FindWorldIntersection(Vector3 rayStart, Vector3 rayEnd, out L
 			{
 				var model = InternalCSGModelManager.Models[g];
 
-                if (!ModelTraits.IsModelSelectable(model))
+                if (!model.isActiveAndEnabled || !ModelTraits.IsModelSelectable(model))
 					continue;
 
 				if (ignoreUnrenderables && !ModelTraits.WillModelRender(model) &&
@@ -922,7 +922,7 @@ public static bool FindWorldIntersection(Vector3 rayStart, Vector3 rayEnd, out L
 
 				intersection = modelIntersection;
 			}
-
+			
 			if (intersection == null)
 				return false;
 

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Utility/PrefabUtility.cs

@@ -129,7 +129,11 @@ public static GameObject GetPrefabAsset(GameObject gameObject)
             {
                 var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
                 if (prefabStage.IsPartOfPrefabContents(gameObject))
+    #if UNITY_2020_1_OR_NEWER
+                    return (GameObject)AssetDatabase.LoadMainAssetAtPath(prefabStage.assetPath);
+    #else
                     return (GameObject)AssetDatabase.LoadMainAssetAtPath(prefabStage.prefabAssetPath);
+    #endif
             }
     #endif
 

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/Generators/Generator.ExtrudedBase.cs

@@ -286,6 +286,7 @@ protected bool UpdateExtrudedShape(bool registerUndo = true)
 					Cancel();
 					return false;
 				}
+
 				if (generatedGameObjects != null && generatedGameObjects.Length > 0)
 				{
 					if (registerUndo)
@@ -355,8 +356,8 @@ protected bool UpdateExtrudedShape(bool registerUndo = true)
 							brush.ControlMesh.SetDirty();
                             if (registerUndo)
                                 EditorUtility.SetDirty(brush);
-                            }
-						}
+                        }
+					}
 					HideGenerateBrushes();
 				}
 			}

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/Generators/Generator.FreeDraw.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
@@ -92,6 +92,13 @@ public void GenerateFromPolygon(Camera camera, CSGBrush brush, CSGPlane plane, V
 			base.planeOnGeometry = true;
 			base.smearTextures = false;
 
+
+			var brushScale = brush.transform.lossyScale;
+			var brushInverted = (Math.Sign(brushScale.x) * Math.Sign(brushScale.y) * Math.Sign(brushScale.z)) < 0;
+
+			if (brushInverted)
+				plane = plane.Negated();
+
 			settings.Init(meshVertices, indices);
 
 			haveForcedDirection = true;
@@ -364,7 +371,7 @@ internal override bool UpdateBaseShape(bool registerUndo = true)
 			if (curvedEdges == null)
 				return false;
 			ShapePolygonUtility.RemoveDuplicatePoints(ref outlineVertices);
-
+			
 			if (generateSmoothing)
 			{
 				var usedSmoothingGroupIndices = SurfaceUtility.GetUsedSmoothingGroupIndices();
@@ -1373,7 +1380,7 @@ protected override void HandleEditShapeEvents(SceneView sceneView, Rect sceneRec
 						visualSnappedBrush.ChildData != null &&
 						visualSnappedBrush.ChildData.ModelTransform)
 					{
-						var brush_transformation	= visualSnappedBrush.compareTransformation.localToWorldMatrix;
+						var brush_transformation = visualSnappedBrush.compareTransformation.localToWorldMatrix;
 						CSGRenderer.DrawOutlines(visualSnappedBrush.brushNodeID, brush_transformation, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines);
 					}
 				}
@@ -1518,7 +1525,7 @@ protected override void HandleEditShapeEvents(SceneView sceneView, Rect sceneRec
 						visualSnappedBrush.ChildData != null &&
 						visualSnappedBrush.ChildData.ModelTransform)
 					{
-						var brush_transformation	= visualSnappedBrush.compareTransformation.localToWorldMatrix;
+						var brush_transformation = visualSnappedBrush.compareTransformation.localToWorldMatrix;
 						CSGRenderer.DrawOutlines(visualSnappedBrush.brushNodeID, brush_transformation, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines, ColorSettings.SelectedOutlines);
 					}						
 				}