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 年前
ChrisTchou
2bcbc2ec
MultiParallax Node, and fixes to Texture Asset and UVTriPlanar nodes
8 年前
Matt Dean
18a97c8c
Added Anisotropic Metallic master
8 年前
Eduardo Chaves
20f9d0ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
fac62848
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
45eedc86
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Jennifer Nordwall
c51c8ff3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
f13a8ff6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
c439053d
Custom node with switchable inputs, warp node types and AA checkerboard
8 年前
Natasha Tatarchuk
0cbb50e7
parallax occlusion mapping node, currently purely samples the height texture, no height scale controls or other input slots (uses texture asset for inner loop sampling).
8 年前
Natasha Tatarchuk
db418d02
parallax occlusion mapping node - added support for height scalar parameter
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 年前
Eduardo Chaves
2cc38eba
Fixing Height to Normal
8 年前
Jennifer Nordwall
b94d71ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
7a9f1ef2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
683c517e
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
8 年前
Florent Guinier
73112c5a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
189f30e4
SphericalIndentation node, and adding ability to source shader globals in Any nodes
8 年前
Eduardo Chaves
cfb46195
Fixing script errors
8 年前
bfogerty
abec21f1
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
eed9ee0e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
ChrisTchou
5c5083d0
Adding 3d checkerboard & 3d output from sphere dent
8 年前
bfogerty
7d92d077
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 年前
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
e8c71321
converting nodes to new system.
8 年前
Tim Cooper
d0d60781
Texture asset is now a real asset type...
8 年前
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
d88535a5
tidy up new nodes for upgrading.
7 年前
Tim Cooper
b37655bd
Update to latest version of graph view.
7 年前
Tim Cooper
28cf7cb6
Upgrade to trunk based graph view.
7 年前
Yuanxing Cai
77e26863
Merge branch 'master' into crash-fixes
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Peter Bay Bastian
696062ae
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
7 年前
Peter Bay Bastian
693b0aa5
Remove `elements` from MaterialNodePresenter. Sub-presenters are accessed through independent properties now.
Much simpler to work with and also less garbage generation :)
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
65d3639a
Add pre-split to TextureSamplerNode ( #60 )
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Tim Cooper
f6fa3513
Starting to extract properties.
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
Tim Cooper
be067cc2
first real working shader in the 'new' model.
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Peter Bay Bastian
c002d689
Move graph things from Runtime to Editor
7 年前
Tim Cooper
215e1b6a
Refactoring slot types.
7 年前
damian
a327462f
Converted all nodes to use no-presenter.
7 年前
Peter Bay Bastian
f695b6fa
Enum attribute control
7 年前
Peter Bay Bastian
e6e04a49
Use attribute controls for TransformNode
7 年前
Peter Bay Bastian
aeedf575
Attribute control for gradient node
7 年前
Peter Bay Bastian
fd78eaed
Small fix for gradient node
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 年前
Matt Dean
3ca3abee
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
7 年前
Matt Dean
9772a011
More PR fixes
7 年前
Matt Dean
31068f89
More PR fixes
7 年前
Peter Bay Bastian
39d3dc25
Undo support for all node controls
7 年前
Matt Dean
25f091c2
Missed file
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 年前
Peter Bay Bastian
cdc27449
Fix height to normal node
7 年前
Peter Bay Bastian
2e843191
Better initialization in gradient node
7 年前
Tim Cooper
ccf49055
Merge remote-tracking branch 'origin/master'
7 年前
Tim Cooper
66cf728c
Tidy up transforms so that graphs have a 'prefered' space to work in.
7 年前
Tim Cooper
52f89bea
Merge branch 'spacetranslation' into master2
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
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
a3c5d049
Input Part 1
Input/Basic (WIP)
Input/Scene (WIP)
7 年前
Matt Dean
f3353a02
Input Part 2
Input/Geometry
7 年前
Peter Bay Bastian
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
Matt Dean
abed850e
Merge master
And fix conflicts
7 年前
Matt Dean
a02b954a
Input Part 3
- Final for now
- No texture nodes
- No gradient nodes
- Havent check parity
- Fixes for PR
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 年前
Tim Cooper
497d1891
Fix merge issues.
7 年前
Tim Cooper
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
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 年前
Tim Cooper
8e5b0d9b
First pass inlining property nodes.
7 年前
Natalie Burke
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
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
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 年前
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 年前
Tim Cooper
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
Peter Bay Bastian
69616da6
Color slots (a vec4 slot with a different input control)
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
b14c1f98
Merge branch 'master' into node-artistic-adjustment
7 年前
Peter Bay Bastian
f463b52e
Make HeightToNormal node use a UV slot rather than manually binding to UV channel
7 年前
Matt Dean
dadccc50
Merge branch 'master' into node-channel
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
048fd0dd
Update to latest light weight pipeline.
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
35129ab8
Merge pull request #91 from Unity-Technologies/node-bugfixes
Node Bugfixes
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 年前
Peter Bay Bastian
1cf9ffde
Update node titles to use new array-based grouping `[Title("UV/Flipbook")]` -> `[Title("UV", "Flipbook")]`
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
b60e8b5a
Update Blend node
7 年前
Matt Dean
8cdf0c8f
Move BlendModesEnum
7 年前
Matt Dean
5f368a29
Move old Artistic nodes back to WIP folder
7 年前
Matt Dean
e6dcc45d
Comment out old artistic nodes
7 年前
Matt Dean
c6d1844b
Comment out old nodes
7 年前
Matt Dean
3604c2f5
Move old logic nodes to WIP
7 年前
Matt Dean
3d06be46
Moved Normal nodes
7 年前
Matt Dean
7857730f
Move vertex interpolator node to WIP
7 年前
Matt Dean
e9fb8030
Comment out vertex interpolator node
7 年前
Matt Dean
5ce62a7e
Move old procedural to WIP
7 年前
Matt Dean
83230e2c
Comment out old procedural nodes
7 年前
GitHub
0eec5e4e
Merge pull request #95 from Unity-Technologies/node-validate-current
Validate all current nodes
7 年前
Matt Dean
9717c2d8
Move Box node
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Matt Dean
e348b11e
Moved Repeating Dot node
7 年前
Matt Dean
d1e59e63
Moved Scene Normals and Scene Velocity nodes to WIP
7 年前
Matt Dean
1449994e
Comment out Scene Normals and Scene Velocity nodes
7 年前
Matt Dean
1f9fe754
Move Scene Depth to WIP
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
GitHub
1a3f590c
Merge pull request #99 from Unity-Technologies/node-input-scene
Node Input Scene
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
GitHub
6f046031
Merge pull request #127 from Unity-Technologies/procedural-shape
Procedural Shape
7 年前
Tim Cooper
5c979fc8
Merge master
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 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into 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 年前