2a039635
[Shader Graph] Inital commit of modularised graph editor
12 年前
7d0465eb
[Shader Graph]Reformat the code to match conventions.
9 年前
c2f74843
Fix up setting preview properties to be pull based instead of push based (needs close review)
9 年前
53f95972
[shader graph]Refactor
-namespace UnityEditor.Graphs.Material
+namespace UnityEditor.MaterialGraph
9 年前
60dd24e7
[shader graph]Update update some nodes to have multiple outputs.
9 年前
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
4d5ee48d
[shader graph]Start adding UI to the graph view.
9 年前
28d3f4cc
[Shader Graph]
Remove properties as they are not needed (will expose property setting per input node)
Add support for compact node UI view
Add Vector3 node
Update some example graphs
9 年前
51ceebd2
[shader graph]optimise for GC
9 年前
82eedf8b
[shader graph]allow properties to be exposed (happens via UI)
9 年前
abcc9002
[shader graph]
*Fix exposition of vector properties
*Change validation (graph wholeistic)
*Add view layer callback for when nodes change internally (need repaint)
*Add missing pool classes
9 年前
2a69fb8d
[shader graph] remove debug that was left in.
9 年前
798bca64
[shader graph]
*Use GUID for node identifier instead of instance ID (Stable between runs)
*Cash hash of last generated preview shader string, do not regenerate if it's the same
*Serialize node preview shaders / materials / last generated shader hash (load time optimisation)
*Add node property: canDeleteNode returns false by default. True for pixel master node
*Rarrange popup menu
9 年前
af2e75ab
[shader graph]Data refactor 3
9 年前
34db823b
[shader graph]Data refactor 4 (working kind of now)
9 年前
159a13a8
[shader graph]Renable delete. Fix guids so shaders generate properly.
9 年前
418682b1
[Material Graph]Refactoring graph architecture.
9 年前
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
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 年前
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
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 年前
8e10c8cb
[mat graph]Sub graph is working again.
8 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
553fedbf
[Format]Run code formatting
8 年前
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
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 年前
234030ae
Corrected onModified calls for various nodes
8 年前
7ee96660
[mat graph]Start work on remapper
8 年前
c11fe3b4
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
8 年前
435b3c0e
Add names to property nodes in the editor
8 年前
2e183994
Add time checkbox
Make shorter GUIDs
8 年前
7e160ce8
Run `hg format` on repository
7 年前
f6fa3513
Starting to extract properties.
7 年前
8a87c992
More refactoring.
7 年前
735c401b
Working: Properties window + new master node.
7 年前
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
215e1b6a
Refactoring slot types.
7 年前
24923996
misc fixes afer changes
7 年前
56967512
Property attribute control
7 年前
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 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
7 年前
8e5b0d9b
First pass inlining property nodes.
7 年前
f14af0f4
Added Cubemap nodes
7 年前
16640c42
Run code format tool
7 年前
3f34639b
Fixes for subgraph, preview and property nodes
7 年前
21f4a1ac
Fix Property node output names
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 年前
2f6e839e
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
7 年前
e24aafae
Boolean node and type (part 2)
7 年前
cfb57499
Add Slider
ShaderProperty, Control, Node and property list entry
7 年前
333ded2e
Remove IntegerMaterialSlot
7 年前
739c124a
Merge branch 'master' into sliders
7 年前
484b4f58
* Add individual properties to node search
* Remove dropdown from property node
* Add all compatible slots to node search when dragging into empty space
*
7 年前
4ad43705
Vector1 property refactor and types
7 年前
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
57a0eab1
Remove unused imports in entire solution
7 年前
394320a1
Add documentation links for all nodes
7 年前
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
fafb59af
Run code formatter.
7 年前
Tim Cooper
Peter Bay Bastian
Matt Dean
GitHub