f799dd40
Really Rough working HD Unlit master node.
7 年前
f79b8aa2
Add alpha clip threshold to PRB master.
7 年前
5c979fc8
Merge master
7 年前
25b66c4b
fixing merge
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
f71d562a
Working HD / LW unlit from same shader file.
7 年前
c3ae833e
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
7 年前
6c0a8015
Disable HDUnlit for now as there are missing remaps.
7 年前
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
25109a19
Extend PBR master functionality
- Add Fade and Multiply blend modes
- Expose culling options
- Change UV enum to caps
- Add camel case string converter to utils
- Convert camel case on CodeFunctionNode
7 年前
ccf55db8
Revert Master node changes
- Will put in separate PR
- Remove new blend modes
- Remove culling dropdown
7 年前
20df2273
Add newlines
7 年前
352a061a
Merge branch 'master' into compare-and-branch
7 年前
179e0ef0
[FIX]#168 Add alpha into unlit node.
7 年前
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
725a1ea9
Merge branch 'master' into sliders
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
8984577a
Merge branch 'master' into node-input
7 年前
fb49e741
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 年前
e1d9b584
Added a Settings Menu for Nodes.
6 年前
8dc99cbc
*Fefactor subshader / master node generation to be more uniform
*Add subshader generator as a 'real' thing, need to hook up UI now so that these can be added and removed.
7 年前
27b8deec
Add API for modification of embedded supported subshaders
7 年前
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
6 年前
7b5ca064
Merge with master
6 年前
bcf4854e
Change normal slot in PBR Master node to display default space binding rather than a vector3 control
6 年前
f5ae4e88
Merge with master
6 年前
b3551b81
Master node improvements part 1
- Add two sided option
- Add multiply blend mode
- Rename blend modes
- Add master node parameter labels
6 年前
27242a3d
Add slot type for bound types to be used in PBR Master node
6 年前
b73b2432
Add Transparent (premultiply alpha) blend mode
6 年前
fcd875c3
Split blend enum into two
6 年前
a83bd958
Make PBR master node be able to require normal and remove BoundVector3MaterialSlot
6 年前
5e8fdfe2
Merge pull request #259 from Unity-Technologies/node-bugfixes
Master node improvements
6 年前
8de769dd
Move lightweight sub-shaders and templates to SRP repository
6 年前
394320a1
Add documentation links for all nodes
6 年前
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
6 年前
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
6 年前
998d8e22
Merge pull request #250 from Unity-Technologies/bound-type-defualt-slots
Bound type default slots
6 年前
0b584564
Merge with master
6 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
6 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
6 年前
d36a05a1
Fix issues after merge with master
6 年前
cfd61180
New node settings. Moved the createsettingselement to the master node
6 年前
2ff4fbd7
Added new settings files for the common settings on the master nodes, PBR and Unlit Master
6 年前
1dfe50bd
Removed the control attributes
6 年前
962fc981
Removed the dependency on SRP so this is now self contained within Shadergraph.
Also removed the dependency on API changes that are note yet in trunk. Button Container on nodes.
6 年前
8f3d14dc
Update with cleaning out unused code. And some formatting.
6 年前
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
6 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
6 年前
e7f9893d
Rebuild previous branch (see comments)
Also:
- Add cull control to shadow and depth
- Add clip define (need to add clip to shadow/depth frag)
- Add HD pipeline tag to unlit subshader
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 年前
94ce8db1
Fix fragment slots adding data to vertex description
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 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
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 年前
544afac6
Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies
6 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
6 年前
51a1873e
Merge branch 'master' into update-changelog
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
549996da
Allow sub-shaders to tell whether they are compatible with a given render pipeline, and hook it up with the UI support for that such that an error is shown in the event that it's _not_ compatible.
This also adds a check in Update() such that the UI is reloaded when the render pipeline changes.
6 年前
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Tim Cooper
GitHub
Jens Holm
Matt Dean
Peter Bay Bastian
Martin Thorzen
Alex Lian
Stephane Laroche
Frédéric Vauchelles
Paul Melamed
Sebastien Lagarde
Antoine Lelievre
Remy
Nerites
Aleksandr Kirillov