浏览代码

Update to new GraphView

Update includes fix for MiddleMouse / Alt+LeftMouse pan

Signed-off-by: joce <joce@unity3d.com>
/main
joce 8 年前
当前提交
4aa813fd
共有 29 个文件被更改,包括 675 次插入73 次删除
  1. 2
      MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/Clicker.cs
  2. 5
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Circle.cs
  3. 5
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/InvisibleBorderContainer.cs
  4. 8
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/MiniMap.cs
  5. 20
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/NodesContentView.cs
  6. 18
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/Presenters/NodesContentViewPresenter.cs
  7. 1
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/SimpleContentView.cs
  8. 30
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/SimpleContentView.uss
  9. 4
      MaterialGraphProject/Assets/NewUI/Editor/Elements/GraphElement.cs
  10. 2
      MaterialGraphProject/Assets/NewUI/Editor/Elements/IMGUIElement.cs
  11. 3
      MaterialGraphProject/Assets/NewUI/Editor/Elements/Node.cs
  12. 4
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ClickSelector.cs
  13. 6
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ContentDragger.cs
  14. 2
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/Dragger.cs
  15. 2
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/EdgeConnector.cs
  16. 56
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/MouseManipulator.cs
  17. 2
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/RectangleSelector.cs
  18. 17
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/Resizer.cs
  19. 2
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/SelectionDragger.cs
  20. 2
      MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.cs
  21. 2
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Testing/IntegrationTests/Graphs/WithSubGraph.ShaderGraph
  22. 156
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Comment.cs
  23. 12
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Comment.cs.meta
  24. 41
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Presenters/CommentPresenter.cs
  25. 12
      MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Presenters/CommentPresenter.cs.meta
  26. 44
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ManipActivator.cs
  27. 12
      MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ManipActivator.cs.meta
  28. 259
      MaterialGraphProject/Assets/Resources/BebasNeue.otf
  29. 19
      MaterialGraphProject/Assets/Resources/BebasNeue.otf.meta

2
MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/Clicker.cs


public Clicker()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
}
public override EventPropagation HandleEvent(Event evt, VisualElement finalTarget)

5
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Circle.cs


var p = new Vector2(Mathf.Max(rectangle.x, Mathf.Min(radius, rectangle.xMax)), Mathf.Max(rectangle.y, Mathf.Min(radius, rectangle.yMax)));
return Vector2.Distance(new Vector2(radius, radius), p) <= radius;
}
public Circle()
{
elementTypeColor = new Color(1.0f, 1.0f, 1.0f, 0.5f);
}
}
}

5
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/InvisibleBorderContainer.cs


{
return paddingRect.Contains(localPoint);
}
public InvisibleBorderContainer()
{
elementTypeColor = new Color(0.0f, 1.0f, 0.0f, 0.5f);
}
}
}

8
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/MiniMap.cs


readonly Label m_Label;
Dragger m_Dragger;
readonly Color m_ViewportColor = new Color(1.0f, 1.0f, 0.0f, 0.5f);
readonly Color m_ChildrenColor = new Color(1.0f, 1.0f, 1.0f, 0.25f);
Color m_ViewportColor = new Color(1.0f, 1.0f, 0.0f, 0.35f);
readonly Color m_SelectedChildrenColor = new Color(1.0f, 1.0f, 1.0f, 0.5f);
// Various rects used by the MiniMap

// Display elements in the MiniMap
Color currentColor = Handles.color;
Handles.color = m_ChildrenColor;
foreach (var child in container.children)
{
var elem = child as GraphElement;

var rect = CalculateElementRect(elem);
Handles.DrawSolidRectangleWithOutline(rect, m_ChildrenColor, m_ChildrenColor);
Handles.color = elem.elementTypeColor;
Handles.DrawSolidRectangleWithOutline(rect, elem.elementTypeColor, elem.elementTypeColor);
var elementPresenter = elem.GetPresenter<GraphElementPresenter>();
if (elementPresenter != null && elementPresenter.selected)
DrawRectangleOutline(rect, m_SelectedChildrenColor);

20
MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/NodesContentView.cs


using System;
using UnityEditor;
using UnityEngine;
using UnityEngine.RMGUI;

class NodesContentView : SimpleContentView
{
private readonly System.Random m_Rnd = new System.Random();
private int m_CommentIndex;
public NodesContentView()
{

var menu = new GenericMenu();
menu.AddItem(new GUIContent("Create Operator"), false,
contentView => CreateOperator(),
this);
menu.AddItem(new GUIContent("Create Comment"), false,
contentView => CreateComment(),
this);
menu.ShowAsContext();
return EventPropagation.Continue;

int y = m_Rnd.Next(0, 300);
contentViewPresenter.CreateOperator(typeof(Vector3), new Rect(x, y, 200, 176), "Shiny New Operator");
}
public void CreateComment()
{
var contentViewPresenter = ((GraphView) this).presenter as NodesContentViewPresenter;
if (contentViewPresenter != null)
{
int x = m_Rnd.Next(0, 600);
int y = m_Rnd.Next(0, 500);
var color = new Color(m_Rnd.Next(0, 255) / 255f, m_Rnd.Next(0, 255) / 255f, m_Rnd.Next(0, 255) / 255f);
var title = String.Format("Comment {0}", (++m_CommentIndex));
var body = "This is another comment. It is made of words and a few return carriages. Nothing more. I hope we can see this whole line.\n\n" +
"This is a new paragraph. Just to test the CommentPresenter.";
contentViewPresenter.CreateComment(new Rect(x, y, 500, 300), title, body, color);
}
}
}
}

