Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Tim Cooper
a2d8ad62
Add drawing of custom node preview
Delegate drawing to a custom drawer class that is looked up via
attribute, it will search for most specific drawer first, then walk up
the inheritence chain.
9 年前
Tim Cooper
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
9 年前
Tim Cooper
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
Tim Cooper
c522adcc
[material graph]Working on texture preview / regeneration of drawing layer workflow.
9 年前
Tim Cooper
cea17e49
[Material graph] Tidy up asset handling (generic graph drawer that can be used by all graphs)
9 年前
Tim Cooper
516c1760
[Material graph]Mark asset as dirty on modification so it can be saved properly when modified.
9 年前
Tim Cooper
26c129c0
[Material Graph] Sub graph / subgraph input nodes are can be added now, need to work on slots still
9 年前
Tim Cooper
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
9 年前
Tim Cooper
51558db2
[Material graph]hax to serialize texture reference :/
9 年前
Tim Cooper
0dd596bf
[Material Graph] change nodes property to GetNodes<T> where you can get nodes of a given type
Remove redundent code
Set node when adding to graph (do not set owner manually)
Tidy up tests after changes.
9 年前
Tim Cooper
d9619701
[material graph] Tidy up API for slot management (make generic).
9 年前
Tim Cooper
addd6c34
[Material Graph]Write tests / fix issues as encountered
9 年前
Tim Cooper
8e10c8cb
[mat graph]Sub graph is working again.
8 年前
Tim Cooper
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
Tim Cooper
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
8 年前
Tim Cooper
607a2f9e
[material graph]Add button to convert selection into subGraph
8 年前
Tim Cooper
376c8378
[material graph]Change how precision works, make default precision half.
8 年前
Tim Cooper
ac62e6d8
[Shader Graph]Tidy function input nodes to now handle input dimensions nicely.
8 年前
Tim Cooper
7ae021c6
[material graph]Convert slots from being a string into being an int that can be referenced from the node.
8 年前
Tim Cooper
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
Tim Cooper
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
Tim Cooper
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
Tim Cooper
480131e4
[Material Graph]Split out lighting functions to different files
8 年前
Tim Cooper
553fedbf
[Format]Run code formatting
8 年前
Tim Cooper
95b250d2
[material graph] Fix newline issues.
8 年前
Tim Cooper
b6ca28a2
[material graph]Make newline platform standard.
8 年前
Tim Cooper
5055d67e
[Material graph]More testing + fix things that are broken with the tests.
8 年前
Tim Cooper
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
Tim Cooper
d759e955
[Material Graph]Tidy up integration testing.
8 年前
Tim Cooper
b42e0339
[Material Graph]Fix up texture node serialization.
8 年前
Tim Cooper
29600f72
[Material graph] Fix up subgraph asset reference serialization.
8 年前
Tim Cooper
8ecfe640
[material graph]Remove upgrade code, no needed yet.
8 年前
Tim Cooper
ff11a50c
[Material node] use color property instead of field.
8 年前
Tim Cooper
6f66febe
[material graph]Fix standalone compile issue.
8 年前
Tim Cooper
01630326
drawing preview now.
8 年前
Tim Cooper
c565a8d4
fix formatting
8 年前
Tim Cooper
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
Tim Cooper
d55cb3d6
[material graph]Fixing position + serializing positions
8 年前
Tim Cooper
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
8 年前
Tim Cooper
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
Tim Cooper
ab7317bb
[Mat Graph]Run code formatter
8 年前
Tim Cooper
860a7a67
[Material Graph]delete edge + vector 1 node drawing.
8 年前
Tim Cooper
57c91c90
[material graph]Run code formatter.
8 年前
Peter Bay Bastian
85173f43
Added UI for Vector{2,3,4}
8 年前
Peter Bay Bastian
a848031a
Added NodeModificationScope for the onNodeModifiedCallback
Currently it is not used anywhere and all the places making the
callbacks are passing ShaderRegeneration. Need to analyse which
properties actually causes ShaderRegeneration as well as actually use
this callback to regenerate shaders rather than checking against node
version.
8 年前
Peter Bay Bastian
f8cafbbb
Removed preview from vector nodes
8 年前
Peter Bay Bastian
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
Peter Bay Bastian
234030ae
Corrected onModified calls for various nodes
8 年前
Tim Cooper
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
Tim Cooper
f6777ffb
[Material Graph]Restore first slot for normal map for now. Needs a real fix.
8 年前
Tim Cooper
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
Tim Cooper
1c332af5
[mat graph]Fix issue with edges not behaving well
8 年前
Tim Cooper
3a45f192
[mat graph]Fix up previews a bit more.
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 年前
Paul Demeulenaere
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
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
5cbe3cf4
[mat graph]Fix subgraphnode always regenerating the graph + fix exception on port adaptor
8 年前
Tim Cooper
93902ec9
[material graph] Pad v1 -> v4 properly.
8 年前
Tim Cooper
bc6130d7
Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node.
8 年前
Paul Demeulenaere
2629abf3
Avoid adding twice the same property (we should also have a test for that)
8 年前
julienf-unity
95bdff73
Add default constructor for MaterialSlotDefaultInput to allow deserialization
8 年前
Peter Bay Bastian
42eb0e0c
Merge branch 'master' of github.com:stramit/MaterialGraph
8 年前
Paul Demeulenaere
94f746ff
- Avoid add null shaderChunks
- Public for normal slot (useful for default input)
8 年前
Paul Demeulenaere
51383cec
Add world tangent node (with IRequireTangent behavior)
8 年前
Tim Cooper
47d64c52
[mat graph]Remove implicit node creation now that we have better code generation framework.
8 年前
Tim Cooper
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
8 年前
Tim Cooper
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
Paul Demeulenaere
c1f9ae7d
Add WorldBitangentNode (with IMayRequireBitangent behavior)
8 年前
Paul Demeulenaere
2c0192a0
Add VertexColorNode & Fix missing bitangent in AbstractSurfaceMasterNode.cs
8 年前
Paul Demeulenaere
8592d7d0
Add an index to RequiresMeshUV, allows require UV1 to UV3
8 年前
Tim Cooper
7ee96660
[mat graph]Start work on remapper
8 年前
Tim Cooper
57c58904
[mat graph]More remapping
8 年前
Tim Cooper
112ae744
[mat graph]Really rough, but working! remap nodes.
8 年前
Tim Cooper
c11fe3b4
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
8 年前
Tim Cooper
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
Peter Bay Bastian
70e53ed7
Refined `ModificationScope` with `.Topological`
`Topological` represents something that changes the topology of the
graph, i.e. something that causes e.g. edge removal.
8 年前
Peter Bay Bastian
22ea3bd8
It is now possible to mark a master node as active in a shader graph (but not in others like sub graphs or remap graphs)
8 年前
Peter Bay Bastian
5960f11a
Added basic inspector for graph editor and added the selected nodes to the graph asset
It currently just shows the names of the currently selected nodes
8 年前
Peter Bay Bastian
0d1c4d7e
Extracted common parts of MaterialGraphAsset, MaterialRemapAsset and MaterialSubGraphAsset into abstract class
8 年前
Tim Cooper
e6b70122
[Material Graph]Show slot default inputs in the inspector.
8 年前
Tim Cooper
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
Tim Cooper
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
Florent Guinier
ce59a9db
Step1 for LevelNode
8 年前
Tim Cooper
1896e42f
[Improvements]Change workflow to work with new montreal importer work (scriptable importer)
8 年前
Florent Guinier
6f40e6a8
Level node (this time working :))
8 年前
Florent Guinier
8f28c9f1
move levelNode to "range" menu
8 年前
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 年前
Florent Guinier
cbbf048e
Fix SwizzleNode step1
8 年前
Tim Cooper
3094ee75
Merge branch 'new-importer-workflow' into hackweek2017
8 年前
Florent Guinier
7ae13517
SwizzleNode now working
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 年前
Florent Guinier
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
c30e0ee9
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
24f3679d
Added Function4Input & Function4InputTest
8 年前
bfogerty
30bac3ab
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
5bed2efc
Menu Reorg: Input
8 年前
Eduardo Chaves
5eca2dca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
d6b32a39
Menu Reorg: UV
8 年前
Florent Guinier
085216ab
Split And Combine step1
8 年前
Eduardo Chaves
91c14c31
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
eeaa57f9
Menu Reorg: Channel & Procedural
8 年前
bfogerty
9d1506f2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
dd853ee2
Add flexibility to splitnode
8 年前
Matt Dean
4eca4e2f
Menu Reorg: Art & Levels
8 年前
bfogerty
1edaa84a
Removed unused property values.
8 年前
Florent Guinier
4b0b903e
Add CombineNode
8 年前
Matt Dean
423d104b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Andre McGrail
b6182225
Menu reorg: All math nodes organised and cleaned
8 年前
vlad
45498f4b
Made rotation node default to mesh UVs if no UV input is specified.
8 年前
vlad
500e0026
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
4adac24f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
vlad
fd9c67e7
Cosmetic change on the output name of the rotation node.
8 年前
bfogerty
1bba1ba2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
ae510b9e
Added a Voronoi Noise Node
8 年前
RinaldoTjan
41da8598
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
MingWai
b359c1c7
Let master node to have 2D preview
8 年前
bfogerty
cd52a1e3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
5e5d7d07
Fix the title of the node.
It was named RGB to Linear in the node title.
8 年前
RinaldoTjan
180f53e2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
1780d88e
The Voronoi Noise can now be animated.
8 年前
Jennifer Nordwall
8a797aa6
Added matrix multiply, transpose, vector projection and rejection
8 年前
RinaldoTjan
67baa28e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Andre McGrail
503b7b62
Remap node fix, beginning of toggle node
8 年前
bfogerty
0d1ac07f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
6ff47f50
Repeating Dot Procedural Node
8 年前
bfogerty
ee8f0ea6
Added a spherize node and fixed a bug in the checkerboatd node.
8 年前
ChrisTchou
9ac0408c
Adding support for IMayRequireViewDirectionTangentSpace, and a simple Parallax node to use it. Node seems to have the correct behavior, but not fully tested.
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 年前
bfogerty
874af82d
Fixed a spherize node calculation error.
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 年前
vlad
09332619
Texture Asset node and sampler2D input/output type
8 年前
Florent Guinier
9f32c80b
ExportTextureMasterNode fix + cleanup
8 年前
bfogerty
a82b356e
Added a Pulse Node
8 年前
Eduardo Chaves
e2223047
Adding Heightmap to Normalmap node. Fixing some bugs with function N
8 年前
bfogerty
f0331f23
Added a procedural box node and made a few changes to the inputs of the pulse node.
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 年前
bfogerty
c80b6a3a
Added an IF node
8 年前
Matt Dean
7968bfa6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
2f5a98bb
We now have a Custom Code Node
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 年前
Florent Guinier
8012f9e3
Fix CustomTexture preview
8 年前
Eduardo Chaves
82a36753
Fixed sufix hack adding _Uniform at the end of sampler 2Ds. Now this case is handled correctly
8 年前
Jennifer Nordwall
2adf665a
Added input/output checking
8 年前
Florent Guinier
f13a8ff6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
vlad
12603c9a
Changing all Texture2D types to Teture to allow custom render textures to be added.
8 年前
bfogerty
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
04080286
Fixed bug. The Cartesian to Polar Node now outputs a vector 2d.
8 年前
Tim Cooper
c8eb7c61
Reenable sub graphs
8 年前
Andre McGrail
bc8714b2
Added nodes:
-ReflectionProbe (samples local reflection probe and has exposed LOD, needs blending and box projection added)
-LightProbe (samples the light probes SH)
Testings scenes and cleanup
8 年前
Tim Cooper
435b3c0e
Add names to property nodes in the editor
8 年前
bfogerty
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
ef69c53a
Convolve filter v1 (WIP)
8 年前
bfogerty
a1811244
A Custom Node can now have no inputs or outputs
8 年前
Matt Dean
c7fbf38f
Added Matrix 2 and 3 types
8 年前
Andre McGrail
ee0f0bf6
Tweaked toggle node, now shows on shader as checkbox
Added expose and HDR check box to colour node
Initial work on float types
8 年前
Florent Guinier
1d20711e
convolve filter step2 (plug weights)
8 年前
bfogerty
2df2cc2b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
74c4e0ee
Convolution filter presenter
8 年前
Eduardo Chaves
c3b50c34
Adding Vertex position to master node and vertex position input node
8 年前
Florent Guinier
ff74ebd2
Convolution filter : fix preview
8 年前
Matt Dean
eeb9f4ff
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
3bce395a
Added Matrix4 and fixed Matrix multiply
8 年前
Matt Dean
3bb72fa1
Updated matrix mul and transpose (hardcoded to 3x3)
8 年前
Andre McGrail
c99dc5e2
REPO FIX
8 年前
bfogerty
5dbc06ce
Voronoi noise now outputs different different effects.
8 年前
Matt Dean
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
a20b7720
Added a Twist UV node and moved the Noise Node into the correct directory.
8 年前
Matt Dean
b2d664e0
Added matrix common and ops
8 年前
MingWai
3ccadfe5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
8938908f
Adding more output variations to voronoi noise
8 年前
bfogerty
995a95bc
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
e1e3ee9c
Added default value to the UVTile node
8 年前
Jennifer Nordwall
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
bd162e6b
Added default value to the checkerboard node
8 年前
Eduardo Chaves
d48c5531
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Natasha Tatarchuk
419516e8
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 年前
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 年前
vlad
953f009f
New sampler2D type for the cases when users require a texture reference, but don't care about using a separate sampler state.
8 年前
bfogerty
7a9f1ef2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Andre McGrail
22cf545d
Fixed math in remap node
Added second output for screenPos that is pure XY UVs
8 年前
Matt Dean
c09d8226
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
46d84ef9
Fixed vector2 node
8 年前
bfogerty
d92a2269
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Andre McGrail
6d640d6a
Added cam direction node
Added cam position node(should be implemented better but no time)
8 年前
ChrisTchou
683c517e
Merge remote-tracking branch 'origin/hackweek2017' 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 年前
vlad
b247c311
Texture assets and related notes work now (Thanks Tim!)
8 年前
MingWai
bdfd3b5f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
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
2e183994
Add time checkbox
Make shorter GUIDs
8 年前
Tim Cooper
96cdde05
Add node that 'just does' HLSL and can convert to shader node based on API.
8 年前
Tim Cooper
e8c71321
converting nodes to new system.
8 年前
Tim Cooper
0336445f
fix node adaption so casting works as expected
8 年前
Tim Cooper
eb2f7590
fix error in uv rotate node.
8 年前
Tim Cooper
08ce57cd
Fix bugs in blend node after port.
8 年前
Tim Cooper
3198bd43
Remove Function2Input node as it is no longer needed.
8 年前
Tim Cooper
4b1458e8
Remove Function3Input (use code node) :)
8 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
8 年前
Tim Cooper
5e6630fb
Porting more nodes to not be function nodes
8 年前
Tim Cooper
eac70c08
Graph edit window now survives serialization.
8 年前
Tim Cooper
d0d60781
Texture asset is now a real asset type...
7 年前
Tim Cooper
06b7010b
Remove "AnyNode"
7 年前
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 年前
Tim Cooper
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Tim Cooper
e3f06249
Shader name is now the name of the file.
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
Tim Cooper
793887f9
Working 'convert to subgraph'
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
178cb981
Extension method for `INode.RequiresTime`
7 年前
Peter Bay Bastian
f9acfdc0
Missing change for previous commit
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
d69d3c1d
Move IMayRequireNormal into own file
7 年前
Peter Bay Bastian
f32d2e24
Add DictionaryPool
7 年前
Peter Bay Bastian
8dc11b9a
Fix split node and add test for it ( #62 )
7 年前
Peter Bay Bastian
ce4b9371
Fix combine node and update split test to also use combine node
7 年前
Peter Bay Bastian
af51e8ac
Better labels for combine node
7 年前
Peter Bay Bastian
fbc6eeac
Fix node compatibility check ( #58 )
7 年前
Peter Bay Bastian
6eea794b
Remove scale and offset from shader inspector
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Matt Dean
e1d63321
Initial attempt
7 年前
Tim Cooper
f6fa3513
Starting to extract properties.
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
Tim Cooper
354517e6
Partially working new master node architecture.
7 年前
Tim Cooper
be067cc2
first real working shader in the 'new' model.
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
d0f07a14
Add everything to vertex input struct as default
7 年前
Matt Dean
b213473c
Adjust vertex input index
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
699f1e8d
temp commit
7 年前
Tim Cooper
0818f178
temp
7 年前
Tim Cooper
735c401b
Working: Properties window + new master node.
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
29754ac3
Working light weight unlit master node
7 年前
Tim Cooper
580b206b
missed files
7 年前
Tim Cooper
fb21bff8
Working lightweight metallic master node.
7 年前
Tim Cooper
0b56c45b
first pass.
7 年前
Tim Cooper
8d5e6fd1
texture exposition working
7 年前
Tim Cooper
52d5558a
do not throw errors on default sampler slots, nodes need to handle this case.
7 年前
Tim Cooper
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
Peter Bay Bastian
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
Tim Cooper
76430e32
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
7 年前
Peter Bay Bastian
bf91b908
Put in change notification for preview expanded state
7 年前
Tim Cooper
e5c78ee9
Separate usage of 'graph requirements' from 'model requirements' to not pollute the surface input structure.
7 年前
Peter Bay Bastian
dcc886b3
Default preview to be expanded
7 年前
Tim Cooper
97cfbe75
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
7 年前
Tim Cooper
1229aaef
Use slot defaults for master nodes.
7 年前
Tim Cooper
c1f2dd69
Unlit and lit nodes now working properly in and outside a subgraph :)
7 年前
Tim Cooper
97674d1f
Remap graph handling for textures.
7 年前
Tim Cooper
4a551695
temp
7 年前
Jens Holm
c5b4edc2
Add preview node
7 年前
Peter Bay Bastian
314ba653
Add change notifications for shader properties
7 年前
Peter Bay Bastian
dc01b9ae
Fix constructor in ShaderPropertyRemoved
7 年前
Jens Holm
2ab88d19
Add title to PreviewNode
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Tim Cooper
19ff14c7
remove c#4 features.
7 年前
Peter Bay Bastian
a3385c0f
Undo/redo prototype
7 年前
Tim Cooper
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
Tim Cooper
79841e4c
Starting to work layer graph
7 年前
Tim Cooper
7809cfe9
refactoring material graph to allow for layered materials.
7 年前
Peter Bay Bastian
c002d689
Move graph things from Runtime to Editor
7 年前
Tim Cooper
4e26b4fc
First pass working layered graph :)
7 年前
Tim Cooper
215e1b6a
Refactoring slot types.
7 年前
Peter Bay Bastian
ff8de4d3
New attribute-based system for node controls
7 年前
Tim Cooper
2c1b60e0
compiling
7 年前
Jens Holm
ddc1113a
Resize handle added only to preview node
7 年前
Peter Bay Bastian
1125f7df
Common attribute control for floaty properties
7 年前
Tim Cooper
24923996
misc fixes afer changes
7 年前
Tim Cooper
3da19296
missed files
7 年前
Peter Bay Bastian
811d7dab
Color attribute control
7 年前
Peter Bay Bastian
95ea6e13
Turn off preview for color node
7 年前
Peter Bay Bastian
f695b6fa
Enum attribute control
7 年前
Peter Bay Bastian
56967512
Property attribute control
7 年前
Peter Bay Bastian
152042bb
Comment out IfNode for now
7 年前
Peter Bay Bastian
7bb42428
Use attribute controls for Matrix nodes
7 年前
Peter Bay Bastian
319e2795
Fix update scope of matrix nodes (they do not support preview properties yet)
7 年前
Peter Bay Bastian
9bf884ab
Add object field attribute control
7 年前
Peter Bay Bastian
3790252c
Remove last node presenters and also type mapper in MaterialGraphPresenter
7 年前
Peter Bay Bastian
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
damian
83548475
Merging master.
7 年前
Matt Dean
4ec6fe3b
Maths Part 1
- Maths/Basic
- Maths/Advanced
- Maths/Range
- Add HLSL safe conversion for node name
7 年前
Peter Bay Bastian
1b46d517
More robust undo/redo by removing and adding nodes
7 年前
Matt Dean
3ca3abee
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
7 年前
Matt Dean
b4599393
Fix merge conflicts for PR
7 年前
Matt Dean
9772a011
More PR fixes
7 年前
Matt Dean
31068f89
More PR fixes
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 年前
Jens Holm
cd7aa840
Add fixed aspect ratio and initial size to PreviewNode
7 年前
Tim Cooper
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
Tim Cooper
b2eceafe
Improve 'geometry' based nodes so they can do space translations internally.
7 年前
Peter Bay Bastian
ab269bcc
Fix issues that should have caused compile errors
7 年前
Tim Cooper
5bc05ae7
tidy up code
7 年前
Peter Bay Bastian
9dbfb5c3
Move slot compatibility check code into MaterialSlot
Validate commands directly in window class, rather than through MaterialGraphPresenter
Move a few things from MaterialGraphPresenter to GraphEditorView
Create manipulator for node creation (NodeCreator), rather than manually doing it in MaterialGraph
Move things from MaterialGraph constructor into GraphEditorView
Completely remove GridBackground, as we were not using it
Remove Clicker manipulator, as it was not used
7 年前
Tim Cooper
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Matt Dean
d085dca3
Maths Part 3
- Cleanup after merge
- Started on Maths/Vector
- Fixed Log and Exponential outputs
- Partial Derivative is WIP
7 年前
Matt Dean
da4c61fd
Maths Part 4
- Maths/Vector (finish)
- Maths/Derivative
- Maths/Trigonometry
- Maths/Matrix (temporarily removed for rewrite)
- Moved CommonMatrix enum to MatrixCommonNode.cs and removed file
7 年前
Matt Dean
6f70ee57
Added Hyperbolic Cos/Tan
7 年前
Matt Dean
a3c5d049
Input Part 1
Input/Basic (WIP)
Input/Scene (WIP)
7 年前
Tim Cooper
9ff93cdb
Add specific material slot types and port code generation node to use them.
7 年前
Peter Bay Bastian
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
GitHub
fcd97941
Merge pull request #75 from Unity-Technologies/master
Update from master
7 年前
Matt Dean
f3353a02
Input Part 2
Input/Geometry
7 年前
Matt Dean
03923b0b
Input Part 3
Input/Matrix
Input/Time (WIP)
7 年前
Peter Bay Bastian
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
Peter Bay Bastian
d284676f
Fix duplicate type parenthesis on sub-graph nodes
7 年前
Matt Dean
abed850e
Merge master
And fix conflicts
7 年前
Peter Bay Bastian
418c94c0
Fix bug in Vector nodes
7 年前
Matt Dean
a02b954a
Input Part 3
- Final for now
- No texture nodes
- No gradient nodes
- Havent check parity
- Fixes for PR
7 年前
Matt Dean
52b69b3c
Merge branch 'master' into node-validation
7 年前
Tim Cooper
3039671f
Merge master
7 年前
Natalie Burke
791e8bd7
UV Node Updates - pass 01. Main changes made to CartesianToPolar, Twist, Rotator, adding Transform. Reorganized old UV nodes based on node validation notes
7 年前
Matt Dean
516051d4
First pass Gradient Nodes
- Added ShaderGraph.cginc
- Added Gradient Type
- Added GradientMaterialSlot
- Added Gradient SlotValueType
- Added Gradient ConcreteSlotValueType
- Added GradientAsset node
- Added Gradient2D node
- Added Gradient PropertyType
7 年前
Tim Cooper
497d1891
Fix merge issues.
7 年前
Tim Cooper
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
7 年前
Tim Cooper
72e82ce1
fix up graph validation.
7 年前
GitHub
713f6000
Merge pull request #79 from Unity-Technologies/improve-texture-node
Improve texture node
7 年前
Matt Dean
41b314d2
Merge branch 'master' into node-validation
7 年前
Matt Dean
62ff2d02
Merge fixes
7 年前
Tim Cooper
0063c976
Fix concrete slots not being initialized.
7 年前
Matt Dean
fe4745b9
Input Part 4
- Organised Input/Texture
- Added TextureAsset
- Added TextureControl
7 年前
Tim Cooper
8e5b0d9b
First pass inlining property nodes.
7 年前
Matt Dean
c86f6166
Input Part 5
Fixed sampler state
7 年前
Tim Cooper
92a955c3
Add converter from v1,v2,v3,v4,col nodes -> properties.
7 年前
Matt Dean
324ba49c
Input Part 6 (Gradient)
- Merge branch Gradient
- Added Gradient MaterialSlot and ShaderProperty
- Added defaulty handling
- Fixed SamplerState variable name bug
7 年前
Tim Cooper
0addad32
Fix stack overflow
7 年前
Natalie Burke
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
Matt Dean
c27b2a9e
Rename Texture2DAssetNode
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Natalie Burke
9650733e
changing result to out - cutting transfrom - adding Tiling Offset. Some functionality may change based on Tiling Offset UV input/texture node changes
7 年前
Natalie Burke
dc3b9dcd
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
Natalie Burke
e92749db
changing input order to increase consistency. Added center input for rotate node
7 年前
Natalie Burke
f9118863
reordering and sorting of procedural nodes, created temp make shadergraph category and added nodes that should become shader graphs there. Fixed broken procedural nodes, added useful inputs, unified stylization
7 年前
Peter Bay Bastian
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
GitHub
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
Matt Dean
a63160cc
UV Nodes
- Minor fixes to Natalies commits
7 年前
Matt Dean
e44629cb
Fixes for PR
- Rename Tangent/Normal/Bitangent nodes
- Make GetHLSLSafeNAme static
- Rename MatrixCommonNode > TransformationMatrixNode
- Rename enums for Log and Exponential base
- String interpolation > Switch statement
- Full names for all Trigonometry nodes
- Rename Reflect/Project/Reject > Reflection/Projection/Rejection
- Rename Fresnel/FresnelEffect
- Rename unit enum in RotateNode (remove duplicate in UVTransform)
- Add min/max clamp to Gradient2D evaluation
7 年前
Matt Dean
bbb186d6
Remove Gradient nodes and asset type :(
7 年前
Matt Dean
02c6b58d
Merge master
7 年前
Peter Bay Bastian
ac179c90
Outside node controls for vector types
7 年前
Matt Dean
a8cf2f2b
Added Projection Parameters to Camera Node
7 年前
Peter Bay Bastian
7b9315c4
Outside node control for UV slots
7 年前
Peter Bay Bastian
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
7 年前
Peter Bay Bastian
a00f148d
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
7 年前
Tim Cooper
fba42d48
Use GUID instead of object reference so that we can properly restore object link after assembly reload.
7 年前
Tim Cooper
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
Tim Cooper
bb560530
Rename folders
7 年前
Tim Cooper
acd0279b
Hue Node
7 年前
Tim Cooper
25b59d14
Saturation Node
7 年前
Peter Bay Bastian
69616da6
Color slots (a vec4 slot with a different input control)
7 年前
Matt Dean
471c7357
Contrast Node
7 年前
Matt Dean
8e0e719e
White Balance Node
7 年前
Matt Dean
8707e0ea
Replace Color Node
7 年前
Matt Dean
711f81fa
Added Channel Mixer Node
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Matt Dean
b48cb4c9
Color Mask Node
7 年前
Matt Dean
b14c1f98
Merge branch 'master' into node-artistic-adjustment
7 年前
Peter Bay Bastian
f7b7c84f
Replace repeated code with loop in surface description generation
7 年前
Matt Dean
13948f2d
Channel Mask Node
7 年前
Matt Dean
8653d727
Change Replace Color to use Color slot types
7 年前
Peter Bay Bastian
5d2c7e65
Fix typo
7 年前
Matt Dean
c06cd050
Fixes for PR
Also made function reusable for different node insatnces
7 年前
Matt Dean
6c7ced70
Merge branch 'master' into node-artistic-mask
7 年前
Peter Bay Bastian
b48b4340
Make `GetRequirements` work with a list of nodes, rather than doing a depth first collect itself
7 年前
Peter Bay Bastian
b63c4c28
Prepare shader generation for uber shader
7 年前
Matt Dean
2cc3b58e
Fix Channel Mask node
- Convert to Abstract derived
- Move channel validation check to node side
- Cleanup
7 年前
mathieum-unity
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
Peter Bay Bastian
2fa06117
Implemented uber shader
7 年前
mathieum-unity
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
Peter Bay Bastian
b5df720c
Move output selection in uber shader to an earlier place, to benefit from less register usage and early exit
7 年前
Peter Bay Bastian
f615cb37
Work with new GraphView slot coloring
7 年前
mathieum-unity
d7f591a9
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
# MaterialGraphProject/UnityPackageManager/manifest.json
7 年前
Matt Dean
446c232d
Screen Node
7 年前
Matt Dean
20cf4421
Flip Node
- Added ToggleControl (first pass)
7 年前
Matt Dean
7cc96aea
Camera Node Improvements
7 年前
Matt Dean
96fb4fb6
Flip Node Improvements
- Pass flip as an argument to method
- Switch to abs(flip - value)
- Handle preview rendering path
- Handle reuse of method
7 年前
Peter Bay Bastian
b2ec0ce4
Don't use `GetVariableNameForSlot` for surface description struct field, such that nodes that override this to an expression (i.e. not a variable name) can have a preview
7 年前
Matt Dean
e9a12809
Object Node
7 年前
Matt Dean
66be97cf
Split Node improvements
- Fix error with single channel input
- Clean code
7 年前
Matt Dean
7b095256
Transform Node Fixes
7 年前
Matt Dean
6a3937c7
Swizzle Node
7 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
Matt Dean
874bec55
Depth Texture Node
- SamplerShaderProperty
7 年前
Matt Dean
1daf0032
Normals Texture Node
7 年前
Peter Bay Bastian
e1281f8c
Fixes for new node style
7 年前
Matt Dean
7f9b8cab
Motion Vector Texture Node
7 年前
Matt Dean
d84ea3c2
Fixes for Depth Texture and Normals Texture Nodes
7 年前
Matt Dean
b53566fb
Fog Node
7 年前
GitHub
a8dfafe4
Merge pull request #84 from Unity-Technologies/node-artistic-mask
Node Artistic Mask
7 年前
Tim Cooper
da15e457
dirty first pass pass architecture.
7 年前
Matt Dean
c3edb9c7
Ambient Node
7 年前
Matt Dean
dadccc50
Merge branch 'master' into node-channel
7 年前
Tim Cooper
6f035d8a
hack and slash.
7 年前
Matt Dean
5131e8e1
Fixes for PR
7 年前
Matt Dean
0eff0dec
Add Normal unpack mode for Texture 2D Node
7 年前
Tim Cooper
f559320c
'working' previews.
7 年前
Matt Dean
f14af0f4
Added Cubemap nodes
7 年前
Tim Cooper
1d641fec
For final shader generation use the master node.
7 年前
Matt Dean
736a2328
Add LOD input and inline reflection vector
7 年前
Tim Cooper
a0602cf5
Generalised PBR / Unlit master
7 年前
Matt Dean
b510d6f4
Fixes for PR
7 年前
Tim Cooper
0ceca805
Add transparency modes.
7 年前
Peter Bay Bastian
7386944f
DynamicVectorMaterialSlot now becomes an appropriately sized vector during shader generation (or float if vec1)
7 年前
Matt Dean
f698c591
Changed Length Node output to vec1
7 年前
GitHub
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
Matt Dean
627c384a
Fixes to Screen Position Node
- Added Raw type (no divide by w, needed for uv projection)
- Removed unused method
- Switched output to vec4
- Renamed slot vars
- Fixed output
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
048fd0dd
Update to latest light weight pipeline.
7 年前
Matt Dean
65348a87
Rename Checkboard Node
7 年前
Matt Dean
5e47b629
Fixes for PR
7 年前
Matt Dean
73639f15
Fix Checkerboard node
- Rename class
- Rename method
- Change color slots to Color type
- Adjust UVs to align checker to boundaries
- Use precision value
- Comment out old node (using the Checkerboard name)
7 年前
GitHub
9ddf9039
Merge pull request #85 from Unity-Technologies/node-channel
Node Channel
7 年前
GitHub
d8578f92
Merge pull request #82 from Unity-Technologies/node-artistic-adjustment
Node artistic adjustment
7 年前
GitHub
35129ab8
Merge pull request #91 from Unity-Technologies/node-bugfixes
Node Bugfixes
7 年前
GitHub
5d9b28af
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
7 年前
Tim Cooper
ec95c348
Add template path export.
7 年前
Tim Cooper
03becbc9
Add shadergraph package
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
0e092ee5
remove files that should not be there.
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
1eba56e9
run reformat tool
7 年前
Jens Holm
d52d83b7
Add SerializableMesh
7 年前
Peter Bay Bastian
e91932f8
Node selector / search
7 年前
Jens Holm
e5a6f66e
Serialize preview mesh in graph asset instead of through GraphInspectorView persistent data
7 年前
Peter Bay Bastian
1cf9ffde
Update node titles to use new array-based grouping `[Title("UV/Flipbook")]` -> `[Title("UV", "Flipbook")]`
7 年前
Peter Bay Bastian
128c6db4
Add sub-graphs to node search menu
7 年前
Tim Cooper
2f0a0145
Remove layer graph + remap graph for beta1
7 年前
Peter Bay Bastian
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
Matt Dean
a19f5b15
Moved BlendMode node
7 年前
Matt Dean
484cbca7
Renamed Blend node
7 年前
Matt Dean
b60e8b5a
Update Blend node
7 年前
Matt Dean
8cdf0c8f
Move BlendModesEnum
7 年前
Matt Dean
4d3bb030
Rename BlendMode
7 年前
Matt Dean
5f368a29
Move old Artistic nodes back to WIP folder
7 年前
Matt Dean
7c7d7604
Add Colorspace Conversion node
7 年前
Matt Dean
bcfd7b47
Fix Blend node naming conventions
7 年前
Matt Dean
24863ece
Remove old colorspace conversion nodes and fix part preview graph
7 年前
Matt Dean
3604c2f5
Move old logic nodes to WIP
7 年前
Matt Dean
ed55de08
Remove logic folder
7 年前
Matt Dean
3d06be46
Moved Normal nodes
7 年前
Matt Dean
65e40578
Delete old normal folder
7 年前
Matt Dean
7857730f
Move vertex interpolator node to WIP
7 年前
Matt Dean
7301ac69
Moving more nodes
7 年前
Matt Dean
3f34639b
Fixes for subgraph, preview and property nodes
7 年前
Matt Dean
a7e7a333
Move Property node into Input
7 年前
Matt Dean
21f4a1ac
Fix Property node output names
7 年前
Matt Dean
5ce62a7e
Move old procedural to WIP
7 年前
Matt Dean
3157dc84
Move Noise nodes to Noise folder
7 年前
Matt Dean
7017122a
Fixes to noise nodes
7 年前
Matt Dean
e1814d28
Renamed noise nodes
7 年前
Matt Dean
d0950f2d
Rename Normal nodes
7 年前
Matt Dean
134e68b6
Fix Normal nodes
7 年前
Matt Dean
7c2a62b0
Add Normal Strength node
7 年前
Matt Dean
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
GitHub
0eec5e4e
Merge pull request #95 from Unity-Technologies/node-validate-current
Validate all current nodes
7 年前
Matt Dean
e7f2c3a5
Add Polygon node
7 年前
Matt Dean
4c9b3b08
Switch DDX node to dynamic dimension ports
7 年前
Matt Dean
9717c2d8
Move Box node
7 年前
Matt Dean
1e450d4f
Switch DDY node to dynamic dimension ports
7 年前
Matt Dean
2fc3d22e
Rename Box node > Square node
7 年前
Matt Dean
b08ed60c
Switch DDXY node to dynamic dimension ports
7 年前
Matt Dean
5b4a28ab
Fix Square node
7 年前
Matt Dean
16cbb0ed
Switch Distance output to Vector1
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Matt Dean
278cfacc
Renamed Square node > Rectangle node
7 年前
Matt Dean
599b2ee7
Switch Reflection node to dynamic dimension ports
7 年前
Matt Dean
5c0e0f70
Fixes for PR
7 年前
Matt Dean
e348b11e
Moved Repeating Dot node
7 年前
Matt Dean
f4ca23e8
Switch Cross Product node to Vector3 ports
7 年前
Matt Dean
f48335e0
Renamed files
7 年前
Matt Dean
afc52ffa
Fixes to polygon and ellipse nodes
7 年前
Matt Dean
c47de91f
Fix variables names from coordinate space
7 年前
Matt Dean
1c91fd60
Remove uneeded class
7 年前
GitHub
46e0e4e5
Merge pull request #98 from Unity-Technologies/node-bugfixes
Maths nodes bugfixes
7 年前
Matt Dean
68dcee06
Renamed Repeating Dot node > Ellipse node
7 年前
Matt Dean
fb3d355b
Removed uneeded Fog enum
7 年前
Matt Dean
4512dff0
Started work on Rounded Rectangle node
7 年前
Matt Dean
2d57b390
Add Orthographic slots to Camera node
7 年前
Matt Dean
0364097d
Fix Rounded Rectangle
7 年前
Matt Dean
d1e59e63
Moved Scene Normals and Scene Velocity nodes to WIP
7 年前
Matt Dean
ae1bad65
Fixes pre-PR
7 年前
Peter Bay Bastian
c467fab5
Make color space conversion node controls a bit neater
7 年前
Matt Dean
2a6ef764
Fix Camera node direction slot
7 年前
Matt Dean
10685e95
Fixes for PR
7 年前
Matt Dean
df7a48db
Remove partial derivative precision
7 年前
Matt Dean
1f9fe754
Move Scene Depth to WIP
7 年前
Peter Bay Bastian
211cf575
Refactor ColorspaceConversionControl to work on enums in general and implement it for TransformNode
7 年前
Matt Dean
5a69c812
Merge branch 'master' into node-bugfixes
7 年前
Matt Dean
9fcf8bc7
Transform node fixes
7 年前
Matt Dean
adae5870
Rename Hue input to Offset
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Matt Dean
63709067
Missing from previous commit
7 年前
Matt Dean
fd5fa964
Merge Master
7 年前
Tim Cooper
f799dd40
Really Rough working HD Unlit master node.
7 年前
Matt Dean
f716bede
Add Vertex Input generator
- Fixes Issue #103
- Removed vertex color input when not required
7 年前
Matt Dean
298ac06f
Missing from previous commit
7 年前
Tim Cooper
16406a1d
Working on conversion to new library
7 年前
Matt Dean
2775c78f
Delete old nodes
7 年前
Matt Dean
c827f632
Fix non-modifiable cubemap data
7 年前
Matt Dean
db7fee2a
Fix object and world position affine check
7 年前
Jens Holm
682d177b
Add zoom/scale to preview mesh and refactor preview data into seperate class
7 年前
GitHub
a5b781b9
Merge pull request #93 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
Matt Dean
97df3812
Fixes for Blend node
7 年前
Matt Dean
00d8b6e8
Rename ColorMaterialSlot > ColorRGBAMaterialSlot and add ColorRGB slot
7 年前
Matt Dean
a8be8e67
Fix slot value type
7 年前
GitHub
ef9bd86c
Merge pull request #124 from Unity-Technologies/color-rgb
Color RGB
7 年前
Tim Cooper
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Tim Cooper
ae8e0962
starting to update nodes to new library.
7 年前
Peter Bay Bastian
27c461e8
Make sure that new properties do not alias the names of other properties (#fix 102)
7 年前
Peter Bay Bastian
81940dcd
Add object control back to SubGraphNode for now ( fixes #112 )
7 年前
GitHub
1a3f590c
Merge pull request #99 from Unity-Technologies/node-input-scene
Node Input Scene
7 年前
Tim Cooper
e3bd536c
Merge branch 'master' into HDMaster
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
GitHub
6a80fdeb
Merge pull request #122 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Tim Cooper
7a9a255f
More work on porting node library across to new shader library.
7 年前
Peter Bay Bastian
c0c7450c
Saturate dot product result in fresnel effect node to avoid negative values
7 年前
Tim Cooper
7995a0e9
upgrading to new shader library.
7 年前
Tim Cooper
f2413918
fix up typo.
7 年前
GitHub
6f046031
Merge pull request #127 from Unity-Technologies/procedural-shape
Procedural Shape
7 年前
Tim Cooper
f79b8aa2
Add alpha clip threshold to PRB master.
7 年前
Peter Bay Bastian
0ac8d160
Fix for DDXY node
7 年前
Peter Bay Bastian
914403a2
Temp fix for various nodes
7 年前
Peter Bay Bastian
24b03e7c
Don't convert property nodes to inline nodes during undo/redo ( fixes #125 )
7 年前
Matt Dean
b23f23cb
First pass Matrix 4x4 nodes
7 年前
Tim Cooper
bf727807
Fix lightmapping issue.
7 年前
Jens Holm
8a16933b
Minor refactor of preview mesh rotation and scale according to PR comments
7 年前
Matt Dean
0fca7431
Rename Texture2D and Cubemap nodes
7 年前
Matt Dean
8697ac36
Preliminary work on Dynamic Matrix
- Add other matrix slot value types
7 年前
Tim Cooper
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
Matt Dean
cef293ac
Rename Texture2D and Cubemap node files
7 年前
Matt Dean
1a08b1b1
Add DynamicMatrixMaterialSlot and fix all Matrix input types
7 年前
Matt Dean
056c4c90
Update serialization upgrader
7 年前
GitHub
e8ae5340
Merge pull request #129 from Unity-Technologies/node-bugfixes
Rename Texture2D and Cubemap nodes
7 年前
Matt Dean
14f5c06b
Fix Matrix Multiply Vector node
7 年前
GitHub
f4e6a374
Merge pull request #130 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
GitHub
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
Peter Bay Bastian
929cf786
Add ShaderStringBuilder and change non-CodeFunctionNodes to use it
7 年前
Peter Bay Bastian
f9685e94
Revert use of internal method
7 年前
Jens Holm
8454398a
Center rotationin of preveiw mesh and fix serialization of preview mesh
7 年前
Peter Bay Bastian
11a83d08
Squash SerializableGraph into AbstractMaterialGraph
7 年前
Jens Holm
a4e8458d
Remove zooming in inspector preview
7 年前
Peter Bay Bastian
e3aaf843
Squash `SerializableNode` into `AbstractMaterialNode`
7 年前
Peter Bay Bastian
5fe33b9e
Squash `SerializableSlot` into `MaterialSlot`
7 年前
Peter Bay Bastian
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
GitHub
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
GitHub
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
GitHub
1f3752d8
Merge pull request #133 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
Peter Bay Bastian
83c052cb
Various clean-ups to make code a bit more neat
7 年前
Peter Bay Bastian
409a35e4
Add LegacyAttribute for declaring old class names directly on the node class
7 年前
Peter Bay Bastian
d5813d06
Move legacy type remapping code outside of AbstractMaterialGraph and cache the result in a static field
7 年前
Peter Bay Bastian
5ef7f04d
Move GetRequirements into ShaderGraphRequirements and give it a nicer name
7 年前
Peter Bay Bastian
ce482316
Modify SwizzleNode such that it is possible to change channels without shader generation in preview mode
7 年前
Peter Bay Bastian
c2183225
Make GetChannelCount return an integer rather than a number enum thingie
7 年前
Peter Bay Bastian
0055dc00
Rename LegacyAttribute to FormerNameAttribute
7 年前
Peter Bay Bastian
35350e91
Remove function from Swizzle node, makes more sense to just write inline
7 年前
Peter Bay Bastian
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 年前
Peter Bay Bastian
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
Peter Bay Bastian
1a6d34eb
Output shader errors to console when uber shader has error
7 年前
GitHub
eb5b5a85
Shader source mapping for node functions ( #137 )
7 年前
Jens Holm
e1ebec49
Merge master
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Tim Cooper
25b66c4b
fixing merge
7 年前
GitHub
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 年前
Tim Cooper
ad906af4
Creating mini shader graph library / fixing gamma -> linear colours
7 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Matt Dean
ec76d400
Fix Fog node
7 年前
Tim Cooper
a13c3ee9
Use helper function to figure out if we have warnings or errors.
7 年前
Matt Dean
125d4bb5
Switch Linear Light blend methods
7 年前
Tim Cooper
5c4cbe12
For LW use the proper shader paths that get exported from the LW package..
7 年前
Matt Dean
3e4f3590
Channel Mask node to Mask Field (prt 1)
7 年前
Matt Dean
29e04332
Channel Mask node to Mask Field (prt 2)
7 年前
Matt Dean
4503a2ce
Change Flip node to flip 1 > -1 and added Invert Colors node
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 年前
Matt Dean
1ea14a06
Rename Sign output on Camera node
7 年前
Tim Cooper
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
Matt Dean
4f8a273e
Fix UV bindings for preview shader and Unlit master
7 年前
Tim Cooper
8342aa12
Finish refactoring subgraphs.
7 年前
Matt Dean
d057e6de
Fix Ambient node
7 年前
Tim Cooper
2888f1c2
-When we validate a subgraph node we also need to validate the subgraph (generates the concrete values).
-Allow promotion of vector types. v2->v3/v4 v3->v4. Rule is alpha channel gets 1, other channels get 0.
7 年前
GitHub
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
Matt Dean
dee739b5
Restore LinearLightAddSub blend mode
7 年前
Tim Cooper
6c0a8015
Disable HDUnlit for now as there are missing remaps.
7 年前
Matt Dean
8f22e3a7
Boolean node and type (part 1)
7 年前
Matt Dean
11d733ee
Fix Normal Strength node
7 年前
Jens Holm
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Matt Dean
b78bf280
Add Metal Reflectance Node
7 年前
Matt Dean
2f6e839e
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
7 年前
Matt Dean
e24aafae
Boolean node and type (part 2)
7 年前
Matt Dean
f9d9e891
Rename Blend node inputs
7 年前
GitHub
87638b44
Merge pull request #149 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Matt Dean
c3e0543b
Add Dielectric Specular node
7 年前
Matt Dean
8ea43935
Add HDR Color
- Add HDR Color node
- Add new constructor to ColorShaderProperty
- Add hdr flag to ColorControl
- Add HDR Color property to GraphInspectorView
7 年前
Matt Dean
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
Matt Dean
eeae2f11
Fix Screen Position node
7 年前
Matt Dean
cfb57499
Add Slider
ShaderProperty, Control, Node and property list entry
7 年前
Matt Dean
bbd475d5
Add Branch node
- Fix compatible types
- Fix default property name
7 年前
Matt Dean
8ab84621
Add Triplanar node
7 年前
Matt Dean
333ded2e
Remove IntegerMaterialSlot
7 年前
Matt Dean
fd575df7
Fixes for PR
7 年前
Matt Dean
6d66cb6a
Revert Screen Position node changes
7 年前
Matt Dean
e7ccc01e
Fixes
- Change Comparison node to Vec1 inputs
- Change Branch node logic to avoid another if statement
7 年前
Matt Dean
70e75999
Fix Channel Mask validation
7 年前
Matt Dean
ab60aa3e
Update Triplanar slot label
7 年前
Matt Dean
28df6957
Upgrade Slider UI to UIElements
7 年前
Matt Dean
dbaf707b
Add All, Any, IsInfinite and IsNaN nodes
7 年前
Martin Thorzen
29920efb
[FIX] #159 Added a utility node method for converting float to shader value. To catch Infinity text string.
7 年前
Matt Dean
7c4730ca
PR Fixes
- Add boolean slot control view
- Add nodes And/Nand/Or
- Fix Branch node defaults
- Add USS for boolean slot
7 年前
Matt Dean
f7209064
Switch control's HDR argument to enum
7 年前
Matt Dean
7e22f269
Update ToggleControl to UIElements
Cosmetic fixes to
- InvertColors node
- ChannelMixer node
- Blend node
7 年前
Matt Dean
e5024bd2
Cosmetic (name) changes
7 年前
Martin Thorzen
fc1154db
[FIX] #162 Checking if the texture has changed or not and updating accordingly.
7 年前
Tim Cooper
feb5b785
Fix up instancing from graph.
7 年前
Martin Thorzen
06553d81
updated with PR feedback
7 年前
Matt Dean
e36e1fc8
Fix Sampler State property
- Update to new shader library
7 年前
Matt Dean
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 年前
Matt Dean
9bc7e3e7
Fix looping of flipbook
7 年前
Matt Dean
d2cd9dcf
Update Twirl defaults
7 年前
Matt Dean
7c4099ec
Fix Screen Position and Reflection Probe nodes
- Requires reorder of preview shader includes
- Requires adding EntityLighting.hlsl to preview shader includes (For DecodeHDREnvironment)
- Requires addeing unity_SpecCube0 (texture, sampler and instruction) to ShaderVariables.hlsl (for Preview shader)
- Added "legacy" ComputeScreenPos function
7 年前
Matt Dean
2e568046
Fresnel node fixes
- Add default bindings
- Switch to 3D preview
7 年前
Matt Dean
2ec75211
Fix Math node default values
7 年前
Matt Dean
41300be2
Fix Screen Position Tile mode
7 年前
Matt Dean
8deedb5f
Add missing Sampler State types
- Trilinear
- Mirror
- MirrorOnce
7 年前
Matt Dean
76783350
Recode Flipbook node
- From Abstract
- Add Invert X and Y controls
7 年前
Matt Dean
f767c268
Fix blend modes
7 年前
Matt Dean
fe197d85
Update Math node defaults
7 年前
Matt Dean
ccf55db8
Revert Master node changes
- Will put in separate PR
- Remove new blend modes
- Remove culling dropdown
7 年前
Matt Dean
20df2273
Add newlines
7 年前
Matt Dean
4b962efc
Fix Subtract node default
7 年前
Matt Dean
480fb3f5
Fix Flipbook node invert logic
7 年前
Matt Dean
ff6d2e4d
Change ComputeScreenPos to use projection sign as an argument
7 年前
GitHub
c763baf4
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Matt Dean
f43e0a6f
Merge branch 'master' into node-input
7 年前
Matt Dean
352a061a
Merge branch 'master' into compare-and-branch
7 年前
Matt Dean
c119f05e
Add Dither node
7 年前
Matt Dean
a3be4eae
Add Not node
7 年前
Matt Dean
b1dc4ab4
Change Comparison func convert to switch
7 年前
Jens Holm
55b86ced
Merge branch 'master' into inspector-window
7 年前
Tim Cooper
9e8d791f
[FIX]#105 properly adapt input to master node when going from v2->v3/4
7 年前
Matt Dean
d6b2ca25
Fix vector lengths
7 年前
Tim Cooper
179e0ef0
[FIX]#168 Add alpha into unlit node.
7 年前
Tim Cooper
e9757253
Feedback from PR
7 年前
GitHub
16ddad23
Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace
Fixes #159 , fixes #88 , fixes #157 , fixes #162
7 年前
GitHub
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
Martin Thorzen
878e4c49
[FIX] fixes #176 When validating the graph we check if the outputslot and the input slot are compatible. If not, then we do not create the edge.
7 年前
Matt Dean
725a1ea9
Merge branch 'master' into sliders
7 年前
GitHub
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
Matt Dean
9a589fe6
Update Fog node to latest SRP library
7 年前
Peter Bay Bastian
d00ca780
Merge branch 'master' into blackboard
7 年前
Matt Dean
739c124a
Merge branch 'master' into sliders
7 年前
Matt Dean
28672efd
Add a frac to Tiled Screen Position
Because it looks like it doesnt work and I keep forgetting that it actually does...
7 年前
Matt Dean
a20b14d1
Update Transform node to latest SRP library
7 年前
GitHub
1c0c24b4
Merge pull request #151 from Unity-Technologies/sliders
Sliders, Integers and HDR Color
7 年前
Peter Bay Bastian
0534342e
Added support for reordering properties in blackboard
7 年前
Matt Dean
8984577a
Merge branch 'master' into node-input
7 年前
Matt Dean
93aa1de8
Refactor Dielectric Specular node for UI changes
7 年前
GitHub
317f1cac
Merge pull request #182 from Unity-Technologies/fix-master-preview-switch-prop-node
[FIX] fixes #176 When validating the graph we check if the outputslot…
7 年前
Matt Dean
01fb5620
Fixes for PR
7 年前
Jens Holm
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Matt Dean
5863364b
Fixes for PR
7 年前
GitHub
df1a52fd
Merge pull request #187 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
GitHub
e9df888c
Merge pull request #189 from Unity-Technologies/blackboard
Blackboard improvements
7 年前
GitHub
758a90e4
Merge pull request #170 from Unity-Technologies/node-input
Various nodes
7 年前
Matt Dean
affdcadf
Add HDR color support to Blackboard
7 年前
Peter Bay Bastian
484b4f58
* Add individual properties to node search
* Remove dropdown from property node
* Add all compatible slots to node search when dragging into empty space
*
7 年前
Matt Dean
0292ae36
Color control refactor
- Add mode enum to ControlView
- Remove HDR Color node
- Switch Color node value to struct
- Update USS
7 年前
Tim Cooper
7ab634f3
Apply remapping to all serialzied types
7 年前
Matt Dean
78db5ef1
Refactor float based shader properties
7 年前
Matt Dean
4ad43705
Vector1 property refactor and types
7 年前
GitHub
395c3ec5
Merge pull request #193 from Unity-Technologies/properties-in-search
Improvements to node search
7 年前
Matt Dean
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
Matt Dean
3dae07c8
Add FormerName tag to Vector1ShaderProperty
7 年前
Matt Dean
bd973f81
Rename Vector1ShaderProperty.cs
7 年前
GitHub
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
Matt Dean
02d1b5dd
Fix UV material slot serialization
7 年前
Matt Dean
97f21962
Fix Color node recompilation
7 年前
Peter Bay Bastian
891d3537
Possible fix for #154 - UV channel was not being serialized
7 年前
GitHub
92a10806
Merge pull request #202 from Unity-Technologies/peter-fixes
Various fixes
7 年前
Peter Bay Bastian
c118b914
Insert missing remove method call in remove method ( fixes #200 )
7 年前
Martin Thorzen
29361772
Merge branch 'master' into tidy-master-preview
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Matt Dean
41740d78
First pass dynamic Multiply node
- Temp adding of test graph
7 年前
Martin Thorzen
24300f52
Adding documentation functionality on the nodes.
public virtual string documentationURL() has been added to AbstractMaterialNode
Pressing F1 will take you to the documentation if it exists.
Right clicking on a node gives you the context menu item See Documentation that also takes you to the documentation if it exists.
7 年前
Matt Dean
22c13f89
Cleanup and fixes (part 1)
- Fix not updating edges when validation changes
- Generate correct function headers
- Calculate whether matrix slot connections are error'd
- Fix validation in subgraphs
- Various cleanup
7 年前
Matt Dean
e5bdf43e
Add preview serialization for matrices
7 年前
Matt Dean
3ad21797
Fix Matrix Transpose node
- Cleanup and fixes in matrix slots and props
7 年前
Matt Dean
06549ef3
Add Matrix Determinant node
7 年前
GitHub
545de289
Merge pull request #209 from Unity-Technologies/goto-documentation-per-node
Adding documentation functionality on the nodes.
7 年前
Matt Dean
e5591143
Add declaration overrides for matrix shader properties
7 年前
Matt Dean
8348d52e
Refactor matrix validation functions
- Move multi use helpers to slot value helper
- Make abstractnode validation functions public virtual to reduce code duplication when doing custom validation
-
7 年前
Jens Holm
625ddde1
Add zoom to master preview
7 年前
Matt Dean
394859b7
Remove old matrix multiply nodes
7 年前
GitHub
341a6fc3
Merge pull request #211 from Unity-Technologies/master-preview-zoom
Master preview zoom
7 年前
Matt Dean
dc41a21f
Add Matrix Split node
7 年前
Keijiro Takahashi
39a5af4a
Fix to RandomRangeNode
- Changed the seed input format from Vector1 to Vector2.
- Changed the way of applying Min/Max.
7 年前
Matt Dean
e9026c65
Fix implicit conversion check for non dynamic casts
7 年前
Matt Dean
a6899bcf
Combine and Split node fixes
7 年前
Matt Dean
da78abd3
Added Matrix Construction node
7 年前
Matt Dean
6298bd34
Add axis selection to Matrix Split and Construction nodes
7 年前
GitHub
b3f61fbc
Merge pull request #213 from keijiro/fix-range
Improvements to RandomRangeNode
7 年前
Keijiro Takahashi
820e58c3
Improvements to artistic nodes.
- Added the fuzziness slot to ReplaceColorNode and ColorMaskNode. It works like
the fuzziness parameter in Photoshop that gives softer edges to the mask.
- Changed the output format of ColorMaskNode from Vector3 to Vector1. It only
outputs single channel masks.
- Added the opacity slot to BlendNode. It's useful when one tries using
BlendNode like layers in Photoshop.
7 年前
Keijiro Takahashi
746b96e3
Added Gradient Noise node.
7 年前
Matt Dean
e20fd08b
Fix matrix defaults
7 年前
GitHub
02682528
Merge pull request #216 from keijiro/gradient-noise-node
Addition of Gradient Noise node.
7 年前
Keijiro Takahashi
72b23308
Fixes to the previous commit.
- Added default value 1.0 to the opacity slots.
- Swapped the slot IDs to be compatible with the previous versions.
7 年前
Tim Cooper
025d9ffb
UVNode now outputs vector4 UV's
7 年前
Keijiro Takahashi
de7e2997
Addition of ScreenPositionSlotControlView
- Added ScreenPositionSlotControlView and its style element (USS).
- Moved ScreenSpaceType enum definition to ScreenSpaceType.cs and added
ScreenSpaceTypeExtensions that provides extension methods for the enum.
- Updated the existing implementation to work with
ScreenPositionSlotControlView.
7 年前
Keijiro Takahashi
8c83fd3d
Changed input slot IDs for backward compatibility.
7 年前
GitHub
b9b93c1c
Merge pull request #215 from keijiro/improve-artnodes
Improvements to artistic nodes.
7 年前
Martin Thorzen
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.
7 年前
Tim Cooper
3b150ad9
Add Shadow / depth passes to lightweight unlit master node.
7 年前
Matt Dean
3df359f2
Merge branch 'master' into node-matrix
7 年前
GitHub
d2945014
Merge pull request #219 from keijiro/screenspace-slot
Addition of ScreenPositionSlotControlView
7 年前
Tim Cooper
000afbf2
Remove unneeded files
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
Matt Dean
5b6fd3d8
Fixes to Matrix 2 definition
7 年前
Martin Thorzen
e1d9b584
Added a Settings Menu for Nodes.
7 年前
Tim Cooper
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 年前
Matt Dean
98f88207
Update documentation links
Math/Derivatives
Math/Interpolation
Math/Range
7 年前
GitHub
6dfcd844
Merge pull request #227 from Unity-Technologies/node-bugfixes
Update documentation links
7 年前
Tim Cooper
27b8deec
Add API for modification of embedded supported subshaders
7 年前
Tim Cooper
b5bf1073
Add API so that we can find the type of subshaders that can be added.
7 年前
GitHub
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
7 年前
Peter Bay Bastian
0b99046c
Fix issue causing deserialization to fail
7 年前
Peter Bay Bastian
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
7 年前
GitHub
a1c15f0d
Merge pull request #229 from Unity-Technologies/safer-callbacks
Safer callbacks
7 年前
Matt Dean
6cb97136
Update Is NaN node for GLES and D3D
Fixes #218
7 年前
Keijiro Takahashi
2dfb9d77
Easy-to-understand names for step function arguments.
7 年前
Keijiro Takahashi
a3b44dd5
Fix for issue #222
Changed to use correct dimensions in declarations of properties.
7 年前
GitHub
e621117d
Merge pull request #231 from keijiro/fix-222
Fix for issue #222
7 年前
GitHub
e6be5cc8
Merge pull request #232 from keijiro/step-args
Easy-to-understand slot names for Step node.
7 年前
Matt Dean
ba7e5c3b
Whiteout blend method for Triplanar node normal mode
7 年前
Martin Thorzen
7b5ca064
Merge with master
7 年前
Matt Dean
e36aeb23
Transform Triplanar normal output to tangent space
7 年前
Matt Dean
d5db5366
Fix Transform node bitangent usage
7 年前
Peter Bay Bastian
a4d1c27d
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
7 年前
GitHub
91b5a7ad
Merge pull request #233 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
GitHub
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
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 年前
Peter Bay Bastian
e7ecacd5
Rename package folder to match package name
7 年前
Peter Bay Bastian
00564880
Fix shader include paths, update gitignore, add meta files and replace UNITY_SHADERGRAPH_DEVMODE with an optional DebugOutput directory
7 年前
GitHub
286d82a6
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
7 年前
Peter Bay Bastian
5399d0b1
Update LW master nodes to work with latest SRP repo
7 年前
Keijiro Takahashi
bcc36851
Antialiasing with procedural shapes.
7 年前
Jens Holm
3bff7ec6
Make bound input types have a default slot label that identifies the space of the default input
7 年前
Jens Holm
bcf4854e
Change normal slot in PBR Master node to display default space binding rather than a vector3 control
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Martin Thorzen
0a72fe97
When saving a sub graph, we now go through all the shader graphs and updated them if they are using this sub graph.
Not allowed to have sub graph inside a sub graph
Removed sub graph from searh window when in subgraph
Prompting the user when removing slots and properties from the sub graph.
7 年前
Martin Thorzen
584d2bb4
[FIX] #251 Nodes are now selected again after pasted
7 年前
Matt Dean
b3551b81
Master node improvements part 1
- Add two sided option
- Add multiply blend mode
- Rename blend modes
- Add master node parameter labels
7 年前
Jens Holm
27242a3d
Add slot type for bound types to be used in PBR Master node
7 年前
Peter Bay Bastian
a2bafb38
Fix float serialization in Constant Node to not be affected by system locale (was comma as decimal separator causing shader errors)
7 年前
Matt Dean
b73b2432
Add Transparent (premultiply alpha) blend mode
7 年前
Jens Holm
12543f9b
Add vertex color input label to bound input type
7 年前
Matt Dean
e11fa9b7
Add missing node fixes
7 年前
Matt Dean
de80e921
Add two sided support for shadow pass
7 年前
Jens Holm
5d32dbf0
Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView
7 年前
GitHub
40495e65
Merge pull request #261 from Unity-Technologies/fix-constant-node
Fix Constant Node code gen
7 年前
Matt Dean
fcd875c3
Split blend enum into two
7 年前
Jens Holm
a83bd958
Make PBR master node be able to require normal and remove BoundVector3MaterialSlot
7 年前
GitHub
0f41473d
Merge pull request #248 from keijiro/shapes-aa
Antialiasing with procedural shapes.
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 年前
Matt Dean
1f3d0114
Minor node fixes
- Update Dot Product to use Dynamic Vectors
- Change Branch evaluation to lerp
7 年前
GitHub
5ba70535
Merge pull request #264 from Unity-Technologies/node-bugfixes
Minor node fixes
7 年前
Peter Bay Bastian
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
7 年前
Matt Dean
394320a1
Add documentation links for all nodes
7 年前
Martin Thorzen
edb12553
[FIX] #272 This will prefix the generated code with "sg_"
7 年前
Matt Dean
a0875348
Fix Light Probe node
- Update function to latest SRP library
- Add missing function for preview rendering
7 年前
Matt Dean
8cbbf3c2
Missing fix
7 年前
Martin Thorzen
f9797583
Fixed the feedback from GIT
7 年前
GitHub
e7b2f640
Merge pull request #276 from Unity-Technologies/fix-subgraph-name-start-with-number
[FIX] #272 This will prefix the generated code with "sg_"
7 年前
Matt Dean
b7a61817
Update Multiply node defaults
7 年前
GitHub
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
7 年前
GitHub
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
7 年前
GitHub
998d8e22
Merge pull request #250 from Unity-Technologies/bound-type-defualt-slots
Bound type default slots
7 年前
GitHub
96c8a0c7
Merge pull request #257 from Unity-Technologies/copy-paste-fix
[FIX] #251 Nodes are now selected again after pasted
7 年前
GitHub
16df8b10
Merge pull request #278 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
Peter Bay Bastian
0b584564
Merge with master
7 年前
GitHub
3de3ae25
Merge pull request #262 from Unity-Technologies/rebuild-all-dependant-shaders-from-subgraph
When saving a sub graph, we now go through all the shader graphs and …
7 年前
Peter Bay Bastian
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
Peter Bay Bastian
0e49b142
* Fix Serializable(Cubemap|Mesh|Texture) classes
* Add back in blackboard classes to work with 2018.1
* Wrap some things in `#if UNITY_2018_1`s
7 年前
Peter Bay Bastian
abac19b4
Add an asmdef at the repository root for unreleased stuff and move HD pipeline things there
7 年前
GitHub
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
7 年前
GitHub
230aeda4
Merge pull request #284 from Unity-Technologies/move-hd-outside-package
Remove implicit dependency on HD for package
7 年前
Peter Bay Bastian
c27172ce
Fix warnings from about unused variables that are kept there for legacy deserialization
7 年前
GitHub
03f44061
Merge pull request #285 from Unity-Technologies/fix-serializable-warnings
Fix warnings from legacy deserialization classes
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 年前
Martin Thorzen
9720e0dc
Added input fields to the vector nodes
7 年前
Martin Thorzen
d36a05a1
Fix issues after merge with master
7 年前
Martin Thorzen
abd8a058
Made IMayRequirePosition public
7 年前
Martin Thorzen
cfd61180
New node settings. Moved the createsettingselement to the master node
7 年前
GitHub
eae8c0fc
Merge pull request #293 from Unity-Technologies/vector-input-fields
Vector input fields and IMayRequirePosition
7 年前
Martin Thorzen
dbf93edc
Updated teh Graph path functionality. It now saves the path and reads it back
7 年前
Martin Thorzen
8742fc7b
Merge branch 'master' into node-settings
7 年前
Matt Dean
589cb99a
Add changes from previous branch
7 年前
Jens Holm
392166aa
Add labels in Vector4MaterialSlot constructor
7 年前
Martin Thorzen
88b45aa5
Added functionality so that you cannot have properties with the same name. It appends (*) to your property where * is just the next sequential number.
7 年前
Matt Dean
ff7c4856
Fix serialisation of preview properties in Gradient Asset node
7 年前
Jens Holm
0f82d00d
Add preview to SubGraphOutputNode
7 年前
Peter Bay Bastian
ad7f7e58
Ignore the subjected property when sanitizing name
7 年前
Martin Thorzen
2ff4fbd7
Added new settings files for the common settings on the master nodes, PBR and Unlit Master
7 年前
Matt Dean
348a9654
Change GetPreviewProperty to return list for multiple properties from one slot
7 年前
Jens Holm
a073faf1
Make SubGraphOutputNode have 3D preview similar to MasterNodes
7 年前
Martin Thorzen
2fde6ea5
Moved the node settings menu to the right place.
7 年前
Matt Dean
2a3637d0
Override GradientShaderProperty declaration for preview rendering
7 年前
Martin Thorzen
1dfe50bd
Removed the control attributes
7 年前
Matt Dean
15328c1d
Add support for Fixed gradient mode
7 年前
Jens Holm
f1a39c3d
Add input slots from the SubGraphOutputNode in the preveiw shader generation
7 年前
Martin Thorzen
ed104fa3
Added titleButtonContainer for buttons.
Removed bring to front on previewfiller
7 年前
Matt Dean
70436083
Remove GC allocations on preview property collection
7 年前
Matt Dean
88372b5f
Add ref keyword (fix)
7 年前
Matt Dean
dcfde51b
Improve gradient sample code
Unroll loops
Remove control flow
Remove dynamic indexing
7 年前
Martin Thorzen
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.
7 年前
Matt Dean
eda467e3
Remove ref keywords
7 年前
Martin Thorzen
8f3d14dc
Update with cleaning out unused code. And some formatting.
7 年前
Matt Dean
25fc05eb
Rename GradientAssetNode.cs > GradientNode.cs
7 年前
GitHub
c268bca4
Merge pull request #303 from Unity-Technologies/fix-empty-strings-blackboard
Blackboard Property fixes.
7 年前
Matt Dean
90f19e2e
Rename Gradient Asset Node > Gradient Node
7 年前
GitHub
312d23e1
Merge pull request #304 from Unity-Technologies/sub-graph-preview-fix
Sub graph preview fix
7 年前
Peter Bay Bastian
9cc55c03
Merge branch 'master' into path-for-shaders
7 年前
GitHub
23cc01bd
Merge pull request #302 from Unity-Technologies/path-for-shaders
Change path for graphs
7 年前
Jens Holm
74c313c2
Add copy function in IShaderProperty, and implement this in all property classes
7 年前
Peter Bay Bastian
0c641d4b
Fixed warnings from generated transform code
7 年前
Jens Holm
b68215c9
Add text field on properties to allow a custom reference name
7 年前
Martin Thorzen
3d65bbd2
Fixes for decimal issues. comma and period could be wrong / different on different machines, this should now have been fixed
7 年前
Peter Bay Bastian
11c1b9be
Fix all Shader Graph tests (including integration graphs)
7 年前
Jens Holm
ed5436e4
Make custom property names dirty the graph
7 年前
Jens Holm
af05fcf1
Make properties into concrete nodes when copied if the propery value is not in the blackboard in the target graph
7 年前
GitHub
1536b7ef
Merge pull request #316 from Unity-Technologies/fix-for-decimal-issue
Fix for issues regarding decimals / periods
7 年前
Jens Holm
42451460
Make reference names editable throught text field and add reference name sanitation
7 年前
Jens Holm
1ba516e7
Make reset reference menu appear only when reference name is overridden
7 年前
Jens Holm
c5caad3e
Make edges preserved when copying a property node that is converted to a concrete node
7 年前
Jens Holm
810ea255
Fix the node edges not being preserved when the property is actually copied along with the property node
7 年前
Jens Holm
2e2f5f9e
Simplify regex for checking valid property reference
7 年前
Jens Holm
49ac046f
Add funciton to handle duplicate naming
7 年前
Jens Holm
7f9416d0
Make use of the generic duplicate name handling funciton when editing property and reference names
7 年前
Jens Holm
f1e0d4a5
Add docstring to the sanitize function
7 年前
GitHub
6b96c163
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
7 年前
GitHub
f6380703
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
7 年前
Martin Thorzen
3c602bad
Added base functionality to give an error on incompatible render pipeline
7 年前
Martin Thorzen
01126a2f
Fixed an issue where vector 1 node was not evaluating properly.
7 年前
GitHub
9e68ec0c
Merge pull request #342 from Unity-Technologies/fix-vector1-node
Fixed an issue where vector 1 node was not evaluating properly.
7 年前
Peter Bay Bastian
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
Peter Bay Bastian
abdeff3a
Implement Copy() for GradientShaderProperty
7 年前
GitHub
a3897b8c
Merge pull request #317 from Unity-Technologies/copy-property-nodes
Make property nodes into concrete nodes when copied between graphs
7 年前
Jens Holm
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
GitHub
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
7 年前
Peter Bay Bastian
c17cc7e1
Fix null ref exception and update images to be large files
7 年前
GitHub
deb17f95
Merge pull request #350 from Unity-Technologies/fix-subshader-null
Fix null ref exception
7 年前
GitHub
9696a5d1
Merge pull request #326 from Unity-Technologies/editable-property-reference-names
Editable property reference names
7 年前
Peter Bay Bastian
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
7 年前
GitHub
8a2e5a5e
Merge pull request #347 from Unity-Technologies/warning-incompatible-pipeline
Warning incompatible pipeline
7 年前
jensgholm15@gmail.com
ed51c9ec
Make nodes spawn in the center of the view when copied from another graph
7 年前
GitHub
36539f3e
Merge pull request #359 from Unity-Technologies/node-placement-copy
Node placement copy
7 年前
Peter Bay Bastian
54aaeaae
Move to 'ShaderGraph' folder
7 年前
Peter Bay Bastian
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
7 年前
Peter Bay Bastian
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
7 年前
Peter Bay Bastian
a107a23e
Major shader generation refactor part 1
7 年前
Peter Bay Bastian
c3134b61
Refactor GenerateStandardTransforms
7 年前
Peter Bay Bastian
6cdf82d9
Further ShaderStageCapability work
- Add to slot compatibility check (fix create node menu generation)
- Add ShaderStageCapability to CodeFunctionNode slot attribute
- Move SampleTexture2D, NormalCreate, Checkerboard and Triplanar to fragment stage only
7 年前
Peter Bay Bastian
94ce8db1
Fix fragment slots adding data to vertex description
7 年前
Peter Bay Bastian
77dc0df1
Make all procedural shape nodes fragment stage only
7 年前
Peter Bay Bastian
495c97b8
Search window respects shader stage
7 年前
Peter Bay Bastian
a7789fc7
PR fixes #1
- Change output shader layout to fix subgraphs
7 年前
Peter Bay Bastian
35c8e0e3
Temporarily remove vertex capability from Subgraphs
7 年前
Peter Bay Bastian
b5379b4b
Fixed float value to string error and truncation warning for normal create node
7 年前
Peter Bay Bastian
3eef43d8
Added name to abstract material graph. This one is the name from the materialgraph on disk. Added a write file and open file in graph utils. Changed the converttoshader functionality to return a string so it could be re-used in implementation for writing a file.
7 年前
Matt Dean
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
Martin Thorzen
7688ce53
Updated with the PR feedback
7 年前
GitHub
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
GitHub
92542c54
Merge pull request #1354 from Unity-Technologies/sg/fix-error-float-value-to-string
Fix float value to string error
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 年前
Peter Bay Bastian
6db9deb9
Make PreviewProperty check a bit nicer and fix a warning
7 年前
GitHub
06d2091a
Merge pull request #1383 from Unity-Technologies/Add-support-of-per-light-shadow-mask-control
Add support of per light shadow mask control
7 年前
Peter Bay Bastian
a958b031
Rename PropertyType.Texture to Texture2D
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
GitHub
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
7 年前
GitHub
57c37d06
Merge pull request #1355 from Unity-Technologies/sg/show-generated-code
Show generated code for shader graph
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 年前
Tim Cooper
99d825bc
first pass fixing paths
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Peter Bay Bastian
d94fc511
Make HD Shader Graph sub-shader specify RenderPipeline so that it doesn't break LW support
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 年前
Martin Thorzen
7c397424
Addded cache for subgraph. Before it was deserializing on every frame.
7 年前
Martin Thorzen
048a40af
Removed Legacy Code
7 年前
Martin Thorzen
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
7 年前
GitHub
8f9bff6a
Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph
Fixes for Subgraph
7 年前
Matt Dean
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
7 年前
Alex Lindman
34778d4a
added tex2d lod node
7 年前
Peter Bay Bastian
88b60892
Fixing AA of procedural checkerboard node
7 年前
Chris Tchou
f37d6cf2
First pass HDRP lit vertex anim
Works, issues to fix:
screen position and view direction are not accesible in vertex shader
unlit shader needs update
7 年前
Peter Bay Bastian
6e2cae42
Fixing frequency limiter to allow the lerp values to actually hit their endpoints. Also switching to a slightly cheaper calculation that gives nearly identical results.
7 年前
Peter Bay Bastian
fce56481
Add dependency interface and importer implementation
7 年前
Matt Dean
aa2a3ad7
Update slot name
7 年前
Matt Dean
4357fbd0
Make work in vertex shader
7 年前
Peter Bay Bastian
7f024953
Implement dependency tracking for sub graphs
7 年前
Matt Dean
de873ebd
Fixes to IsFrontFace node
7 年前
Matt Dean
887571b9
Fix ScreenPosition transformation
7 年前
Matt Dean
8204a168
Rename IsFrontFace node
7 年前
Peter Bay Bastian
544afac6
Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies
7 年前
Matt Dean
2a7ab752
Move IsFrontFace node
7 年前
GitHub
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
7 年前
Chris Tchou
7777e6e0
Merge branch 'vertexAnimHDRP' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
Chris Tchou
d3bcb929
Fixes for vertex animation velocity buffer, screen position
And some refactoring
7 年前
Chris Tchou
929feabf
Merge remote-tracking branch 'origin/sg/fix-checkerboard' into vertexAnimHDRP2
7 年前
Chris Tchou
9f55549e
Fix for HD Unlit master node screen position and advanced features.
Cleanup of generated code -- putting debug output on an internal switch.
7 年前
Alex Lindman
d3185691
added sphere mask node
7 年前
Alex Lindman
37dd4a52
Revert "added sphere mask node"
This reverts commit 8e71abaf5cc697787f4dc4c4e2c6d59eeb30d093.
7 年前
Alex Lindman
4165fc2d
Revert "Revert "added sphere mask node""
fixing a mistake i only just now noticed shhh
7 年前
Alex Lindman
a0fb31b5
fixing spacing
7 年前
Peter Bay Bastian
d2afb9db
Separate class and struct fields in PreviewProperty union, such that they do not overlap
7 年前
GitHub
2b137c18
Merge pull request #1479 from Unity-Technologies/sg/fix-gc-bug
Fix GC bug
7 年前
GitHub
5bfd4b01
Merge pull request #1429 from Unity-Technologies/sg/texture2dlod
Added Sample Texture 2D LOD Node
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
GitHub
f0f49516
Merge pull request #1461 from Unity-Technologies/sg/fix-screen-position
Fix ScreenPosition transformation
7 年前
GitHub
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
GitHub
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
7 年前
sebastienlagarde
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
Oliver Schnabel
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
Remy
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
GitHub
961e2a42
Merge pull request #1497 from Unity-Technologies/FalseColorMode
Added false color debug mode
7 年前
sebastienlagarde
16cef1a8
Update include generator to use space instead of tabs
7 年前
GitHub
2ed78d94
Merge pull request #1500 from Unity-Technologies/Update-generator
Update include generator to use space instead of tabs
7 年前
Sebastien Lagarde
c95b7c47
Merge branch 'master' into normal-buffer-support
7 年前
Paul Melamed
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
7 年前
GitHub
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
7 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
Martin Thorzen
37c00666
Added update title to master preview and blackboard.
cleaned up assetName parameter and dded it as a property instead
Made a seperate shader graph post processor file
7 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
Martin Thorzen
93058019
Re-added this functionality since I will remove it in another PR
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
GitHub
13b0e098
Removed unnecessary space
7 年前
Chris Tchou
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
7 年前
GitHub
19222bee
Merge pull request #1518 from Unity-Technologies/hdrpcleanup
HDRP cleanup -- Consolidating shared HDRP code to utility class, cleaning up output shader code by removing debug comments (on internal bool switch)
7 年前
Antoine Lelievre
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Peter Bay Bastian
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.
7 年前
Stephane Laroche
a49a696e
Merge branch 'master' into StackLit2
7 年前
Remy
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Matt Dean
b7161c18
Fix initialization of vector properties when duplicating subgraphs
7 年前
Matt Dean
1f85b9a1
Fixes for PR
7 年前
GitHub
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
7 年前
Sebastien Lagarde
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
Sebastien Lagarde
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
7 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
GitHub
540a8964
Merge pull request #1579 from Unity-Technologies/sg/fix-duplicate-subgraphs
Fix initialization of vector properties when duplicating subgraphs
6 年前
GitHub
4138567f
Merge pull request #1462 from Unity-Technologies/sg/spheremasknode
Added Sphere Mask Node
6 年前
sebastienlagarde
7934a87a
Merge branch 'master' into LightUnits
6 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
Remy
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 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
Peter Bay Bastian
358cdac8
Fix texture and boolean property types in subgraphs
6 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
GitHub
7d8789d6
Merge pull request #1458 from Unity-Technologies/sg/fix-subgraph-properties
Fix texture and boolean property types in subgraphs
6 年前
Tim Cooper
893f84e9
Add warnings as errors to test projects + fix issues
6 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
Nerites
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
Matt Dean
cef782d1
Added Normal Derive Nodes ( #1550 )
* adding normal derive nodes
* updates to changelog and renaming normal nodes for clarity
* updated file names
* changed float to precision on normal reconstruct z node
6 年前
Matt Dean
e5de9e5a
Added Texel Size Node ( #1527 )
* adding texel size node
* updated changelog
6 年前
Matt Dean
c6494b51
Added Wave Form Nodes ( #1547 )
* small sampling of wave form nodes
* updates to waveform calcs
* fixed noise wave function
* updates noise wave and changelog
* update name of node directory folder
* updated maths and noise sine wave node name + changelog
* updated filename for noise sine wave node
* updated float to precision in noise sine wave
* updated changelog
6 年前
GitHub
d28560f9
Set stage capability for Texture2DArray and Texture3D nodes ( #1651 )
6 年前
GitHub
953cdf48
Fix normalizations in Shader Graph with LWRP ( #1571 )
* Remove double normalization
* Update changelog
* Normalize tangent and bitangent in pixel remap
* Fixes for PR
- Do correct normalization
- Update changelog
- Update importer version
* Missing post-processing submodule update
* Fixes to changelog
6 年前
Remy
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Nerites
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
GitHub
74d0a872
Merge pull request #1745 from Unity-Technologies/master
Merge from master
6 年前
Julien Ignace
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
GitHub
f0c6fbeb
Remove all legacy matrices from Shader Graph ( #1652 )
* Removed all legacy matrices from Shader Graph
* Change None enum entry to -1
* Fixes for PR
6 年前
Antoine Lelievre
71ec7369
Merge HDRP/staging
6 年前
Remy
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
Yao Xiaoling
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Matt Dean
91d80f85
Small Node Fixes ( #1670 )
* unroll simple noise loop and add overwrite blend mode to blend node
* updated changelog
* fixed polygon node caluclations
* put overwrite blend mode at the end of the enum
* updates to changelog
* fixing z calculation on normal strength node
6 年前
Matt Dean
0a5ac9f7
Added new Rotation about axis node ( #1695 )
* Added new Rotation about axis node
* changes for pr
* changed description
6 年前
Sebastien Lagarde
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
Antoine Lelievre
d5e69c03
Merge HDRP/staging
6 年前
sebastienlagarde
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
GitHub
6d4f0be7
New template parser ( #1532 )
* Converting template parser to a class to enable recursive $include in the near future
* New template parser working with $include, $splice
Including dependency tracking on $include
* Adding $buildType template command, and cleaning up the code around that.
* Bump major version number. Using ShaderStringBuilder.
* Don't build slot list twice
* Fix view space position for FB case 1064118
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
sebastienlagarde
0267674b
Merge branch 'master' into HDRP/staging
6 年前
GitHub
ee4e73a4
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
6 年前
sebastienlagarde
f75e94af
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
Sebastien Lagarde
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
Frédéric Vauchelles
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
RSlysz
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
GitHub
f44d2214
Bump post version ( #1883 )
* Bump shader graph version dependency.
* Fix shader compile warnings
6 年前
egomeh
170858df
Merge master
6 年前
GitHub
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 年前
GitHub
d3224f75
Fix for system locales ( #1593 )
Fixed an issue that color property and vector in blackboard could still cause a system locale error.
6 年前
egomeh
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
Yao Xiao Ling
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Thomas
468989ad
Merge branch 'master' into pyramid-rework
6 年前
GitHub
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前