Some files that weren't correctly added to previous commits

Sander van Rossen · Sander van Rossen · commit 8475d4703892 · 2020-12-07T17:49:21.000+01:00
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Managers/InternalCSGModelManager.Lifetime.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Managers/InternalCSGModelManager.Lifetime.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
@@ -65,11 +65,35 @@ public static void Shutdown()
 		#endregion
 
 		#region UndoRedoPerformed
+		internal static bool IgnoreMaterials = false;
 		public static void UndoRedoPerformed()
 		{
 			BrushOutlineManager.ClearOutlines();
 			
 			CheckForChanges(forceHierarchyUpdate: true);
+
+			if (!IgnoreMaterials)
+			{
+				foreach (var brush in Brushes)
+				{
+					try
+					{
+						//brush.EnsureInitialized();
+						if (brush.Shape != null)
+							ShapeUtility.CheckMaterials(brush.Shape);
+					}
+					finally { }
+				}
+				foreach (var brush in Brushes)
+				{
+					try
+					{
+						InternalCSGModelManager.CheckSurfaceModifications(brush, true);
+						//InternalCSGModelManager.ValidateBrush(brush);
+					}
+					finally { }
+				}
+			}
 		}
 		#endregion
 		
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Data/SceneQuery/SceneQueryUtility.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Data/SceneQuery/SceneQueryUtility.cs
@@ -525,8 +525,11 @@ public static CSGModel EndPicking(HideFlagsState state, UnityEngine.GameObject p
             return null;
         }
 