18
MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/Presenters/NodesContentViewPresenter.cs


verticalNodePresenter.position = new Rect(430, 420, 100, 100);
AddElement(verticalNodePresenter);
var commentPresenter = CreateInstance<CommentPresenter>();
commentPresenter.position = new Rect(830, 0, 500, 300);
commentPresenter.color = new Color(0.4f, 0f, 0f, 0.3f);
commentPresenter.titleBar = "My First Comment";
commentPresenter.body = "This is my first comment. It is made of words and a few return carriages. Nothing more. I hope we can see this whole line.\n\n" +
"This is a new paragraph. Just to test the CommentPresenter.";
AddElement(commentPresenter);
var miniMapPresenter = CreateInstance<MiniMapPresenter>();
miniMapPresenter.position = new Rect(210, 186, 200, 176);
AddElement(miniMapPresenter);

nodePresenter.position = pos;
nodePresenter.title = title;
AddElement(nodePresenter);
}
public void CreateComment(Rect pos, string title, string body, Color color)
{
var commentPresenter = CreateInstance<CommentPresenter>();
commentPresenter.position = pos;
commentPresenter.titleBar = title;
commentPresenter.color = color;
commentPresenter.body = body;
AddElement(commentPresenter);
}
protected NodesContentViewPresenter() {}

1
MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/SimpleContentView.cs


dataMapper[typeof(SimpleElementPresenter)] = typeof(SimpleElement);
dataMapper[typeof(WWWImagePresenter)] = typeof(WWWImage);
dataMapper[typeof(IMGUIPresenter)] = typeof(IMGUIElement);
dataMapper[typeof(CommentPresenter)] = typeof(Comment);
}
}
}

30
MaterialGraphProject/Assets/NewUI/Editor/Demo/Views/SimpleContentView.uss


InvisibleBorderContainer.graphElement.selected {
border-color:#00F;
}
Comment.graphElement {
background-color:rgba(100, 0, 0, 0.3);
}
Comment.graphElement.selected {
border-color:rgba(0, 0, 0, 0.0);
}
Comment.graphElement #commentTitle {
font:path("Assets/Resources/BebasNeue.otf");
font-size:64;
text-alignment:upper-left;
text-color:rgba(192, 192, 192, 0.8);
border-left:3;
border-top:3;
border-right:3;
border-width:3;
text-clipping:clip;
word-wrap:true;
}
Comment.graphElement #commentBody {
font:path("Assets/Resources/Roboto/Roboto-Regular.ttf");
font-size:12;
text-alignment:upper-left;
text-color:rgba(192, 192, 192, 0.8);
text-clipping:clip;
word-wrap:true;
}

4
MaterialGraphProject/Assets/NewUI/Editor/Elements/GraphElement.cs


{
GraphElementPresenter m_Presenter;
Color m_ElementTypeColor;
public Color elementTypeColor { get { return m_ElementTypeColor; } set { m_ElementTypeColor = value; } }
m_ElementTypeColor = new Color(0.9f, 0.9f, 0.9f, 0.5f);
}
public T GetPresenter<T>() where T : GraphElementPresenter

2
MaterialGraphProject/Assets/NewUI/Editor/Elements/IMGUIElement.cs


