Tim Cooper
2a039635
[Shader Graph] Inital commit of modularised graph editor
12 年前
Tim Cooper
1eaab6d4
[MaterialGraph] Compiling (and working) specular / metal setups.
9 年前
Tim Cooper
3a90f6f2
[Shader Graph] Rearrange project structure.
9 年前
Tim Cooper
7d0465eb
[Shader Graph]Reformat the code to match conventions.
9 年前
Tim Cooper
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 年前
Tim Cooper
53f95972
[shader graph]Refactor
-namespace UnityEditor.Graphs.Material
+namespace UnityEditor.MaterialGraph
9 年前
Tim Cooper
3824cd6b
[Shader Graph] tidying.
9 年前
Tim Cooper
94238998
[Shader graph]Add float input node
9 年前
Tim Cooper
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
Tim Cooper
70760866
[shader graph]more support for multiple correct channeling.
9 年前
Tim Cooper
bb779dab
[shadergraph]Make export button that works.
9 年前
Tim Cooper
6086c6d6
[shader graph]Integtate new non modifiable settings into shader graph. Fix setting properties generation pipe to be simpler.
9 年前
Tim Cooper
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 年前
Tim Cooper
51ceebd2
[shader graph]optimise for GC
9 年前
Tim Cooper
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 年前
Tim Cooper
c1c5d22d
[shader graph]
*All inputs should go through the adaptor. This stops weird implicit swizzles.
*Adaptor now uses swizzles instead of new vector.
9 年前
Tim Cooper
a99eb964
[shader graph]Add default input UI support (very alpha)
9 年前
Tim Cooper
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 年前
Tim Cooper
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 年前
Tim Cooper
af2e75ab
[shader graph]Data refactor 3
9 年前
Tim Cooper
34db823b
[shader graph]Data refactor 4 (working kind of now)
9 年前
Tim Cooper
418682b1
[Material Graph]Refactoring graph architecture.
9 年前
Tim Cooper
7a1ca7ce
[material graph]Compiles again.
9 年前
Tim Cooper
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
9 年前
Tim Cooper
07060e1e
[materialgraph] start removing old things.
9 年前
Tim Cooper
c142890b
[Material graph]Logging
9 年前
Tim Cooper
0de2d9bd
[Material Graph] Mode node collecton code to NodeUtils away from member functions
9 年前
Tim Cooper
404ea34c
[material graph]Moving namespaces / extract things to interface
9 年前
Tim Cooper
3958bdb1
[Material Graph]Rearrange project.
9 年前
Tim Cooper
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Peter Bay Bastian
60926063
ColorNodeData now re-uses the underlying list returned by GetControlData()
MaterialNodeData.Initialize(INode) is now virtual, so that e.g. ColorNodeData can override and do initialization of it's own first.
Implemented item reference checking for lists in NodeDrawer and MaterialNodeDrawer
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Peter Bay Bastian
fa8baa2c
Created IEnumerable extension for zipping together enumerables
(so that we can easily iterate over 2 collections using their
IEnumerable interface, rather than having to index into one of them)
8 年前
Peter Bay Bastian
8dd129c5
Extracted type mapping functionality into own class such that it can be re-used for node inspector
8 年前
Tim Cooper
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
Peter Bay Bastian
ce272542
Implemented copy/paste functionality for graph (currently uses shift rather than ctrl, as the latter does not fire the event)
8 年前
joce
cfc167d9
TypeMapper now derives from BaseDataMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
c5baafe7
Integrate latest GraphView
Signed-off-by: joce <joce@unity3d.com>
8 年前
joce
2a1b5b99
TypeMapper => GraphTypeMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
Peter Bay Bastian
ab990b62
TypeMapper and ScriptableObjectFactory
Only used in AbstractGraphInspector for now
8 年前
joce
f4fad3a8
Update to latest GraphView
** Requires update to Unity branch **
- New way to reference StyleSheets (no longer using attributes). This in the
goal of moving GraphView to a GitHub submodule.
- Styles sheets moved under Resources folder
- BaseTypeMapper renamed BaseTypeFactory
- Little change to edge drawing code.
- Changes to selection mechanism.
- NodeAnchors are no longer always removed/added on a DataChange (more changes
to come to this soon).
- Dragger and NodeDragger change only the VisualElement on MouseMove. The
presenter is now changes and notified of the change only upon MouseUp.
- Various minute changes to demo presenters.
Signed-off-by: joce <joce@unity3d.com>
8 年前
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 年前
Peter Bay Bastian
f2510f42
#35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones)
7 年前
Tim Cooper
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
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
5c6dfe96
Add collection initialization support to TypeMapper
7 年前
Peter Bay Bastian
f6a7d3b4
Remove ScriptableObjectFactory and make fallback type optional in TypeMapper
7 年前
Peter Bay Bastian
c884fe33
Make TypeMapper data-driven rather than generic and remove old inspector things from GraphInspectorPresenter
7 年前
Peter Bay Bastian
b174415a
Simplify checks in TypeMapper
7 年前
Peter Bay Bastian
4f6745e0
Add utility function for calculating hash codes
7 年前
Peter Bay Bastian
64c9a49b
Purge usage of presenters and datawatch from graph inspector
7 年前
Matt Dean
fc0d26d6
Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters
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 年前
Tim Cooper
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
damian
a327462f
Converted all nodes to use no-presenter.
7 年前
damian
20646d1b
Removed MaterialNodePresenter.
7 年前
Tim Cooper
6161fea6
Fix compiler warnings :)
7 年前
GitHub
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
GitHub
5363a614
Merge pull request #71 from Unity-Technologies/no-presenters
No presenters
7 年前
Peter Bay Bastian
80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
Peter Bay Bastian
c6b895e7
Remove command handling from MaterialGraphPresenter
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge 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 年前
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 年前
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 年前
Peter Bay Bastian
e1f95448
Various bug fixes
* Clean up master preview render data
* Add size check to IndexSet.Contains
7 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
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 年前
Martin Thorzen
bf9b4a4c
Updated the Settings UI.
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 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Martin Thorzen
584d2bb4
[FIX] #251 Nodes are now selected again after pasted
7 年前
Peter Bay Bastian
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
7 年前
GitHub
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
7 年前
GitHub
96c8a0c7
Merge pull request #257 from Unity-Technologies/copy-paste-fix
[FIX] #251 Nodes are now selected again after pasted
7 年前
Peter Bay Bastian
0b584564
Merge with master
7 年前
Peter Bay Bastian
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
Peter Bay Bastian
fecfaaea
Fix compile errors on trunk by introducing various compatibility extensions
7 年前
Peter Bay Bastian
0e49b142
* Fix Serializable(Cubemap|Mesh|Texture) classes
* Add back in blackboard classes to work with 2018.1
* Wrap some things in `#if UNITY_2018_1`s
7 年前
Peter Bay Bastian
9e3b2fca
Remove GraphTypeMapper
7 年前
GitHub
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
7 年前
Martin Thorzen
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
Peter Bay Bastian
13a428be
More trunk compatibility fixes
7 年前
GitHub
685fecd6
Merge pull request #286 from Unity-Technologies/trunk-compatibility
More trunk compatibility fixes
7 年前
Martin Thorzen
8742fc7b
Merge branch 'master' into node-settings
7 年前
Jens Holm
74039530
Allow sahder properties to be copied and pasted between graphs
7 年前
Jens Holm
8201871e
Add meta properties in the CopyPasteGraph
7 年前
Peter Bay Bastian
6ec339e3
Forwardport pull request #336
7 年前
Peter Bay Bastian
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
GitHub
a3897b8c
Merge pull request #317 from Unity-Technologies/copy-property-nodes
Make property nodes into concrete nodes when copied between graphs
7 年前
Jens Holm
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
GitHub
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
7 年前
Peter Bay Bastian
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
7 年前
jensgholm15@gmail.com
ed51c9ec
Make nodes spawn in the center of the view when copied from another graph
7 年前
Martin Thorzen
3a802291
Capturemouse event and trickle down enum has changed and this is a fix for that so it is compatible with older versions.
7 年前
GitHub
d657628e
Merge pull request #361 from Unity-Technologies/fix-obsolete-methods
Fix obsolete warnings
7 年前
GitHub
36539f3e
Merge pull request #359 from Unity-Technologies/node-placement-copy
Node placement copy
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
Peter Bay Bastian
f9b16024
Remove 2018.1 compatibility code from Shader Graph
7 年前
GitHub
29b369e0
Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs
Remove 2018.1 compatibility code from Shader Graph
7 年前
Peter Bay Bastian
31db4b9f
Fix core changes to UIElements Toggle with compatibility layer
7 年前
GitHub
ba8fbc25
Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes
Compatibility with Toggle changes in core Unity
7 年前
Antoine Lelievre
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Stephane Laroche
a49a696e
Merge branch 'master' into StackLit2
7 年前
Remy
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Tim Cooper
9bf79289
Backport pull request #1529
7 年前
Nerites
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前