Tim Cooper
2a039635
[Shader Graph] Inital commit of modularised graph editor
12 年前
Tim Cooper
6b771e90
[Shader Graph] Fix some assets.
12 年前
Tim Cooper
2de768fd
[Shader Graph]Making it work on current setup.
9 年前
Tim Cooper
4f5faaa2
[Shader Graph]Add project settings
9 年前
Tim Cooper
41921c92
[Shader Graph] update serialization
9 年前
Tim Cooper
3da9634f
[Shader graph]working delete + connect of nodes / edges
9 年前
Tim Cooper
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
Tim Cooper
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 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Tim Cooper
376c8378
[material graph]Change how precision works, make default precision half.
9 年前
Tim Cooper
3313d8c4
trying new UI
8 年前
Tim Cooper
8c5f323e
fixing node drawing
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Tim Cooper
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
joce
64bf0c23
Fix MaterialGraph to match updated Unity changes
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
c5baafe7
Integrate latest GraphView
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
b965052b
update to latest canvas2d branch
Signed-off-by: joce <joce@unity3d.com>
8 年前
Tim Cooper
591ca2fd
Start upgrade to new graph view.
8 年前
Florent Guinier
50b72765
default target == d3d11
8 年前
bfogerty
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
5d59a7b3
Adding Demo Scene stuff.
8 年前
Jennifer Nordwall
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
7a9f1ef2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
683c517e
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
8 年前
Peter Bay Bastian
3457c49b
Updated to work after merge with trunk
8 年前
Tim Cooper
0d9b1e6a
Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes)
7 年前
Tim Cooper
0e769105
Merge branch 'hackweek2017' into tidying
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs
# MaterialGraphProject/Assets/_MingWai/GeneratedTextureDemo/0-UnityLogo-Texture.asset.meta
# MaterialGraphProject/Assets/_MingWai/Gradient.asset.meta
7 年前
Mads Ronnow
f4f2a2f8
Fixed graph image comparison test and added graph shader text comparison in test
7 年前
Tim Cooper
28cf7cb6
Upgrade to trunk based graph view.
7 年前
Tim Cooper
f9b09347
remove testable suffix (not needed)
7 年前
Yuanxing Cai
77e26863
Merge branch 'master' into crash-fixes
7 年前
Peter Bay Bastian
f2510f42
#35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones)
7 年前
Peter Bay Bastian
cffc8159
Update project version
7 年前
Matt Dean
fc0d26d6
Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters
7 年前
Peter Bay Bastian
65e94a0c
Add rate limiting for preview updates
7 年前
Tim Cooper
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
damian
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
GitHub
5363a614
Merge pull request #71 from Unity-Technologies/no-presenters
No presenters
7 年前
Peter Bay Bastian
97bd13fa
Set render pipeline to LW
7 年前
Peter Bay Bastian
7d5025eb
Various comfort changes to gitignore so that we have less "do not commit" files popping up
7 年前
Tim Cooper
ccf49055
Merge remote-tracking branch 'origin/master'
7 年前
Peter Bay Bastian
1fda75af
more party
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Peter Bay Bastian
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
GitHub
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
Peter Bay Bastian
a00f148d
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Peter Bay Bastian
12229415
Misc changes from change to a scripted importer
7 年前
mathieum-unity
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
mathieum-unity
120a0ffe
clean up before merge
7 年前
Peter Bay Bastian
61fab094
Update to work with trunk
7 年前
mathieum-unity
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 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
GitHub
8d403174
Merge pull request #83 from mathieum-unity/graphview-styling-updates
Graphview styling updates
7 年前
Peter Bay Bastian
7fd5c8ef
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Peter Bay Bastian
e1281f8c
Fixes for new node style
7 年前
Matt Dean
dadccc50
Merge branch 'master' into node-channel
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
048fd0dd
Update to latest light weight pipeline.
7 年前
Tim Cooper
54ac74c0
Merge branch 'master' into node-input-scene
7 年前
Peter Bay Bastian
94202c55
Assembly Definition Files
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
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 年前
Peter Bay Bastian
e1f95448
Various bug fixes
* Clean up master preview render data
* Add size check to IndexSet.Contains
7 年前
Peter Bay Bastian
d41f2281
Fix hanging edges ( fixes #142 , fixes #152 , fixes #158 )
7 年前
GitHub
29adf637
Merge pull request #172 from Unity-Technologies/fix-hanging-edges
Fix hanging edges (fixes #142 , fixes #152 , fixes #158 )
7 年前
Matt Dean
725a1ea9
Merge branch 'master' into sliders
7 年前
Matt Dean
8984577a
Merge branch 'master' into node-input
7 年前
Jens Holm
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Matt Dean
9e6e6e30
Revert uneeded changes
7 年前
Peter Bay Bastian
c1e7625e
Hide debug outputs behind a define
7 年前
GitHub
e2675d66
Merge pull request #246 from Unity-Technologies/devmode-define
Devmode define
7 年前