Tim Cooper
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
8 年前
Tim Cooper
c142890b
[Material graph]Logging
8 年前
Tim Cooper
327231db
[Material graph]More tests + fixes along the way.
8 年前
Tim Cooper
ed811c3c
[material graph]Tidy slot reference usages + update tests.
8 年前
Tim Cooper
8f52ff02
[Material Graph]Finish tests for serializable graph
8 年前
Tim Cooper
6cf26ef3
[Material Graph] Add a test for serializable node
8 年前
Tim Cooper
0de2d9bd
[Material Graph] Mode node collecton code to NodeUtils away from member functions
8 年前
Tim Cooper
2630ebd1
[Material Graph]Material graph does not need reference to owner + more tests.
8 年前
Tim Cooper
404ea34c
[material graph]Moving namespaces / extract things to interface
8 年前
Tim Cooper
3958bdb1
[Material Graph]Rearrange project.
8 年前
Tim Cooper
b824e4af
[material graph] ensure logger is valid
8 年前
Tim Cooper
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
8 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
8 年前
Tim Cooper
a2d8ad62
Add drawing of custom node preview
Delegate drawing to a custom drawer class that is looked up via
attribute, it will search for most specific drawer first, then walk up
the inheritence chain.
8 年前
Tim Cooper
0dd596bf
[Material Graph] change nodes property to GetNodes<T> where you can get nodes of a given type
Remove redundent code
Set node when adding to graph (do not set owner manually)
Tidy up tests after changes.
8 年前
Tim Cooper
addd6c34
[Material Graph]Write tests / fix issues as encountered
8 年前
Tim Cooper
7cf4d1f0
[Material Graph]More tests + tidy custom serialization.
8 年前
Tim Cooper
8acbd944
[Material Graph]Tidy up test running / folder layout
8 年前
Tim Cooper
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
Tim Cooper
ac62e6d8
[Shader Graph]Tidy function input nodes to now handle input dimensions nicely.
8 年前
Tim Cooper
a9673209
[Shader Graph]Add function node input tests.
8 年前
Tim Cooper
7ae021c6
[material graph]Convert slots from being a string into being an int that can be referenced from the node.
8 年前
Tim Cooper
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
Tim Cooper
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
Tim Cooper
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
Tim Cooper
553fedbf
[Format]Run code formatting
8 年前
Tim Cooper
95b250d2
[material graph] Fix newline issues.
8 年前
Tim Cooper
5055d67e
[Material graph]More testing + fix things that are broken with the tests.
8 年前
Tim Cooper
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
Tim Cooper
6cf280f3
[Material Graph]Add image comparison tests. Just add graph to UnityShaderEditor/Tests/IntegrationTests/Graphs
8 年前
Tim Cooper
c565a8d4
fix formatting
8 年前
Tim Cooper
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
Tim Cooper
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
Tim Cooper
f17d4796
[Material Graph] Fix tests.
8 年前
Tim Cooper
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
GitHub
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Tim Cooper
9ea47ed4
working on shader compiler issues
8 年前
Tim Cooper
53ae5d47
Merge branch 'fixingshadercompiler' into HEAD
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/NodeExpander.cs.meta
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Styles/SerializableGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/TextureNode.cs
8 年前
Tim Cooper
33d4a8e3
[mat graph] fix some tests
8 年前
Tim Cooper
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
8 年前
Tim Cooper
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
Tim Cooper
591ca2fd
Start upgrade to new graph view.
7 年前
Florent Guinier
24f3679d
Added Function4Input & Function4InputTest
7 年前
bfogerty
30bac3ab
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Eduardo Chaves
5eca2dca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
vlad
09332619
Texture Asset node and sampler2D input/output type
7 年前
Florent Guinier
fac62848
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Jennifer Nordwall
72252143
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Tim Cooper
435b3c0e
Add names to property nodes in the editor
7 年前
bfogerty
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Andre McGrail
9b83efd5
Colour test update
7 年前
Andre McGrail
4b2e13a6
Revert "Colour test update"
This reverts commit a4c62a3020f8f92bfd8fe9fcbf8dce55089321d4.
7 年前
Andre McGrail
671dad3b
Color test fix
7 年前
Matt Dean
eeb9f4ff
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Jennifer Nordwall
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Florent Guinier
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
RinaldoTjan
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
Tim Cooper
e8c71321
converting nodes to new system.
7 年前
Tim Cooper
3198bd43
Remove Function2Input node as it is no longer needed.
7 年前
Tim Cooper
4b1458e8
Remove Function3Input (use code node) :)
7 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
7 年前
Tim Cooper
d0d60781
Texture asset is now a real asset type...
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Tim Cooper
f6fa3513
Starting to extract properties.
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
2c1b60e0
compiling
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 年前
Tim Cooper
6161fea6
Fix compiler warnings :)
7 年前
GitHub
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
Peter Bay Bastian
b75b4c04
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
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 年前
Tim Cooper
3039671f
Merge master
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Tim Cooper
16640c42
Run code format tool
7 年前
Tim Cooper
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
Peter Bay Bastian
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
Matt Dean
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
Peter Bay Bastian
94202c55
Assembly Definition Files
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Peter Bay Bastian
562e71c8
Fix SerializableGraphTests
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Matt Dean
fd5fa964
Merge Master
7 年前
Peter Bay Bastian
11a83d08
Squash SerializableGraph into AbstractMaterialGraph
7 年前
Peter Bay Bastian
e3aaf843
Squash `SerializableNode` into `AbstractMaterialNode`
7 年前
Peter Bay Bastian
5fe33b9e
Squash `SerializableSlot` into `MaterialSlot`
7 年前
GitHub
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
GitHub
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
Peter Bay Bastian
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Matt Dean
4ad43705
Vector1 property refactor and types
7 年前
GitHub
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Peter Bay Bastian
57a0eab1
Remove unused imports in entire solution
7 年前
GitHub
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Peter Bay Bastian
11c1b9be
Fix all Shader Graph tests (including integration graphs)
6 年前
Peter Bay Bastian
4e1798b6
Update gitignore and fix compile warning and test
6 年前
Peter Bay Bastian
7f761cb8
Add Float and Cubemap to test case
6 年前
GitHub
6b96c163
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
6 年前
Peter Bay Bastian
8076c27e
Merge branch 'master' into copy-property-nodes
6 年前
Jens Holm
60639f41
Merge branch 'master' into editable-property-reference-names
6 年前