Matt Dean
|
b2d664e0
|
Added matrix common and ops
|
8 年前 |
Tim Cooper
|
215e1b6a
|
Refactoring slot types.
|
7 年前 |
Peter Bay Bastian
|
f695b6fa
|
Enum attribute control
|
7 年前 |
|
Tim Cooper
|
a5c9b0ce
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
|
7 年前 |
|
Matt Dean
|
da4c61fd
|
Maths Part 4
- Maths/Vector (finish)
- Maths/Derivative
- Maths/Trigonometry
- Maths/Matrix (temporarily removed for rewrite)
- Moved CommonMatrix enum to MatrixCommonNode.cs and removed file
|
7 年前 |
|
Matt Dean
|
03923b0b
|
Input Part 3
Input/Matrix
Input/Time (WIP)
|
7 年前 |
|
Peter Bay Bastian
|
f95f8c27
|
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
|
7 年前 |
|
Matt Dean
|
abed850e
|
Merge master
And fix conflicts
|
7 年前 |
