1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
3e4c0174
[Material Graph]Add in general node collapse.
9 年前
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
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 年前
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
9 年前
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
c522adcc
[material graph]Working on texture preview / regeneration of drawing layer workflow.
9 年前
cea17e49
[Material graph] Tidy up asset handling (generic graph drawer that can be used by all graphs)
9 年前
516c1760
[Material graph]Mark asset as dirty on modification so it can be saved properly when modified.
9 年前
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
9 年前
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 年前
d9619701
[material graph] Tidy up API for slot management (make generic).
9 年前
8e10c8cb
[mat graph]Sub graph is working again.
9 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
9 年前
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
9 年前
675ed679
[mat graph] Add duplicate command.
9 年前
607a2f9e
[material graph]Add button to convert selection into subGraph
8 年前
7ae021c6
[material graph]Convert slots from being a string into being an int that can be referenced from the node.
8 年前
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
553fedbf
[Format]Run code formatting
8 年前
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
6cf280f3
[Material Graph]Add image comparison tests. Just add graph to UnityShaderEditor/Tests/IntegrationTests/Graphs
8 年前
3313d8c4
trying new UI
8 年前
9fb975a4
[mat graph]Remove Canvas2D from repository.
8 年前
8c5f323e
fixing node drawing
8 年前
01630326
drawing preview now.
8 年前
c565a8d4
fix formatting
8 年前
a9948aa0
Fix drawers.
8 年前
3d3740f2
Merge in new ui from canada
8 年前
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
d55cb3d6
[material graph]Fixing position + serializing positions
8 年前
66cea910
allow adding nodes again.
8 年前
8dc43619
[mat graph]Readd the delete operator.
8 年前
36e3583e
[MaterialGraph]Allow connection code back in + delete edges
8 年前
a6b1e348
[MaterialGraph]Add mapping between data base type and draw data type.
8 年前
51f6cf0b
[Material graph] Fix control id issues when there are two nodes of the same type
8 年前
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
8 年前
9398ce96
[Material graph]Fix preview render for 2d nodes (use correct color space.
8 年前
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
ab7317bb
[Mat Graph]Run code formatter
8 年前
2ea489dd
[Material Graph] Tidy view + fix css + add time update nodes in again.
8 年前
860a7a67
[Material Graph]delete edge + vector 1 node drawing.
8 年前
60926063
ColorNodeData now re-uses the underlying list returned by GetControlData()
MaterialNodeData.Initialize(INode) is now virtual, so that e.g. ColorNodeData can override and do initialization of it's own first.
Implemented item reference checking for lists in NodeDrawer and MaterialNodeDrawer
8 年前
a6b9b337
Extracted type mapping of AbstractGraphDataSource into own function
8 年前
68ec6c34
Typo in AbstractGraphDataSource.MapType(Type)
8 年前
4668408f
AbstractGraphDataSource now re-uses existing elements when adding/removing nodes&edges
8 年前
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 年前
f62171b8
LINQ-ified some stuff in AbstractGraphDataSource.UpdateData()
8 年前
151572ca
Quick fix for graphs not saving, needs more investigation.
8 年前
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
81fc3b44
Refactored slots container creation into own function because it was messy to look at
8 年前
3093c701
upgrading ui
8 年前
f6ff69e4
[Mat Graph]More porting to new CSS
8 年前
f4c0b482
[mat graph]More CSS
8 年前
662d4eed
readdcode
8 年前
7369250d
Fixed issue where dragging would not save new position
8 年前
14f32a76
Fix visual selection issue (no border + title disappearing) and extract header into its own drawer
8 年前
f1abf833
Implemented node collapsing
8 年前
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
1c332af5
[mat graph]Fix issue with edges not behaving well
8 年前
4dd59714
[mat graph]Fix style sheet issues
8 年前
3a45f192
[mat graph]Fix up previews a bit more.
8 年前
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
190ab48a
Improved node collapsing performance a lot
8 年前
9ea47ed4
working on shader compiler issues
8 年前
6f6d8b45
Fixed data watching for HeaderDrawer
8 年前
e7cb8660
Added collapsing of not-connected slots
8 年前
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 年前
5cbe3cf4
[mat graph]Fix subgraphnode always regenerating the graph + fix exception on port adaptor
8 年前
af616546
Implemented basic title bar
8 年前
07fa7d87
Fix compilation with runtime merge
8 年前
bb982188
Remove imported.asset files
8 年前
da329206
Removed absolute positioning from GraphView and did minor tweaks to title bar
8 年前
08a32f0c
Removed absolute positioning from TitleBar
8 年前
c299e028
TitleBarDrawData is now managed by GraphDataSource rather than GraphEditWindow
8 年前
621f548e
Style tweaks and minor code clean-up for title bar
8 年前
235ac2cb
Made title bar look more like the one in the scene view and added button for showing graph in scene view (not functional yet though)
8 年前
53ab6c81
Added options button (not functional yet)
8 年前
c6e6d4e4
Refactored title bar button into own drawer
8 年前
be11b1e0
"Show in project"-button now works
8 年前
7ef50ef7
Replaced accidental tabs with spaces
8 年前
1ded56e2
Added active state for title bar buttons a la the CSS pseudo class
8 年前
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
fa8baa2c
Created IEnumerable extension for zipping together enumerables
(so that we can easily iterate over 2 collections using their
IEnumerable interface, rather than having to index into one of them)
8 年前
682248e0
Created GraphEditorDrawer by extracting view stuff from AbstractGraphEditWindow
The latter was getting very crowded and more views that are not inside
the GraphView are on the way.
8 年前
6a436d82
Changed TitleBar.uss to use class names rather than naming
I think we need some proper guidelines on USS usage. I think a sensible
rule would be that names are reserved for the owning view, such that it
can be used for layouting etc.
8 年前
c90ddfc2
USS clean-up for nodes
8 年前
780c7cc1
Updated styling to look like Hugo's mockup + fixes
- HeaderDrawer now extends from DataWatchContainer rather than
GraphElement (don’t do the latter for things that are inside nodes)
8 年前
6b8dd307
Minor style tweak
8 年前
a8450aba
Hide right pane in node if there are no output slots
8 年前
640ab79a
Fixed hiding of right pane when there are no outputs
Also removed some unnecessary classList checks
8 年前
d8ebbf95
Re-added highlight-border for selected nodes
8 年前
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 年前
31965b77
Slots can now be changed while a graph is loaded
Rather than storing all sub draw data instances mixed together in a
shared list, they are now stored per type such that e.g. anchors/slots
can easily be updated.
8 年前
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 年前
508a8634
Minor drawer clean-up and replaced NodeExpander with Clickable
8 年前
5b3b60c7
Fix for serialized selection
8 年前
14bd9deb
Minor codestyle clean-up
8 年前
8dd129c5
Extracted type mapping functionality into own class such that it can be re-used for node inspector
8 年前
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
e69e0431
Foundation has been laid for node inspectors (partially implemented for surface master)
8 年前
2483a684
Added preview of first selected node in inspector
8 年前
e5c4ffb6
Inspector now listens for changes to node relevant to the previewed node. It is now possible to pin the selected node, while another node is pinned (to avoid having to click 2 times). Constant re-paint is now only turned on if any relevant nodes require time.
8 年前
ddc991d7
Removed un-pin functionality, such that a node is always pinned (defaults to active master node). Also improved interface for AbstractGraphInspector.
8 年前
cb87ed84
Minor improvements to graph inspector
8 年前
46e1234d
Styling for connectors
8 年前
e6b70122
[Material Graph]Show slot default inputs in the inspector.
8 年前
4aa813fd
Update to new GraphView
Update includes fix for MiddleMouse / Alt+LeftMouse pan
Signed-off-by: joce <joce@unity3d.com>
8 年前
72ac3b4c
Fix RectangleSelect + node selection highlight
Both issues were caused by the nodes positioning incorrectly being flagged as
Relative. Putting it to Absolute fixed all of this. It also messed with the
nodes positioning, which is why the ShaderGraphs had to be changed as well.
Signed-off-by: joce <joce@unity3d.com>
8 年前
0ef45c8c
Merge pull request #5 from stramit/issues-fix
Issues fix
8 年前
fc03abf6
Fixed a bug causing frequent, unneeded serialization of the entire graph in the graph inspector
8 年前
4d814c36
Fixed a bug causing null reference errors if no graph asset was selected
8 年前
d99fa8d2
Moved global selection handling into its own manipulator, rather than piggy-backing the ClickSelector, as an edge case was not being handled.
(when the selection didn't change the global selection wouldn't be changed - e.g. "select node in graph, select something from the scene, click selected node" wouldn't select the graph in the project window)
8 年前
ce272542
Implemented copy/paste functionality for graph (currently uses shift rather than ctrl, as the latter does not fire the event)
8 年前
1770fee9
Duplication support for graph nodes
8 年前
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
8133e0c7
Focus graph when changing selection.
8 年前
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
4ff1c093
NodeDrawer now derives from Node.
And all the superfluous files have been removed.
Signed-off-by: joce <joce@unity3d.com>
8 年前
98e645eb
Make Node and NodePresenter members private
They still accessible through public (and in the case of Node, virtual)
interfaces.
Signed-off-by: joce <joce@unity3d.com>
8 年前
36c08357
Commandable manipulator for #11
8 年前
574bc97d
First implementation of node collapsing for MG
Signed-off-by: joce <joce@unity3d.com>
8 年前
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
cfc167d9
TypeMapper now derives from BaseDataMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
c5baafe7
Integrate latest GraphView
Signed-off-by: joce <joce@unity3d.com>
8 年前
2a1b5b99
TypeMapper => GraphTypeMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
ab990b62
TypeMapper and ScriptableObjectFactory
Only used in AbstractGraphInspector for now
8 年前
f4fad3a8
Update to latest GraphView
** Requires update to Unity branch **
- New way to reference StyleSheets (no longer using attributes). This in the
goal of moving GraphView to a GitHub submodule.
- Styles sheets moved under Resources folder
- BaseTypeMapper renamed BaseTypeFactory
- Little change to edge drawing code.
- Changes to selection mechanism.
- NodeAnchors are no longer always removed/added on a DataChange (more changes
to come to this soon).
- Dragger and NodeDragger change only the VisualElement on MouseMove. The
presenter is now changes and notified of the change only upon MouseUp.
- Various minute changes to demo presenters.
Signed-off-by: joce <joce@unity3d.com>
8 年前
b965052b
update to latest canvas2d branch
Signed-off-by: joce <joce@unity3d.com>
8 年前
591ca2fd
Start upgrade to new graph view.
8 年前
9e18b962
Temporarily disable pixel caching due to issues with IMGUI controls
8 年前
1896e42f
[Improvements]Change workflow to work with new montreal importer work (scriptable importer)
8 年前
8bbb99b1
fix up serialisation on load.
8 年前
8f917469
Fix saving the shader so that it can be used on objects in the scene.
8 年前
3094ee75
Merge branch 'new-importer-workflow' into hackweek2017
8 年前
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
d8de64bf
Fixed slot bug
8 年前
45eedc86
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
fe8256e6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
c8eb7c61
Reenable sub graphs
8 年前
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
2e183994
Add time checkbox
Make shorter GUIDs
8 年前
5e3b99fe
working on better workflow (double click shader to open in edit window)
8 年前
eac70c08
Graph edit window now survives serialization.
8 年前
3457c49b
Updated to work after merge with trunk
7 年前
06b7010b
Remove "AnyNode"
7 年前
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 年前
0e769105
Merge branch 'hackweek2017' into tidying
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs
# MaterialGraphProject/Assets/_MingWai/GeneratedTextureDemo/0-UnityLogo-Texture.asset.meta
# MaterialGraphProject/Assets/_MingWai/Gradient.asset.meta
7 年前
d88535a5
tidy up new nodes for upgrading.
7 年前
b37655bd
Update to latest version of graph view.
7 年前
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
daa21fd3
Fixed a crash when deleting nodes from the graph.
7 年前
28cf7cb6
Upgrade to trunk based graph view.
7 年前
77e26863
Merge branch 'master' into crash-fixes
7 年前
f0b691e4
* Fixed keyboard shortcuts.
* Reverted crash on node deletion fix as it's fixed in the latest GraphView.
7 年前
a1e42ea7
Fixed the shortcut problem in a proper way.
7 年前
ea281f24
Merge pull request #41 from stramit/crash-fixes
Crash fixes
7 年前
dfe9bbae
Enable pixel caching for nodes (should yield better performance)
7 年前
d470f1f1
Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView
7 年前
Tim Cooper
Peter Bay Bastian
GitHub
julienf-unity
joce
Florent Guinier
Jennifer Nordwall
ChrisTchou
bfogerty
Yuanxing Cai