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 年前
57c91c90
[material graph]Run code formatter.
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 年前
cdc2bd79
Extracted NodePreviewDrawer from MaterialNodeDrawer
8 年前
88700be8
MaterialNodeDrawer no longer uses MarkDirtyHack for time-dependent nodes, instead only re-painting
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 年前
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
f6ff69e4
[Mat Graph]More porting to new CSS
8 年前
da353adb
MaterialNodeDrawer might have been not cleaning up old stuff if the dataProvider was null
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 年前
e1f379f3
Recreate latest changes from RMGUI from joce
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 年前
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 年前
591ca2fd
Start upgrade to new graph view.
7 年前
3457c49b
Updated to work after merge with trunk
7 年前
f52ba9a6
Minor changes to MaterialNodeDrawer
7 年前
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
28cf7cb6
Upgrade to trunk based graph view.
7 年前
72c6ad7a
Push NodeDrawer members down into MaterialNodeDrawer
7 年前
f589fb80
Preview rendering works again for non-time-dependent nodes
7 年前
d470f1f1
Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView
7 年前
696062ae
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
7 年前
485654b6
#31 Graph inspector now lives inside graph editor window (also, it works again!)
7 年前
45e02be9
Rename *Drawer to *View
7 年前
693b0aa5
Remove `elements` from MaterialNodePresenter. Sub-presenters are accessed through independent properties now.
Much simpler to work with and also less garbage generation :)
7 年前
b057a909
Clean-up MaterialNodeView a bit
7 年前
8bfc6985
Remove needless inheritance from MaterialNodePresenter in GraphControlPresenter
7 年前
4b24135e
#29 Window now tells `MaterialGraphPresenter` to update previews, rather than using schedulers per node
7 年前
c0b10e8f
Update to work with latest graphics/shadergraph
7 年前
ed185a44
Preliminary vertex shader support
7 年前
5b7af74e
Fix node repainting
7 年前
bec6cdbb
New preview system and master node preview in inspector
7 年前
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
a3385c0f
Undo/redo prototype
7 年前
513db118
Fix updating of node positions until we get rid of presenters
7 年前
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
cc2d2e3f
Add resize handle withh draggable functionality to MaterialNodeView
7 年前
ff8de4d3
New attribute-based system for node controls
7 年前
e9b2550a
Added support for checking compatible no-presenter anchors.
7 年前
ddc1113a
Resize handle added only to preview node
7 年前
336d2f81
Rename variable in MaterialNodeView
7 年前
591d8820
Fixed MaterialNodeView.OnModified() after no-presenters change.
7 年前
20646d1b
Removed MaterialNodePresenter.
7 年前
7e977d50
Fixed inspector and node position is now saved.
7 年前
3790252c
Remove last node presenters and also type mapper in MaterialGraphPresenter
7 年前
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
83548475
Merging master.
7 年前
3db84206
Fixed some bugs after master merge.
7 年前
cd7aa840
Add fixed aspect ratio and initial size to PreviewNode
7 年前
43fda89f
Remove `INode.onReplaced` (leftover from previous redo impl)
7 年前
95a87cde
Clean up MaterialNodeView after merge with presenter
7 年前
a97628f1
Work around UIElements bug causing VisualElement.Sort to throw a NullReferenceException if the element is childless
7 年前
8407756d
Workaround sRGB issue in UIElements such that previews are now rendered correctly
7 年前
347edc88
Colored edges! (also, unify node and edge view creation)
7 年前
3f1df674
PreviewSystem -> PreviewManager
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
4391569c
Use asset name for sub-graph nodes
7 年前
4be8c24e
Update preview toggle button to mostly match design
7 年前
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
7 年前
536b1737
Preview styling and toggling update
7 年前
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
4f983742
Update type in dynamic slot names when they change
7 年前
972596ff
Remove unneeded event handling (handled elsewhere now)
7 年前
4d07b648
Edges for outside node controls
7 年前
9e5cc1af
rename anchor > port
7 年前
67c85cbe
Fix preview dirty'ing
7 年前
ec2df61b
Fix preview position in 2D previews
Turn off pixel caching for nodes
7 年前
f9ccf9f9
Update slot names on topological change
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
406da125
Add INodeModificationListener which allows control views to be notified of node change
7 年前
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
af2552b3
Enable pixel cache for nodes again
7 年前
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
61fab094
Update to work with trunk
7 年前
f615cb37
Work with new GraphView slot coloring
7 年前
066bcccb
Remove unneeded GV capability code
7 年前
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 年前
4e0aa7d7
Fixed default expanded state
7 年前
14bcb1d7
Full-resolution preview in blackboard
7 年前
7fd5c8ef
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
e1281f8c
Fixes for new node style
7 年前
fe10dc56
Fix bug causing preview to be now shown after creating a node
7 年前
4eb8bc6a
Misc usability fixes for shadergraph:
-cubmap / texture -> convert to / from properties
-Removing properties not creates inline nodes
-Nicer names for newly created properties
-Drag texture to graph now creates 2d sampler node
-Drat normal map to graph sets up 'normal map' state
-Create shader graph now creats a default PBR node
-
7 年前
16640c42
Run code format tool
7 年前
ab14181b
Make PortInputView use pre-multiplied alpha background color and put its edge behind itself and node (still need to make it render behind other nodes)
7 年前
0b1d9efe
Minor style changes to fix spacing between node controls
Also removes some leftover toolbar styles
7 年前
72c4bdea
Move contextual actions from node search menu into actual context menu
7 年前
09db5bd9
- Remove NodeCreator
- Derive Port so that we can use our own IEdgeConnectorListener
- Handle element removal event from GraphView
7 年前
02c12a94
Fix order of things when adding slots ( fixes #111 )
7 年前
890a9ece
More correct order of things in MaterialNodeView initialization
7 年前
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
eb5b5a85
Shader source mapping for node functions ( #137 )
7 年前
d41f2281
Fix hanging edges ( fixes #142 , fixes #152 , fixes #158 )
7 年前
49fe52c4
Fix bug causing selection outlines to disappear when zoomed out
7 年前
546a460b
Make preview node change in width as well as height ( fixes #121 )
7 年前
cab9a4b5
Put preview in a separate pixel cache for performance
7 年前
16db0624
* Hunt down code causing pixel cache dirtying every frame
* Put inline/port inputs in a shared pixel cache per node (rather than per input)
* Make preview and controls independent of node collapsed state
* Tidy up MaterialNodeView a bit
* Introduce PixelCacheProfiler for somewhat manually hunting down bad pixel caches
7 年前
56f2361c
Merge branch 'master' into peter-fixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
4334f8e2
Split up MaterialGraph.USS file into multiple USS files for better organization.
7 年前
77b49204
Added a Settings menu for Nodes. Implementation of IHasSettings. Nodes can derive from this interface and implement their own VisualElement as their settings menu.
7 年前
324ad522
Updated the settings visual element for nodes
7 年前
e1d9b584
Added a Settings Menu for Nodes.
7 年前
8dc99cbc
*Fefactor subshader / master node generation to be more uniform
*Add subshader generator as a 'real' thing, need to hook up UI now so that these can be added and removed.
7 年前
bf9b4a4c
Updated the Settings UI.
7 年前
7b5ca064
Merge with master
7 年前
5f331eda
[FIX] Disabled the resizing of preview node.
7 年前
50036920
Added functionality to double click on a subgraph node to open it up in a new shader graph window
7 年前
5dd3e527
Updated so it is only left mouse click that can open using the double click
7 年前
f5ae4e88
Merge with master
7 年前
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
7 年前
166af912
[FIX] #271 Making sure that the new inports are modifiable after saving the subgraph
7 年前
fecfaaea
Fix compile errors on trunk by introducing various compatibility extensions
7 年前
a323085a
Updated with the feedback from PR
7 年前
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
7 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
ed104fa3
Added titleButtonContainer for buttons.
Removed bring to front on previewfiller
7 年前
3868cb59
Fixed so that the preview is not drawn ontop of the Settings Menu
7 年前
962fc981
Removed the dependency on SRP so this is now self contained within Shadergraph.
Also removed the dependency on API changes that are note yet in trunk. Button Container on nodes.
7 年前
e34a3053
Fixed the PR feedback I got.
6 年前
a2b1f9e5
Fix warnings
6 年前
6ec339e3
Forwardport pull request #336
6 年前
3c602bad
Added base functionality to give an error on incompatible render pipeline
6 年前
83dbd5d0
Add change callback to controls when edge changes
6 年前
34997ed9
Cleaned up the code
6 年前
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
6 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
6 年前
3eef43d8
Added name to abstract material graph. This one is the name from the materialgraph on disk. Added a write file and open file in graph utils. Changed the converttoshader functionality to return a string so it could be re-used in implementation for writing a file.
6 年前
7688ce53
Updated with the PR feedback
6 年前
fafb59af
Run code formatter.
6 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
6 年前
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
6 年前
848b6b57
fix for case #987330 now the preview is behind the outline.
6 年前
37c00666
Added update title to master preview and blackboard.
cleaned up assetName parameter and dded it as a property instead
Made a seperate shader graph post processor file
6 年前
549996da
Allow sub-shaders to tell whether they are compatible with a given render pipeline, and hook it up with the UI support for that such that an error is shown in the event that it's _not_ compatible.
This also adds a check in Update() such that the UI is reloaded when the render pipeline changes.
6 年前
9bf79289
Backport pull request #1529
6 年前
Tim Cooper
Peter Bay Bastian
joce
damian
Jens Holm
mathieum-unity
GitHub
Martin Thorzen