Skip to content

Commit 2f9ef75

Browse files
author
Antoine Lelievre
committed
Fix Unity 6 compilation
1 parent bc71d48 commit 2f9ef75

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

Assets/com.alelievr.NodeGraphProcessor/Editor/Resources/GraphProcessorStyles/BaseNodeView.uss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ ParameterNodeView #controls EnumField > VisualElement > VisualElement {
242242
align-content: center;
243243
}
244244

245-
#collapse-button:
245+
#collapse-button
246246
{
247247
width: 16px;
248248
height: 16px;

Assets/com.alelievr.NodeGraphProcessor/Editor/Utils/BaseEdgeDragHelper.cs

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,10 @@ public override void Reset(bool didConnect = false)
9898

9999
graphView = null;
100100
}
101-
102-
public override bool HandleMouseDown(MouseDownEvent evt)
101+
public override bool HandleMouseDown(MouseDownEvent evt) => HandleMouseDownEvent(evt.mousePosition);
102+
103+
bool HandleMouseDownEvent(Vector2 mousePosition)
103104
{
104-
Vector2 mousePosition = evt.mousePosition;
105-
106105
if ((draggedPort == null) || (edgeCandidate == null))
107106
{
108107
return false;
@@ -195,19 +194,20 @@ internal Vector2 GetEffectivePanSpeed(Vector2 mousePos)
195194
}
196195

197196
Vector2 lastMousePos;
198-
public override void HandleMouseMove(MouseMoveEvent evt)
197+
198+
public override void HandleMouseMove(MouseMoveEvent evt) =>
199+
HandleMouseMoveEvent((VisualElement)evt.target, evt.mousePosition, evt.localMousePosition);
200+
void HandleMouseMoveEvent(VisualElement ve, Vector2 mousePosition, Vector2 localMousePosition)
199201
{
200-
var ve = (VisualElement)evt.target;
201-
Vector2 gvMousePos = ve.ChangeCoordinatesTo(graphView.contentContainer, evt.localMousePosition);
202+
Vector2 gvMousePos = ve.ChangeCoordinatesTo(graphView.contentContainer, localMousePosition);
202203
panDiff = GetEffectivePanSpeed(gvMousePos);
203204

204205
if (panDiff != Vector3.zero)
205206
panSchedule.Resume();
206207
else
207208
panSchedule.Pause();
208209

209-
Vector2 mousePosition = evt.mousePosition;
210-
lastMousePos = evt.mousePosition;
210+
lastMousePos = mousePosition;
211211

212212
edgeCandidate.candidatePosition = mousePosition;
213213

@@ -277,12 +277,12 @@ private void Pan(TimerState ts)
277277
wasPanned = true;
278278
}
279279

280-
public override void HandleMouseUp(MouseUpEvent evt)
280+
public override void HandleMouseUp(MouseUpEvent evt) => HandleMouseUpEvent(evt.mousePosition);
281+
282+
void HandleMouseUpEvent(Vector2 mousePosition)
281283
{
282284
bool didConnect = false;
283285

284-
Vector2 mousePosition = evt.mousePosition;
285-
286286
// Reset the highlights.
287287
graphView.ports.ForEach((p) => {
288288
p.OnStopEdgeDragging();
@@ -359,6 +359,14 @@ public override void HandleMouseUp(MouseUpEvent evt)
359359
Reset(didConnect);
360360
}
361361

362+
#if UNITY_6000_0_58_OR_NEWER
363+
public override bool HandlePointerDown(PointerDownEvent evt) => HandleMouseDownEvent(evt.position);
364+
365+
public override void HandlePointerMove(PointerMoveEvent evt) => HandleMouseMoveEvent((VisualElement)evt.target, evt.position, evt.localPosition);
366+
367+
public override void HandlePointerUp(PointerUpEvent evt) => HandleMouseUpEvent(evt.position);
368+
#endif
369+
362370
Rect GetPortBounds(BaseNodeView nodeView, int index, List<PortView> portList)
363371
{
364372
var port = portList[index];

Assets/com.alelievr.NodeGraphProcessor/Editor/Views/BaseGraphView.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ public class BaseGraphView : GraphView, IDisposable
114114
/// <summary>
115115
/// Object to handle nodes that shows their UI in the inspector.
116116
/// </summary>
117-
[SerializeField]
118117
protected NodeInspectorObject nodeInspector
119118
{
120119
get

Assets/com.alelievr.NodeGraphProcessor/Editor/com.alelievr.NodeGraphProcessor.Editor.asmdef

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"name": "com.alelievr.NodeGraphProcessor.Editor",
3+
"rootNamespace": "",
34
"references": [
45
"GUID:ca937d03ee5dd4d699091438dc0f3ae6"
56
],
@@ -12,5 +13,12 @@
1213
"precompiledReferences": [],
1314
"autoReferenced": true,
1415
"defineConstraints": [],
15-
"versionDefines": []
16+
"versionDefines": [
17+
{
18+
"name": "Unity",
19+
"expression": "6000.0.58",
20+
"define": "UNITY_6000_0_58_OR_NEWER"
21+
}
22+
],
23+
"noEngineReferences": false
1624
}

0 commit comments

Comments
 (0)