Tim Cooper
a9c7d4bf
[Shader Graph] Add simple test framework to validate generation is consistant.
9 年前
Tim Cooper
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
9 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Tim Cooper
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
9 年前
Tim Cooper
8acbd944
[Material Graph]Tidy up test running / folder layout
9 年前
Tim Cooper
553fedbf
[Format]Run code formatting
8 年前
Tim Cooper
5055d67e
[Material graph]More testing + fix things that are broken with the tests.
8 年前
Tim Cooper
6cf280f3
[Material Graph]Add image comparison tests. Just add graph to UnityShaderEditor/Tests/IntegrationTests/Graphs
8 年前
Tim Cooper
d759e955
[Material Graph]Tidy up integration testing.
8 年前
Tim Cooper
b42e0339
[Material Graph]Fix up texture node serialization.
8 年前
Tim Cooper
29600f72
[Material graph] Fix up subgraph asset reference serialization.
8 年前
Tim Cooper
3313d8c4
trying new UI
8 年前
Tim Cooper
8c5f323e
fixing node drawing
8 年前
Tim Cooper
c565a8d4
fix formatting
8 年前
Tim Cooper
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
Peter Bay Bastian
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
Tim Cooper
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
Tim Cooper
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
GitHub
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Tim Cooper
bc6130d7
Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node.
8 年前
Tim Cooper
2aecf91f
update biggest graph to have new master node.
8 年前
Tim Cooper
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
8 年前
Tim Cooper
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
Tim Cooper
7ee96660
[mat graph]Start work on remapper
8 年前
Tim Cooper
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
Tim Cooper
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
joce
4aa813fd
Update to new GraphView
Update includes fix for MiddleMouse / Alt+LeftMouse pan
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
72ac3b4c
Fix RectangleSelect + node selection highlight
Both issues were caused by the nodes positioning incorrectly being flagged as
Relative. Putting it to Absolute fixed all of this. It also messed with the
nodes positioning, which is why the ShaderGraphs had to be changed as well.
Signed-off-by: joce <joce@unity3d.com>
8 年前
GitHub
0ef45c8c
Merge pull request #5 from stramit/issues-fix
Issues fix
8 年前
Tim Cooper
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
Peter Bay Bastian
4ff1c093
NodeDrawer now derives from Node.
And all the superfluous files have been removed.
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
574bc97d
First implementation of node collapsing for MG
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
7ab5cea2
Update shader graphs (placement was broken)
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
4702ac61
Updated graphs
Signed-off-by: joce <joce@unity3d.com>
8 年前
Tim Cooper
591ca2fd
Start upgrade to new graph view.
8 年前
vlad
12603c9a
Changing all Texture2D types to Teture to allow custom render textures to be added.
8 年前
bfogerty
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Jennifer Nordwall
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Tim Cooper
d0d60781
Texture asset is now a real asset type...
8 年前
Peter Bay Bastian
3457c49b
Updated to work after merge with trunk
8 年前
Tim Cooper
06b7010b
Remove "AnyNode"
7 年前
Peter Bay Bastian
0dccf931
Added medium-ish shader graph for performance testing
8 年前
Tim Cooper
0e769105
Merge branch 'hackweek2017' into tidying
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs
# MaterialGraphProject/Assets/_MingWai/GeneratedTextureDemo/0-UnityLogo-Texture.asset.meta
# MaterialGraphProject/Assets/_MingWai/Gradient.asset.meta
7 年前
Mads Ronnow
f4f2a2f8
Fixed graph image comparison test and added graph shader text comparison in test
7 年前
Mads Ronnow
edd8c41d
Now using RMS for texture compare
Added Assert Fail if text template doesn't exist.
7 年前
Peter Bay Bastian
bdd1ae34
Make MaterialGraphPreviewGenerator disposable
7 年前
Tim Cooper
d2627032
Start work on 'unit testing' each node.
7 年前
Tim Cooper
c54ee0eb
String compare for generated shader tests should not care about whitespace (we use platform native when generating so there can be differences between windows / mac)
7 年前
Yuanxing Cai
77e26863
Merge branch 'master' into crash-fixes
7 年前
Tim Cooper
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Tim Cooper
e3f06249
Shader name is now the name of the file.
7 年前
Tim Cooper
b1e5c75f
Update shader generation tests.
7 年前
Tim Cooper
ff3530d9
Add cracks graph for testing
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
Tim Cooper
a494cc0c
Adding back sub graph support
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
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
8dc11b9a
Fix split node and add test for it ( #62 )
7 年前
Peter Bay Bastian
4cf36072
Enabling pretty printing of shader graph JSON
7 年前
Peter Bay Bastian
ce4b9371
Fix combine node and update split test to also use combine node
7 年前
Peter Bay Bastian
fb537d2b
Update test scene
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Tim Cooper
1793f62f
Add LW SRP into material graph
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 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Tim Cooper
c1f2dd69
Unlit and lit nodes now working properly in and outside a subgraph :)
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Peter Bay Bastian
aeedf575
Attribute control for gradient node
7 年前
Peter Bay Bastian
fd78eaed
Small fix for gradient node
7 年前
Peter Bay Bastian
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
damian
83548475
Merging master.
7 年前
Tim Cooper
615c8ff6
Update test shaders
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 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Jens Holm
0f07c1c0
Add mesh selection for master node preveiw
7 年前
GitHub
fcd97941
Merge pull request #75 from Unity-Technologies/master
Update from master
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 年前
Tim Cooper
3039671f
Merge master
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Peter Bay Bastian
12229415
Misc changes from change to a scripted importer
7 年前
mathieum-unity
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
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
94202c55
Assembly Definition Files
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Peter Bay Bastian
5fe33b9e
Squash `SerializableSlot` into `MaterialSlot`
7 年前
GitHub
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
GitHub
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Tim Cooper
7ab634f3
Apply remapping to all serialzied types
7 年前
Matt Dean
9c0b93c1
Merge branch 'master' into node-bugfixes
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 年前
Peter Bay Bastian
8af999a0
Fix paths for integration tests
7 年前
Peter Bay Bastian
aa81dc20
Remove old integration test graphs
7 年前
GitHub
286d82a6
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Peter Bay Bastian
11c1b9be
Fix all Shader Graph tests (including integration graphs)
7 年前
Peter Bay Bastian
7bafacee
Add support for folders in integration test graphs folder
7 年前
GitHub
6b96c163
Merge pull request #324 from Unity-Technologies/fix-tests
Fix tests
7 年前
Peter Bay Bastian
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
Jens Holm
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
Peter Bay Bastian
2abf0fae
Merge branch 'master' of ShaderGraph into sg/move-repository
7 年前
Tim Cooper
416f1e20
Disable integration test for now.
7 年前
GitHub
53aa984e
Merge pull request #1434 from Unity-Technologies/build/fix-tests
Build/fix tests
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前