80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
ab269bcc
Fix issues that should have caused compile errors
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 年前
706ca05d
Add null check for serialized object in MaterialGraphEditWindow
7 年前
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
3f1df674
PreviewSystem -> PreviewManager
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
de93c238
Merge trunk
7 年前
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
a1cb65d5
Working scripted importer version.
7 年前
84f8f35e
Fixing 'convert to subgraph'
7 年前
fba42d48
Use GUID instead of object reference so that we can properly restore object link after assembly reload.
7 年前
7492cebb
Change tracking using undo system
7 年前
61fab094
Update to work with trunk
7 年前
d21cc6ad
Fix change tracking so that it doesn't prompt you to save when closing right after you clicked save
7 年前
abe8b7b6
Remove pixel cache disables in a few places
7 年前
14bcb1d7
Full-resolution preview in blackboard
7 年前
f14af0f4
Added Cubemap nodes
7 年前
9d6fad5e
Make "convert to subgraph" undoable (doesn't delete the sub graph though)
7 年前
9284e11f
Calculate bounds of nodes converted to subgraph and use for placement of subgraph node and nodes inside the subgraph #46 #47
7 年前
3fdee329
ShaderGraph window now loads properly between Editor sessions #49
7 年前
7be0bdf0
Close ShaderGraph window if it fails to load asset from serialized guid
7 年前
5d9b28af
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
7 年前
16640c42
Run code format tool
7 年前
e91932f8
Node selector / search
7 年前
2f0a0145
Remove layer graph + remap graph for beta1
7 年前
944c3654
Dispose resources when an exception is thrown during Update or ChangeSelection, such that we don't run out of preview scenes and ruin previews for everyone
7 年前
9604758c
Fix inconsistent persistence key causing SG to not maintain zoom and position sometimes
7 年前
ce26a5b8
Copy node title or property name for properties created inside sub-graph when converting to sub-graph ( fixes #114 )
7 年前
03aee46f
Add null check for OnDestroy
7 年前
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
09d669c8
Various refactorings and improvements ( #139 )
* Move previewMode to RenderData instead of ShaderData (still some to do here, as apparently there's still a RenderData _and a_ ShaderData per node, but the intention was to have a RenderData per node and then share ShaderData between those)
* Introduce a temporary identifier for nodes. The first part of this identifier is an index (`int`) which is assigned linearly. When a node is deleted, its identifier as added to a free list. Each identifier also contains a version (`int`), which is incremented when the identifier is re-used. This allows us to replace usage of Dictionary with List in a lot of places.
* Introduce IndexSet for efficiently storing and manipulating a list of indices (e.g. from temp IDs). Internally this stores a list of 32-bit integers and uses each bit to represent 1 index. The operations of `ISet<int>` are implemented for this type, although that interface does not exist in Unity. The operations are very fast and cac...
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
8f22e3a7
Boolean node and type (part 1)
7 年前
450a5759
[FIX] #88 Added a forcedRedrawPreviews flag that will redraw the graph and update the nodes to reflect changes properly when an external source has been re-imported.
7 年前
f243e1cf
[FIX] #157 Removed the check for Master node which casued the Exception.
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 年前
e71bf6a6
[FIX] fixes #123 Added a m_colorSpace variable to remember what the user had, and if they change we redraw the window.
7 年前
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
70d12230
[FIX] Moved the initialization of this var into update()
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
1a06a11e
Merge pull request #179 from Unity-Technologies/fix-preview-after-color-space-switch
[FIX] fixes #123 Added a m_colorSpace variable to remember what the u…
7 年前
927b9dac
Merge pull request #180 from Unity-Technologies/blackboard
Blackboard
7 年前
4ad43705
Vector1 property refactor and types
7 年前
57a0eab1
Remove unused imports in entire solution
6 年前
00a8f677
Fixes #242 by initalizing the color space field properly
6 年前
0a72fe97
When saving a sub graph, we now go through all the shader graphs and updated them if they are using this sub graph.
Not allowed to have sub graph inside a sub graph
Removed sub graph from searh window when in subgraph
Prompting the user when removing slots and properties from the sub graph.
6 年前
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
6 年前
0b584564
Merge with master
6 年前
166af912
[FIX] #271 Making sure that the new inports are modifiable after saving the subgraph
6 年前
fecfaaea
Fix compile errors on trunk by introducing various compatibility extensions
6 年前
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
6 年前
74039530
Allow sahder properties to be copied and pasted between graphs
6 年前
8201871e
Add meta properties in the CopyPasteGraph
6 年前
02587bed
Add conditional includes in MaterialGraphWindow and MaterialGraphView
6 年前
ed51c9ec
Make nodes spawn in the center of the view when copied from another graph
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 年前
42b09806
Add first pass Texture2DArray and Texture3D support
6 年前
7688ce53
Updated with the PR feedback
6 年前
57c37d06
Merge pull request #1355 from Unity-Technologies/sg/show-generated-code
Show generated code for shader graph
6 年前
fafb59af
Run code formatter.
6 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
6 年前
58554194
Remove old "update dependencies" code from window class
6 年前
f8fc4b16
Added functionality for updating the title of the shader graph window
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 年前
67f8b052
Removing this, since it has been added into another PR
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 年前
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 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
0d207da9
Fix for prompting dirty shader graph
Wen a shader graph is dirty it will now tell you the name of it.
6 年前
d638cb4b
one more new line
Added another new line character since that is how the save dirty scene looks like
6 年前
4294530e
Fixes for previews not updating ( #1737 )
Added a bool for frame all.
Dirty the nodes after Geometry changed event.
6 年前
Peter Bay Bastian
Jens Holm
Patrick Fournier
GitHub
Tim Cooper
Matt Dean
Martin Thorzen
jensgholm15@gmail.com
martint-unity