UnityX

Author: tomkail

Assets/UnityX/Scripts/Components/PolygonRenderer/Editor/PolygonOutlineRendererEditor.cs

@@ -26,7 +26,8 @@ public override void OnInspectorGUI() {
 		serializedObject.ApplyModifiedProperties();
 	}
 
-	void OnSceneGUI () {
+    protected override void OnMultiEditSceneGUI () {
+        base.OnMultiEditSceneGUI();
 		Undo.RecordObject(data, "Edit polygon");
 		polygonEditor.OnSceneGUI(data.polygon);
 	}

Assets/UnityX/Scripts/Components/PolygonRenderer/Editor/PolygonRendererEditor.cs

@@ -26,7 +26,8 @@ public override void OnInspectorGUI() {
 		serializedObject.ApplyModifiedProperties();
 	}
 
-	void OnSceneGUI () {
+    protected override void OnMultiEditSceneGUI () {
+        base.OnMultiEditSceneGUI();
 		Undo.RecordObject(data, "Edit polygon");
 		polygonEditor.OnSceneGUI(data.polygon);
 	}

Assets/UnityX/Scripts/Components/Transform/Transform Copier/Editor/TransformCopierEditor.cs

@@ -15,8 +15,7 @@ public override void OnEnable() {
 	void OnDisable() {
 		Tools.hidden = false;
 	}
-
-	void OnSceneGUI () {
+    protected override void OnMultiEditSceneGUI () {
 		Tools.hidden = data.enabled && (Application.isPlaying && data.playMode || !Application.isPlaying && data.editMode) && ((data.position && Tools.current == Tool.Move) || (data.rotation && Tools.current == Tool.Rotate));
 		var color = Handles.color;
 		Handles.color = Color.blue;

Assets/UnityX/Scripts/Components/UI/WorldSpaceUIElement/WorldSpaceUIElement.cs

@@ -150,8 +150,8 @@ public Vector3 GetLocalScale () {
 
 	protected override void Awake () {
 		#if UNITY_EDITOR
-		if(!Application.isPlaying && !_updateInEditMode)
-			return;
+		if(UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(gameObject) != null) return;
+        if(!Application.isPlaying && !_updateInEditMode) return;
 		#endif
 		rectTransform = this.GetRectTransform();
 		if(camera == null)
@@ -161,16 +161,16 @@ protected override void Awake () {
 
 	protected override void OnEnable () {
 		#if UNITY_EDITOR
-		if(!Application.isPlaying && !_updateInEditMode)
-			return;
+		if(UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(gameObject) != null) return;
+        if(!Application.isPlaying && !_updateInEditMode) return;
 		#endif
 		Refresh();
 	}
 
 	protected override void OnTransformParentChanged () {
 		#if UNITY_EDITOR
-		if(!Application.isPlaying && !_updateInEditMode)
-			return;
+		if(UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(gameObject) != null) return;
+        if(!Application.isPlaying && !_updateInEditMode) return;
 		#endif
 		SetRootCanvas();
 		base.OnTransformParentChanged ();
@@ -179,8 +179,8 @@ protected override void OnTransformParentChanged () {
 	// LateUpdate because we want it to come even after camera updates
 	private void LateUpdate () {
 		#if UNITY_EDITOR
-		if(!Application.isPlaying && !_updateInEditMode)
-			return;
+		if(UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(gameObject) != null) return;
+        if(!Application.isPlaying && !_updateInEditMode) return;
 		#endif
 		Refresh();
 	}

Assets/UnityX/Scripts/Editor Tools/Base Editor Class/Editor/BaseEditor.cs

@@ -33,10 +33,17 @@ public override void OnInspectorGUI() {
 		if(GUI.changed && target != null) {         
 			EditorUtility.SetDirty(target);
 		}
-		
-		serializedObject.ApplyModifiedProperties();
 	}
-	
+
+    public virtual void OnSceneGUI() {
+        if (target == datas [0]) {
+            OnMultiEditSceneGUI ();
+        }
+    }
+
+    // Called once per SceneView refresh. You should iterate the targets/datas array to draw per object here
+    protected virtual void OnMultiEditSceneGUI () {}
+
 	protected void SetData () {
 		// If an object has been deleted under our feet we need to handle it gracefully
 		// (Previously it would assert)

Assets/UnityX/Scripts/Editor Tools/EditorTime/Editor/EditorTime.cs

@@ -2,7 +2,9 @@
 using UnityEditor;
 using System.Collections;
 
+#if UNITY_EDITOR
 [InitializeOnLoad]
+#endif
 public class EditorTime {
 
 	public static float time {

Assets/UnityX/Scripts/Editor Tools/SceneGUIDrawer.meta Assets/UnityX/Scripts/Editor Tools/SceneView.meta

@@ -0,0 +1,61 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// A bunch of utilities for the scene view - useful for culling handles/gizmos for performance reasons.
+public static class SceneViewUtility {
+    #if UNITY_EDITOR
+    static bool ready;
+    static Plane[] frustumPlanes = new Plane[6];
+    static Vector3 sceneViewCameraPosition;
+    static bool sceneViewCameraIsOrthographic;
+    public static float sceneViewCameraOrthographicSize;
+
+    static float maxDistance = 750;
+    static float minOrthographicSizeFraction = 0.035f;
+
+    static SceneViewUtility () {
+        UnityEditor.SceneView.beforeSceneGui += BeforeSceneGUI;
+    }
+
+    static void BeforeSceneGUI (UnityEditor.SceneView sceneView) {
+        ready = true;
+        GeometryUtility.CalculateFrustumPlanes(UnityEditor.SceneView.currentDrawingSceneView.camera, frustumPlanes);
+        sceneViewCameraIsOrthographic = UnityEditor.SceneView.currentDrawingSceneView.camera.orthographic;
+        sceneViewCameraOrthographicSize = UnityEditor.SceneView.currentDrawingSceneView.camera.orthographicSize;
+        sceneViewCameraPosition = UnityEditor.SceneView.currentDrawingSceneView.camera.transform.position;
+    }
+
+    public static bool IsVisibleInSceneView (Vector3 point) {
+        return ready && 
+        (sceneViewCameraIsOrthographic ? true : Vector3.Distance(sceneViewCameraPosition, point) < maxDistance)
+         && 
+        TestPlanesPoint(frustumPlanes, point);
+    }
+    public static bool IsVisibleInSceneView (Vector3 point, float radius) {
+        return ready && 
+        (sceneViewCameraIsOrthographic ? radius > sceneViewCameraOrthographicSize*minOrthographicSizeFraction : Vector3.Distance(sceneViewCameraPosition, point) < maxDistance)
+         && 
+        TestPlanesSphere(frustumPlanes, point, radius);
+    }
+    public static bool IsVisibleInSceneView (Bounds bounds) {
+        return ready && 
+        (sceneViewCameraIsOrthographic ? bounds.extents.magnitude > sceneViewCameraOrthographicSize*minOrthographicSizeFraction : Vector3.Distance(sceneViewCameraPosition, bounds.ClosestPoint(sceneViewCameraPosition)) < maxDistance)
+         && 
+        GeometryUtility.TestPlanesAABB(frustumPlanes, bounds);
+    }
+
+    public static bool TestPlanesPoint (Plane[] planes, Vector3 point) {
+		for(int i = 0; i < 6; i++)
+			if(Vector3.Dot(planes[i].normal, point) + planes[i].distance < 0) 
+				return false;
+		return true;
+	}
+    public static bool TestPlanesSphere (Plane[] planes, Vector3 point, float radius) {
+		for(int i = 0; i < 6; i++)
+			if(Vector3.Dot(planes[i].normal, point) + planes[i].distance + radius < 0) 
+				return false;
+		return true;
+	}
+    #endif
+}

Assets/UnityX/Scripts/Editor Tools/SceneGUIDrawer/Editor.meta Assets/UnityX/Scripts/Editor Tools/SceneView/Editor.meta

@@ -31,7 +31,8 @@ public ShuffleBag (ShuffleBag<T> otherBag) {
 		_items = new List<T>(otherBag.items);
 	}
 
-	private void RefreshBag () {
+	private void RefreshBag (bool clearBeforeAdding = true) {
+        if(clearBeforeAdding) _items.Clear();
 		foreach(var item in _sourceItems) {
 			_items.Add(item);
 		}

Assets/UnityX/Scripts/Editor Tools/SceneGUIDrawer/Editor/SceneGUIDrawer.cs Assets/UnityX/Scripts/Editor Tools/SceneView/Editor/SceneGUIDrawer.cs

@@ -535,7 +535,7 @@ public bool GetIsClockwise () {
 			return x >= 0;
 		}
 
-		public void ReverseDirection () {
+		public void FlipWindingOrder () {
 			System.Array.Reverse(_vertices);
 		}
 

Assets/UnityX/Scripts/Editor Tools/SceneGUIDrawer/Editor/SceneGUIDrawer.cs.meta Assets/UnityX/Scripts/Editor Tools/SceneView/Editor/SceneGUIDrawer.cs.meta

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 
 namespace SplineSystem {
@@ -227,7 +224,7 @@ private void DrawControlPointHandle (ref SplineBezierPoint bezierPoint, ref Spli
 
 			var newControlPointPosition = DrawEditableControlPointHandle(controlPointPosition, controlPointRotation);
 			if(controlPointPosition != newControlPointPosition) {
-                controlPoint.distance = Vector3.Dot(newControlPointPosition - bezierPointPosition, controlPointRotation * Vector3.forward);
+                controlPoint.distance = Vector3.Dot(matrix.inverse.MultiplyPoint3x4(newControlPointPosition) - matrix.inverse.MultiplyPoint3x4(bezierPointPosition), controlPointRotation * Vector3.forward);
                 changed = true;
             }
 		}
@@ -306,9 +303,8 @@ SamplePoint GetSamplePoint (Spline spline, Vector2 mousePosition) {
                     var lastPoint = HandleUtility.WorldToGUIPoint(matrix.MultiplyPoint3x4(curve._points[0]));
                     for (var j = 1; j < curve._points.Length; j++) {
                         var nextPoint = HandleUtility.WorldToGUIPoint(matrix.MultiplyPoint3x4(curve._points[j]));
-                        UnityX.Geometry.Line line = new UnityX.Geometry.Line(lastPoint, nextPoint);
-                        var normalizedDistanceOnLine = line.GetNormalizedDistanceOnLine(mousePosition);
-                        var pointOnLine = Vector2.LerpUnclamped(line.start, line.end, normalizedDistanceOnLine);
+                        var normalizedDistanceOnLine = GetNormalizedDistanceOnLine(lastPoint, nextPoint, mousePosition);
+                        var pointOnLine = Vector2.LerpUnclamped(lastPoint, nextPoint, normalizedDistanceOnLine);
                         var sqrDistanceFromLine = (mousePosition - pointOnLine).sqrMagnitude;
                         if(sqrDistanceFromLine < bestSqrDistance) {
                             bestSqrDistance = sqrDistanceFromLine;
@@ -335,6 +331,16 @@ SamplePoint GetSamplePoint (Spline spline, Vector2 mousePosition) {
                 }
             }
             return new SamplePoint(bestCurveIndex, bestCurvePointIndex, bestBezierPointIndex, bestNormalizedDistanceOnLine);
+
+            static float GetNormalizedDistanceOnLine(Vector2 start, Vector2 end, Vector2 p, bool clamped = true) {
+                float sqrLength = (start.x-end.x) * (start.x-end.x) + (start.y-end.y) * (start.y-end.y);
+                if (sqrLength == 0f) return 0;
+                // Divide by length squared so that we can save on normalising (end-start), since
+                // we're effectively dividing by the length an extra time.
+                float n = Vector2.Dot(p - start, end - start) / sqrLength;
+                if(!clamped) return n;
+                return Mathf.Clamp01(n);
+            }
         }
 
         /*

Assets/UnityX/Scripts/Editor Tools/SceneView/SceneViewUtility.cs

@@ -1,6 +1,5 @@
 using UnityEngine;
 using System.Collections.Generic;
-using UnityX.Geometry;
 
 namespace SplineSystem {
 	public delegate void OnSplineChangeEvent(Spline spline);
@@ -50,7 +49,10 @@ public float length {
 			}
 		}
 		public Bounds bounds;
-		
+
+        public Spline () {
+			Validate();
+		}
 		public Spline (params SplineBezierPoint[] bezierPoints) {
 			this.bezierPoints = bezierPoints;
 			RefreshCurveData();
@@ -148,7 +150,7 @@ public static Spline CreateFromPoints (IList<Vector3> points, IList<Quaternion>
 		}
 
 		public void RefreshCurveData () {
-			if(bezierPoints.Length <= 1) return;
+            if(bezierPoints == null || bezierPoints.Length <= 1) return;
 			if(curves == null || curves.Length != bezierPoints.Length-1) curves = new SplineBezierCurve[bezierPoints.Length-1];
 			for (int i = 0; i < bezierPoints.Length-1; i++) curves[i] = new SplineBezierCurve(bezierPoints [i], bezierPoints [i+1]);
 
@@ -392,8 +394,8 @@ float EstimateArcLengthAlongCurve (Vector3 position, SplineBezierCurve bestCurve
 			var leftPoint = bestCurve.GetPointAtT(leftT);
 			var rightPoint = bestCurve.GetPointAtT(rightT);
 
-			closestDistanceAlongLeftLine = Line3D.GetNormalizedDistanceOnLine(leftPoint, centerPoint, position, clampAtStart);
-			closestDistanceAlongRightLine = Line3D.GetNormalizedDistanceOnLine(centerPoint, rightPoint, position, clampAtEnd);
+			closestDistanceAlongLeftLine = GetNormalizedDistanceOnLine(leftPoint, centerPoint, position, clampAtStart);
+			closestDistanceAlongRightLine = GetNormalizedDistanceOnLine(centerPoint, rightPoint, position, clampAtEnd);
 			float closestDistanceOnLineA = SqrDistance(position, Vector3.LerpUnclamped(leftPoint, centerPoint, closestDistanceAlongLeftLine));
 			float closestDistanceOnLineB = SqrDistance(position, Vector3.LerpUnclamped(centerPoint, rightPoint, closestDistanceAlongRightLine));
 			var arcLengthOffsetMultiplier = 0f;
@@ -478,8 +480,8 @@ public bool Validate () {
 				quality = defaultQuality;
 				didChange = true;
 			}
-			if(bezierPoints.Length < 2) {
-                this.bezierPoints = new SplineBezierPoint[] {
+			if(bezierPoints == null || bezierPoints.Length < 2) {
+                bezierPoints = new SplineBezierPoint[] {
                     new SplineBezierPoint(new Vector3(-1,1,0), Quaternion.LookRotation(Vector3.right, Vector3.forward), 1f, 1f),
                     new SplineBezierPoint(new Vector3(1,-1,0), Quaternion.LookRotation(Vector3.right, Vector3.forward), 1f, 1f)
                 };
@@ -547,5 +549,19 @@ public static void DrawCurveLineGizmos (Spline spline, SplineBezierCurve curve,
 		static float SqrDistance (Vector3 a, Vector3 b) {
 			return (a.x-b.x) * (a.x-b.x) + (a.y-b.y) * (a.y-b.y) + (a.z-b.z) * (a.z-b.z);
 		}
+
+        static float GetNormalizedDistanceOnLine(Vector3 start, Vector3 end, Vector3 p, bool clamped = true) {
+			float sqrLength = SqrDistance(start, end);
+			return GetNormalizedDistanceOnLineInternal(start, end, p, sqrLength, clamped);
+		}
+
+		static float GetNormalizedDistanceOnLineInternal(Vector3 start, Vector3 end, Vector3 p, float sqrLength, bool clamped = true) {
+			if (sqrLength == 0f) return 0;
+			// Divide by length squared so that we can save on normalising (end-start), since
+			// we're effectively dividing by the length an extra time.
+			float n = Vector3.Dot(p - start, end - start) / sqrLength;
+			if(!clamped) return n;
+			return Mathf.Clamp01(n);
+		}
 	}
 }

Assets/UnityX/Scripts/Editor Tools/SceneView/SceneViewUtility.cs.meta

@@ -1,8 +1,4 @@
 using UnityEngine;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using UnityX.Geometry;
 
 namespace SplineSystem {
 	// Arc length == NormalizedDistance

Assets/UnityX/Scripts/Extensions/Collections/ShuffleBag.cs

@@ -13,7 +13,7 @@ public static void MoveToTop(Component component) {
 		if(component.gameObject.GetComponent<Component>() == component) return;
 		Component[] comps = component.gameObject.GetComponents<Component>();
 		if(component == comps[0]) return;
-		int componentIndex = comps.IndexOf(component);
+		int componentIndex = System.Array.IndexOf(comps, component);
 		for(int i = 0; i < componentIndex-1; i++)
 			UnityEditorInternal.ComponentUtility.MoveComponentUp (component);
 	}
@@ -22,7 +22,7 @@ public static void MoveToBottom(Component component) {
 		if(component == null) return;
 		Component[] comps = component.gameObject.GetComponents<Component>();
 		if(component == comps[comps.Length-1]) return;
-		int componentIndex = comps.IndexOf(component);
+		int componentIndex = System.Array.IndexOf(comps, component);
 		for(int i = 0; i < comps.Length-componentIndex-1; i++)
 			UnityEditorInternal.ComponentUtility.MoveComponentDown (component);
 	}

Assets/UnityX/Scripts/Extensions/Geometry/Polygon/Polygon.cs

@@ -7,7 +7,9 @@
 /// <summary>
 /// Provides callbacks for more specific selection events.
 /// </summary>
+#if UNITY_EDITOR
 [InitializeOnLoad]
+#endif
 public static class SelectionX {
 	const string editorPrefsPath = "SelectionXLastSelection";