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
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
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.
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
553fedbf
[Format]Run code formatting
8 年前
Tim Cooper
c565a8d4
fix formatting
8 年前
Tim Cooper
8736b714
color node now updates dependent nodes when the color is modified.
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
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Paul Demeulenaere
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
8 年前
Tim Cooper
47d64c52
[mat graph]Remove implicit node creation now that we have better code generation framework.
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
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 年前
joce
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
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 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
eb8a8906
Use dictionary to store nodes for faster lookups
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 年前
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
c5a7e594
Fix integration with Undo by introducing IGraphObject
7 年前
damian
83548475
Merging master.
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 年前
Peter Bay Bastian
867e4ea2
Replace OnGraphChange with polling-based change tracking system
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 年前
Patrick Fournier
de93c238
Merge trunk
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 年前
mathieum-unity
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
16640c42
Run code format tool
7 年前
Tim Cooper
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
Peter Bay Bastian
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
Matt Dean
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Peter Bay Bastian
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
GitHub
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
GitHub
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
GitHub
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 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Peter Bay Bastian
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
7 年前
GitHub
a1c15f0d
Merge pull request #229 from Unity-Technologies/safer-callbacks
Safer callbacks
7 年前
Martin Thorzen
7b5ca064
Merge with master
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前