45e02be9
Rename *Drawer to *View
7 年前
7e160ce8
Run `hg format` on repository
7 年前
a92b64bb
#31 UIElements-based graph inspector
7 年前
8e1d62b6
Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31 )
7 年前
ff2d3ef8
Change namespace of GraphInspector{Presenter,View}
7 年前
a76aadd7
Remove a few todos in code
7 年前
64c9a49b
Purge usage of presenters and datawatch from graph inspector
7 年前
6c9cb29a
Refactor toolbar (no more presenters, acts a little more like buttons)
7 年前
65e94a0c
Add rate limiting for preview updates
7 年前
3930a641
Remove GraphEditorPresenter
7 年前
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
a4a72ae8
Added support for connecting edges between 2 no-presenter nodes.
7 年前
7e977d50
Fixed inspector and node position is now saved.
7 年前
145b4d5f
Get rid of presenter for graph inspector
7 年前
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 年前
26e0dad5
Move copy paste boilerplate and event handling to GraphView.
7 年前
19de8169
Move framing shortcuts to GraphView.
7 年前
9c92399a
Add copy to clipboard toolbar button
7 年前
80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
c88791bb
Duplication/insert etc. now selects the new elements
7 年前
9dbfb5c3
Move slot compatibility check code into MaterialSlot
Validate commands directly in window class, rather than through MaterialGraphPresenter
Move a few things from MaterialGraphPresenter to GraphEditorView
Create manipulator for node creation (NodeCreator), rather than manually doing it in MaterialGraph
Move things from MaterialGraph constructor into GraphEditorView
Completely remove GridBackground, as we were not using it
Remove Clicker manipulator, as it was not used
7 年前
c6b895e7
Remove command handling from MaterialGraphPresenter
7 年前
46b505fb
Move more stuff from MaterialGraphPresenter, also introduce proper constructor
7 年前
c43005a1
Remove last bit of presenters YAY
7 年前
b6a4d98d
Fix preview rendering bugs (causing re-use of previous texture and disapperance of checkerboard background) and persistence (remembers zoom etc. between assembly reloads, scene changes, even play mode!)
7 年前
9cbe42fb
Fix bug causing collapsed nodes to not have slots visible that should be visible
7 年前
2ecc2e08
Add copy to clipboard for selected node
7 年前
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
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 年前
73c2bce4
Properly dispose of MaterialNodeViews
7 年前
347edc88
Colored edges! (also, unify node and edge view creation)
7 年前
dc8375d3
Gradient edges
7 年前
0b1c506d
Fix direction on some gradients
7 年前
3f1df674
PreviewSystem -> PreviewManager
7 年前
81d2a867
Add drag and drop to graph for Texture2D and subgraphs
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
8e5b0d9b
First pass inlining property nodes.
7 年前
92a955c3
Add converter from v1,v2,v3,v4,col nodes -> properties.
7 年前
e9731703
Move convert to property / inline node to right click menu.
7 年前
e408be90
Handle remove events from GraphView
7 年前
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
972596ff
Remove unneeded event handling (handled elsewhere now)
7 年前
9e5cc1af
rename anchor > port
7 年前
fba42d48
Use GUID instead of object reference so that we can properly restore object link after assembly reload.
7 年前
bfe3f5fc
Fix null ref on exit
7 年前
2fa06117
Implemented uber shader
7 年前
61fab094
Update to work with trunk
7 年前
14bcb1d7
Full-resolution preview in blackboard
7 年前
da15e457
dirty first pass pass architecture.
7 年前
6f035d8a
hack and slash.
7 年前
f559320c
'working' previews.
7 年前
1d641fec
For final shader generation use the master 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 年前
e91932f8
Node selector / search
7 年前
2c5ae2d4
Move "Copy shader" into context menu
7 年前
b4404ee6
Remove preview rate limitation button
7 年前
90868fe3
Move "convert to subgraph" to context menu
7 年前
02e4d882
Move "update asset" button to blackboard
7 年前
4a06bed4
Remove last bit of toolbar
7 年前
d2e30d64
Update right click menu.
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 年前
8c82d94e
- Dropping edge on graph (specifically not on a slot) now pops up the add node menu and auto-connects to the first compatible slot (only shows nodes where a slot is compatible)
- Another repaint to fix issue where an added node is not shown
- Update ports and colors when deleting nodes per graphview's request
7 年前
eed09312
When creating nodes by dropping edge, reposition the node after creating it such that the edge stays at the same position
7 年前
178bcf2b
Save correct position to node drawState
7 年前
53517148
Even better node repositioning
7 年前
22adea01
Make graph inspector window not pinned to the right side of the editor window
7 年前
82f3473f
Add resize handle to inspector window
7 年前
0ff2964b
Improve resize handling of inspector window
7 年前
f0203715
Ensure inspector winow to stay in editor window rect after window resize
7 年前
2a66a4bf
Remove selection stuff from inspector and move properties to the top
7 年前
ec88c9f3
Reigister postlayout callback on graphview rather than inspector view
7 年前
e1ebec49
Merge master
7 年前
9b1d3da9
Make maste node preview a separate window
7 年前
5f6443a4
Add draggable manipulator for floating windows
7 年前
b73f8bc1
Created the functionality of creating Nodes directly when hitting spacebar. Simplified to not have to right click and click create node.
7 年前
55b86ced
Merge branch 'master' into inspector-window
7 年前
d41f2281
Fix hanging edges ( fixes #142 , fixes #152 , fixes #158 )
7 年前
d7635005
Remove unused function in GraphEditrorView
7 年前
bfd7b48d
Import blackboard to project, still WIP
7 年前
1749ff66
A bunch of stuff for blackboard
- Fix SelectionDropper, so that selection of properties work
- Hack in a ContextualMenuManipulator so that context menus work in collaboration with GraphView
- Add a "Delete" option to context menu for properties
- Only show context menu options for nodes if a node or GV is right-clicked
- When adding a new property it is now expanding initially
- Rename a few Action properties to match GraphView convention
- Add a regular Unity toolbar (using IMGUI) to Shader Graph, as it looked weird without one
- Remove old inspector
7 年前
530a769c
Serialize layout of floating windows in GraphEditorView
7 年前
fa558b34
Add changes according to PR feedback
7 年前
46fe1f23
Change window layout serialization to happen when resize or dragging of master preview finished changing
7 年前
ed016425
Chnage name of master preview VisualElement to reflect prevuious name update
7 年前
dfcf6af9
Merge pull request #175 from Unity-Technologies/inspector-window
7 年前
d60a0f8d
Merge with master
7 年前
e3d84f9b
Add option in resize handels to make it staty in the bounds of the parent element
7 年前
4cfaf738
Add serialization for blackboard layout
7 年前
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
f2b52952
[FIX] fixes #96 Needed to put the input and output of the edge to Null.
7 年前
66a70b8f
Merge branch 'master' into inspector-window and resolve conflicts
7 年前
a3c9f868
Merge pull request #186 from Unity-Technologies/fix-nodes-are-still-filled-after-edge-deletion
[FIX] fixes #96 Needed to put the input and output of the edge to Null.
7 年前
358c118c
Change floating window serialization to track offset to closest corner rather than just position
7 年前
12be2cf3
Update master preview rendertexture size when layout has finished changeing
7 年前
4df636c0
Merge pull request #188 from Unity-Technologies/window-layout-docking
Change window position serialization to track closest corner
7 年前
af26c91a
Add flag in resize handle to maintain aspect ratio
7 年前
ae1852e9
Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale
7 年前
058f5c05
[FIX] Fixed an issue where openening up an empty shadergraph without any nodes caused an error.
7 年前
de57de9e
Add function in master preview to update rendertexture size after next layout change
7 年前
a4f6c1fd
Merge pull request #194 from Unity-Technologies/master-preview-rendertexture-rescale
Make rendertexture on master adapt resolution on rescale
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 年前
41740d78
First pass dynamic Multiply node
- Temp adding of test graph
7 年前
24300f52
Adding documentation functionality on the nodes.
public virtual string documentationURL() has been added to AbstractMaterialNode
Pressing F1 will take you to the documentation if it exists.
Right clicking on a node gives you the context menu item See Documentation that also takes you to the documentation if it exists.
7 年前
22c13f89
Cleanup and fixes (part 1)
- Fix not updating edges when validation changes
- Generate correct function headers
- Calculate whether matrix slot connections are error'd
- Fix validation in subgraphs
- Various cleanup
7 年前
54af42c8
Adding documentation functionality on the nodes.
public virtual string documentationURL() has been added to AbstractMaterialNode
Pressing F1 will take you to the documentation if it exists.
Right clicking on a node gives you the context menu item See Documentation that also takes you to the documentation if it exists.
7 年前
545de289
Merge pull request #209 from Unity-Technologies/goto-documentation-per-node
Adding documentation functionality on the nodes.
7 年前
7ba4ae46
Make ResizeSideHandle be aware of nearest corner
ResizeSideHandles resize function are split into three cases, and the
resize handle is recording which corner it is closest to when the mouse
is preseed. This is to figure out which direction the window should
resize in when maintaining aspect ratio.
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 年前
3df359f2
Merge branch 'master' into node-matrix
7 年前
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
7 年前
7b5ca064
Merge with master
7 年前
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
7 年前
f187d743
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
7 年前
e7218ad7
Remove unused variables and classes and rework how master preview resizing is handled
7 年前
57a0eab1
Remove unused imports in entire solution
7 年前
584d2bb4
[FIX] #251 Nodes are now selected again after pasted
6 年前
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
6 年前
96c8a0c7
Merge pull request #257 from Unity-Technologies/copy-paste-fix
[FIX] #251 Nodes are now selected again after pasted
6 年前
cfaa488d
Make serialized window layout serialize abosulte position properties
6 年前
b1e38c12
Add collapse button on master preview
6 年前
ab80ca3c
Make master preview resize rendertexture continuously
6 年前
daa8f8ad
Make window draggable able to clamp to the parent window
6 年前
8e243e0b
Make floating windows serialize layout realtive to correct content area
6 年前
19a741e4
Switch blackboard layout modifiers to default modifiers
6 年前
7061787f
Add docking layout to blackbourd via GeometryChangedEvent on GraphView
6 年前
6ec339e3
Forwardport pull request #336
6 年前
fe56266d
Ensure the blackboard remains in view after deserialization
6 年前
10d61e23
Started the functionality for opening shader code in user set, text editor
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 年前
8c691503
Removed the old Drag and Drop methods
6 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
6 年前
fafb59af
Run code formatter.
6 年前
804a560f
Fix Shader Graph toolbar not showing up
6 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
6 年前
05d6a1be
Removed old unneccessary code that prevented the spacebar to create node functionality to work as intended.
6 年前
8cec3344
Fix a compile warning in GraphEditorView
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 年前
b283a847
Fixed a small issue where the path was the name. We only want the last name of the shader and not the path to it.
6 年前
9cccf3fb
Updated with feedback
6 年前
Peter Bay Bastian
damian
Patrick Fournier
Jens Holm
Tim Cooper
Martin Thorzen
GitHub
Matt Dean