Tim Cooper
3dc77b34
[Shader Graph] Update the graph to use the new asset generation callback.
12 年前
Tim Cooper
2de768fd
[Shader Graph]Making it work on current setup.
9 年前
Tim Cooper
3138de7e
[Shader Graph]Fix minor issues as they are encountered
9 年前
Tim Cooper
7d0465eb
[Shader Graph]Reformat the code to match conventions.
9 年前
Tim Cooper
53f95972
[shader graph]Refactor
-namespace UnityEditor.Graphs.Material
+namespace UnityEditor.MaterialGraph
9 年前
Tim Cooper
556a7777
[shaderGraph]
*Use last shader string instead of hash.
9 年前
Tim Cooper
af2e75ab
[shader graph]Data refactor 3
9 年前
Tim Cooper
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
9 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Tim Cooper
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
9 年前
Tim Cooper
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
Tim Cooper
7ee96660
[mat graph]Start work on remapper
8 年前
Tim Cooper
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
Tim Cooper
1896e42f
[Improvements]Change workflow to work with new montreal importer work (scriptable importer)
8 年前
Tim Cooper
3094ee75
Merge branch 'new-importer-workflow' into hackweek2017
8 年前
Florent Guinier
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Tim Cooper
5e3b99fe
working on better workflow (double click shader to open in edit window)
8 年前
Tim Cooper
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
Peter Bay Bastian
f516d811
Merge remote-tracking branch 'origin/subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
0b56c45b
first pass.
7 年前
Tim Cooper
97cfbe75
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Tim Cooper
79841e4c
Starting to work layer graph
7 年前
damian
20646d1b
Removed MaterialNodePresenter.
7 年前
Tim Cooper
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 年前
Tim Cooper
6161fea6
Fix compiler warnings :)
7 年前
GitHub
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
Peter Bay Bastian
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 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge 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 年前
Tim Cooper
6f035d8a
hack and slash.
7 年前
GitHub
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
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 年前
Tim Cooper
54ac74c0
Merge branch 'master' into node-input-scene
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 年前
Tim Cooper
2f0a0145
Remove layer graph + remap graph for beta1
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Martin Thorzen
5dd5411a
Moved the create shader graphs in under Create -> Shader -> PBR shader / Unlit Shader / Sub Shader
They also create proper defaults. PBR creates a PBR Master, Unlit creates an Unlit Master
7 年前
GitHub
ea1b4595
Merge pull request #210 from Unity-Technologies/shadergraph-creation-workflow
Moved the create shader graphs in under Create -> Shader -> PBR shade…
7 年前
Matt Dean
3df359f2
Merge branch 'master' into node-matrix
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
Peter Bay Bastian
57a0eab1
Remove unused imports in entire solution
7 年前
GitHub
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前