Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for PolyMeshEditor to work with Unity5 #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes for PolyMeshEditor to work with Unity5 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 48 additions & 35 deletions Assets/PolyMesh/Scripts/Editor/PolyMeshEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
using UnityEngine;
using UnityEngine;
using UnityEditor;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;

[CustomEditor(typeof(PolyMesh))]
public class PolyMeshEditor : Editor
{
// Using a static flag to tell OnSceneGui when an undo was made while editing
// because static variables stats survive Unity's undo/redo system
private static bool UNDO_WHILE_EDIT = false;

enum State { Hover, Drag, BoxSelect, DragSelected, RotateSelected, ScaleSelected, Extrude }

const float clickRadius = 0.12f;

FieldInfo undoCallback;
bool editing;
bool tabDown;
State state;

List<Vector3> keyPoints;
Expand All @@ -22,7 +22,7 @@ enum State { Hover, Drag, BoxSelect, DragSelected, RotateSelected, ScaleSelected

Matrix4x4 worldToLocal;
Quaternion inverseRotation;

Vector3 mousePosition;
Vector3 clickPosition;
Vector3 screenMousePosition;
Expand All @@ -37,6 +37,17 @@ enum State { Hover, Drag, BoxSelect, DragSelected, RotateSelected, ScaleSelected
bool doExtrudeUpdate;
bool draggingCurve;

void OnEnable()
{
// Listen for undo/redo from the editor
Undo.undoRedoPerformed += OnUndoRedo;
}

void OnDisable()
{
Undo.undoRedoPerformed -= OnUndoRedo;
}

#region Inspector GUI

public override void OnInspectorGUI()
Expand Down Expand Up @@ -178,6 +189,13 @@ void OnSceneGUI()
if (KeyPressed(editKey))
editing = !editing;

// Using a static flag, because static seems to survive the undo/redo process
if (UNDO_WHILE_EDIT)
{
editing = true;
UNDO_WHILE_EDIT = false;
}

if (editing)
{
//Update lists
Expand All @@ -188,14 +206,6 @@ void OnSceneGUI()
isCurve = new List<bool>(polyMesh.isCurve);
}

//Crazy hack to register undo
if (undoCallback == null)
{
undoCallback = typeof(EditorApplication).GetField("undoRedoPerformed", BindingFlags.NonPublic | BindingFlags.Static);
if (undoCallback != null)
undoCallback.SetValue(null, new EditorApplication.CallbackFunction(OnUndoRedo));
}

//Load handle matrix
Handles.matrix = polyMesh.transform.localToWorldMatrix;

Expand Down Expand Up @@ -226,11 +236,11 @@ void OnSceneGUI()
{
switch (e.keyCode)
{
case KeyCode.Q:
case KeyCode.W:
case KeyCode.E:
case KeyCode.R:
return;
case KeyCode.Q:
case KeyCode.W:
case KeyCode.E:
case KeyCode.R:
return;
}
}

Expand All @@ -244,7 +254,6 @@ void OnSceneGUI()
HandleUtility.AddDefaultControl(GUIUtility.GetControlID(FocusType.Passive));
return;
}

//Cursor rectangle
EditorGUIUtility.AddCursorRect(new Rect(0, 0, Camera.current.pixelWidth, Camera.current.pixelHeight), mouseCursor);
mouseCursor = MouseCursor.Arrow;
Expand All @@ -265,7 +274,7 @@ void OnSceneGUI()
worldToLocal = polyMesh.transform.worldToLocalMatrix;
inverseRotation = Quaternion.Inverse(polyMesh.transform.rotation) * Camera.current.transform.rotation;
snap = gridSnap;

//Update mouse position
screenMousePosition = new Vector3(e.mousePosition.x, Camera.current.pixelHeight - e.mousePosition.y);
var plane = new Plane(-polyMesh.transform.forward, polyMesh.transform.position);
Expand All @@ -278,25 +287,24 @@ void OnSceneGUI()

//Update nearest line and split position
nearestLine = NearestLine(out splitPosition);

//Update the state and repaint
var newState = UpdateState();
if (state != newState)
SetState(newState);
HandleUtility.Repaint();
e.Use();
}
}

void HideWireframe(bool hide)
{
if (polyMesh.renderer != null)
EditorUtility.SetSelectedWireframeHidden(polyMesh.renderer, hide);
if (polyMesh.GetComponent<Renderer>() != null)
EditorUtility.SetSelectedWireframeHidden(polyMesh.GetComponent<Renderer>(), hide);
}

void RecordUndo()
{
#if UNITY_4_3
#if UNITY_5_0
Undo.RecordObject(target, "PolyMesh Changed");
#else
Undo.RegisterUndo(target, "PolyMesh Changed");
Expand All @@ -305,8 +313,8 @@ void RecordUndo()

void RecordDeepUndo()
{
#if UNITY_4_3
Undo.RegisterFullObjectHierarchyUndo(target);
#if UNITY_5_0
Undo.RegisterFullObjectHierarchyUndo(target, "PolyMesh Changed");
#else
Undo.RegisterSceneUndo("PolyMesh Changed");
#endif
Expand All @@ -323,8 +331,8 @@ void SetState(State newState)
state = newState;
switch (state)
{
case State.Hover:
break;
case State.Hover:
break;
}
}

Expand Down Expand Up @@ -424,12 +432,17 @@ State UpdateState()
//Update the mesh on undo/redo
void OnUndoRedo()
{
// If undo/redo was called while editing
// mark it for OnSceneGui to reset the editing flag
// after the unity editor has completed the undo/redo process
UNDO_WHILE_EDIT = editing;

keyPoints = new List<Vector3>(polyMesh.keyPoints);
curvePoints = new List<Vector3>(polyMesh.curvePoints);
isCurve = new List<bool>(polyMesh.isCurve);
polyMesh.BuildMesh();
}

void LoadPoly()
{
for (int i = 0; i < keyPoints.Count; i++)
Expand Down Expand Up @@ -1165,11 +1178,11 @@ static void CreatePolyMesh()

static void CreateSquare(PolyMesh polyMesh, float size)
{
polyMesh.keyPoints.AddRange(new Vector3[] { new Vector3(size, size), new Vector3(size, -size), new Vector3(-size, -size), new Vector3(-size, size)} );
polyMesh.curvePoints.AddRange(new Vector3[] { Vector3.zero, Vector3.zero, Vector3.zero, Vector3.zero } );
polyMesh.isCurve.AddRange(new bool[] { false, false, false, false } );
polyMesh.keyPoints.AddRange(new Vector3[] { new Vector3(size, size), new Vector3(size, -size), new Vector3(-size, -size), new Vector3(-size, size) });
polyMesh.curvePoints.AddRange(new Vector3[] { Vector3.zero, Vector3.zero, Vector3.zero, Vector3.zero });
polyMesh.isCurve.AddRange(new bool[] { false, false, false, false });
polyMesh.BuildMesh();
}

#endregion
}
}