Tim Cooper
|
2a039635
|
[Shader Graph] Inital commit of modularised graph editor
|
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
|
1eaab6d4
|
[MaterialGraph] Compiling (and working) specular / metal setups.
|
9 年前 |
Tim Cooper
|
3824cd6b
|
[Shader Graph] tidying.
|
9 年前 |
Tim Cooper
|
31fa7c60
|
[Material Graph]Readd export button. Fix issue with sub graph exports.
|
9 年前 |
Tim Cooper
|
313777e5
|
[Mat Graph] Master Node Inversion refactor
|
8 年前 |
Tim Cooper
|
1c332af5
|
[mat graph]Fix issue with edges not behaving well
|
8 年前 |
GitHub
|
1172640f
|
Merge pull request #1 from stramit/MasterNode
Master node
|
8 年前 |
GitHub
|
dc7e686b
|
Merge pull request #2 from stramit/NewUI
New ui
|
8 年前 |
Tim Cooper
|
9ea47ed4
|
working on shader compiler issues
|
8 年前 |
Tim Cooper
|
53ae5d47
|
Merge branch 'fixingshadercompiler' into HEAD
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/NodeExpander.cs.meta
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Styles/SerializableGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/TextureNode.cs
|
8 年前 |
Tim Cooper
|
7ee96660
|
[mat graph]Start work on remapper
|
8 年前 |
Tim Cooper
|
112ae744
|
[mat graph]Really rough, but working! remap nodes.
|
8 年前 |
Tim Cooper
|
e6cc7289
|
Merge branch 'RemapAndSubshader'
|
8 年前 |
Andre McGrail
|
8e7cca56
|
Remap Resurrected again
Cubemap uses WorldViewReflection if no UVs plugged in
|
8 年前 |
Eduardo Chaves
|
5eca2dca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
MingWai
|
4c1c61da
|
ExportTexture MasterNode
|
8 年前 |
RinaldoTjan
|
ea69972e
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
17d6c4b6
|
Fix compilation error in ExportTextureMasterNode
|
8 年前 |
Matt Dean
|
18a97c8c
|
Added Anisotropic Metallic master
|
8 年前 |
Eduardo Chaves
|
20f9d0ca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
fac62848
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
a861a405
|
export texture compatible with CustomTexture (wip)
|
8 年前 |
Matt Dean
|
7968bfa6
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
72252143
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Andre McGrail
|
0e23df0d
|
Tweaked shader template with GI support
|
8 年前 |
Matt Dean
|
e9270489
|
Advanced master updates
- Add subsurface master node
- Add custom data support to abstract advanced master
- Removed pragma target 5.0 (for GL)
|
8 年前 |
ChrisTchou
|
45eedc86
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
fe8256e6
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
8012f9e3
|
Fix CustomTexture preview
|
8 年前 |
Jennifer Nordwall
|
c51c8ff3
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
bfogerty
|
1f0971d6
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
475f5e3b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
vlad
|
5f08fc4e
|
Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc.
|
8 年前 |
Matt Dean
|
05bc3cb7
|
Added some anisotropy maps and test graphs
|
8 年前 |
vlad
|
cd1776fc
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
b94d71ca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
RinaldoTjan
|
c5984a7b
|
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 年前 |
Tim Cooper
|
e3f06249
|
Shader name is now the name of the file.
|
7 年前 |
Peter Bay Bastian
|
c178455f
|
Fix alpha blending in shader template
|
7 年前 |
Matt Dean
|
e1d63321
|
Initial attempt
|
7 年前 |
Matt Dean
|
2c7d3d45
|
Some channels working
|
7 年前 |
Matt Dean
|
7a860c7c
|
Initial functional PBR master
|
7 年前 |
Matt Dean
|
6617bfcf
|
Working Lightweight PBR Masters
|
7 年前 |
Matt Dean
|
5aa5451a
|
Fixes for PR
|
7 年前 |
Matt Dean
|
02a01bed
|
Bring handwritten and graphmade vertex structs in line
|
7 年前 |
Matt Dean
|
22d054b1
|
PBR Parity between graph and bespoke
- Need to gamma convert albedo textures somehow
- Still no blending
|
7 年前 |
Matt Dean
|
4399a579
|
Add FastBlinn master
|
7 年前 |
Matt Dean
|
c9975eed
|
Add unlit master and cleanup
|
7 年前 |
GitHub
|
569bb836
|
Merge pull request #65 from stramit/lt-pipeline-masters
Lightweight PBR master nodes
|
7 年前 |
Tim Cooper
|
95cdeda0
|
Merge remote-tracking branch 'origin/master' into refactor-properties
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/GraphInspectorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/SurfaceMasterNodeEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Views/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GraphEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs
|
7 年前 |
Tim Cooper
|
29754ac3
|
Working light weight unlit master node
|
7 年前 |
Tim Cooper
|
fb21bff8
|
Working lightweight metallic master node.
|
7 年前 |
Tim Cooper
|
779d0288
|
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
|
7 年前 |
Tim Cooper
|
e5c78ee9
|
Separate usage of 'graph requirements' from 'model requirements' to not pollute the surface input structure.
|
7 年前 |
Tim Cooper
|
97cfbe75
|
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
|
7 年前 |
Tim Cooper
|
c1f2dd69
|
Unlit and lit nodes now working properly in and outside a subgraph :)
|
7 年前 |
Tim Cooper
|
f2cae710
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
Tim Cooper
|
85affe1f
|
Update lightweight pipeline / SRP version
|
7 年前 |
Tim Cooper
|
66cf728c
|
Tidy up transforms so that graphs have a 'prefered' space to work in.
|
7 年前 |
Tim Cooper
|
52f89bea
|
Merge branch 'spacetranslation' into master2
|
7 年前 |
GitHub
|
21a946ef
|
Merge pull request #73 from Unity-Technologies/master
Merge master
|
7 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
Tim Cooper
|
da15e457
|
dirty first pass pass architecture.
|
7 年前 |
Tim Cooper
|
6f035d8a
|
hack and slash.
|
7 年前 |
Tim Cooper
|
a0602cf5
|
Generalised PBR / Unlit master
|
7 年前 |
Tim Cooper
|
0ceca805
|
Add transparency modes.
|
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
|
048fd0dd
|
Update to latest light weight pipeline.
|
7 年前 |
Tim Cooper
|
54ac74c0
|
Merge branch 'master' into node-input-scene
|
7 年前 |
Tim Cooper
|
f799dd40
|
Really Rough working HD Unlit master node.
|
7 年前 |
Tim Cooper
|
16406a1d
|
Working on conversion to new library
|
7 年前 |
Tim Cooper
|
7995a0e9
|
upgrading to new shader library.
|
7 年前 |
Tim Cooper
|
f79b8aa2
|
Add alpha clip threshold to PRB master.
|
7 年前 |
Tim Cooper
|
bf727807
|
Fix lightmapping issue.
|
7 年前 |
GitHub
|
d1d69177
|
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
|
7 年前 |
Tim Cooper
|
5c979fc8
|
Merge master
|
7 年前 |
Tim Cooper
|
ad906af4
|
Creating mini shader graph library / fixing gamma -> linear colours
|
7 年前 |
Tim Cooper
|
5c4cbe12
|
For LW use the proper shader paths that get exported from the LW package..
|
7 年前 |
Tim Cooper
|
d920687b
|
Fix up LWUnlit to work with shader library.
|
7 年前 |
Tim Cooper
|
f71d562a
|
Working HD / LW unlit from same shader file.
|
7 年前 |
GitHub
|
c3ae833e
|
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
|
7 年前 |
Jens Holm
|
93fa2455
|
Merge remote-tracking branch 'origin/master' into inspector-window
|
7 年前 |
Tim Cooper
|
21984136
|
LW working with new SRP release.
|
7 年前 |
GitHub
|
2927625a
|
Merge pull request #169 from Unity-Technologies/SRP-0.1.25
Srp 0.1.25
|
7 年前 |
Tim Cooper
|
216c2b0a
|
Fix shader template issue + bump release.
|
7 年前 |
Tim Cooper
|
feb5b785
|
Fix up instancing from graph.
|
7 年前 |
Matt Dean
|
97e5473e
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
Matt Dean
|
f43e0a6f
|
Merge branch 'master' into node-input
|
7 年前 |
Matt Dean
|
352a061a
|
Merge branch 'master' into compare-and-branch
|
7 年前 |
Tim Cooper
|
98264874
|
Use proper UV channel for lightmap coordinates.
|
7 年前 |
Jens Holm
|
55b86ced
|
Merge branch 'master' into inspector-window
|
7 年前 |
Tim Cooper
|
64df08f0
|
[fix]Fix preview blending when you have alpha
|
7 年前 |
Tim Cooper
|
179e0ef0
|
[FIX]#168 Add alpha into unlit node.
|
7 年前 |
Tim Cooper
|
e9757253
|
Feedback from PR
|
7 年前 |
GitHub
|
8e8beb43
|
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
|
7 年前 |
Matt Dean
|
725a1ea9
|
Merge branch 'master' into sliders
|
7 年前 |
Peter Bay Bastian
|
d00ca780
|
Merge branch 'master' into blackboard
|
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 年前 |
Tim Cooper
|
3b150ad9
|
Add Shadow / depth passes to lightweight unlit master node.
|
7 年前 |
GitHub
|
e986db46
|
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
|
7 年前 |
Martin Thorzen
|
7b5ca064
|
Merge with master
|
7 年前 |
Peter Bay Bastian
|
5399d0b1
|
Update LW master nodes to work with latest SRP repo
|
7 年前 |
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
7 年前 |
Matt Dean
|
de80e921
|
Add two sided support for shadow pass
|
7 年前 |
GitHub
|
5e8fdfe2
|
Merge pull request #259 from Unity-Technologies/node-bugfixes
Master node improvements
|
7 年前 |
Peter Bay Bastian
|
8de769dd
|
Move lightweight sub-shaders and templates to SRP repository
|
7 年前 |
GitHub
|
df788737
|
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
|
7 年前 |
Peter Bay Bastian
|
0b584564
|
Merge with master
|
7 年前 |
Peter Bay Bastian
|
a029858d
|
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
|
7 年前 |
Keijiro Takahashi
|
69fe16a8
|
Bugfix: IsGammaSpace is undefined in HD Unlit
|
7 年前 |
GitHub
|
0431024d
|
Merge pull request #279 from keijiro/fix-hdrp-unlit
Fix: IsGammaSpace is undefined in the HD Unlit subshader
|
7 年前 |
Martin Thorzen
|
731a2018
|
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
|
7 年前 |
Peter Bay Bastian
|
a107a23e
|
Major shader generation refactor part 1
|
7 年前 |
GitHub
|
ae1dff05
|
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
|
7 年前 |
Alex Lian
|
3be7d580
|
Merge remote-tracking branch 'origin/master' into build/automation
|
7 年前 |
Stephane Laroche
|
9498fe0b
|
Merge branch 'master' into stacklit
|
7 年前 |
Matt Dean
|
26a4b39a
|
HD subshaders branch rebuild
|
7 年前 |
GitHub
|
cd218826
|
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
|
7 年前 |
Alex Lian
|
0d975dea
|
Merge remote-tracking branch 'origin/master' into build/automation
|
7 年前 |
Matt Dean
|
36a0484f
|
Merge remote-tracking branch 'origin/master' into sg/texture-types
|
7 年前 |
Alex Lian
|
bb48e6ea
|
Move new files merged from master
For file re-org, catch up files
|
7 年前 |
sebastienlagarde
|
c0461407
|
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
|
7 年前 |
GitHub
|
7f5da648
|
Merge branch 'master' into sg/show-generated-code
|
7 年前 |
Peter Bay Bastian
|
76d74e4f
|
Move HD sub-shader into HD package
|
7 年前 |
GitHub
|
ff309c06
|
Merge pull request #1392 from Unity-Technologies/sg/move-hd-subshader-to-package
Move HD sub-shader to HD package
|
7 年前 |
Tim Cooper
|
2c4a517b
|
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
|
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 年前 |