{
public class IMGUIElement : SimpleElement
{
private IMGUIContainer m_Container;
protected IMGUIContainer m_Container;
public IMGUIElement()
{
m_Container = new IMGUIContainer

3
MaterialGraphProject/Assets/NewUI/Editor/Elements/Node.cs


using UnityEngine;
using UnityEngine.RMGUI;
namespace RMGUI.GraphView

name = "output", // for USS&Flexbox
pickingMode = PickingMode.Ignore,
};
elementTypeColor = new Color(0.9f, 0.9f, 0.9f, 0.5f);
AddChild(mainContainer);
mainContainer.AddChild(m_InputContainer);

4
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ClickSelector.cs


{
// snoop events before children
phaseInterest = EventPhase.Capture;
activateButtons[(int)MouseButton.LeftMouse] = true;
activateButtons[(int)MouseButton.RightMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
activators.Add(new ManipActivator {button = MouseButton.RightMouse});
}
public override EventPropagation HandleEvent(Event evt, VisualElement finalTarget)

6
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ContentDragger.cs


public ContentDragger()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activateModifiers = KeyModifiers.Alt;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse, modifiers = KeyModifiers.Alt});
activators.Add(new ManipActivator {button = MouseButton.MiddleMouse});
panSpeed = new Vector2(1, 1);
clampToParentEdges = false;
}

switch (evt.type)
{
case EventType.MouseDown:
if (CanStartManipulation(evt) && HasModifiers(evt))
if (CanStartManipulation(evt))
{
this.TakeCapture();

2
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/Dragger.cs


public Dragger()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
panSpeed = new Vector2(1, 1);
clampToParentEdges = false;
}

2
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/EdgeConnector.cs


public EdgeConnector()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
}
public override EventPropagation HandleEvent(Event evt, VisualElement finalTarget)

56
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/MouseManipulator.cs


using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.RMGUI;

{
MouseButton manipButton { get; set; }
bool[] m_ActivateButtons = new bool[Enum.GetNames(typeof(MouseButton)).Length];
public bool[] activateButtons { get { return m_ActivateButtons; } }
public List<ManipActivator> activators { get; private set; }
private ManipActivator m_currentActivator;
public KeyModifiers activateModifiers { get; set; }
public MouseManipulator()
{
activators = new List<ManipActivator>();
}
if (!activateButtons[evt.button])
foreach (var activator in activators)
return false;
if (activator.Matches(evt))
{
m_currentActivator = activator;
return true;
}
manipButton = (MouseButton)evt.button;
return true;
return false;
return (((MouseButton)evt.button == manipButton) && this.HasCapture());
}
protected bool HasModifiers(Event evt)
{
if (((activateModifiers & KeyModifiers.Alt) != 0 && !evt.alt) ||
((activateModifiers & KeyModifiers.Alt) == 0 && evt.alt))
{
return false;
}
if (((activateModifiers & KeyModifiers.Ctrl) != 0 && !evt.control) ||
((activateModifiers & KeyModifiers.Ctrl) == 0 && evt.control))
{
return false;
}
if (((activateModifiers & KeyModifiers.Shift) != 0 && !evt.shift) ||
((activateModifiers & KeyModifiers.Shift) == 0 && evt.shift))
{
return false;
}
if (((activateModifiers & KeyModifiers.Command) != 0 && !evt.command) ||
((activateModifiers & KeyModifiers.Command) == 0 && evt.command))
{
return false;
}
return true;
return ((MouseButton)evt.button == m_currentActivator.button) && this.HasCapture();
}
}
}

2
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/RectangleSelector.cs


public RectangleSelector()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
m_Rectangle = new RectangleSelect
{
positionType = PositionType.Absolute,

17
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/Resizer.cs


private readonly Rect k_WidgetTextOffset = new Rect(0, 0, 5, 5);
public Resizer()
public Resizer() :
this(new Vector2(30.0f, 30.0f))
m_MinimumSize = new Vector2(30.0f, 30.0f);
activateButton = MouseButton.LeftMouse;
positionType = PositionType.Absolute;
positionTop = float.NaN;
positionLeft = float.NaN;
positionBottom = 0;
positionRight = 0;
// make clickable area bigger than render area
paddingLeft = 10;
paddingTop = 14;
width = 20;
height = 20;
}
public Resizer(Vector2 minimumSize)

2
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/SelectionDragger.cs


{
public SelectionDragger()
{
activateButtons[(int)MouseButton.LeftMouse] = true;
activators.Add(new ManipActivator {button = MouseButton.LeftMouse});
panSpeed = new Vector2(1, 1);
clampToParentEdges = false;
}

2
MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.cs


if (!m_Presenter.elements.Contains(c.presenter))
{
c.parent.RemoveChild(c);
selection.Remove(c);
selection.Remove(c);
}
}

