3824cd6b
[Shader Graph] tidying.
9 年前
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
8 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
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 年前
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
b359c1c7
Let master node to have 2D preview
7 年前
cd52a1e3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
180f53e2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
ec474be5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
06b7010b
Remove "AnyNode"
7 年前
793887f9
Working 'convert to subgraph'
7 年前
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 年前
d69d3c1d
Move IMayRequireNormal into own file
7 年前
8a87c992
More refactoring.
7 年前
be067cc2
first real working shader in the 'new' model.
7 年前
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
29754ac3
Working light weight unlit master node
7 年前
76430e32
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
7 年前
314ba653
Add change notifications for shader properties
7 年前
dc01b9ae
Fix constructor in ShaderPropertyRemoved
7 年前
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
79841e4c
Starting to work layer graph
7 年前
c002d689
Move graph things from Runtime to Editor
7 年前
4e26b4fc
First pass working layered graph :)
7 年前
83548475
Merging master.
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 年前
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
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 年前
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
b2eceafe
Improve 'geometry' based nodes so they can do space translations internally.
7 年前
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
abed850e
Merge master
And fix conflicts
7 年前
a02b954a
Input Part 3
- Final for now
- No texture nodes
- No gradient nodes
- Havent check parity
- Fixes for PR
7 年前
3039671f
Merge master
7 年前
de93c238
Merge trunk
7 年前
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
16640c42
Run code format tool
7 年前
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
2f0a0145
Remove layer graph + remap graph for beta1
7 年前
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
c47de91f
Fix variables names from coordinate space
7 年前
46e0e4e5
Merge pull request #98 from Unity-Technologies/node-bugfixes
Maths nodes bugfixes
7 年前
67d2fd02
Merge master
7 年前
fd5fa964
Merge Master
7 年前
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
41e06942
Change IGeneratesFunction such that a name is provided to a registry, which only allows 1 implementation per name. Includes a validation mode that checks that multiple given functions with the same name are actually the same.
7 年前
5c979fc8
Merge master
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 年前
5c86f77c
Merge master
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
77b49204
Added a Settings menu for Nodes. Implementation of IHasSettings. Nodes can derive from this interface and implement their own VisualElement as their settings menu.
6 年前
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
6 年前
a1c15f0d
Merge pull request #229 from Unity-Technologies/safer-callbacks
Safer callbacks
6 年前
7b5ca064
Merge with master
6 年前
57a0eab1
Remove unused imports in entire solution
6 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
6 年前
f5ae4e88
Merge with master
6 年前
abd8a058
Made IMayRequirePosition public
6 年前
eae8c0fc
Merge pull request #293 from Unity-Technologies/vector-input-fields
Vector input fields and IMayRequirePosition
6 年前
8742fc7b
Merge branch 'master' into node-settings
6 年前
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
6 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
6 年前
4dfbc988
Fix per-stage requirements and translations part 1
- Separate Master node requirements into per-slot stages
- Add shader stage option to IMayRequire interfaces
- Remove uneeded intermediate spaces from surface description
- Change orthonormal basis to world
6 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
6 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
9498fe0b
Merge branch 'master' into stacklit
6 年前
26a4b39a
HD subshaders branch rebuild
6 年前
cd218826
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
6 年前
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
6 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
6 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
6 年前
fafb59af
Run code formatter.
6 年前
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
6 年前
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
6 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
6 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
6 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
8908da09
Pipeline specific graph functions and nodes ( #1673 )
* Refactor GraphFunctions includes to per-pipeline
* Add Scene Color node
- And camera opaque requirements
- Returns 0s in HD
* Add Scene Depth node
* Rename GraphFunctions.hlsl > ShaderGraphFunctions.hlsl
* Update references to ShaderGraphFunctions.hlsl
6 年前
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Tim Cooper
GitHub
MingWai
bfogerty
RinaldoTjan
Florent Guinier
Peter Bay Bastian
damian
Matt Dean
Patrick Fournier
mathieum-unity
Jens Holm
Martin Thorzen
Alex Lian
Stephane Laroche
sebastienlagarde
Frédéric Vauchelles
Oliver Schnabel
Remy
Paul Melamed
Thomas
Chris Tchou
Nerites
Aleksandr Kirillov
egomeh
Yao Xiao Ling