Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
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.
9 年前
Tim Cooper
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
9 年前
Tim Cooper
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
Tim Cooper
cea17e49
[Material graph] Tidy up asset handling (generic graph drawer that can be used by all graphs)
9 年前
Tim Cooper
516c1760
[Material graph]Mark asset as dirty on modification so it can be saved properly when modified.
9 年前
Tim Cooper
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
9 年前
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.
9 年前
Tim Cooper
d9619701
[material graph] Tidy up API for slot management (make generic).
9 年前
Tim Cooper
7cf4d1f0
[Material Graph]More tests + tidy custom serialization.
9 年前
Tim Cooper
a00cc631
[Material Graph] Tidy serialization (make safer) + Add SerializationHelper tests.
9 年前
Tim Cooper
8e31ace1
[material graph]Slot serialization test
8 年前
Tim Cooper
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
Tim Cooper
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
8 年前
Tim Cooper
607a2f9e
[material graph]Add button to convert selection into subGraph
8 年前
Tim Cooper
376c8378
[material graph]Change how precision works, make default precision half.
8 年前
Tim Cooper
ac62e6d8
[Shader Graph]Tidy function input nodes to now handle input dimensions nicely.
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
df47a2ff
[material graph] add tests for node configuration.
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
c565a8d4
fix formatting
8 年前
Tim Cooper
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
Tim Cooper
ab7317bb
[Mat Graph]Run code formatter
8 年前
Peter Bay Bastian
a848031a
Added NodeModificationScope for the onNodeModifiedCallback
Currently it is not used anywhere and all the places making the
callbacks are passing ShaderRegeneration. Need to analyse which
properties actually causes ShaderRegeneration as well as actually use
this callback to regenerate shaders rather than checking against node
version.
8 年前
Peter Bay Bastian
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
Peter Bay Bastian
f1abf833
Implemented node collapsing
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Paul Demeulenaere
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
8 年前
Tim Cooper
bc6130d7
Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node.
8 年前
Paul Demeulenaere
94144e69
Add DepthFirstCollectNodesFromNodeSlotList (allows a list of input slot instead one)
8 年前
Tim Cooper
47d64c52
[mat graph]Remove implicit node creation now that we have better code generation framework.
8 年前
Tim Cooper
c11fe3b4
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
8 年前
Tim Cooper
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
Peter Bay Bastian
70e53ed7
Refined `ModificationScope` with `.Topological`
`Topological` represents something that changes the topology of the
graph, i.e. something that causes e.g. edge removal.
8 年前
Peter Bay Bastian
5960f11a
Added basic inspector for graph editor and added the selected nodes to the graph asset
It currently just shows the names of the currently selected nodes
8 年前
Tim Cooper
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
Peter Bay Bastian
7343f497
Added IDisposable functionality to ObjectPool (and ListPool)
8 年前
Tim Cooper
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
Tim Cooper
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
joce
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
Eduardo Chaves
c3b50c34
Adding Vertex position to master node and vertex position input node
8 年前
Andre McGrail
c99dc5e2
REPO FIX
8 年前
Matt Dean
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Jennifer Nordwall
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
8 年前
Tim Cooper
5e3b99fe
working on better workflow (double click shader to open in edit window)
7 年前
Tim Cooper
b44a8aea
Fix some bugs in new nodes (bad conversion to HLSLSnippet node) + Add ability to hide slots at the slot level (i.e. hide implicit inputs for function node)
7 年前
Tim Cooper
28cf7cb6
Upgrade to trunk based graph view.
7 年前
Yuanxing Cai
77e26863
Merge branch 'master' into crash-fixes
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
Peter Bay Bastian
f516d811
Merge remote-tracking branch 'origin/subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
f32d2e24
Add DictionaryPool
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Peter Bay Bastian
eb8a8906
Use dictionary to store nodes for faster lookups
7 年前
Peter Bay Bastian
b1ca732a
Rewrite `DepthFirstCollectNodesFromNode` to be non-recursive
7 年前
Peter Bay Bastian
1e3fb5de
Add dictionary for storing `Node -> Edges` reference in SerializableGraph (faster/more scalable edge look-ups)
7 年前
Matt Dean
fc0d26d6
Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters
7 年前
Peter Bay Bastian
a93f2736
Add change notifications for graph, used for managing previews better
7 年前
Tim Cooper
95cdeda0
Merge remote-tracking branch 'origin/master' into refactor-properties
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/GraphInspectorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/SurfaceMasterNodeEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Views/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GraphEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs
7 年前
Peter Bay Bastian
75826752
Add edge change notifications to IGraph
Move time-dependent preview tracking into PreviewSystem
7 年前
Peter Bay Bastian
609307fe
MaterialGraphPresenter now relies on change notifications rather than diffing
7 年前
Tim Cooper
76430e32
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
7 年前
Peter Bay Bastian
314ba653
Add change notifications for shader properties
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Peter Bay Bastian
a3385c0f
Undo/redo prototype
7 年前
Tim Cooper
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
Tim Cooper
2c1b60e0
compiling
7 年前
Tim Cooper
24923996
misc fixes afer changes
7 年前