joce
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
cfc167d9
TypeMapper now derives from BaseDataMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
2a1b5b99
TypeMapper => GraphTypeMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
Florent Guinier
ce59a9db
Step1 for LevelNode
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
7ae13517
SwizzleNode now working
8 年前
Eduardo Chaves
dd8a892c
Adding constants node and corresponding presenter Adding Negate Node Adding UVPanner Node
8 年前
vlad
5db9bbb1
Saturate, UV Rotation, and tex2Dlod nodes.
8 年前
Florent Guinier
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Eduardo Chaves
0abd0951
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 年前
RinaldoTjan
c8fdeadc
Re-Adding BlendMode Presenter definition.
Re-Adding BlendMode Presenter Definition.
8 年前
Eduardo Chaves
620b809b
Adding the Add node with dynamic inputs and respective presenter (W.I.P)
8 年前
Eduardo Chaves
91c14c31
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
4eca4e2f
Menu Reorg: Art & Levels
8 年前
Andre McGrail
503b7b62
Remap node fix, beginning of toggle node
8 年前
vlad
09332619
Texture Asset node and sampler2D input/output type
8 年前
bfogerty
4fcc2e9b
Presenter for the If Node
8 年前
bfogerty
2f5a98bb
We now have a Custom Code Node
8 年前
Jennifer Nordwall
2adf665a
Added input/output checking
8 年前
MingWai
660338f9
Gradient node
8 年前
Matt Dean
c7fbf38f
Added Matrix 2 and 3 types
8 年前
Florent Guinier
74c4e0ee
Convolution filter presenter
8 年前
Matt Dean
3bce395a
Added Matrix4 and fixed Matrix multiply
8 年前
Andre McGrail
48e29dbb
Transform node in master graph presenter
Fixed power slider
8 年前
ChrisTchou
c439053d
Custom node with switchable inputs, warp node types and AA checkerboard
8 年前
Matt Dean
b2d664e0
Added matrix common and ops
8 年前
MingWai
3c115bee
Scatter node (not ready for use)
8 年前
Jennifer Nordwall
475f5e3b
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 年前
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 年前
vlad
7d7f4c31
Added the SamplerState presenter
8 年前
ChrisTchou
683c517e
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
8 年前
ChrisTchou
189f30e4
SphericalIndentation node, and adding ability to source shader globals in Any nodes
8 年前
ChrisTchou
5c5083d0
Adding 3d checkerboard & 3d output from sphere dent
8 年前
vlad
b247c311
Texture assets and related notes work now (Thanks Tim!)
8 年前
ChrisTchou
c19d413a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Tim Cooper
3198bd43
Remove Function2Input node as it is no longer needed.
8 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
8 年前
Tim Cooper
d0d60781
Texture asset is now a real asset type...
7 年前
Tim Cooper
b37655bd
Update to latest version of graph view.
7 年前
Tim Cooper
28cf7cb6
Upgrade to trunk based graph view.
7 年前
Peter Bay Bastian
d470f1f1
Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView
7 年前
Peter Bay Bastian
696062ae
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
7 年前
Peter Bay Bastian
485654b6
#31 Graph inspector now lives inside graph editor window (also, it works again!)
7 年前
Peter Bay Bastian
47925068
#35 Unify {Graph,Material}NodePresenter
7 年前
Peter Bay Bastian
1513eb00
Tidy up presenters folder, such that all the actual node presenters (i.e. corresponding to an actual node) lives inside their own folder
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
9dd4edeb
#11 #43 Copy, paste & duplicate now works properly and is handled by the window rather than GraphView
7 年前
Peter Bay Bastian
04fedafb
Support "Cut" command
7 年前
Peter Bay Bastian
78c22505
Handle delete via window and presenter rather than `MaterialGraphView`
7 年前
Peter Bay Bastian
a3cbf332
#29 Propagate `requiresTime` in `MaterialGraphPresenter.UpdateData` rather than computing it on-the-fly (+ rename a bunch of variables in said method to match new conventions)
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
Peter Bay Bastian
4b24135e
#29 Window now tells `MaterialGraphPresenter` to update previews, rather than using schedulers per node
7 年前
Tim Cooper
a494cc0c
Adding back sub graph support
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
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
8e1d62b6
Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31 )
7 年前
Peter Bay Bastian
fbc6eeac
Fix node compatibility check ( #58 )
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Peter Bay Bastian
24f84a48
Do more efficient look-up of nodes in graph presenter update
7 年前
Tim Cooper
f6fa3513
Starting to extract properties.
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
Peter Bay Bastian
bec6cdbb
New preview system and master node preview in inspector
7 年前
Tim Cooper
95cdeda0
Merge remote-tracking branch 'origin/master' into refactor-properties
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/GraphInspectorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/SurfaceMasterNodeEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Views/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GraphEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs
7 年前
Peter Bay Bastian
75826752
Add edge change notifications to IGraph
Move time-dependent preview tracking into PreviewSystem
7 年前
Peter Bay Bastian
609307fe
MaterialGraphPresenter now relies on change notifications rather than diffing
7 年前
Peter Bay Bastian
8e841bce
Remove UpdateData from MaterialGraphPresenter
7 年前
Peter Bay Bastian
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
Tim Cooper
97cfbe75
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
7 年前
Tim Cooper
4a551695
temp
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Peter Bay Bastian
a3385c0f
Undo/redo prototype
7 年前
Tim Cooper
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
damian
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
Peter Bay Bastian
ff8de4d3
New attribute-based system for node controls
7 年前
damian
e9b2550a
Added support for checking compatible no-presenter anchors.
7 年前
damian
33ee05ff
Fixed compatibleAnchors checks for when starting on a no-presenter anchor.
7 年前
damian
a4a72ae8
Added support for connecting edges between 2 no-presenter nodes.
7 年前
Tim Cooper
3da19296
missed files
7 年前
Peter Bay Bastian
811d7dab
Color attribute control
7 年前
damian
2ecb0d96
Hooked up MaterialNodeView.OnModified() to main presenter OnModified callback.
7 年前
damian
92315882
Fixed deleting edges
7 年前
damian
a327462f
Converted all nodes to use no-presenter.
7 年前
Peter Bay Bastian
f695b6fa
Enum attribute control
7 年前
damian
d9e85fdf
Cleaning up presenter code.
7 年前
Peter Bay Bastian
56967512
Property attribute control
7 年前
damian
17b67cdf
More cleanup of presenter code.
7 年前
Peter Bay Bastian
152042bb
Comment out IfNode for now
7 年前
damian
20646d1b
Removed MaterialNodePresenter.
7 年前
Peter Bay Bastian
e6e04a49
Use attribute controls for TransformNode
7 年前
Peter Bay Bastian
7bb42428
Use attribute controls for Matrix nodes
7 年前
Peter Bay Bastian
aeedf575
Attribute control for gradient node
7 年前
Peter Bay Bastian
3790252c
Remove last node presenters and also type mapper in MaterialGraphPresenter
7 年前
Peter Bay Bastian
c5a7e594
Fix integration with Undo by introducing IGraphObject
7 年前
damian
83548475
Merging master.
7 年前
damian
3db84206
Fixed some bugs after master merge.
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 年前
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 年前
Patrick Fournier
26e0dad5
Move copy paste boilerplate and event handling to GraphView.
7 年前
Peter Bay Bastian
95a87cde
Clean up MaterialNodeView after merge with presenter
7 年前
Peter Bay Bastian
dac79163
Remove Match(GraphChange) utility function
7 年前
Peter Bay Bastian
80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
Peter Bay Bastian
c88791bb
Duplication/insert etc. now selects the new elements
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 年前
Peter Bay Bastian
c6b895e7
Remove command handling from MaterialGraphPresenter
7 年前
Peter Bay Bastian
46b505fb
Move more stuff from MaterialGraphPresenter, also introduce proper constructor
7 年前