2
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Testing/IntegrationTests/Graphs/WithSubGraph.ShaderGraph


\ }\n}"
m_ActiveMasterNodeGUIDSerialized: 64b0bbae-b36d-4a39-a73f-d42252a1f3cc
m_GeneratedShader: {fileID: 48506289944378500}
m_DrawingData:
m_SerializableSelection: []
--- !u!48 &48506289944378500
Shader:
m_ObjectHideFlags: 0

156
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Comment.cs


using System.Security.Cryptography.X509Certificates;
using UnityEditor;
using UnityEngine;
using UnityEngine.RMGUI;
using UnityEngine.RMGUI.StyleSheets;
namespace RMGUI.GraphView.Demo
{
// TODO: Temporary class to use IMGUI's TextArea instead of RMGUI.TextField (unavailable for now)
public class Comment : IMGUIElement
{
int m_MaxTitleLength;
bool m_ShowBackgroundColor;
// TODO: Get style from USS when switching to RMGUI.TextField
GUIStyle m_TitleStyle;
GUIStyle m_BodyStyle;
public override void OnGUIHandler()
{
var commentPresenter = GetPresenter<CommentPresenter>();
if (commentPresenter == null)
return;
Color oldBackgroundColor = GUI.backgroundColor;
GUI.backgroundColor = backgroundColor;
EditorGUILayout.BeginVertical();
commentPresenter.titleBar = EditorGUILayout.TextArea(commentPresenter.titleBar, /*m_MaxTitleLength,*/ m_TitleStyle);
if (m_ShowBackgroundColor)
commentPresenter.color = EditorGUILayout.ColorField(commentPresenter.color);
commentPresenter.body = EditorGUILayout.TextArea(commentPresenter.body, m_BodyStyle);
EditorGUILayout.EndVertical();
GUI.backgroundColor = oldBackgroundColor;
}
public Comment()
{
clipChildren = true;
elementTypeColor = new Color(0.8f, 0.8f, 0.8f, 0.5f);
backgroundColor = elementTypeColor;
m_MaxTitleLength = 64;
m_Container.positionTop = 0;
m_TitleStyle = new GUIStyle();
m_TitleStyle.name = "commentTitle";
m_TitleStyle.font = EditorGUIUtility.Load("Assets/Resources/BebasNeue.otf") as Font;
m_TitleStyle.fontSize = 64;
m_TitleStyle.alignment = TextAnchor.UpperLeft;
m_TitleStyle.normal.textColor = new Color(0.75f, 0.75f, 0.75f);
m_TitleStyle.border.left = 3;
m_TitleStyle.border.top = 3;
m_TitleStyle.border.right = 3;
m_TitleStyle.clipping = TextClipping.Clip;
m_TitleStyle.wordWrap = true;
m_TitleStyle.padding.top = 8;
m_TitleStyle.padding.left = 8;
m_TitleStyle.padding.bottom = 8;
m_TitleStyle.padding.right = 8;
m_TitleStyle.margin.top = 8;
m_TitleStyle.margin.bottom = 8;
m_TitleStyle.margin.left = 8;
m_TitleStyle.margin.right = 8;
m_BodyStyle = new GUIStyle();
m_BodyStyle.name = "commentBody";
m_BodyStyle.font = EditorGUIUtility.Load("Assets/Resources/Roboto/Roboto-Regular.ttf") as Font;
m_BodyStyle.fontSize = 12;
m_BodyStyle.alignment = TextAnchor.UpperLeft;
m_BodyStyle.normal.textColor = new Color(0.75f, 0.75f, 0.75f);
m_BodyStyle.clipping = TextClipping.Clip;
m_BodyStyle.wordWrap = true;
m_BodyStyle.padding.top = 8;
m_BodyStyle.padding.left = 8;
m_BodyStyle.padding.bottom = 8;
m_BodyStyle.padding.right = 8;
m_BodyStyle.margin.top = 8;
m_BodyStyle.margin.bottom = 8;
m_BodyStyle.margin.left = 8;
m_BodyStyle.margin.right = 8;
AddManipulator(new ContextualMenu((evt, customData) =>
{
var menu = new GenericMenu();
menu.AddItem(new GUIContent("Toggle Background Color Control"), false,
contentView => ToggleBackgroundColor(),
this);
menu.ShowAsContext();
return EventPropagation.Continue;
}));
}
private void ToggleBackgroundColor()
{
m_ShowBackgroundColor = !m_ShowBackgroundColor;
}
public override void OnDataChanged()
{
base.OnDataChanged();
var commentPresenter = GetPresenter<CommentPresenter>();
if (commentPresenter == null)
return;
backgroundColor = new Color(commentPresenter.color.r, commentPresenter.color.g, commentPresenter.color.b, 0.5f);
this.Touch(ChangeType.Layout);
}
}
// // Comment is, for the moment, made of a title bar and a comment body (both IMGUI), until we have RMGUI.TextField
// public class Comment : IMGUIElement
// {
// TextField m_TitleBar;
// TextField m_Body;
//
// public Comment()
// {
// clipChildren = true;
// elementTypeColor = new Color(0.8f, 0.8f, 0.8f, 0.5f);
//
// m_TitleBar = new TextField()
// {
// name = "commentTitle",
// flex = 1
// };
// AddChild(m_Title);
//
// m_Body = new TextField()
// {
// name = "commentBody",
// flex = 1
// };
// AddChild(m_Body);
// }
//
// public override void OnDataChanged()
// {
// base.OnDataChanged();
//
// var commentPresenter = GetPresenter<CommentPresenter>();
// if (commentPresenter == null)
// return;
//
// m_TitleBar.text = commentPresenter.titleBar;
// m_Body.text = commentPresenter.body;
//
// this.Touch(ChangeType.Layout);
// }
// }
}

