2a039635
[Shader Graph] Inital commit of modularised graph editor
12 年前
2de768fd
[Shader Graph]Making it work on current setup.
9 年前
3138de7e
[Shader Graph]Fix minor issues as they are encountered
9 年前
1eaab6d4
[MaterialGraph] Compiling (and working) specular / metal setups.
9 年前
7d0465eb
[Shader Graph]Reformat the code to match conventions.
9 年前
e1a0768f
[Shader Graph]
Add preview for main node
Allow overriding of preview size per node
Fix issue with preview generation happening before active nodes were recached
Allow 'preview' generation to generate surface shaders
Fix bug in function3 nodes
9 年前
e7365ac3
[shader graph] add lerp node.
9 年前
e902d076
[Shader Graph] Remove time hacks and use time overrides when rendering. Use real editor time.
9 年前
64357be6
[shader graph]Add asset preview for graph.
9 年前
c2f74843
Fix up setting preview properties to be pull based instead of push based (needs close review)
9 年前
53f95972
[shader graph]Refactor
-namespace UnityEditor.Graphs.Material
+namespace UnityEditor.MaterialGraph
9 年前
9b51c881
[shader graph]Tidy up generation of shaders / preview.
9 年前
cb909cbc
[shader graph] Support adding / removing master node slots for easy upgrading.
9 年前
424d2324
[shader graph] Fix issue where we were overriding base class and not calling the function.
9 年前
5a34322a
[Shader Graph] Previews rendering.
9 年前
4b137787
[shader graph]Reenable node UI. Not amazingly laid out yet, but it will get there.
9 年前
ff4d4704
[shader graph]fix layout.
9 年前
94238998
[Shader graph]Add float input node
9 年前
229ce4f5
[shader graph]Fix fix up defaults for node inputs. Moving towards typed inputs.
9 年前
60dd24e7
[shader graph]Update update some nodes to have multiple outputs.
9 年前
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
70760866
[shader graph]more support for multiple correct channeling.
9 年前
450a5f11
[shader graph]small tweaks and cleanup to the invalid state caching.
9 年前
4d5ee48d
[shader graph]Start adding UI to the graph view.
9 年前
bb779dab
[shadergraph]Make export button that works.
9 年前
6086c6d6
[shader graph]Integtate new non modifiable settings into shader graph. Fix setting properties generation pipe to be simpler.
9 年前
28d3f4cc
[Shader Graph]
Remove properties as they are not needed (will expose property setting per input node)
Add support for compact node UI view
Add Vector3 node
Update some example graphs
9 年前
51ceebd2
[shader graph]optimise for GC
9 年前
82eedf8b
[shader graph]allow properties to be exposed (happens via UI)
9 年前
abcc9002
[shader graph]
*Fix exposition of vector properties
*Change validation (graph wholeistic)
*Add view layer callback for when nodes change internally (need repaint)
*Add missing pool classes
9 年前
c1c5d22d
[shader graph]
*All inputs should go through the adaptor. This stops weird implicit swizzles.
*Adaptor now uses swizzles instead of new vector.
9 年前
2a69fb8d
[shader graph] remove debug that was left in.
9 年前
a99eb964
[shader graph]Add default input UI support (very alpha)
9 年前
6aaca4fc
[shader graph]
*Unified deletion architecture - Delete edges before nodes
*Input proxies now aware of their type
*Fix shader builder bug when mapping from vector1 -> vector2. Some compilers need this to be explicit )swizzle with .xx).
9 年前
1062aabb
[shader graph] Allow nodes to no generate default inputs via flag. Only really usefull on base pixel node.
9 年前
f93f8c6b
[shader graph]
*Allow drawn nodes to invaludate the model in OnGUI for the node (if for example the slots change)
*Lighting functions now determine what is available on master pixel node
9 年前
798bca64
[shader graph]
*Use GUID for node identifier instead of instance ID (Stable between runs)
*Cash hash of last generated preview shader string, do not regenerate if it's the same
*Serialize node preview shaders / materials / last generated shader hash (load time optimisation)
*Add node property: canDeleteNode returns false by default. True for pixel master node
*Rarrange popup menu
9 年前
556a7777
[shaderGraph]
*Use last shader string instead of hash.
9 年前
d1eb6888
[shader graph]
*properly initialize new graphs
*Reenable combine node.
9 年前
51415775
[shader graph]Data refactor begins.
9 年前
6d78b98e
[shader graph]data refactor pt2
9 年前
af2e75ab
[shader graph]Data refactor 3
9 年前
34db823b
[shader graph]Data refactor 4 (working kind of now)
9 年前
a2b27b3c
[Shader graph]Working on getting previews again.
9 年前
159a13a8
[shader graph]Renable delete. Fix guids so shaders generate properly.
9 年前
418682b1
[Material Graph]Refactoring graph architecture.
9 年前
7a1ca7ce
[material graph]Compiles again.
9 年前
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
9 年前
ed811c3c
[material graph]Tidy slot reference usages + update tests.
9 年前
0de2d9bd
[Material Graph] Mode node collecton code to NodeUtils away from member functions
9 年前
2630ebd1
[Material Graph]Material graph does not need reference to owner + more tests.
9 年前
404ea34c
[material graph]Moving namespaces / extract things to interface
9 年前
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
3e4c0174
[Material Graph]Add in general node collapse.
9 年前
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
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 年前
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
9 年前
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
c522adcc
[material graph]Working on texture preview / regeneration of drawing layer workflow.
9 年前
26c129c0
[Material Graph] Sub graph / subgraph input nodes are can be added now, need to work on slots still
9 年前
51558db2
[Material graph]hax to serialize texture reference :/
9 年前
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 年前
d9619701
[material graph] Tidy up API for slot management (make generic).
9 年前
addd6c34
[Material Graph]Write tests / fix issues as encountered
9 年前
8e10c8cb
[mat graph]Sub graph is working again.
8 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
8 年前
376c8378
[material graph]Change how precision works, make default precision half.
8 年前
ac62e6d8
[Shader Graph]Tidy function input nodes to now handle input dimensions nicely.
8 年前
7ae021c6
[material graph]Convert slots from being a string into being an int that can be referenced from the node.
8 年前
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
553fedbf
[Format]Run code formatting
8 年前
95b250d2
[material graph] Fix newline issues.
8 年前
5055d67e
[Material graph]More testing + fix things that are broken with the tests.
8 年前
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
b42e0339
[Material Graph]Fix up texture node serialization.
8 年前
ff11a50c
[Material node] use color property instead of field.
8 年前
01630326
drawing preview now.
8 年前
c565a8d4
fix formatting
8 年前
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
d55cb3d6
[material graph]Fixing position + serializing positions
8 年前
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
8 年前
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
ab7317bb
[Mat Graph]Run code formatter
8 年前
860a7a67
[Material Graph]delete edge + vector 1 node drawing.
8 年前
57c91c90
[material graph]Run code formatter.
8 年前
85173f43
Added UI for Vector{2,3,4}
8 年前
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 年前
f8cafbbb
Removed preview from vector nodes
8 年前
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
234030ae
Corrected onModified calls for various nodes
8 年前
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
f6777ffb
[Material Graph]Restore first slot for normal map for now. Needs a real fix.
8 年前
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
1c332af5
[mat graph]Fix issue with edges not behaving well
8 年前
3a45f192
[mat graph]Fix up previews a bit more.
8 年前
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
9ea47ed4
working on shader compiler issues
8 年前
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
8 年前
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 年前
bc6130d7
Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node.
8 年前
95bdff73
Add default constructor for MaterialSlotDefaultInput to allow deserialization
8 年前
42eb0e0c
Merge branch 'master' of github.com:stramit/MaterialGraph
8 年前
94f746ff
- Avoid add null shaderChunks
- Public for normal slot (useful for default input)
8 年前
51383cec
Add world tangent node (with IRequireTangent behavior)
8 年前
47d64c52
[mat graph]Remove implicit node creation now that we have better code generation framework.
8 年前
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
8 年前
c1f9ae7d
Add WorldBitangentNode (with IMayRequireBitangent behavior)
8 年前
2c0192a0
Add VertexColorNode & Fix missing bitangent in AbstractSurfaceMasterNode.cs
8 年前
8592d7d0
Add an index to RequiresMeshUV, allows require UV1 to UV3
8 年前
7ee96660
[mat graph]Start work on remapper
8 年前
c11fe3b4
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
8 年前
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
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 年前
e6b70122
[Material Graph]Show slot default inputs in the inspector.
8 年前
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
ce59a9db
Step1 for LevelNode
8 年前
6f40e6a8
Level node (this time working :))
8 年前
8f28c9f1
move levelNode to "range" menu
8 年前
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 年前
cbbf048e
Fix SwizzleNode step1
8 年前
7ae13517
SwizzleNode now working
8 年前
2c5dc651
Cleanup
Cleaned up new nodes
Changed Function3Input kShaderNames to be protected
8 年前
c127b19f
-Moved cube map node
-Tweaked colour guide texture
-Fixed time node
8 年前
cf30e087
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
c30e0ee9
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
24f3679d
Added Function4Input & Function4InputTest
8 年前
30bac3ab
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
5bed2efc
Menu Reorg: Input
8 年前
5eca2dca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
d6b32a39
Menu Reorg: UV
8 年前
085216ab
Split And Combine step1
8 年前
91c14c31
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
eeaa57f9
Menu Reorg: Channel & Procedural
8 年前
9d1506f2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
dd853ee2
Add flexibility to splitnode
8 年前
4eca4e2f
Menu Reorg: Art & Levels
8 年前
1edaa84a
Removed unused property values.
8 年前
4b0b903e
Add CombineNode
8 年前
423d104b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
b6182225
Menu reorg: All math nodes organised and cleaned
8 年前
45498f4b
Made rotation node default to mesh UVs if no UV input is specified.
8 年前
500e0026
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
4adac24f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
fd9c67e7
Cosmetic change on the output name of the rotation node.
8 年前
1bba1ba2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ae510b9e
Added a Voronoi Noise Node
8 年前
41da8598
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
b359c1c7
Let master node to have 2D preview
8 年前
cd52a1e3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
5e5d7d07
Fix the title of the node.
It was named RGB to Linear in the node title.
8 年前
180f53e2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
1780d88e
The Voronoi Noise can now be animated.
8 年前
8a797aa6
Added matrix multiply, transpose, vector projection and rejection
8 年前
67baa28e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
503b7b62
Remap node fix, beginning of toggle node
8 年前
0d1ac07f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
6ff47f50
Repeating Dot Procedural Node
8 年前
ee8f0ea6
Added a spherize node and fixed a bug in the checkerboatd node.
8 年前
ec474be5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
82da97c0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
874af82d
Fixed a spherize node calculation error.
8 年前
ea69972e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
09332619
Texture Asset node and sampler2D input/output type
8 年前
a82b356e
Added a Pulse Node
8 年前
e2223047
Adding Heightmap to Normalmap node. Fixing some bugs with function N
8 年前
f0331f23
Added a procedural box node and made a few changes to the inputs of the pulse node.
8 年前
20f9d0ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
fac62848
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
c80b6a3a
Added an IF node
8 年前
7968bfa6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
2f5a98bb
We now have a Custom Code Node
8 年前
72252143
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
45eedc86
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
fe8256e6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
82a36753
Fixed sufix hack adding _Uniform at the end of sampler 2Ds. Now this case is handled correctly
8 年前
2adf665a
Added input/output checking
8 年前
f13a8ff6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
12603c9a
Changing all Texture2D types to Teture to allow custom render textures to be added.
8 年前
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
04080286
Fixed bug. The Cartesian to Polar Node now outputs a vector 2d.
8 年前
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 年前
435b3c0e
Add names to property nodes in the editor
8 年前
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ef69c53a
Convolve filter v1 (WIP)
8 年前
a1811244
A Custom Node can now have no inputs or outputs
8 年前
c7fbf38f
Added Matrix 2 and 3 types
8 年前
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 年前
1d20711e
convolve filter step2 (plug weights)
8 年前
2df2cc2b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
74c4e0ee
Convolution filter presenter
8 年前
ff74ebd2
Convolution filter : fix preview
8 年前
eeb9f4ff
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
3bce395a
Added Matrix4 and fixed Matrix multiply
8 年前
3bb72fa1
Updated matrix mul and transpose (hardcoded to 3x3)
8 年前
c99dc5e2
REPO FIX
8 年前
5dbc06ce
Voronoi noise now outputs different different effects.
8 年前
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
a20b7720
Added a Twist UV node and moved the Noise Node into the correct directory.
8 年前
b2d664e0
Added matrix common and ops
8 年前
3ccadfe5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
8938908f
Adding more output variations to voronoi noise
8 年前
995a95bc
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
e1e3ee9c
Added default value to the UVTile node
8 年前
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bd162e6b
Added default value to the checkerboard node
8 年前
d48c5531
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
419516e8
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
5f08fc4e
Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc.
8 年前
b94d71ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
953f009f
New sampler2D type for the cases when users require a texture reference, but don't care about using a separate sampler state.
8 年前
7a9f1ef2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
22cf545d
Fixed math in remap node
Added second output for screenPos that is pure XY UVs
8 年前
c09d8226
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
46d84ef9
Fixed vector2 node
8 年前
d92a2269
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
6d640d6a
Added cam direction node
Added cam position node(should be implemented better but no time)
8 年前
683c517e
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
8 年前
73112c5a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
abec21f1
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
b247c311
Texture assets and related notes work now (Thanks Tim!)
8 年前
bdfd3b5f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
b061e067
Lava and some stuff.
Fixed screen pos
8 年前
670f4bf3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
c19d413a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
98611b46
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
2e183994
Add time checkbox
Make shorter GUIDs
8 年前
96cdde05
Add node that 'just does' HLSL and can convert to shader node based on API.
8 年前
e8c71321
converting nodes to new system.
8 年前
0336445f
fix node adaption so casting works as expected
8 年前
eb2f7590
fix error in uv rotate node.
8 年前
08ce57cd
Fix bugs in blend node after port.
8 年前
3198bd43
Remove Function2Input node as it is no longer needed.
8 年前
4b1458e8
Remove Function3Input (use code node) :)
8 年前
8df91eb4
Remove function 1 input and function 4 input
8 年前
5e6630fb
Porting more nodes to not be function nodes
8 年前
d0d60781
Texture asset is now a real asset type...
7 年前
06b7010b
Remove "AnyNode"
7 年前
0d9b1e6a
Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes)
7 年前
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 年前
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
8f5cab45
[fixes]Fix broken unit tests.
7 年前
793887f9
Working 'convert to subgraph'
7 年前
f516d811
Merge remote-tracking branch 'origin/subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
7 年前
7e160ce8
Run `hg format` on repository
7 年前
d69d3c1d
Move IMayRequireNormal into own file
7 年前
f32d2e24
Add DictionaryPool
7 年前
8dc11b9a
Fix split node and add test for it ( #62 )
7 年前
ce4b9371
Fix combine node and update split test to also use combine node
7 年前
af51e8ac
Better labels for combine node
7 年前
ed185a44
Preliminary vertex shader support
7 年前
f6fa3513
Starting to extract properties.
7 年前
8a87c992
More refactoring.
7 年前
354517e6
Partially working new master node architecture.
7 年前
be067cc2
first real working shader in the 'new' model.
7 年前
0818f178
temp
7 年前
735c401b
Working: Properties window + new master node.
7 年前
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
29754ac3
Working light weight unlit master node
7 年前
580b206b
missed files
7 年前
fb21bff8
Working lightweight metallic master node.
7 年前
0b56c45b
first pass.
7 年前
8d5e6fd1
texture exposition working
7 年前
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
bf91b908
Put in change notification for preview expanded state
7 年前
e5c78ee9
Separate usage of 'graph requirements' from 'model requirements' to not pollute the surface input structure.
7 年前
dcc886b3
Default preview to be expanded
7 年前
97cfbe75
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
7 年前
c1f2dd69
Unlit and lit nodes now working properly in and outside a subgraph :)
7 年前
4a551695
temp
7 年前
c5b4edc2
Add preview node
7 年前
2ab88d19
Add title to PreviewNode
7 年前
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
c002d689
Move graph things from Runtime to Editor
7 年前
215e1b6a
Refactoring slot types.
7 年前
ff8de4d3
New attribute-based system for node controls
7 年前
2c1b60e0
compiling
7 年前
ddc1113a
Resize handle added only to preview node
7 年前
1125f7df
Common attribute control for floaty properties
7 年前
24923996
misc fixes afer changes
7 年前
811d7dab
Color attribute control
7 年前
95ea6e13
Turn off preview for color node
7 年前
f695b6fa
Enum attribute control
7 年前
56967512
Property attribute control
7 年前
152042bb
Comment out IfNode for now
7 年前
7bb42428
Use attribute controls for Matrix nodes
7 年前
319e2795
Fix update scope of matrix nodes (they do not support preview properties yet)
7 年前
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
83548475
Merging master.
7 年前
4ec6fe3b
Maths Part 1
- Maths/Basic
- Maths/Advanced
- Maths/Range
- Add HLSL safe conversion for node name
7 年前
3ca3abee
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
7 年前
b4599393
Fix merge conflicts for PR
7 年前
9772a011
More PR fixes
7 年前
31068f89
More PR fixes
7 年前
a5c9b0ce
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
7 年前
6161fea6
Fix compiler warnings :)
7 年前
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
b75b4c04
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
7 年前
cd7aa840
Add fixed aspect ratio and initial size to PreviewNode
7 年前
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
b2eceafe
Improve 'geometry' based nodes so they can do space translations internally.
7 年前
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
d085dca3
Maths Part 3
- Cleanup after merge
- Started on Maths/Vector
- Fixed Log and Exponential outputs
- Partial Derivative is WIP
7 年前
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 年前
6f70ee57
Added Hyperbolic Cos/Tan
7 年前
a3c5d049
Input Part 1
Input/Basic (WIP)
Input/Scene (WIP)
7 年前
9ff93cdb
Add specific material slot types and port code generation node to use them.
7 年前
f3353a02
Input Part 2
Input/Geometry
7 年前
03923b0b
Input Part 3
Input/Matrix
Input/Time (WIP)
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
abed850e
Merge master
And fix conflicts
7 年前
418c94c0
Fix bug in Vector nodes
7 年前
a02b954a
Input Part 3
- Final for now
- No texture nodes
- No gradient nodes
- Havent check parity
- Fixes for PR
7 年前
52b69b3c
Merge branch 'master' into node-validation
7 年前
3039671f
Merge master
7 年前
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 年前
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 年前
497d1891
Fix merge issues.
7 年前
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
7 年前
713f6000
Merge pull request #79 from Unity-Technologies/improve-texture-node
Improve texture node
7 年前
41b314d2
Merge branch 'master' into node-validation
7 年前
62ff2d02
Merge fixes
7 年前
fe4745b9
Input Part 4
- Organised Input/Texture
- Added TextureAsset
- Added TextureControl
7 年前
8e5b0d9b
First pass inlining property nodes.
7 年前
c86f6166
Input Part 5
Fixed sampler state
7 年前
92a955c3
Add converter from v1,v2,v3,v4,col nodes -> properties.
7 年前
324ba49c
Input Part 6 (Gradient)
- Merge branch Gradient
- Added Gradient MaterialSlot and ShaderProperty
- Added defaulty handling
- Fixed SamplerState variable name bug
7 年前
0addad32
Fix stack overflow
7 年前
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
c27b2a9e
Rename Texture2DAssetNode
7 年前
de93c238
Merge trunk
7 年前
9650733e
changing result to out - cutting transfrom - adding Tiling Offset. Some functionality may change based on Tiling Offset UV input/texture node changes
7 年前
dc3b9dcd
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
e92749db
changing input order to increase consistency. Added center input for rotate node
7 年前
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 年前
a63160cc
UV Nodes
- Minor fixes to Natalies commits
7 年前
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 年前
bbb186d6
Remove Gradient nodes and asset type :(
7 年前
02c6b58d
Merge master
7 年前
a8cf2f2b
Added Projection Parameters to Camera Node
7 年前
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
7 年前
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
bb560530
Rename folders
7 年前
acd0279b
Hue Node
7 年前
25b59d14
Saturation Node
7 年前
69616da6
Color slots (a vec4 slot with a different input control)
7 年前
471c7357
Contrast Node
7 年前
8e0e719e
White Balance Node
7 年前
8707e0ea
Replace Color Node
7 年前
711f81fa
Added Channel Mixer Node
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
b48cb4c9
Color Mask Node
7 年前
b14c1f98
Merge branch 'master' into node-artistic-adjustment
7 年前
13948f2d
Channel Mask Node
7 年前
8653d727
Change Replace Color to use Color slot types
7 年前
c06cd050
Fixes for PR
Also made function reusable for different node insatnces
7 年前
2cc3b58e
Fix Channel Mask node
- Convert to Abstract derived
- Move channel validation check to node side
- Cleanup
7 年前
f615cb37
Work with new GraphView slot coloring
7 年前
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 年前
446c232d
Screen Node
7 年前
20cf4421
Flip Node
- Added ToggleControl (first pass)
7 年前
7cc96aea
Camera Node Improvements
7 年前
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 年前
e9a12809
Object Node
7 年前
66be97cf
Split Node improvements
- Fix error with single channel input
- Clean code
7 年前
7b095256
Transform Node Fixes
7 年前
6a3937c7
Swizzle Node
7 年前
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
874bec55
Depth Texture Node
- SamplerShaderProperty
7 年前
1daf0032
Normals Texture Node
7 年前
7f9b8cab
Motion Vector Texture Node
7 年前
d84ea3c2
Fixes for Depth Texture and Normals Texture Nodes
7 年前
b53566fb
Fog Node
7 年前
a8dfafe4
Merge pull request #84 from Unity-Technologies/node-artistic-mask
Node Artistic Mask
7 年前
c3edb9c7
Ambient Node
7 年前
dadccc50
Merge branch 'master' into node-channel
7 年前
6f035d8a
hack and slash.
7 年前
5131e8e1
Fixes for PR
7 年前
0eff0dec
Add Normal unpack mode for Texture 2D Node
7 年前
f14af0f4
Added Cubemap nodes
7 年前
1d641fec
For final shader generation use the master node.
7 年前
736a2328
Add LOD input and inline reflection vector
7 年前
f698c591
Changed Length Node output to vec1
7 年前
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
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 年前
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
048fd0dd
Update to latest light weight pipeline.
7 年前
65348a87
Rename Checkboard Node
7 年前
5e47b629
Fixes for PR
7 年前
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 年前
9ddf9039
Merge pull request #85 from Unity-Technologies/node-channel
Node Channel
7 年前
d8578f92
Merge pull request #82 from Unity-Technologies/node-artistic-adjustment
Node artistic adjustment
7 年前
35129ab8
Merge pull request #91 from Unity-Technologies/node-bugfixes
Node Bugfixes
7 年前
5d9b28af
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
7 年前
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 年前
0e092ee5
remove files that should not be there.
7 年前
54ac74c0
Merge branch 'master' into node-input-scene
7 年前
16640c42
Run code format tool
7 年前
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
1eba56e9
run reformat tool
7 年前
e91932f8
Node selector / search
7 年前
1cf9ffde
Update node titles to use new array-based grouping `[Title("UV/Flipbook")]` -> `[Title("UV", "Flipbook")]`
7 年前
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
a19f5b15
Moved BlendMode node
7 年前
484cbca7
Renamed Blend node
7 年前
b60e8b5a
Update Blend node
7 年前
8cdf0c8f
Move BlendModesEnum
7 年前
4d3bb030
Rename BlendMode
7 年前
5f368a29
Move old Artistic nodes back to WIP folder
7 年前
7c7d7604
Add Colorspace Conversion node
7 年前
bcfd7b47
Fix Blend node naming conventions
7 年前
24863ece
Remove old colorspace conversion nodes and fix part preview graph
7 年前
3604c2f5
Move old logic nodes to WIP
7 年前
ed55de08
Remove logic folder
7 年前
3d06be46
Moved Normal nodes
7 年前
65e40578
Delete old normal folder
7 年前
7857730f
Move vertex interpolator node to WIP
7 年前
7301ac69
Moving more nodes
7 年前
3f34639b
Fixes for subgraph, preview and property nodes
7 年前
a7e7a333
Move Property node into Input
7 年前
21f4a1ac
Fix Property node output names
7 年前
5ce62a7e
Move old procedural to WIP
7 年前
3157dc84
Move Noise nodes to Noise folder
7 年前
7017122a
Fixes to noise nodes
7 年前
e1814d28
Renamed noise nodes
7 年前
d0950f2d
Rename Normal nodes
7 年前
134e68b6
Fix Normal nodes
7 年前
7c2a62b0
Add Normal Strength node
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
0eec5e4e
Merge pull request #95 from Unity-Technologies/node-validate-current
Validate all current nodes
7 年前
e7f2c3a5
Add Polygon node
7 年前
4c9b3b08
Switch DDX node to dynamic dimension ports
7 年前
9717c2d8
Move Box node
7 年前
1e450d4f
Switch DDY node to dynamic dimension ports
7 年前
2fc3d22e
Rename Box node > Square node
7 年前
b08ed60c
Switch DDXY node to dynamic dimension ports
7 年前
5b4a28ab
Fix Square node
7 年前
16cbb0ed
Switch Distance output to Vector1
7 年前
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
278cfacc
Renamed Square node > Rectangle node
7 年前
599b2ee7
Switch Reflection node to dynamic dimension ports
7 年前
5c0e0f70
Fixes for PR
7 年前
e348b11e
Moved Repeating Dot node
7 年前
f4ca23e8
Switch Cross Product node to Vector3 ports
7 年前
f48335e0
Renamed files
7 年前
afc52ffa
Fixes to polygon and ellipse nodes
7 年前
46e0e4e5
Merge pull request #98 from Unity-Technologies/node-bugfixes
Maths nodes bugfixes
7 年前
68dcee06
Renamed Repeating Dot node > Ellipse node
7 年前
fb3d355b
Removed uneeded Fog enum
7 年前
4512dff0
Started work on Rounded Rectangle node
7 年前
2d57b390
Add Orthographic slots to Camera node
7 年前
0364097d
Fix Rounded Rectangle
7 年前
d1e59e63
Moved Scene Normals and Scene Velocity nodes to WIP
7 年前
ae1bad65
Fixes pre-PR
7 年前
c467fab5
Make color space conversion node controls a bit neater
7 年前
2a6ef764
Fix Camera node direction slot
7 年前
10685e95
Fixes for PR
7 年前
df7a48db
Remove partial derivative precision
7 年前
1f9fe754
Move Scene Depth to WIP
7 年前
211cf575
Refactor ColorspaceConversionControl to work on enums in general and implement it for TransformNode
7 年前
5a69c812
Merge branch 'master' into node-bugfixes
7 年前
9fcf8bc7
Transform node fixes
7 年前
adae5870
Rename Hue input to Offset
7 年前
67d2fd02
Merge master
7 年前
63709067
Missing from previous commit
7 年前
fd5fa964
Merge Master
7 年前
298ac06f
Missing from previous commit
7 年前
16406a1d
Working on conversion to new library
7 年前
2775c78f
Delete old nodes
7 年前
97df3812
Fixes for Blend node
7 年前
00d8b6e8
Rename ColorMaterialSlot > ColorRGBAMaterialSlot and add ColorRGB slot
7 年前
a8be8e67
Fix slot value type
7 年前
ef9bd86c
Merge pull request #124 from Unity-Technologies/color-rgb
Color RGB
7 年前
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
81940dcd
Add object control back to SubGraphNode for now ( fixes #112 )
7 年前
1a3f590c
Merge pull request #99 from Unity-Technologies/node-input-scene
Node Input Scene
7 年前
e3bd536c
Merge branch 'master' into HDMaster
7 年前
5546123e
Merge branch 'master' into node-bugfixes
7 年前
6a80fdeb
Merge pull request #122 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
7a9a255f
More work on porting node library across to new shader library.
7 年前
c0c7450c
Saturate dot product result in fresnel effect node to avoid negative values
7 年前
7995a0e9
upgrading to new shader library.
7 年前
6f046031
Merge pull request #127 from Unity-Technologies/procedural-shape
Procedural Shape
7 年前
0ac8d160
Fix for DDXY node
7 年前
914403a2
Temp fix for various nodes
7 年前
b23f23cb
First pass Matrix 4x4 nodes
7 年前
0fca7431
Rename Texture2D and Cubemap nodes
7 年前
8697ac36
Preliminary work on Dynamic Matrix
- Add other matrix slot value types
7 年前
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
cef293ac
Rename Texture2D and Cubemap node files
7 年前
1a08b1b1
Add DynamicMatrixMaterialSlot and fix all Matrix input types
7 年前
e8ae5340
Merge pull request #129 from Unity-Technologies/node-bugfixes
Rename Texture2D and Cubemap nodes
7 年前
14f5c06b
Fix Matrix Multiply Vector node
7 年前
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
929cf786
Add ShaderStringBuilder and change non-CodeFunctionNodes to use it
7 年前
e3aaf843
Squash `SerializableNode` into `AbstractMaterialNode`
7 年前
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
409a35e4
Add LegacyAttribute for declaring old class names directly on the node class
7 年前
ce482316
Modify SwizzleNode such that it is possible to change channels without shader generation in preview mode
7 年前
c2183225
Make GetChannelCount return an integer rather than a number enum thingie
7 年前
0055dc00
Rename LegacyAttribute to FormerNameAttribute
7 年前
35350e91
Remove function from Swizzle node, makes more sense to just write inline
7 年前
41e06942
Change IGeneratesFunction such that a name is provided to a registry, which only allows 1 implementation per name. Includes a validation mode that checks that multiple given functions with the same name are actually the same.
7 年前
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
eb5b5a85
Shader source mapping for node functions ( #137 )
7 年前
e1ebec49
Merge master
7 年前
5c979fc8
Merge master
7 年前
25b66c4b
fixing merge
7 年前
09d669c8
Various refactorings and improvements ( #139 )
* Move previewMode to RenderData instead of ShaderData (still some to do here, as apparently there's still a RenderData _and a_ ShaderData per node, but the intention was to have a RenderData per node and then share ShaderData between those)
* Introduce a temporary identifier for nodes. The first part of this identifier is an index (`int`) which is assigned linearly. When a node is deleted, its identifier as added to a free list. Each identifier also contains a version (`int`), which is incremented when the identifier is re-used. This allows us to replace usage of Dictionary with List in a lot of places.
* Introduce IndexSet for efficiently storing and manipulating a list of indices (e.g. from temp IDs). Internally this stores a list of 32-bit integers and uses each bit to represent 1 index. The operations of `ISet<int>` are implemented for this type, although that interface does not exist in Unity. The operations are very fast and cac...
7 年前
ad906af4
Creating mini shader graph library / fixing gamma -> linear colours
7 年前
5c86f77c
Merge master
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
ec76d400
Fix Fog node
7 年前
125d4bb5
Switch Linear Light blend methods
7 年前
3e4f3590
Channel Mask node to Mask Field (prt 1)
7 年前
29e04332
Channel Mask node to Mask Field (prt 2)
7 年前
4503a2ce
Change Flip node to flip 1 > -1 and added Invert Colors node
7 年前
c3ae833e
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
7 年前
1ea14a06
Rename Sign output on Camera node
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
8342aa12
Finish refactoring subgraphs.
7 年前
d057e6de
Fix Ambient node
7 年前
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 年前
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
dee739b5
Restore LinearLightAddSub blend mode
7 年前
8f22e3a7
Boolean node and type (part 1)
7 年前
11d733ee
Fix Normal Strength node
7 年前
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
b78bf280
Add Metal Reflectance Node
7 年前
2f6e839e
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
7 年前
e24aafae
Boolean node and type (part 2)
7 年前
f9d9e891
Rename Blend node inputs
7 年前
87638b44
Merge pull request #149 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
c3e0543b
Add Dielectric Specular node
7 年前
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 年前
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
eeae2f11
Fix Screen Position node
7 年前
cfb57499
Add Slider
ShaderProperty, Control, Node and property list entry
7 年前
bbd475d5
Add Branch node
- Fix compatible types
- Fix default property name
7 年前
8ab84621
Add Triplanar node
7 年前
333ded2e
Remove IntegerMaterialSlot
7 年前
6d66cb6a
Revert Screen Position node changes
7 年前
e7ccc01e
Fixes
- Change Comparison node to Vec1 inputs
- Change Branch node logic to avoid another if statement
7 年前
70e75999
Fix Channel Mask validation
7 年前
ab60aa3e
Update Triplanar slot label
7 年前
28df6957
Upgrade Slider UI to UIElements
7 年前
dbaf707b
Add All, Any, IsInfinite and IsNaN nodes
7 年前
29920efb
[FIX] #159 Added a utility node method for converting float to shader value. To catch Infinity text string.
7 年前
7c4730ca
PR Fixes
- Add boolean slot control view
- Add nodes And/Nand/Or
- Fix Branch node defaults
- Add USS for boolean slot
7 年前
f7209064
Switch control's HDR argument to enum
7 年前
7e22f269
Update ToggleControl to UIElements
Cosmetic fixes to
- InvertColors node
- ChannelMixer node
- Blend node
7 年前
e5024bd2
Cosmetic (name) changes
7 年前
25109a19
Extend PBR master functionality
- Add Fade and Multiply blend modes
- Expose culling options
- Change UV enum to caps
- Add camel case string converter to utils
- Convert camel case on CodeFunctionNode
7 年前
9bc7e3e7
Fix looping of flipbook
7 年前
d2cd9dcf
Update Twirl defaults
7 年前
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 年前
2e568046
Fresnel node fixes
- Add default bindings
- Switch to 3D preview
7 年前
2ec75211
Fix Math node default values
7 年前
41300be2
Fix Screen Position Tile mode
7 年前
76783350
Recode Flipbook node
- From Abstract
- Add Invert X and Y controls
7 年前
fe197d85
Update Math node defaults
7 年前
4b962efc
Fix Subtract node default
7 年前
480fb3f5
Fix Flipbook node invert logic
7 年前
c763baf4
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
f43e0a6f
Merge branch 'master' into node-input
7 年前
352a061a
Merge branch 'master' into compare-and-branch
7 年前
c119f05e
Add Dither node
7 年前
a3be4eae
Add Not node
7 年前
b1dc4ab4
Change Comparison func convert to switch
7 年前
55b86ced
Merge branch 'master' into inspector-window
7 年前
d6b2ca25
Fix vector lengths
7 年前
179e0ef0
[FIX]#168 Add alpha into unlit node.
7 年前
e9757253
Feedback from PR
7 年前
16ddad23
Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace
Fixes #159 , fixes #88 , fixes #157 , fixes #162
7 年前
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
725a1ea9
Merge branch 'master' into sliders
7 年前
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
9a589fe6
Update Fog node to latest SRP library
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
739c124a
Merge branch 'master' into sliders
7 年前
28672efd
Add a frac to Tiled Screen Position
Because it looks like it doesnt work and I keep forgetting that it actually does...
7 年前
a20b14d1
Update Transform node to latest SRP library
7 年前
1c0c24b4
Merge pull request #151 from Unity-Technologies/sliders
Sliders, Integers and HDR Color
7 年前
8984577a
Merge branch 'master' into node-input
7 年前
93aa1de8
Refactor Dielectric Specular node for UI changes
7 年前
01fb5620
Fixes for PR
7 年前
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
5863364b
Fixes for PR
7 年前
df1a52fd
Merge pull request #187 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
758a90e4
Merge pull request #170 from Unity-Technologies/node-input
Various nodes
7 年前
affdcadf
Add HDR color support to Blackboard
7 年前
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 年前
0292ae36
Color control refactor
- Add mode enum to ControlView
- Remove HDR Color node
- Switch Color node value to struct
- Update USS
7 年前
7ab634f3
Apply remapping to all serialzied types
7 年前
78db5ef1
Refactor float based shader properties
7 年前
4ad43705
Vector1 property refactor and types
7 年前
395c3ec5
Merge pull request #193 from Unity-Technologies/properties-in-search
Improvements to node search
7 年前
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
97f21962
Fix Color node recompilation
7 年前
29361772
Merge branch 'master' into tidy-master-preview
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs
7 年前
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
41740d78
First pass dynamic Multiply node
- Temp adding of test graph
7 年前
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 年前
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 年前
e5bdf43e
Add preview serialization for matrices
7 年前
3ad21797
Fix Matrix Transpose node
- Cleanup and fixes in matrix slots and props
7 年前
06549ef3
Add Matrix Determinant node
7 年前
545de289
Merge pull request #209 from Unity-Technologies/goto-documentation-per-node
Adding documentation functionality on the nodes.
7 年前
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 年前
394859b7
Remove old matrix multiply nodes
7 年前
dc41a21f
Add Matrix Split node
7 年前
39a5af4a
Fix to RandomRangeNode
- Changed the seed input format from Vector1 to Vector2.
- Changed the way of applying Min/Max.
7 年前
e9026c65
Fix implicit conversion check for non dynamic casts
7 年前
a6899bcf
Combine and Split node fixes
7 年前
da78abd3
Added Matrix Construction node
7 年前
6298bd34
Add axis selection to Matrix Split and Construction nodes
7 年前
b3f61fbc
Merge pull request #213 from keijiro/fix-range
Improvements to RandomRangeNode
7 年前
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 年前
746b96e3
Added Gradient Noise node.
7 年前
e20fd08b
Fix matrix defaults
7 年前
02682528
Merge pull request #216 from keijiro/gradient-noise-node
Addition of Gradient Noise node.
7 年前
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 年前
025d9ffb
UVNode now outputs vector4 UV's
7 年前
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 年前
8c83fd3d
Changed input slot IDs for backward compatibility.
7 年前
b9b93c1c
Merge pull request #215 from keijiro/improve-artnodes
Improvements to artistic nodes.
7 年前
3df359f2
Merge branch 'master' into node-matrix
7 年前
d2945014
Merge pull request #219 from keijiro/screenspace-slot
Addition of ScreenPositionSlotControlView
7 年前
7c973636
Merge branch 'master' into node-bugfixes
7 年前
5b6fd3d8
Fixes to Matrix 2 definition
7 年前
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 年前
98f88207
Update documentation links
Math/Derivatives
Math/Interpolation
Math/Range
7 年前
6dfcd844
Merge pull request #227 from Unity-Technologies/node-bugfixes
Update documentation links
7 年前
27b8deec
Add API for modification of embedded supported subshaders
7 年前
b5bf1073
Add API so that we can find the type of subshaders that can be added.
7 年前
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
7 年前
0b99046c
Fix issue causing deserialization to fail
7 年前
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
7 年前
a1c15f0d
Merge pull request #229 from Unity-Technologies/safer-callbacks
Safer callbacks
7 年前
6cb97136
Update Is NaN node for GLES and D3D
Fixes #218
7 年前
2dfb9d77
Easy-to-understand names for step function arguments.
7 年前
e6be5cc8
Merge pull request #232 from keijiro/step-args
Easy-to-understand slot names for Step node.
7 年前
ba7e5c3b
Whiteout blend method for Triplanar node normal mode
7 年前
7b5ca064
Merge with master
7 年前
e36aeb23
Transform Triplanar normal output to tangent space
7 年前
d5db5366
Fix Transform node bitangent usage
7 年前
a4d1c27d
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
7 年前
91b5a7ad
Merge pull request #233 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
7 年前
57a0eab1
Remove unused imports in entire solution
7 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
e7ecacd5
Rename package folder to match package name
7 年前
286d82a6
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
7 年前
5399d0b1
Update LW master nodes to work with latest SRP repo
7 年前
bcc36851
Antialiasing with procedural shapes.
7 年前
f5ae4e88
Merge with master
7 年前
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 年前
a2bafb38
Fix float serialization in Constant Node to not be affected by system locale (was comma as decimal separator causing shader errors)
7 年前
e11fa9b7
Add missing node fixes
7 年前
40495e65
Merge pull request #261 from Unity-Technologies/fix-constant-node
Fix Constant Node code gen
7 年前
0f41473d
Merge pull request #248 from keijiro/shapes-aa
Antialiasing with procedural shapes.
7 年前
8de769dd
Move lightweight sub-shaders and templates to SRP repository
7 年前
1f3d0114
Minor node fixes
- Update Dot Product to use Dynamic Vectors
- Change Branch evaluation to lerp
7 年前
5ba70535
Merge pull request #264 from Unity-Technologies/node-bugfixes
Minor node fixes
7 年前
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
7 年前
394320a1
Add documentation links for all nodes
7 年前
edb12553
[FIX] #272 This will prefix the generated code with "sg_"
7 年前
a0875348
Fix Light Probe node
- Update function to latest SRP library
- Add missing function for preview rendering
7 年前
8cbbf3c2
Missing fix
7 年前
f9797583
Fixed the feedback from GIT
7 年前
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 年前
b7a61817
Update Multiply node defaults
7 年前
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
7 年前
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
7 年前
16df8b10
Merge pull request #278 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
0b584564
Merge with master
7 年前
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 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
9720e0dc
Added input fields to the vector nodes
7 年前
d36a05a1
Fix issues after merge with master
7 年前
cfd61180
New node settings. Moved the createsettingselement to the master node
7 年前
eae8c0fc
Merge pull request #293 from Unity-Technologies/vector-input-fields
Vector input fields and IMayRequirePosition
7 年前
8742fc7b
Merge branch 'master' into node-settings
7 年前
589cb99a
Add changes from previous branch
7 年前
ff7c4856
Fix serialisation of preview properties in Gradient Asset node
7 年前
2ff4fbd7
Added new settings files for the common settings on the master nodes, PBR and Unlit Master
7 年前
348a9654
Change GetPreviewProperty to return list for multiple properties from one slot
7 年前
2fde6ea5
Moved the node settings menu to the right place.
7 年前
2a3637d0
Override GradientShaderProperty declaration for preview rendering
7 年前
15328c1d
Add support for Fixed gradient mode
7 年前
ed104fa3
Added titleButtonContainer for buttons.
Removed bring to front on previewfiller
7 年前
70436083
Remove GC allocations on preview property collection
7 年前
88372b5f
Add ref keyword (fix)
7 年前
dcfde51b
Improve gradient sample code
Unroll loops
Remove control flow
Remove dynamic indexing
7 年前
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 年前
eda467e3
Remove ref keywords
7 年前
25fc05eb
Rename GradientAssetNode.cs > GradientNode.cs
7 年前
90f19e2e
Rename Gradient Asset Node > Gradient Node
7 年前
11c1b9be
Fix all Shader Graph tests (including integration graphs)
7 年前
6b96c163
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
7 年前
f6380703
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
7 年前
3c602bad
Added base functionality to give an error on incompatible render pipeline
7 年前
01126a2f
Fixed an issue where vector 1 node was not evaluating properly.
7 年前
9e68ec0c
Merge pull request #342 from Unity-Technologies/fix-vector1-node
Fixed an issue where vector 1 node was not evaluating properly.
7 年前
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
7 年前
c17cc7e1
Fix null ref exception and update images to be large files
7 年前
deb17f95
Merge pull request #350 from Unity-Technologies/fix-subshader-null
Fix null ref exception
7 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
7 年前
8a2e5a5e
Merge pull request #347 from Unity-Technologies/warning-incompatible-pipeline
Warning incompatible pipeline
7 年前
54aaeaae
Move to 'ShaderGraph' folder
7 年前
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 年前
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 年前
a107a23e
Major shader generation refactor part 1
7 年前
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 年前
94ce8db1
Fix fragment slots adding data to vertex description
7 年前
77dc0df1
Make all procedural shape nodes fragment stage only
7 年前
35c8e0e3
Temporarily remove vertex capability from Subgraphs
7 年前
b5379b4b
Fixed float value to string error and truncation warning for normal create node
7 年前
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
92542c54
Merge pull request #1354 from Unity-Technologies/sg/fix-error-float-value-to-string
Fix float value to string error
7 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
9498fe0b
Merge branch 'master' into stacklit
7 年前
26a4b39a
HD subshaders branch rebuild
7 年前
cd218826
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
7 年前
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
a958b031
Rename PropertyType.Texture to Texture2D
7 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
7 年前
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 年前
99d825bc
first pass fixing paths
7 年前
fafb59af
Run code formatter.
7 年前
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 年前
7c397424
Addded cache for subgraph. Before it was deserializing on every frame.
7 年前
048a40af
Removed Legacy Code
7 年前
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
7 年前
8f9bff6a
Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph
Fixes for Subgraph
7 年前
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
7 年前
34778d4a
added tex2d lod node
7 年前
88b60892
Fixing AA of procedural checkerboard node
7 年前
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 年前
fce56481
Add dependency interface and importer implementation
7 年前
aa2a3ad7
Update slot name
7 年前
4357fbd0
Make work in vertex shader
7 年前
7f024953
Implement dependency tracking for sub graphs
7 年前
de873ebd
Fixes to IsFrontFace node
7 年前
8204a168
Rename IsFrontFace node
7 年前
544afac6
Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies
7 年前
2a7ab752
Move IsFrontFace node
7 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
7 年前
929feabf
Merge remote-tracking branch 'origin/sg/fix-checkerboard' into vertexAnimHDRP2
7 年前
d3185691
added sphere mask node
7 年前
37dd4a52
Revert "added sphere mask node"
This reverts commit 8e71abaf5cc697787f4dc4c4e2c6d59eeb30d093.
7 年前
4165fc2d
Revert "Revert "added sphere mask node""
fixing a mistake i only just now noticed shhh
7 年前
a0fb31b5
fixing spacing
7 年前
5bfd4b01
Merge pull request #1429 from Unity-Technologies/sg/texture2dlod
Added Sample Texture 2D LOD Node
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
7 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
7933fd8d
Merge branch 'master' into StackLit2
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
6c870111
Merge branch 'master' into FalseColorMode
7 年前
961e2a42
Merge pull request #1497 from Unity-Technologies/FalseColorMode
Added false color debug mode
7 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
7 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
7 年前
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
7 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
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 年前
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 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
7 年前
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
a452a9db
Merge branch 'master' into LightUnits
7 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
4138567f
Merge pull request #1462 from Unity-Technologies/sg/spheremasknode
Added Sphere Mask Node
6 年前
7934a87a
Merge branch 'master' into LightUnits
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
358cdac8
Fix texture and boolean property types in subgraphs
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
7d8789d6
Merge pull request #1458 from Unity-Technologies/sg/fix-subgraph-properties
Fix texture and boolean property types in subgraphs
6 年前
893f84e9
Add warnings as errors to test projects + fix issues
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
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 年前
e5de9e5a
Added Texel Size Node ( #1527 )
* adding texel size node
* updated changelog
6 年前
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 年前
d28560f9
Set stage capability for Texture2DArray and Texture3D nodes ( #1651 )
6 年前
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
74d0a872
Merge pull request #1745 from Unity-Technologies/master
Merge from master
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
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 年前
71ec7369
Merge HDRP/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
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 年前
0a5ac9f7
Added new Rotation about axis node ( #1695 )
* Added new Rotation about axis node
* changes for pr
* changed description
6 年前
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
d5e69c03
Merge HDRP/staging
6 年前
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
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 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
8908da09
Pipeline specific graph functions and nodes ( #1673 )
* Refactor GraphFunctions includes to per-pipeline
* Add Scene Color node
- And camera opaque requirements
- Returns 0s in HD
* Add Scene Depth node
* Rename GraphFunctions.hlsl > ShaderGraphFunctions.hlsl
* Update references to ShaderGraphFunctions.hlsl
6 年前
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Tim Cooper
Peter Bay Bastian
GitHub
Paul Demeulenaere
julienf-unity
Florent Guinier
Andre McGrail
Matt Dean
Eduardo Chaves
bfogerty
vlad
RinaldoTjan
MingWai
Jennifer Nordwall
ChrisTchou
Natasha Tatarchuk
Jens Holm
damian
Natalie Burke
Patrick Fournier
mathieum-unity
Martin Thorzen
Keijiro Takahashi
Alex Lian
Stephane Laroche
sebastienlagarde
Frédéric Vauchelles
Alex Lindman
Chris Tchou
Oliver Schnabel
Remy
Paul Melamed
Sebastien Lagarde
Felipe Lira
Thomas
Nerites
Antoine Lelievre
Aleksandr Kirillov
Julien Ignace
Yao Xiaoling
Yao Xiao Ling
egomeh