Andre McGrail
|
2dbd4aa3
|
Added nodes
-Ceil
-Exponential
-Floor
-Frac
-HSVtoRGB
-Hue
-InverseLerp
-OneMinus
-Remap
-RGBtoHCV
-RGBtoHSV
-Round
-Sign
-SquareRoot
-Step
-Trunc
-FMod
-Log
WIP Nodes
-ComponentSplitNode
-Cubemap
-Function1in3out
|
8 年前 |
Matt Dean
|
2c5dc651
|
Cleanup
Cleaned up new nodes
Changed Function3Input kShaderNames to be protected
|
8 年前 |
|
Andre McGrail
|
c127b19f
|
-Moved cube map node
-Tweaked colour guide texture
-Fixed time node
|
8 年前 |
|
Matt Dean
|
cf30e087
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
vlad
|
5db9bbb1
|
Saturate, UV Rotation, and tex2Dlod nodes.
|
8 年前 |
Eduardo Chaves
|
0abd0951
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Andre McGrail
|
172b7d9c
|
-CubeMap preview fix, added mip level input
-Resurrected the remap node, was lost to the sea of git for a while……
|
8 年前 |
|
Matt Dean
|
d6b72c9a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
c51916c9
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
bfogerty
|
30bac3ab
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Eduardo Chaves
|
5eca2dca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Andre McGrail
|
cdcf8c8e
|
-Toggle node added, works aside from it needs [toggle] in front of the shader property
-Created a Flow-map ShaderGraph, needs to be transferred to a subgraph once they are fixed
|
8 年前 |
|
Florent Guinier
|
ec474be5
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
bfogerty
|
82da97c0
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Andre McGrail
|
efed7b9f
|
Started on some shader graphs
-Flowmap
-Slope
Added some more test assets
-Rock off the asset store
-Tile-able rock texture
-Teapot mesh
|
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 年前 |
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 年前 |
|
Andre McGrail
|
436e34fe
|
Personal testing changes
|
8 年前 |
Natasha Tatarchuk
|
419516e8
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
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 年前 |
MingWai
|
d82bb008
|
scatter
|
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 年前 |
|
MingWai
|
db8f399d
|
fix gradient serialization
|
8 年前 |
|
ChrisTchou
|
211cce2b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Florent Guinier
|
73112c5a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
bfogerty
|
abec21f1
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
MingWai
|
b038c97f
|
gradient assets
|
8 年前 |
|
Andre McGrail
|
b061e067
|
Lava and some stuff.
Fixed screen pos
|
8 年前 |
|
Florent Guinier
|
670f4bf3
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
ChrisTchou
|
c19d413a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Matt Dean
|
98611b46
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
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
|
b44a8aea
|
Fix some bugs in new nodes (bad conversion to HLSLSnippet node) + Add ability to hide slots at the slot level (i.e. hide implicit inputs for function node)
|
7 年前 |
|
Matt Dean
|
6617bfcf
|
Working Lightweight PBR Masters
|
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 年前 |
Peter Bay Bastian
|
8a1f3fbd
|
Remove substance material due to support being removed in Unity
|
7 年前 |
Jens Holm
|
ae1852e9
|
Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale
|
7 年前 |
|
Matt Dean
|
9c0b93c1
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
|
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
|
Peter Bay Bastian
|
7ee5ef2d
|
Move some test assets inside the TestAssets folder
|
7 年前 |
|
Peter Bay Bastian
|
dd9feff6
|
Move files from Assets to top-level
|
7 年前 |
|
GitHub
|
286d82a6
|
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
|
7 年前 |
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
7 年前 |
|
Peter Bay Bastian
|
0e95358f
|
Update meta files
|
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
|
d17dc935
|
Add test templates for graphs and introduce LFS for *.png
|
7 年前 |
|
GitHub
|
6b96c163
|
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
|
7 年前 |
|
Peter Bay Bastian
|
8076c27e
|
Merge branch 'master' into copy-property-nodes
|
7 年前 |
|
Jens Holm
|
60639f41
|
Merge branch 'master' into editable-property-reference-names
|
7 年前 |
|
Tim Cooper
|
cba42a6a
|
Remove large files.
|
7 年前 |
|
Tim Cooper
|
ce3b9547
|
Add files and non large files.
|
7 年前 |
sebastienlagarde
|
8140058d
|
Merge branch 'master' into ContactShadowWithLightTransmission
|
7 年前 |
|
GitHub
|
bd393bda
|
Merge branch 'master' into switch-support
|
7 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
Stephane Laroche
|
f46075fb
|
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
7 年前 |
|
GitHub
|
0610a60c
|
Merge branch 'master' into sg/error-for-incompatible-pipeline
|
6 年前 |
|
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
