浏览代码

Move remaining files out of SerializableGraph folder and remove a few unused files

/main
Peter Bay Bastian 7 年前
当前提交
b2224d93
共有 32 个文件被更改,包括 7 次插入110 次删除
  1. 6
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs
  2. 2
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs
  3. 3
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph.meta
  4. 11
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/MaterialGraphChange.cs.meta
  5. 38
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/MaterialGraphChange.cs
  6. 8
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph.meta
  7. 3
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/GraphChange.cs.meta
  8. 46
      MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/GraphChange.cs
  9. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation.meta
  10. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/IGraphAsset.cs.meta
  11. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/IGraphAsset.cs
  12. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ListPool.cs.meta
  13. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/Logging.cs.meta
  14. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ObjectPool.cs.meta
  15. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/SerializationHelper.cs.meta
  16. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/PooledObject.cs.meta
  17. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/DictionaryPool.cs.meta
  18. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/QueuePool.cs.meta
  19. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/StackPool.cs.meta
  20. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/DictionaryPool.cs
  21. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ListPool.cs
  22. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/Logging.cs
  23. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ObjectPool.cs
  24. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/PooledObject.cs
  25. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/QueuePool.cs
  26. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/SerializationHelper.cs
  27. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/StackPool.cs
  28. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph
  29. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation
  30. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs.meta
  31. 0
      /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs

6
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs


string m_Selected;
[SerializeField]
SerializableGraphObject m_GraphObject;
GraphObject m_GraphObject;
[NonSerialized]
bool m_HasError;

}
}
SerializableGraphObject graphObject
GraphObject graphObject
{
get { return m_GraphObject; }
set

selectedGuid = newSelectionGuid;
var textGraph = File.ReadAllText(path, Encoding.UTF8);
graphObject = CreateInstance<SerializableGraphObject>();
graphObject = CreateInstance<GraphObject>();
graphObject.hideFlags = HideFlags.HideAndDontSave;
graphObject.graph = JsonUtility.FromJson(textGraph, graphType) as IGraph;
graphObject.graph.OnEnable();

2
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs


namespace UnityEditor.Graphing
{
public class SerializableGraphObject : ScriptableObject, IGraphObject, ISerializationCallbackReceiver
public class GraphObject : ScriptableObject, IGraphObject, ISerializationCallbackReceiver
{
[SerializeField]
SerializationHelper.JSONSerializedElement m_SerializedGraph;

3
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph.meta


fileFormatVersion: 2
guid: 20d63795c62940409089af61496db945
timeCreated: 1513348939

11
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/MaterialGraphChange.cs.meta


fileFormatVersion: 2
guid: 53af639a9c00c2740ba7f23e2b38cf34
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

38
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/MaterialGraphChange.cs


using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEditor.Graphing;
namespace UnityEditor.ShaderGraph
{
public class ShaderPropertyAdded : GraphChange
{
public ShaderPropertyAdded(IShaderProperty shaderProperty)
{
this.shaderProperty = shaderProperty;
}
public IShaderProperty shaderProperty { get; private set; }
}
public class ShaderPropertyRemoved : GraphChange
{
public ShaderPropertyRemoved(Guid guid)
{
this.guid = guid;
}
public Guid guid { get; private set; }
}
public class LayerRemoved : GraphChange
{
public LayerRemoved(Guid id)
{
this.id = id;
}
public Guid id { get; private set; }
}
}

8
MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph.meta


fileFormatVersion: 2
guid: e47723110397ff04388ed94332cd6208
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/GraphChange.cs.meta


fileFormatVersion: 2
guid: cbfac7ed81744ca281be9e21eae861c7
timeCreated: 1505620762

46
MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/GraphChange.cs


using System;
namespace UnityEditor.Graphing
{
public abstract class GraphChange {}
public sealed class NodeAddedGraphChange : GraphChange
{
public NodeAddedGraphChange(INode node)
{
this.node = node;
}
public INode node { get; private set; }
}
public sealed class NodeRemovedGraphChange : GraphChange
{
public NodeRemovedGraphChange(INode node)
{
this.node = node;
}
public INode node { get; private set; }
}
public sealed class EdgeAddedGraphChange : GraphChange
{
public EdgeAddedGraphChange(IEdge edge)
{
this.edge = edge;
}
public IEdge edge { get; private set; }
}
public sealed class EdgeRemovedGraphChange : GraphChange
{
public EdgeRemovedGraphChange(IEdge edge)
{
this.edge = edge;
}
public IEdge edge { get; private set; }
}
}

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Implementation.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Assets/IGraphAsset.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/IGraphAsset.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Assets/IGraphAsset.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph/IGraphAsset.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/ListPool.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ListPool.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/Logging.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/Logging.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/ObjectPool.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ObjectPool.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/SerializationHelper.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/SerializationHelper.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/PooledObject.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/PooledObject.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/DictionaryPool.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/DictionaryPool.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/QueuePool.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/QueuePool.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/StackPool.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/StackPool.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/DictionaryPool.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/DictionaryPool.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/ListPool.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ListPool.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/Logging.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/Logging.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/ObjectPool.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/ObjectPool.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/PooledObject.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/PooledObject.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/QueuePool.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/QueuePool.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/SerializationHelper.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/SerializationHelper.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Util/StackPool.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Util/StackPool.cs

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Interfaces → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Interfaces/Graph

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/SerializableGraph/Implementation → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/SerializableGraphObject.cs.meta → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs.meta

/MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/SerializableGraphObject.cs → /MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Implementation/GraphObject.cs

正在加载...
取消
保存