Tim Cooper
834fc657
[shader graph] start porting to new graph framework.
9 年前
Tim Cooper
3da9634f
[Shader graph]working delete + connect of nodes / edges
9 年前
Tim Cooper
c55aaff6
[shader graph]
Tidy up canvas texture generation (do not leak textures / only regenerate when needed)
Mark time dependent nodes dirty all the time
Tidy up Window code slightly
9 年前
Tim Cooper
f119ce26
[canvas2d] change canvas element to use render textures.
9 年前
Tim Cooper
51ceebd2
[shader graph]optimise for GC
9 年前
Tim Cooper
371b3dba
[Material graph]Update to latest canvas2d version
9 年前
Tim Cooper
6e180dc5
[Material graph] add missed files
9 年前
Tim Cooper
accce8b1
[canvas2d]Import latest canvas2d
9 年前
Tim Cooper
3d5186ac
[canvas2d]Make examples live in a namespace.
9 年前
Tim Cooper
15591be8
[canvas2d] Update canvas 2d version
9 年前
Tim Cooper
d6114824
[canvas2d] more tidying
9 年前
Tim Cooper
3958bdb1
[Material Graph]Rearrange project.
9 年前
Tim Cooper
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
Tim Cooper
3e4c0174
[Material Graph]Add in general node collapse.
9 年前
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
c522adcc
[material graph]Working on texture preview / regeneration of drawing layer workflow.
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
8acbd944
[Material Graph]Tidy up test running / folder layout
9 年前
Tim Cooper
a00cc631
[Material Graph] Tidy serialization (make safer) + Add SerializationHelper tests.
9 年前
Tim Cooper
8e31ace1
[material graph]Slot serialization test
9 年前
Tim Cooper
8e10c8cb
[mat graph]Sub graph is working again.
9 年前
Tim Cooper
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
9 年前
Tim Cooper
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
9 年前
Tim Cooper
675ed679
[mat graph] Add duplicate command.
9 年前
Tim Cooper
607a2f9e
[material graph]Add button to convert selection into subGraph
9 年前
Tim Cooper
376c8378
[material graph]Change how precision works, make default precision half.
9 年前
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
6e740eb0
[material graph]Fix test name
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
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
3313d8c4
trying new UI
8 年前
Tim Cooper
9fb975a4
[mat graph]Remove Canvas2D from repository.
8 年前
Tim Cooper
8c5f323e
fixing node drawing
8 年前
Tim Cooper
01630326
drawing preview now.
8 年前
Tim Cooper
c565a8d4
fix formatting
8 年前
Tim Cooper
a9948aa0
Fix drawers.
8 年前
Tim Cooper
3d3740f2
Merge in new ui from canada
8 年前
Tim Cooper
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
Tim Cooper
d55cb3d6
[material graph]Fixing position + serializing positions
8 年前
Tim Cooper
66cea910
allow adding nodes again.
8 年前
Tim Cooper
8dc43619
[mat graph]Readd the delete operator.
8 年前
Tim Cooper
36e3583e
[MaterialGraph]Allow connection code back in + delete edges
8 年前
Tim Cooper
a6b1e348
[MaterialGraph]Add mapping between data base type and draw data type.
8 年前
Tim Cooper
51f6cf0b
[Material graph] Fix control id issues when there are two nodes of the same type
8 年前
Tim Cooper
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
8 年前
Tim Cooper
9398ce96
[Material graph]Fix preview render for 2d nodes (use correct color space.
8 年前
Tim Cooper
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
Tim Cooper
ab7317bb
[Mat Graph]Run code formatter
8 年前
Tim Cooper
2ea489dd
[Material Graph] Tidy view + fix css + add time update nodes in again.
8 年前
Tim Cooper
860a7a67
[Material Graph]delete edge + vector 1 node drawing.
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
a6b9b337
Extracted type mapping of AbstractGraphDataSource into own function
8 年前
Peter Bay Bastian
68ec6c34
Typo in AbstractGraphDataSource.MapType(Type)
8 年前
Peter Bay Bastian
4668408f
AbstractGraphDataSource now re-uses existing elements when adding/removing nodes&edges
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
f62171b8
LINQ-ified some stuff in AbstractGraphDataSource.UpdateData()
8 年前
Tim Cooper
151572ca
Quick fix for graphs not saving, needs more investigation.
8 年前
Peter Bay Bastian
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
Peter Bay Bastian
81fc3b44
Refactored slots container creation into own function because it was messy to look at
8 年前
Tim Cooper
3093c701
upgrading ui
8 年前
Tim Cooper
f6ff69e4
[Mat Graph]More porting to new CSS
8 年前
Tim Cooper
f4c0b482
[mat graph]More CSS
8 年前
Tim Cooper
662d4eed
readdcode
8 年前
Peter Bay Bastian
7369250d
Fixed issue where dragging would not save new position
8 年前
Peter Bay Bastian
14f32a76
Fix visual selection issue (no border + title disappearing) and extract header into its own drawer
8 年前
Peter Bay Bastian
f1abf833
Implemented node collapsing
8 年前
Tim Cooper
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
Tim Cooper
1c332af5
[mat graph]Fix issue with edges not behaving well
8 年前
Tim Cooper
4dd59714
[mat graph]Fix style sheet issues
8 年前
Tim Cooper
3a45f192
[mat graph]Fix up previews a bit more.
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 年前
Peter Bay Bastian
190ab48a
Improved node collapsing performance a lot
8 年前
Tim Cooper
9ea47ed4
working on shader compiler issues
8 年前
Peter Bay Bastian
6f6d8b45
Fixed data watching for HeaderDrawer
8 年前
Peter Bay Bastian
e7cb8660
Added collapsing of not-connected slots
8 年前
Paul Demeulenaere
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
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
5cbe3cf4
[mat graph]Fix subgraphnode always regenerating the graph + fix exception on port adaptor
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 年前
Peter Bay Bastian
af616546
Implemented basic title bar
8 年前
julienf-unity
07fa7d87
Fix compilation with runtime merge
8 年前
julienf-unity
bb982188
Remove imported.asset files
8 年前
Peter Bay Bastian
da329206
Removed absolute positioning from GraphView and did minor tweaks to title bar
8 年前
Peter Bay Bastian
08a32f0c
Removed absolute positioning from TitleBar
8 年前
Peter Bay Bastian
c299e028
TitleBarDrawData is now managed by GraphDataSource rather than GraphEditWindow
8 年前
Peter Bay Bastian
621f548e
Style tweaks and minor code clean-up for title bar
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
53ab6c81
Added options button (not functional yet)
8 年前
Peter Bay Bastian
c6e6d4e4
Refactored title bar button into own drawer
8 年前
Peter Bay Bastian
be11b1e0
"Show in project"-button now works
8 年前
Peter Bay Bastian
7ef50ef7
Replaced accidental tabs with spaces
8 年前
Peter Bay Bastian
1ded56e2
Added active state for title bar buttons a la the CSS pseudo class
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
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
c90ddfc2
USS clean-up for nodes
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
6b8dd307
Minor style tweak
8 年前
Peter Bay Bastian
a8450aba
Hide right pane in node if there are no output slots
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
640ab79a
Fixed hiding of right pane when there are no outputs
Also removed some unnecessary classList checks
8 年前
Peter Bay Bastian
d8ebbf95
Re-added highlight-border for selected nodes
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
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 年前
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 年前
Peter Bay Bastian
508a8634
Minor drawer clean-up and replaced NodeExpander with Clickable
8 年前
Peter Bay Bastian
5b3b60c7
Fix for serialized selection
8 年前
Peter Bay Bastian
14bd9deb
Minor codestyle clean-up
8 年前
Peter Bay Bastian
8dd129c5
Extracted type mapping functionality into own class such that it can be re-used for node inspector
8 年前
Tim Cooper
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
Peter Bay Bastian
e69e0431
Foundation has been laid for node inspectors (partially implemented for surface master)
8 年前
Peter Bay Bastian
2483a684
Added preview of first selected node in inspector
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
ddc991d7
Removed un-pin functionality, such that a node is always pinned (defaults to active master node). Also improved interface for AbstractGraphInspector.
8 年前
Peter Bay Bastian
7343f497
Added IDisposable functionality to ObjectPool (and ListPool)
8 年前
Peter Bay Bastian
cb87ed84
Minor improvements to graph inspector
8 年前
Peter Bay Bastian
46e1234d
Styling for connectors
8 年前
Tim Cooper
e6b70122
[Material Graph]Show slot default inputs in the inspector.
8 年前
joce
4aa813fd
Update to new GraphView
Update includes fix for MiddleMouse / Alt+LeftMouse pan
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
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 年前
GitHub
0ef45c8c
Merge pull request #5 from stramit/issues-fix
Issues fix
8 年前
Peter Bay Bastian
fc03abf6
Fixed a bug causing frequent, unneeded serialization of the entire graph in the graph inspector
8 年前
Peter Bay Bastian
4d814c36
Fixed a bug causing null reference errors if no graph asset was selected
8 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
ce272542
Implemented copy/paste functionality for graph (currently uses shift rather than ctrl, as the latter does not fire the event)
8 年前
Peter Bay Bastian
1770fee9
Duplication support for graph nodes
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
8133e0c7
Focus graph when changing selection.
8 年前
Tim Cooper
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
Peter Bay Bastian
4ff1c093
NodeDrawer now derives from Node.
And all the superfluous files have been removed.
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
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 年前
Peter Bay Bastian
36c08357
Commandable manipulator for #11
8 年前
joce
574bc97d
First implementation of node collapsing for MG
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
cfc167d9
TypeMapper now derives from BaseDataMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
c5baafe7
Integrate latest GraphView
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
2a1b5b99
TypeMapper => GraphTypeMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
Peter Bay Bastian
ab990b62
TypeMapper and ScriptableObjectFactory
Only used in AbstractGraphInspector for now
8 年前
joce
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 年前
joce
b965052b
update to latest canvas2d branch
Signed-off-by: joce <joce@unity3d.com>
8 年前
Tim Cooper
591ca2fd
Start upgrade to new graph view.
8 年前
Peter Bay Bastian
9e18b962
Temporarily disable pixel caching due to issues with IMGUI controls
8 年前
Tim Cooper
1896e42f
[Improvements]Change workflow to work with new montreal importer work (scriptable importer)
8 年前
Tim Cooper
8bbb99b1
fix up serialisation on load.
8 年前
Tim Cooper
8f917469
Fix saving the shader so that it can be used on objects in the scene.
8 年前
Tim Cooper
3094ee75
Merge branch 'new-importer-workflow' into hackweek2017
8 年前
Florent Guinier
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Jennifer Nordwall
d8de64bf
Fixed slot bug
8 年前
ChrisTchou
45eedc86
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
fe8256e6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Tim Cooper
c8eb7c61
Reenable sub graphs
8 年前
bfogerty
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
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
2e183994
Add time checkbox
Make shorter GUIDs
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)
8 年前
Tim Cooper
eac70c08
Graph edit window now survives serialization.
8 年前
Peter Bay Bastian
3457c49b
Updated to work after merge with trunk
8 年前
Tim Cooper
06b7010b
Remove "AnyNode"
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
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 年前
Tim Cooper
d88535a5
tidy up new nodes for upgrading.
7 年前
Tim Cooper
b37655bd
Update to latest version of graph view.
7 年前
Tim Cooper
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
Yuanxing Cai
daa21fd3
Fixed a crash when deleting nodes from the graph.
7 年前
Tim Cooper
28cf7cb6
Upgrade to trunk based graph view.
7 年前
Yuanxing Cai
77e26863
Merge branch 'master' into crash-fixes
7 年前
Yuanxing Cai
f0b691e4
* Fixed keyboard shortcuts.
* Reverted crash on node deletion fix as it's fixed in the latest GraphView.
7 年前
Yuanxing Cai
a1e42ea7
Fixed the shortcut problem in a proper way.
7 年前
GitHub
ea281f24
Merge pull request #41 from stramit/crash-fixes
Crash fixes
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Peter Bay Bastian
dfe9bbae
Enable pixel caching for nodes (should yield better performance)
7 年前
Peter Bay Bastian
d470f1f1
Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView
7 年前
Peter Bay Bastian
f2510f42
#35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones)
7 年前
Peter Bay Bastian
f59ddd5e
#35 Remove meta file that got away
7 年前
Peter Bay Bastian
ecb231e6
#35 Pull AbstractGraphInspector into AbstractMaterialGraphInspector
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 年前
Peter Bay Bastian
c002d689
Move graph things from Runtime to Editor
7 年前
Peter Bay Bastian
f92611b1
Force remapping of `assemblyName` to `Assembly-CSharp-Editor`
Fix error message when failing to deserialize
7 年前
Tim Cooper
2c1b60e0
compiling
7 年前
Tim Cooper
24923996
misc fixes afer changes
7 年前
Peter Bay Bastian
c5a7e594
Fix integration with Undo by introducing IGraphObject
7 年前
damian
83548475
Merging master.
7 年前
Peter Bay Bastian
3b4b0eb6
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
7 年前
damian
6a03177d
Merge branch 'master' into no-presenters
7 年前
Peter Bay Bastian
b7975d8f
Reflection based undo deserialization
7 年前
Peter Bay Bastian
1b46d517
More robust undo/redo by removing and adding nodes
7 年前
Peter Bay Bastian
99701f90
UIElements-based controls for color and vector controls
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 年前
Peter Bay Bastian
43fda89f
Remove `INode.onReplaced` (leftover from previous redo impl)
7 年前
Peter Bay Bastian
dac79163
Remove Match(GraphChange) utility function
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Tim Cooper
9ff93cdb
Add specific material slot types and port code generation node to use them.
7 年前
Peter Bay Bastian
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
Peter Bay Bastian
17a5050c
Fix hanging edges for collapsed nodes after undo/redo
Reduce the amount of `ValidateGraph()` calls when undo/redo'ing to 2 rather than once per node and edge per graph
7 年前
GitHub
fcd97941
Merge pull request #75 from Unity-Technologies/master
Update from 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 年前
Tim Cooper
72e82ce1
fix up graph validation.
7 年前
GitHub
713f6000
Merge pull request #79 from Unity-Technologies/improve-texture-node
Improve texture node
7 年前
Matt Dean
41b314d2
Merge branch 'master' into node-validation
7 年前
Natalie Burke
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Peter Bay Bastian
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
GitHub
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
Peter Bay Bastian
4f1b32b9
Undo fix
7 年前
Peter Bay Bastian
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
7 年前
Tim Cooper
7492cebb
Change tracking using undo system
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Peter Bay Bastian
406da125
Add INodeModificationListener which allows control views to be notified of node change
7 年前
Matt Dean
6c7ced70
Merge branch 'master' into node-artistic-mask
7 年前
Peter Bay Bastian
b63c4c28
Prepare shader generation for uber shader
7 年前
mathieum-unity
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
Peter Bay Bastian
d21cc6ad
Fix change tracking so that it doesn't prompt you to save when closing right after you clicked save
7 年前
mathieum-unity
d7f591a9
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
# MaterialGraphProject/UnityPackageManager/manifest.json
7 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
da15e457
dirty first pass pass architecture.
7 年前
GitHub
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前