-        static GameObject FindFirstWorldIntersection(Camera camera, Vector2 screenPos, Vector3 worldRayStart, Vector3 worldRayEnd, List<GameObject> ignoreGameObjects = null, List<CSGBrush> ignoreBrushes = null, bool ignoreInvisibleSurfaces = true)
+        static GameObject FindFirstWorldIntersection(Camera camera, Vector2 screenPos, Vector3 worldRayStart, Vector3 worldRayEnd, out MeshRenderer meshRenderer, out int materialIndex, List<GameObject> ignoreGameObjects = null, List<CSGBrush> ignoreBrushes = null, bool ignoreInvisibleSurfaces = true)
         {
+			meshRenderer = null;
+			materialIndex = 0;
+
             var wireframeShown = CSGSettings.IsWireframeShown(camera);
 
             TryAgain:
@@ -537,7 +540,10 @@ static GameObject FindFirstWorldIntersection(Camera camera, Vector2 screenPos, V
             var ignoreGameObjectArray = (ignoreGameObjects == null || ignoreGameObjects.Count == 0) ? null : ignoreGameObjects.ToArray();
             {
                 var flagState = BeginPicking(ignoreGameObjectArray);
-                try { gameObject = HandleUtility.PickGameObject(screenPos, false, ignoreGameObjectArray); }
+                try 
+				{ 
+					gameObject = HandleUtility.PickGameObject(screenPos, ignoreGameObjectArray, out materialIndex); 
+				}
                 finally { model = EndPicking(flagState, gameObject); }
             }
 
@@ -580,14 +586,17 @@ static GameObject FindFirstWorldIntersection(Camera camera, Vector2 screenPos, V
             if (ReferenceEquals(gameObject, null) ||
                 !gameObject)
                 return null;
-             
-            // Make sure our found gameobject isn't sneakily a CSG related object (should not happen at this point)
-            if (!gameObject.GetComponent<CSGModel>() &&
-                !gameObject.GetComponent<CSGBrush>() &&
-                !gameObject.GetComponent<CSGOperation>() &&
-                !gameObject.GetComponent<GeneratedMeshInstance>() &&
-                !gameObject.GetComponent<GeneratedMeshes>())
-                return gameObject;
+
+			// Make sure our found gameobject isn't sneakily a CSG related object (should not happen at this point)
+			if (!gameObject.GetComponent<CSGModel>() &&
+				!gameObject.GetComponent<CSGBrush>() &&
+				!gameObject.GetComponent<CSGOperation>() &&
+				!gameObject.GetComponent<GeneratedMeshInstance>() &&
+				!gameObject.GetComponent<GeneratedMeshes>())
+			{
+				meshRenderer = gameObject.GetComponent<MeshRenderer>();
+				return gameObject;
+			}
 
             // If we're not ignoring something, just return null after all
             if (ignoreGameObjects == null)
@@ -598,9 +607,24 @@ static GameObject FindFirstWorldIntersection(Camera camera, Vector2 screenPos, V
             goto TryAgain;
         }
 
+		public static bool FindClickWorldIntersection(Camera camera, Vector2 screenPos, out GameObject foundObject, bool ignoreInvisibleSurfaces = true, bool ignoreDeepClick = false)
+        {
+			MeshRenderer meshRenderer = null;
+			int materialIndex=  0;
+			return FindClickWorldIntersection(camera, screenPos, out foundObject, out meshRenderer, out materialIndex, ignoreInvisibleSurfaces, ignoreDeepClick);
+		}
+
+		public static void ClearDeepClick()
+        {
+			clearDeepClick = true;
+		}
 
-        public static bool FindClickWorldIntersection(Camera camera, Vector2 screenPos, out GameObject foundObject, bool ignoreInvisibleSurfaces = true)
+		static bool clearDeepClick = false;
+
+		public static bool FindClickWorldIntersection(Camera camera, Vector2 screenPos, out GameObject foundObject, out MeshRenderer meshRenderer, out int materialIndex, bool ignoreInvisibleSurfaces = true, bool ignoreDeepClick = false)
 		{
+			meshRenderer = null;
+			materialIndex = 0;
 			foundObject = null;
 			if (!camera)
 				return false;
@@ -610,16 +634,21 @@ public static bool FindClickWorldIntersection(Camera camera, Vector2 screenPos,
 			var worldRayVector	= (worldRay.direction * (camera.farClipPlane - camera.nearClipPlane));
 			var worldRayEnd		= worldRayStart + worldRayVector;
 
-            // If we moved our mouse, reset our ignore list
-            if (_prevSceenPos != screenPos ||
-                _prevCamera != camera)
-                ResetDeepClick();
+			// If we moved our mouse, reset our ignore list
+			if (_prevSceenPos != screenPos ||
+				_prevCamera != camera ||
+				ignoreDeepClick || 
+				clearDeepClick)
+			{
+				ResetDeepClick();
+				clearDeepClick = false;
+			}
 
             _prevSceenPos = screenPos;
             _prevCamera = camera;
 
             // Get the first click that is not in our ignore list
-            foundObject = FindFirstWorldIntersection(camera, screenPos, worldRayStart, worldRayEnd, deepClickIgnoreGameObjectList, deepClickIgnoreBrushList, ignoreInvisibleSurfaces);
+            foundObject = FindFirstWorldIntersection(camera, screenPos, worldRayStart, worldRayEnd, out meshRenderer, out materialIndex, deepClickIgnoreGameObjectList, deepClickIgnoreBrushList, ignoreInvisibleSurfaces);
 
             // If we haven't found anything, try getting the first item in our list that's either a brush or a regular gameobject (loop around)
             if (object.Equals(foundObject, null))
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/DragAndDrop/ISceneDragTool.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/DragAndDrop/ISceneDragTool.cs
@@ -11,7 +11,7 @@ internal interface ISceneDragTool
 		bool ValidateDrop		(SceneView sceneView);
 		bool ValidateDropPoint	(SceneView sceneView);
 		void Reset				();
-		bool DragUpdated		(Transform transformInInspector, Rect selectionRect);
+		bool DragUpdated		(SceneView sceneView, Transform transformInInspector, Rect selectionRect);
 		bool DragUpdated		(SceneView sceneView);
 		void DragPerform		(SceneView sceneView);
 		void DragExited			(SceneView sceneView);
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModeManager.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModeManager.cs
@@ -580,7 +580,8 @@ public static void OnSceneGUI(SceneView sceneView)
 
 			if (RealtimeCSG.CSGSettings.EnableRealtimeCSG)
 			{
-				if (sceneView && sceneWindowType != EventType.Used && !SceneDragToolManager.IsDraggingObjectInScene)
+				if (sceneView && sceneWindowType != EventType.Used && 
+					(!SceneDragToolManager.IsDraggingObjectInScene || EditMode == ToolEditMode.Surfaces))
 				{
 					if (currentEditorWindows.Count == 0)
 					{
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModeSelection.GUI.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModeSelection.GUI.cs
@@ -48,7 +48,8 @@ static void HandleSceneGUI(int id)
 			TooltipUtility.InitToolTip(sceneView);
 			var originalSkin = GUI.skin;
 			{
-				OnEditModeSelectionSceneGUI();
+				if (!SceneDragToolManager.IsDraggingObjectInScene)
+					OnEditModeSelectionSceneGUI();
 
 				var viewRect = new Rect(4, 0, sceneView.position.width, sceneView.position.height - (CSG_GUIStyleUtility.BottomToolBarHeight + 4));
 				GUILayout.BeginArea(viewRect);
@@ -59,7 +60,7 @@ static void HandleSceneGUI(int id)
 				}
 				GUILayout.EndArea();
 
-				if (RealtimeCSG.CSGSettings.EnableRealtimeCSG)
+				if (RealtimeCSG.CSGSettings.EnableRealtimeCSG && !SceneDragToolManager.IsDraggingObjectInScene)
 					SceneViewBottomBarGUI.ShowGUI(sceneView, haveOffset: false);
 			}
 			GUI.skin = originalSkin;
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Edit.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Edit.cs
@@ -2377,6 +2377,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)
 					{
 						if (GUIUtility.hotControl != 0)
 							break;
+						SceneQueryUtility.ClearDeepClick();
 						if (HavePointSelection && (Event.current.commandName == "SoftDelete" || Event.current.commandName == "Delete")) { Event.current.Use(); break; }
 						if (Keys.CancelActionKey.IsKeyPressed()) { Event.current.Use(); break; }
 						if (Keys.SnapToGridKey.IsKeyPressed()) { Event.current.Use(); break; }
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Place.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Place.cs
@@ -190,8 +190,8 @@ public Vector3 LocalSpacePivotCenter
 		[SerializeField] ControlMesh[]	backupControlMeshes			= null;             // brush
 		#endregion
 		
-		public void OnEnableTool()	{ toolIsEnabled		= true;  Tools.hidden = shouldHideTool; ResetTool(); }
-		public void OnDisableTool()	{ toolIsEnabled		= false; Tools.hidden = false; ResetTool(); }		
+		public void OnEnableTool()	{ toolIsEnabled = true;  Tools.hidden = shouldHideTool; ResetTool(); }
+		public void OnDisableTool()	{ toolIsEnabled = false; Tools.hidden = false; ResetTool(); }		
 
 		public void SetTargets(FilteredSelection filteredSelection)
 		{
@@ -424,7 +424,7 @@ void UpdateTargetBoundsHandles(Camera camera)
 			renderLocalCenterPoints[4] = new Vector3(centerX, centerY, minZ);
 			renderLocalCenterPoints[5] = new Vector3(centerX, centerY, maxZ);
 
-			for (int i=0;i< BoundsUtilities.AABBEdgeIndices.Length; i++)
+			for (int i = 0; i < BoundsUtilities.AABBEdgeIndices.Length; i++)
 			{
 				var index1 = BoundsUtilities.AABBEdgeIndices[i][0];
 				var index2 = BoundsUtilities.AABBEdgeIndices[i][1];
@@ -609,7 +609,13 @@ public bool UndoRedoPerformed()
 			//CSGModelManager.Refresh(forceHierarchyUpdate: true);
 			return false;
 		}
-		public bool DeselectAll() { Selection.activeTransform = null; return false; }
+
+		public bool DeselectAll()
+		{
+			SceneQueryUtility.ClearDeepClick();
+			Selection.activeTransform = null; 
+			return false; 
+		}
 		
 		public void RecenterPivot()
 		{
@@ -1695,6 +1701,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)
 
 					case EventType.KeyDown:
 					{
+						SceneQueryUtility.ClearDeepClick();
 						if (Tools.viewTool != ViewTool.FPS && Keys.CloneDragActivate.IsKeyPressed()) { cloneDragKeyPressed = true; Event.current.Use(); break; }
 						if (Keys.HandleSceneKeyDown(EditModeManager.CurrentTool, false)) { Event.current.Use(); break; }
 						if (Keys.FlipSelectionX.IsKeyPressed()) { Event.current.Use(); break; }
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.GUI.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.GUI.cs
@@ -1011,7 +1011,7 @@ public static Rect GetLastSceneGUIRect(EditModeSurface tool)
 		
 		static Vector2 scrollbarPosition = Vector2.zero;
 
-
+		 
 		static Rect sceneGUIRect = new Rect(0, 0, 232, 0);
 		public static void OnSceneGUI(Rect windowRect, EditModeSurface tool)
 		{
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/EditMode.Surface.cs
@@ -459,7 +459,7 @@ void RestoreBackupTexgens()
         
         EditMode SetHoverOn(EditMode editModeType, int target, int index = -1)
         {
-            hoverOnTarget	= target;
+            hoverOnTarget	= target; 
             if (target == -1)
             {
                 hoverOnSurfaceIndex = -1;
@@ -1088,6 +1088,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)
                     
                     case EventType.KeyDown:
                     {
+                        SceneQueryUtility.ClearDeepClick();
                         if (Keys.CancelActionKey.IsKeyPressed()) { Event.current.Use(); break; }
                         if (Keys.CopyMaterialTexGen.IsKeyPressed()) { if (dragMode == DragMode.None) dragMode = DragMode.TextureCopy; Event.current.Use(); break; }
                         if (Keys.HandleSceneKeyDown(EditModeManager.CurrentTool, false)) { Event.current.Use(); break; }
@@ -1307,7 +1308,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)
                             if ( nearestControl != -1)
                             {
                                 surfaceState.UnHoverAll();
-                    
+
                                 if (newEditMode == EditMode.None)
                                 {
                                     for (int s = 0; s < surfaceState.surfaceSelectState.Length; s++)
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/Generators/Generator.Base.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/EditModeGUI/EditModes/Generators/Generator.Base.cs
@@ -301,7 +301,8 @@ protected void HandleKeyboard(EventType type)
 			{
 				case EventType.ValidateCommand:
 				case EventType.KeyDown:
-				{					
+				{
+					SceneQueryUtility.ClearDeepClick();
 					if (Keys.PerformActionKey.IsKeyPressed() ||
 						Keys.DeleteSelectionKey.IsKeyPressed() ||
 						Keys.CancelActionKey.IsKeyPressed())

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,8 @@ public static void OnSceneGUI(SceneView sceneView)`
`580`	`580`
`581`	`581`	`if (RealtimeCSG.CSGSettings.EnableRealtimeCSG)`
`582`	`582`	`{`
`583`		`- if (sceneView && sceneWindowType != EventType.Used && !SceneDragToolManager.IsDraggingObjectInScene)`
	`583`	`+ if (sceneView && sceneWindowType != EventType.Used &&`
	`584`	`+ (!SceneDragToolManager.IsDraggingObjectInScene \|\| EditMode == ToolEditMode.Surfaces))`
`584`	`585`	`{`
`585`	`586`	`if (currentEditorWindows.Count == 0)`
`586`	`587`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ static void HandleSceneGUI(int id)`
`48`	`48`	`TooltipUtility.InitToolTip(sceneView);`
`49`	`49`	`var originalSkin = GUI.skin;`
`50`	`50`	`{`
`51`		`- OnEditModeSelectionSceneGUI();`
	`51`	`+ if (!SceneDragToolManager.IsDraggingObjectInScene)`
	`52`	`+ OnEditModeSelectionSceneGUI();`
`52`	`53`
`53`	`54`	`var viewRect = new Rect(4, 0, sceneView.position.width, sceneView.position.height - (CSG_GUIStyleUtility.BottomToolBarHeight + 4));`
`54`	`55`	`GUILayout.BeginArea(viewRect);`
`@@ -59,7 +60,7 @@ static void HandleSceneGUI(int id)`
`59`	`60`	`}`
`60`	`61`	`GUILayout.EndArea();`
`61`	`62`
`62`		`- if (RealtimeCSG.CSGSettings.EnableRealtimeCSG)`
	`63`	`+ if (RealtimeCSG.CSGSettings.EnableRealtimeCSG && !SceneDragToolManager.IsDraggingObjectInScene)`
`63`	`64`	`SceneViewBottomBarGUI.ShowGUI(sceneView, haveOffset: false);`
`64`	`65`	`}`
`65`	`66`	`GUI.skin = originalSkin;`
Original file line number	Diff line number	Diff line change
`@@ -2377,6 +2377,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)`
`2377`	`2377`	`{`
`2378`	`2378`	`if (GUIUtility.hotControl != 0)`
`2379`	`2379`	`break;`
	`2380`	`+ SceneQueryUtility.ClearDeepClick();`
`2380`	`2381`	`if (HavePointSelection && (Event.current.commandName == "SoftDelete" \|\| Event.current.commandName == "Delete")) { Event.current.Use(); break; }`
`2381`	`2382`	`if (Keys.CancelActionKey.IsKeyPressed()) { Event.current.Use(); break; }`
`2382`	`2383`	`if (Keys.SnapToGridKey.IsKeyPressed()) { Event.current.Use(); break; }`
Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,7 @@ public static Rect GetLastSceneGUIRect(EditModeSurface tool)`
`1011`	`1011`
`1012`	`1012`	`static Vector2 scrollbarPosition = Vector2.zero;`
`1013`	`1013`
`1014`		`-`
	`1014`	`+`
`1015`	`1015`	`static Rect sceneGUIRect = new Rect(0, 0, 232, 0);`
`1016`	`1016`	`public static void OnSceneGUI(Rect windowRect, EditModeSurface tool)`
`1017`	`1017`	`{`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ void RestoreBackupTexgens()`
`459`	`459`
`460`	`460`	`EditMode SetHoverOn(EditMode editModeType, int target, int index = -1)`
`461`	`461`	`{`
`462`		`- hoverOnTarget = target;`
	`462`	`+ hoverOnTarget = target;`
`463`	`463`	`if (target == -1)`
`464`	`464`	`{`
`465`	`465`	`hoverOnSurfaceIndex = -1;`
`@@ -1088,6 +1088,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)`
`1088`	`1088`
`1089`	`1089`	`case EventType.KeyDown:`
`1090`	`1090`	`{`
	`1091`	`+ SceneQueryUtility.ClearDeepClick();`
`1091`	`1092`	`if (Keys.CancelActionKey.IsKeyPressed()) { Event.current.Use(); break; }`
`1092`	`1093`	`if (Keys.CopyMaterialTexGen.IsKeyPressed()) { if (dragMode == DragMode.None) dragMode = DragMode.TextureCopy; Event.current.Use(); break; }`
`1093`	`1094`	`if (Keys.HandleSceneKeyDown(EditModeManager.CurrentTool, false)) { Event.current.Use(); break; }`
`@@ -1307,7 +1308,7 @@ public void HandleEvents(SceneView sceneView, Rect sceneRect)`
`1307`	`1308`	`if ( nearestControl != -1)`
`1308`	`1309`	`{`
`1309`	`1310`	`surfaceState.UnHoverAll();`
`1310`		`-`
	`1311`	`+`
`1311`	`1312`	`if (newEditMode == EditMode.None)`
`1312`	`1313`	`{`
`1313`	`1314`	`for (int s = 0; s < surfaceState.surfaceSelectState.Length; s++)`