12
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Comment.cs.meta


fileFormatVersion: 2
guid: 6b18f5bff13f3ec4ea38f9b5ea51c954
timeCreated: 1481574401
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

41
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Presenters/CommentPresenter.cs


using System;
using UnityEditor;
using UnityEngine;
namespace RMGUI.GraphView.Demo
{
[Serializable]
public class CommentPresenter : IMGUIPresenter
{
[SerializeField]
private string m_TitleBar;
public string titleBar
{
get { return m_TitleBar; }
set { m_TitleBar = value; }
}
[SerializeField]
private string m_Body;
public string body
{
get { return m_Body; }
set { m_Body = value; }
}
[SerializeField]
private Color m_Color;
public Color color
{
get { return m_Color; }
set { m_Color = value; }
}
protected new void OnEnable()
{
base.OnEnable();
capabilities |= Capabilities.Deletable | Capabilities.Resizable;
title = string.Empty;
}
}
}

12
MaterialGraphProject/Assets/NewUI/Editor/Demo/Elements/Presenters/CommentPresenter.cs.meta


fileFormatVersion: 2
guid: 4d4ad776c3cce684bbaa04f340f6c4c8
timeCreated: 1481574691
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

44
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ManipActivator.cs


using UnityEngine;
namespace RMGUI.GraphView
{
public struct ManipActivator
{
public MouseButton button;
public KeyModifiers modifiers;
public bool Matches(Event evt)
{
return button == (MouseButton) evt.button && HasModifiers(evt);
}
private bool HasModifiers(Event evt)
{
if (((modifiers & KeyModifiers.Alt) != 0 && !evt.alt) ||
((modifiers & KeyModifiers.Alt) == 0 && evt.alt))
{
return false;
}
if (((modifiers & KeyModifiers.Ctrl) != 0 && !evt.control) ||
((modifiers & KeyModifiers.Ctrl) == 0 && evt.control))
{
return false;
}
if (((modifiers & KeyModifiers.Shift) != 0 && !evt.shift) ||
((modifiers & KeyModifiers.Shift) == 0 && evt.shift))
{
return false;
}
if (((modifiers & KeyModifiers.Command) != 0 && !evt.command) ||
((modifiers & KeyModifiers.Command) == 0 && evt.command))
{
return false;
}
return true;
}
}
}

12
MaterialGraphProject/Assets/NewUI/Editor/Manipulators/ManipActivator.cs.meta


fileFormatVersion: 2
guid: 4c8126c59be6c26409f23ee8dcdd7ef9
timeCreated: 1482524696
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

259
MaterialGraphProject/Assets/Resources/BebasNeue.otf
文件差异内容过多而无法显示
查看文件

19
MaterialGraphProject/Assets/Resources/BebasNeue.otf.meta


fileFormatVersion: 2
guid: 482bf6bc675e4484e840ef865192826d
timeCreated: 1455620308
licenseType: Pro
TrueTypeFontImporter:
serializedVersion: 2
fontSize: 16
forceTextureCase: -2
characterSpacing: 1
characterPadding: 0
includeFontData: 1
use2xBehaviour: 0
fontNames: []
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存