Tim Cooper
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
9 年前
Tim Cooper
3e4c0174
[Material Graph]Add in general node collapse.
9 年前
Tim Cooper
2645e25c
[Material Graph] split into runtime vs editor. Create UI delegation to handle node drawing nicely.
9 年前
Tim Cooper
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 年前
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
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
9 年前
Tim Cooper
cea17e49
[Material graph] Tidy up asset handling (generic graph drawer that can be used by all graphs)
9 年前
Tim Cooper
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
9 年前
Tim Cooper
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 年前
Tim Cooper
d9619701
[material graph] Tidy up API for slot management (make generic).
9 年前
Tim Cooper
7cf4d1f0
[Material Graph]More tests + tidy custom serialization.
9 年前
Tim Cooper
8e31ace1
[material graph]Slot serialization test
9 年前
Tim Cooper
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
9 年前
Tim Cooper
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
9 年前
Tim Cooper
607a2f9e
[material graph]Add button to convert selection into subGraph
9 年前
Tim Cooper
376c8378
[material graph]Change how precision works, make default precision half.
9 年前
Tim Cooper
ac62e6d8
[Shader Graph]Tidy function input nodes to now handle input dimensions nicely.
8 年前
Tim Cooper
7ae021c6
[material graph]Convert slots from being a string into being an int that can be referenced from the node.
8 年前
Tim Cooper
6ef35ae3
[Material Graph]Use slotid's instead of slots.
8 年前
Tim Cooper
df47a2ff
[material graph] add tests for node configuration.
8 年前
Tim Cooper
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
Tim Cooper
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
Tim Cooper
553fedbf
[Format]Run code formatting
8 年前
Tim Cooper
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
Tim Cooper
ab7317bb
[Mat Graph]Run code formatter
8 年前
Peter Bay Bastian
f1abf833
Implemented node collapsing
8 年前
GitHub
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
Paul Demeulenaere
0c053056
Secret implicit node feature (ease automatic connection considering "virtual" default input node) : plug it for TextureNode
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 年前
Paul Demeulenaere
94144e69
Add DepthFirstCollectNodesFromNodeSlotList (allows a list of input slot instead one)
8 年前
Tim Cooper
47d64c52
[mat graph]Remove implicit node creation now that we have better code generation framework.
8 年前
Tim Cooper
c11fe3b4
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
8 年前
Tim Cooper
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
Tim Cooper
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
Tim Cooper
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
Tim Cooper
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
joce
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
Eduardo Chaves
c3b50c34
Adding Vertex position to master node and vertex position input node
8 年前
Andre McGrail
c99dc5e2
REPO FIX
8 年前
Matt Dean
718af347
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 年前
Florent Guinier
fe87f870
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 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
8 年前
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
8f5cab45
[fixes]Fix broken unit tests.
7 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
7 年前
Peter Bay Bastian
ed185a44
Preliminary vertex shader support
7 年前
Peter Bay Bastian
eb8a8906
Use dictionary to store nodes for faster lookups
7 年前
Peter Bay Bastian
b1ca732a
Rewrite `DepthFirstCollectNodesFromNode` to be non-recursive
7 年前
Peter Bay Bastian
1e3fb5de
Add dictionary for storing `Node -> Edges` reference in SerializableGraph (faster/more scalable edge look-ups)
7 年前
Matt Dean
fc0d26d6
Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters
7 年前
Peter Bay Bastian
a93f2736
Add change notifications for graph, used for managing previews better
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
76430e32
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
7 年前
Peter Bay Bastian
314ba653
Add change notifications for shader properties
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 年前
Tim Cooper
2c1b60e0
compiling
7 年前
Tim Cooper
24923996
misc fixes afer changes
7 年前
Peter Bay Bastian
c5a7e594
Fix integration with Undo by introducing IGraphObject
7 年前
damian
83548475
Merging master.
7 年前
Peter Bay Bastian
3b4b0eb6
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
7 年前
damian
6a03177d
Merge branch 'master' into no-presenters
7 年前
Peter Bay Bastian
b7975d8f
Reflection based undo deserialization
7 年前
Peter Bay Bastian
1b46d517
More robust undo/redo by removing and adding nodes
7 年前
Peter Bay Bastian
99701f90
UIElements-based controls for color and vector controls
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
43fda89f
Remove `INode.onReplaced` (leftover from previous redo impl)
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Tim Cooper
9ff93cdb
Add specific material slot types and port code generation node to use them.
7 年前
Peter Bay Bastian
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
Peter Bay Bastian
17a5050c
Fix hanging edges for collapsed nodes after undo/redo
Reduce the amount of `ValidateGraph()` calls when undo/redo'ing to 2 rather than once per node and edge per graph
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 年前
Tim Cooper
72e82ce1
fix up graph validation.
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 年前
Natalie Burke
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Peter Bay Bastian
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
GitHub
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
Peter Bay Bastian
4f1b32b9
Undo fix
7 年前
Peter Bay Bastian
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
7 年前
Tim Cooper
7492cebb
Change tracking using undo system
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Peter Bay Bastian
b63c4c28
Prepare shader generation for uber shader
7 年前
mathieum-unity
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
Peter Bay Bastian
d21cc6ad
Fix change tracking so that it doesn't prompt you to save when closing right after you clicked save
7 年前
mathieum-unity
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 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
Tim Cooper
da15e457
dirty first pass pass architecture.
7 年前
GitHub
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
Matt Dean
1b3ac398
Merge branch 'master' into node-artistic-adjustment
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 年前
Tim Cooper
e26f02bc
remove non needed logs
7 年前
Peter Bay Bastian
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
Matt Dean
00f3fcff
Merge branch 'master' into node-validate-current
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
e46e896a
Output stack trace along with "invalid edge" warning
7 年前
Tim Cooper
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
Tim Cooper
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
GitHub
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
Peter Bay Bastian
11a83d08
Squash SerializableGraph into AbstractMaterialGraph
7 年前
Peter Bay Bastian
e3aaf843
Squash `SerializableNode` into `AbstractMaterialNode`
7 年前
Peter Bay Bastian
5fe33b9e
Squash `SerializableSlot` into `MaterialSlot`
7 年前
Peter Bay Bastian
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
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 年前
Peter Bay Bastian
38e4110f
Move static methods out of AbstractMaterialNode
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Matt Dean
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
Martin Thorzen
29920efb
[FIX] #159 Added a utility node method for converting float to shader value. To catch Infinity text string.
7 年前
Martin Thorzen
06553d81
updated with PR feedback
7 年前
GitHub
16ddad23
Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace
Fixes #159 , fixes #88 , fixes #157 , fixes #162
7 年前
Matt Dean
725a1ea9
Merge branch 'master' into sliders
7 年前
GitHub
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
Peter Bay Bastian
d00ca780
Merge branch 'master' into blackboard
7 年前
Matt Dean
739c124a
Merge branch 'master' into sliders
7 年前
Matt Dean
8984577a
Merge branch 'master' into node-input
7 年前
Jens Holm
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
GitHub
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
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 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Matt Dean
589cb99a
Add changes from previous branch
7 年前
Martin Thorzen
3d65bbd2
Fixes for decimal issues. comma and period could be wrong / different on different machines, this should now have been fixed
7 年前
GitHub
1536b7ef
Merge pull request #316 from Unity-Technologies/fix-for-decimal-issue
Fix for issues regarding decimals / periods
7 年前
GitHub
f6380703
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
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
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 年前
Matt Dean
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
GitHub
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
Alex Lian
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Stephane Laroche
9498fe0b
Merge branch 'master' into stacklit
7 年前
Matt Dean
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
GitHub
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
7 年前
Tim Cooper
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 年前
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 年前
GitHub
6d4f0be7
New template parser ( #1532 )
* Converting template parser to a class to enable recursive $include in the near future
* New template parser working with $include, $splice
Including dependency tracking on $include
* Adding $buildType template command, and cleaning up the code around that.
* Bump major version number. Using ShaderStringBuilder.
* Don't build slot list twice
* Fix view space position for FB case 1064118
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
sebastienlagarde
0267674b
Merge branch 'master' into HDRP/staging
6 年前
GitHub
ee4e73a4
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
6 年前
sebastienlagarde
f75e94af
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
Sebastien Lagarde
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
Frédéric Vauchelles
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
RSlysz
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Paul Melamed
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 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前