485654b6
#31 Graph inspector now lives inside graph editor window (also, it works again!)
7 年前
45e02be9
Rename *Drawer to *View
7 年前
693b0aa5
Remove `elements` from MaterialNodePresenter. Sub-presenters are accessed through independent properties now.
Much simpler to work with and also less garbage generation :)
7 年前
b057a909
Clean-up MaterialNodeView a bit
7 年前
9dd4edeb
#11 #43 Copy, paste & duplicate now works properly and is handled by the window rather than GraphView
7 年前
04fedafb
Support "Cut" command
7 年前
78c22505
Handle delete via window and presenter rather than `MaterialGraphView`
7 年前
8bfc6985
Remove needless inheritance from MaterialNodePresenter in GraphControlPresenter
7 年前
4fa0de6e
Remove NodePreviewView as it is no longer used
7 年前
34cc0f15
Start work on making 'sub-graph' work again in an expected way.
7 年前
4b24135e
#29 Window now tells `MaterialGraphPresenter` to update previews, rather than using schedulers per node
7 年前
793887f9
Working 'convert to subgraph'
7 年前
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 年前
7e160ce8
Run `hg format` on repository
7 年前
d465f37d
#43 Handle keyboard shortcuts in window rather than GraphView
7 年前
a92b64bb
#31 UIElements-based graph inspector
7 年前
8e1d62b6
Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31 )
7 年前
c0b10e8f
Update to work with latest graphics/shadergraph
7 年前
262456fb
Remove legacy code from MaterialGraphView, which was causing the selection to be cleared when zooming/panning ( #45 )
7 年前
10cced5d
Log error instead of warning when failing to instantiate node instance
7 年前
2b96084b
Move GraphInspector{Presenter,View} into Inspector folder
7 年前
ff2d3ef8
Change namespace of GraphInspector{Presenter,View}
7 年前
a76aadd7
Remove a few todos in code
7 年前
ed185a44
Preliminary vertex shader support
7 年前
5b7af74e
Fix node repainting
7 年前
3ffdcd59
Right click no longer deselects nodes
7 年前
a39f97cc
Update to work with latest GraphView
7 年前
64c9a49b
Purge usage of presenters and datawatch from graph inspector
7 年前
fc0d26d6
Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters
7 年前
bec6cdbb
New preview system and master node preview in inspector
7 年前
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 年前
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
6c9cb29a
Refactor toolbar (no more presenters, acts a little more like buttons)
7 年前
65e94a0c
Add rate limiting for preview updates
7 年前
a3385c0f
Undo/redo prototype
7 年前
9557fcee
Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph
7 年前
513db118
Fix updating of node positions until we get rid of presenters
7 年前
3930a641
Remove GraphEditorPresenter
7 年前
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
815e2106
Fixed compatibale anchor finding.
7 年前
cc2d2e3f
Add resize handle withh draggable functionality to MaterialNodeView
7 年前
ff8de4d3
New attribute-based system for node controls
7 年前
e9b2550a
Added support for checking compatible no-presenter anchors.
7 年前
ddc1113a
Resize handle added only to preview node
7 年前
33ee05ff
Fixed compatibleAnchors checks for when starting on a no-presenter anchor.
7 年前
a4a72ae8
Added support for connecting edges between 2 no-presenter nodes.
7 年前
336d2f81
Rename variable in MaterialNodeView
7 年前
591d8820
Fixed MaterialNodeView.OnModified() after no-presenters change.
7 年前
20646d1b
Removed MaterialNodePresenter.
7 年前
7e977d50
Fixed inspector and node position is now saved.
7 年前
3790252c
Remove last node presenters and also type mapper in MaterialGraphPresenter
7 年前
9f5fba90
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
83548475
Merging master.
7 年前
3db84206
Fixed some bugs after master merge.
7 年前
145b4d5f
Get rid of presenter for graph inspector
7 年前
6161fea6
Fix compiler warnings :)
7 年前
209da78a
Merge remote-tracking branch 'origin/master' into tidyup
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
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 年前
5363a614
Merge pull request #71 from Unity-Technologies/no-presenters
No presenters
7 年前
26e0dad5
Move copy paste boilerplate and event handling to GraphView.
7 年前
cd7aa840
Add fixed aspect ratio and initial size to PreviewNode
7 年前
f1bea6cf
Update following the RFC
7 年前
19de8169
Move framing shortcuts to GraphView.
7 年前
2f6fe8fb
Remove values that are set by default on parent class.
7 年前
43fda89f
Remove `INode.onReplaced` (leftover from previous redo impl)
7 年前
9c92399a
Add copy to clipboard toolbar button
7 年前
95a87cde
Clean up MaterialNodeView after merge with presenter
7 年前
ccf49055
Merge remote-tracking branch 'origin/master'
7 年前
80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
c88791bb
Duplication/insert etc. now selects the new elements
7 年前
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 年前
c6b895e7
Remove command handling from MaterialGraphPresenter
7 年前
a97628f1
Work around UIElements bug causing VisualElement.Sort to throw a NullReferenceException if the element is childless
7 年前
46b505fb
Move more stuff from MaterialGraphPresenter, also introduce proper constructor
7 年前
c43005a1
Remove last bit of presenters YAY
7 年前
b6a4d98d
Fix preview rendering bugs (causing re-use of previous texture and disapperance of checkerboard background) and persistence (remembers zoom etc. between assembly reloads, scene changes, even play mode!)
7 年前
9cbe42fb
Fix bug causing collapsed nodes to not have slots visible that should be visible
7 年前
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
8407756d
Workaround sRGB issue in UIElements such that previews are now rendered correctly
7 年前
2ecc2e08
Add copy to clipboard for selected node
7 年前
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
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 年前
73c2bce4
Properly dispose of MaterialNodeViews
7 年前
347edc88
Colored edges! (also, unify node and edge view creation)
7 年前
dc8375d3
Gradient edges
7 年前
0b1c506d
Fix direction on some gradients
7 年前
fcd97941
Merge pull request #75 from Unity-Technologies/master
Update from master
7 年前
3f1df674
PreviewSystem -> PreviewManager
7 年前
81d2a867
Add drag and drop to graph for Texture2D and subgraphs
7 年前
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
4391569c
Use asset name for sub-graph nodes
7 年前
abed850e
Merge master
And fix conflicts
7 年前
4be8c24e
Update preview toggle button to mostly match design
7 年前
52b69b3c
Merge branch 'master' into node-validation
7 年前
3039671f
Merge master
7 年前
5a5f791f
Working on improving texture node:
*Default texture inputs
*Works via subgraph :)
7 年前
713f6000
Merge pull request #79 from Unity-Technologies/improve-texture-node
Improve texture node
7 年前
41b314d2
Merge branch 'master' into node-validation
7 年前
8e5b0d9b
First pass inlining property nodes.
7 年前
92a955c3
Add converter from v1,v2,v3,v4,col nodes -> properties.
7 年前
11e072f9
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
7 年前
e9731703
Move convert to property / inline node to right click menu.
7 年前
de93c238
Merge trunk
7 年前
e408be90
Handle remove events from GraphView
7 年前
536b1737
Preview styling and toggling update
7 年前
20c7f686
Update changes following merge with master.
7 年前
d50eb6bb
Outside node controls for texture slots + various fixes
7 年前
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
e10be928
Merge pull request #81 from patrickfournier/graph-view-copy-paste
Graph view copy paste, for trunk cfe3ca666188 and later
7 年前
02c6b58d
Merge master
7 年前
ac179c90
Outside node controls for vector types
7 年前
7b9315c4
Outside node control for UV slots
7 年前
4f983742
Update type in dynamic slot names when they change
7 年前
972596ff
Remove unneeded event handling (handled elsewhere now)
7 年前
4d07b648
Edges for outside node controls
7 年前
cc654bc4
Fix picking mode on outside-node-input container, so that invisible stuff doesn't block click events
Match slot colors for outside-node-inputs
7 年前
9e5cc1af
rename anchor > port
7 年前
67c85cbe
Fix preview dirty'ing
7 年前
ec2df61b
Fix preview position in 2D previews
Turn off pixel caching for nodes
7 年前
f9ccf9f9
Update slot names on topological change
7 年前
fba42d48
Use GUID instead of object reference so that we can properly restore object link after assembly reload.
7 年前
bfe3f5fc
Fix null ref on exit
7 年前
69616da6
Color slots (a vec4 slot with a different input control)
7 年前
95cfcc60
Move actual preview rendering into PreviewManager
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
b14c1f98
Merge branch 'master' into node-artistic-adjustment
7 年前
406da125
Add INodeModificationListener which allows control views to be notified of node change
7 年前
6c7ced70
Merge branch 'master' into node-artistic-mask
7 年前
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
2fa06117
Implemented uber shader
7 年前
af2552b3
Enable pixel cache for nodes again
7 年前
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
61fab094
Update to work with trunk
7 年前
f615cb37
Work with new GraphView slot coloring
7 年前
066bcccb
Remove unneeded GV capability code
7 年前
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 年前
abe8b7b6
Remove pixel cache disables in a few places
7 年前
4e0aa7d7
Fixed default expanded state
7 年前
016d19e2
Enable pixel cache on PortInputView
7 年前
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
14bcb1d7
Full-resolution preview in blackboard
7 年前
8d403174
Merge pull request #83 from mathieum-unity/graphview-styling-updates
Graphview styling updates
7 年前
7fd5c8ef
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
e1281f8c
Fixes for new node style
7 年前
cd4618e1
Add field dragger to vector inputs
7 年前
da15e457
dirty first pass pass architecture.
7 年前
dadccc50
Merge branch 'master' into node-channel
7 年前
6f035d8a
hack and slash.
7 年前
fe10dc56
Fix bug causing preview to be now shown after creating a node
7 年前
f559320c
'working' previews.
7 年前
f14af0f4
Added Cubemap nodes
7 年前
1d641fec
For final shader generation use the master node.
7 年前
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
5d9b28af
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
7 年前
4eb8bc6a
Misc usability fixes for shadergraph:
-cubmap / texture -> convert to / from properties
-Removing properties not creates inline nodes
-Nicer names for newly created properties
-Drag texture to graph now creates 2d sampler node
-Drat normal map to graph sets up 'normal map' state
-Create shader graph now creats a default PBR node
-
7 年前
54ac74c0
Merge branch 'master' into node-input-scene
7 年前
16640c42
Run code format tool
7 年前
2731487c
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
e26f02bc
remove non needed logs
7 年前
e91932f8
Node selector / search
7 年前
2c5ae2d4
Move "Copy shader" into context menu
7 年前
b4404ee6
Remove preview rate limitation button
7 年前
90868fe3
Move "convert to subgraph" to context menu
7 年前
02e4d882
Move "update asset" button to blackboard
7 年前
4a06bed4
Remove last bit of toolbar
7 年前
c421de0a
Update use of EdgeControl to non-obsolete properties
7 年前
d2e30d64
Update right click menu.
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
508ec3ef
Workarounds for float formatting (e.g. 0.6 becoming a mess of decimal points) and label draggers (dragging not working on anything but first label on slot control)
7 年前
ab14181b
Make PortInputView use pre-multiplied alpha background color and put its edge behind itself and node (still need to make it render behind other nodes)
7 年前
0b1d9efe
Minor style changes to fix spacing between node controls
Also removes some leftover toolbar styles
7 年前
72c4bdea
Move contextual actions from node search menu into actual context menu
7 年前
67d2fd02
Merge master
7 年前
fd5fa964
Merge Master
7 年前
09db5bd9
- Remove NodeCreator
- Derive Port so that we can use our own IEdgeConnectorListener
- Handle element removal event from GraphView
7 年前
8c82d94e
- Dropping edge on graph (specifically not on a slot) now pops up the add node menu and auto-connects to the first compatible slot (only shows nodes where a slot is compatible)
- Another repaint to fix issue where an added node is not shown
- Update ports and colors when deleting nodes per graphview's request
7 年前
eed09312
When creating nodes by dropping edge, reposition the node after creating it such that the edge stays at the same position
7 年前
178bcf2b
Save correct position to node drawState
7 年前
53517148
Even better node repositioning
7 年前
00d8b6e8
Rename ColorMaterialSlot > ColorRGBAMaterialSlot and add ColorRGB slot
7 年前
ef9bd86c
Merge pull request #124 from Unity-Technologies/color-rgb
Color RGB
7 年前
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
02c12a94
Fix order of things when adding slots ( fixes #111 )
7 年前
e3bd536c
Merge branch 'master' into HDMaster
7 年前
5546123e
Merge branch 'master' into node-bugfixes
7 年前
890a9ece
More correct order of things in MaterialNodeView initialization
7 年前
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
22adea01
Make graph inspector window not pinned to the right side of the editor window
7 年前
82f3473f
Add resize handle to inspector window
7 年前
0ff2964b
Improve resize handling of inspector window
7 年前
f0203715
Ensure inspector winow to stay in editor window rect after window resize
7 年前
2d290890
Merge pull request #134 from Unity-Technologies/inspector-window
Inspector window
7 年前
2a66a4bf
Remove selection stuff from inspector and move properties to the top
7 年前
ec88c9f3
Reigister postlayout callback on graphview rather than inspector view
7 年前
eb5b5a85
Shader source mapping for node functions ( #137 )
7 年前
e1ebec49
Merge master
7 年前
5c979fc8
Merge master
7 年前
758cf9e6
Inspector window changes ( #138 )
* Add resize handle class and reuse some resize handle uss styling in inspector window
* Reigister postlayout callback on graphview rather than inspector view
* Remove resize function from GraphInspectorView
* Add resize handles to corner of inspector window
7 年前
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 年前
e1f95448
Various bug fixes
* Clean up master preview render data
* Add size check to IndexSet.Contains
7 年前
5c86f77c
Merge master
7 年前
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
9b1d3da9
Make maste node preview a separate window
7 年前
5f6443a4
Add draggable manipulator for floating windows
7 年前
b73f8bc1
Created the functionality of creating Nodes directly when hitting spacebar. Simplified to not have to right click and click create node.
7 年前
b3954895
Merge pull request #155 from Unity-Technologies/CreateNodeOnSpace
Created the functionality of creating Nodes directly when hitting spa…
7 年前
7c4730ca
PR Fixes
- Add boolean slot control view
- Add nodes And/Nand/Or
- Fix Branch node defaults
- Add USS for boolean slot
7 年前
7f9b3b2c
Remove eyedropper from Color fields
7 年前
97e5473e
Merge branch 'master' into node-bugfixes
7 年前
c763baf4
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
f43e0a6f
Merge branch 'master' into node-input
7 年前
352a061a
Merge branch 'master' into compare-and-branch
7 年前
55b86ced
Merge branch 'master' into inspector-window
7 年前
d41f2281
Fix hanging edges ( fixes #142 , fixes #152 , fixes #158 )
7 年前
29adf637
Merge pull request #172 from Unity-Technologies/fix-hanging-edges
Fix hanging edges (fixes #142 , fixes #152 , fixes #158 )
7 年前
64df08f0
[fix]Fix preview blending when you have alpha
7 年前
d7635005
Remove unused function in GraphEditrorView
7 年前
c1697dc5
[FIX] fixes #166 Changed the Quad to use the build in resource from Unity
7 年前
bfd7b48d
Import blackboard to project, still WIP
7 年前
e9689ade
Merge pull request #178 from Unity-Technologies/fix-preview-after-playmode
[FIX] fixes #166 Changed the Quad to use the build in resource from Unity
7 年前
1749ff66
A bunch of stuff for blackboard
- Fix SelectionDropper, so that selection of properties work
- Hack in a ContextualMenuManipulator so that context menus work in collaboration with GraphView
- Add a "Delete" option to context menu for properties
- Only show context menu options for nodes if a node or GV is right-clicked
- When adding a new property it is now expanding initially
- Rename a few Action properties to match GraphView convention
- Add a regular Unity toolbar (using IMGUI) to Shader Graph, as it looked weird without one
- Remove old inspector
7 年前
e9757253
Feedback from PR
7 年前
530a769c
Serialize layout of floating windows in GraphEditorView
7 年前
fa558b34
Add changes according to PR feedback
7 年前
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
725a1ea9
Merge branch 'master' into sliders
7 年前
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
739c124a
Merge branch 'master' into sliders
7 年前
46fe1f23
Change window layout serialization to happen when resize or dragging of master preview finished changing
7 年前
ed016425
Chnage name of master preview VisualElement to reflect prevuious name update
7 年前
dfcf6af9
Merge pull request #175 from Unity-Technologies/inspector-window
7 年前
d60a0f8d
Merge with master
7 年前
e3d84f9b
Add option in resize handels to make it staty in the bounds of the parent element
7 年前
4cfaf738
Add serialization for blackboard layout
7 年前
8984577a
Merge branch 'master' into node-input
7 年前
abe82146
Added support for drag and dropping properties to the graph
7 年前
03e99ce6
Remove debug messages
7 年前
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
927b9dac
Merge pull request #180 from Unity-Technologies/blackboard
Blackboard
7 年前
f2b52952
[FIX] fixes #96 Needed to put the input and output of the edge to Null.
7 年前
66a70b8f
Merge branch 'master' into inspector-window and resolve conflicts
7 年前
653eb828
Merge pull request #185 from Unity-Technologies/inspector-window
Make resize handles remain within bounds of parent element
7 年前
a3c9f868
Merge pull request #186 from Unity-Technologies/fix-nodes-are-still-filled-after-edge-deletion
[FIX] fixes #96 Needed to put the input and output of the edge to Null.
7 年前
e9df888c
Merge pull request #189 from Unity-Technologies/blackboard
Blackboard improvements
7 年前
358c118c
Change floating window serialization to track offset to closest corner rather than just position
7 年前
12be2cf3
Update master preview rendertexture size when layout has finished changeing
7 年前
4df636c0
Merge pull request #188 from Unity-Technologies/window-layout-docking
Change window position serialization to track closest corner
7 年前
af26c91a
Add flag in resize handle to maintain aspect ratio
7 年前
ae1852e9
Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale
7 年前
058f5c05
[FIX] Fixed an issue where openening up an empty shadergraph without any nodes caused an error.
7 年前
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
de57de9e
Add function in master preview to update rendertexture size after next layout change
7 年前
f59e7806
Merge pull request #195 from Unity-Technologies/fix-ondisposed-empty-shadergraph
[FIX] Fixed an issue where openening up an empty shadergraph without …
7 年前
a4f6c1fd
Merge pull request #194 from Unity-Technologies/master-preview-rendertexture-rescale
Make rendertexture on master adapt resolution on rescale
7 年前
49fe52c4
Fix bug causing selection outlines to disappear when zoomed out
7 年前
546a460b
Make preview node change in width as well as height ( fixes #121 )
7 年前
df78da56
Merge pull request #203 from Unity-Technologies/bugfix-preview-node
Make preview node change in width on resizing (fixes #121 )
7 年前
cab9a4b5
Put preview in a separate pixel cache for performance
7 年前
29361772
Merge branch 'master' into tidy-master-preview
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs
7 年前
3778ba92
Hide and Unhide Previews for Material Graph
7 年前
16db0624
* Hunt down code causing pixel cache dirtying every frame
* Put inline/port inputs in a shared pixel cache per node (rather than per input)
* Make preview and controls independent of node collapsed state
* Tidy up MaterialNodeView a bit
* Introduce PixelCacheProfiler for somewhat manually hunting down bad pixel caches
7 年前
95fba761
Added undo actions
7 年前
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
56f2361c
Merge branch 'master' into peter-fixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
41740d78
First pass dynamic Multiply node
- Temp adding of test graph
7 年前
beb99728
Merge pull request #207 from Unity-Technologies/peter-fixes
Fixes & performance improvements
7 年前
24300f52
Adding documentation functionality on the nodes.
public virtual string documentationURL() has been added to AbstractMaterialNode
Pressing F1 will take you to the documentation if it exists.
Right clicking on a node gives you the context menu item See Documentation that also takes you to the documentation if it exists.
7 年前
22c13f89
Cleanup and fixes (part 1)
- Fix not updating edges when validation changes
- Generate correct function headers
- Calculate whether matrix slot connections are error'd
- Fix validation in subgraphs
- Various cleanup
7 年前
54af42c8
Adding documentation functionality on the nodes.
public virtual string documentationURL() has been added to AbstractMaterialNode
Pressing F1 will take you to the documentation if it exists.
Right clicking on a node gives you the context menu item See Documentation that also takes you to the documentation if it exists.
7 年前
af192f3f
Merge pull request #208 from Unity-Technologies/hide-unhide-all-previews
Collapse and Expand Previews for Material Graph
7 年前
545de289
Merge pull request #209 from Unity-Technologies/goto-documentation-per-node
Adding documentation functionality on the nodes.
7 年前
02a50c76
Small fixes to "Open Documentation" menu item.
- Fixed an issue causing InvalidOperationException when opening the right-click
menu without having a selected node. Now it shows "Open Documentation" menu
item only when a single node is selected.
- Changed not to show the separator when the menu item is hidden.
7 年前
f44e12ea
Merge pull request #212 from keijiro/fix-docmenuitem
Small fixes to "Open Documentation" menu item.
7 年前
7ba4ae46
Make ResizeSideHandle be aware of nearest corner
ResizeSideHandles resize function are split into three cases, and the
resize handle is recording which corner it is closest to when the mouse
is preseed. This is to figure out which direction the window should
resize in when maintaining aspect ratio.
7 年前
28918b9a
Clear node selection when deleting nodes.
There was an issue that the selection list was not cleared on deletion of nodes.
This caused several problems when invoking node-editing actions right after
deletion.
e.g. Delete a random node and then open the right click menu without selecting
anything. This causes InvalidOperationException in BuildContextualMenu.
This small fix changes the behavior to clear the selection list in the end of
the deletion function.
7 年前
0a42bbd9
Merge pull request #214 from keijiro/fix-delete-node
Clear node selection when deleting nodes.
7 年前
e20fd08b
Fix matrix defaults
7 年前
4334f8e2
Split up MaterialGraph.USS file into multiple USS files for better organization.
7 年前
de7e2997
Addition of ScreenPositionSlotControlView
- Added ScreenPositionSlotControlView and its style element (USS).
- Moved ScreenSpaceType enum definition to ScreenSpaceType.cs and added
ScreenSpaceTypeExtensions that provides extension methods for the enum.
- Updated the existing implementation to work with
ScreenPositionSlotControlView.
7 年前
77b49204
Added a Settings menu for Nodes. Implementation of IHasSettings. Nodes can derive from this interface and implement their own VisualElement as their settings menu.
7 年前
3df359f2
Merge branch 'master' into node-matrix
7 年前
d2945014
Merge pull request #219 from keijiro/screenspace-slot
Addition of ScreenPositionSlotControlView
7 年前
324ad522
Updated the settings visual element for nodes
7 年前
7c973636
Merge branch 'master' into node-bugfixes
7 年前
e1d9b584
Added a Settings Menu for Nodes.
7 年前
8dc99cbc
*Fefactor subshader / master node generation to be more uniform
*Add subshader generator as a 'real' thing, need to hook up UI now so that these can be added and removed.
7 年前
bf9b4a4c
Updated the Settings UI.
7 年前
6456ff21
Updated Unlit settings master node to also have the new stylish settings view
7 年前
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
7 年前
c9173f20
Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate.
7 年前
a1c15f0d
Merge pull request #229 from Unity-Technologies/safer-callbacks
Safer callbacks
7 年前
7b5ca064
Merge with master
7 年前
6ad87d77
Split up ScreenPositionSlotControl into its own .USS file
7 年前
caaf7a64
Merge pull request #236 from Unity-Technologies/splitting-up-uss-files
Splitting up uss files
7 年前
5f331eda
[FIX] Disabled the resizing of preview node.
7 年前
a4d1c27d
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
7 年前
f39faa6c
Merge pull request #237 from Unity-Technologies/disable-resizing-in-preview-node
[FIX] Disabled the resizing of preview node.
7 年前
50036920
Added functionality to double click on a subgraph node to open it up in a new shader graph window
7 年前
9641212d
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
7 年前
5833e245
Added Right click context menu to open sub graph
7 年前
f187d743
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
7 年前
5dd3e527
Updated so it is only left mouse click that can open using the double click
7 年前
e7218ad7
Remove unused variables and classes and rework how master preview resizing is handled
7 年前
57a0eab1
Remove unused imports in entire solution
7 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
75dadc74
Merge pull request #239 from Unity-Technologies/double-click-to-open-subgraph
Added functionality to double click on a subgraph node to open it up …
7 年前
532c8de0
Add control view for bound input types
7 年前
f5ae4e88
Merge with master
7 年前
0a72fe97
When saving a sub graph, we now go through all the shader graphs and updated them if they are using this sub graph.
Not allowed to have sub graph inside a sub graph
Removed sub graph from searh window when in subgraph
Prompting the user when removing slots and properties from the sub graph.
7 年前
584d2bb4
[FIX] #251 Nodes are now selected again after pasted
7 年前
0c19b486
Added the 9_slice image to the settings view. Also added so that the icon looks clicked when clicked.
7 年前
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
7 年前
5d32dbf0
Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView
7 年前
c880667e
Merge pull request #260 from Unity-Technologies/geometrychangedevent
PostLayoutEvent -> GeometryChangedEvent
7 年前
96c8a0c7
Merge pull request #257 from Unity-Technologies/copy-paste-fix
[FIX] #251 Nodes are now selected again after pasted
7 年前
0b584564
Merge with master
7 年前
010106aa
Make cancelling "delete property" cancel the entire operation
7 年前
3de3ae25
Merge pull request #262 from Unity-Technologies/rebuild-all-dependant-shaders-from-subgraph
When saving a sub graph, we now go through all the shader graphs and …
7 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
e818e796
Merge pull request #258 from Unity-Technologies/fix-postlayoutevent
Fixes for PostLayoutEvent changes
7 年前
166af912
[FIX] #271 Making sure that the new inports are modifiable after saving the subgraph
7 年前
fecfaaea
Fix compile errors on trunk by introducing various compatibility extensions
7 年前
a323085a
Updated with the feedback from PR
7 年前
5d5824ef
Merge pull request #281 from Unity-Technologies/fix-subshader-property-update
[FIX] for issue #271
7 年前
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 年前
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
7 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
9720e0dc
Added input fields to the vector nodes
7 年前
d36a05a1
Fix issues after merge with master
7 年前
cfd61180
New node settings. Moved the createsettingselement to the master node
7 年前
eae8c0fc
Merge pull request #293 from Unity-Technologies/vector-input-fields
Vector input fields and IMayRequirePosition
7 年前
cfaa488d
Make serialized window layout serialize abosulte position properties
7 年前
8742fc7b
Merge branch 'master' into node-settings
7 年前
589cb99a
Add changes from previous branch
7 年前
a53fbcc2
Updated with new property sheet and row functionality plus added the .css files for them
7 年前
b1e38c12
Add collapse button on master preview
7 年前
2ff4fbd7
Added new settings files for the common settings on the master nodes, PBR and Unlit Master
7 年前
348a9654
Change GetPreviewProperty to return list for multiple properties from one slot
7 年前
ab80ca3c
Make master preview resize rendertexture continuously
7 年前
15328c1d
Add support for Fixed gradient mode
7 年前
daa8f8ad
Make window draggable able to clamp to the parent window
7 年前
ed104fa3
Added titleButtonContainer for buttons.
Removed bring to front on previewfiller
7 年前
8e243e0b
Make floating windows serialize layout realtive to correct content area
7 年前
3868cb59
Fixed so that the preview is not drawn ontop of the Settings Menu
7 年前
19a741e4
Switch blackboard layout modifiers to default modifiers
7 年前
962fc981
Removed the dependency on SRP so this is now self contained within Shadergraph.
Also removed the dependency on API changes that are note yet in trunk. Button Container on nodes.
7 年前
7061787f
Add docking layout to blackbourd via GeometryChangedEvent on GraphView
7 年前
246492ed
Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements
Layout modifiers improvements
7 年前
e34a3053
Fixed the PR feedback I got.
7 年前
a2b1f9e5
Fix warnings
7 年前
f20e7691
Update Gradient UIs to UIElements
7 年前
9cc55c03
Merge branch 'master' into path-for-shaders
7 年前
a7cb2893
Allow GraphView to copy when only elements of type BlackboardField are selected
7 年前
67827c5c
Remove unnecessary serialized properties
7 年前
74039530
Allow sahder properties to be copied and pasted between graphs
7 年前
74c313c2
Add copy function in IShaderProperty, and implement this in all property classes
7 年前
8201871e
Add meta properties in the CopyPasteGraph
7 年前
02587bed
Add conditional includes in MaterialGraphWindow and MaterialGraphView
7 年前
6ec339e3
Forwardport pull request #336
7 年前
f6380703
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
7 年前
3c602bad
Added base functionality to give an error on incompatible render pipeline
7 年前
83dbd5d0
Add change callback to controls when edge changes
7 年前
34997ed9
Cleaned up the code
7 年前
a49aec2e
Merge pull request #343 from Unity-Technologies/control-edge-callback
Callback on edge change to ControlView
7 年前
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
a3897b8c
Merge pull request #317 from Unity-Technologies/copy-property-nodes
Make property nodes into concrete nodes when copied between graphs
7 年前
60639f41
Merge branch 'master' into editable-property-reference-names
7 年前
c833d39e
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
7 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
7 年前
8a2e5a5e
Merge pull request #347 from Unity-Technologies/warning-incompatible-pipeline
Warning incompatible pipeline
7 年前
ed51c9ec
Make nodes spawn in the center of the view when copied from another graph
7 年前
36539f3e
Merge pull request #359 from Unity-Technologies/node-placement-copy
Node placement copy
7 年前
aa3df588
Removed old interface that wasn't used anymore, IDropTarget
7 年前
02c75c93
Fixed the drag and drop functionality (for 18.2+) for Blackboard
7 年前
e615b99e
Merge pull request #373 from Unity-Technologies/fix-drag-and-drop
Fix drag and drop
7 年前
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 年前
fe56266d
Ensure the blackboard remains in view after deserialization
7 年前
2b11377f
Merge pull request #1352 from Unity-Technologies/sg/blackboard-deserialization-safeguard
Ensure the blackboard remains in view after deserialization
7 年前
10d61e23
Started the functionality for opening shader code in user set, text editor
7 年前
529163c8
Fixed drag and drop for texture2d, cubemap, subgraph and updated the blackboardfield drag and drop
7 年前
3eef43d8
Added name to abstract material graph. This one is the name from the materialgraph on disk. Added a write file and open file in graph utils. Changed the converttoshader functionality to return a string so it could be re-used in implementation for writing a file.
7 年前
8c691503
Removed the old Drag and Drop methods
7 年前
b3ee7f83
Merge branch 'master' into stacklit
7 年前
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
7688ce53
Updated with the PR feedback
7 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
7 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
9498fe0b
Merge branch 'master' into stacklit
7 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
df14a156
Merge pull request #1353 from Unity-Technologies/sg/fix-drag-n-drop
Fix drag and drop
7 年前
927000b8
Merge branch 'master' into sg/texture-types
7 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
55a261e5
Fix drag and drop support
7 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
7 年前
57c37d06
Merge pull request #1355 from Unity-Technologies/sg/show-generated-code
Show generated code for shader graph
7 年前
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 年前
99d825bc
first pass fixing paths
7 年前
fafb59af
Run code formatter.
7 年前
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 年前
804a560f
Fix Shader Graph toolbar not showing up
7 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
7 年前
29b369e0
Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs
Remove 2018.1 compatibility code from Shader Graph
7 年前
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
7 年前
05d6a1be
Removed old unneccessary code that prevented the spacebar to create node functionality to work as intended.
7 年前
b3577726
Merge pull request #1424 from Unity-Technologies/sg/fix-create-node-using-spacebar
Fix for node creation on spacebar
7 年前
2274ce9d
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
7 年前
8f9bff6a
Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph
Fixes for Subgraph
7 年前
8cec3344
Fix a compile warning in GraphEditorView
7 年前
1ee9283d
Merge pull request #1442 from Unity-Technologies/sg/fix-compile-warning
Fix a compile warning in GraphEditorView
7 年前
848b6b57
fix for case #987330 now the preview is behind the outline.
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
3a4763ba
Merge pull request #1467 from Unity-Technologies/sg/fix-for-preview-being-infront-of-outliner
Outliner and preview fix
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
7933fd8d
Merge branch 'master' into StackLit2
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
6c870111
Merge branch 'master' into FalseColorMode
7 年前
37c00666
Added update title to master preview and blackboard.
cleaned up assetName parameter and dded it as a property instead
Made a seperate shader graph post processor file
7 年前
93058019
Re-added this functionality since I will remove it in another PR
7 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
b283a847
Fixed a small issue where the path was the name. We only want the last name of the shader and not the path to it.
7 年前
9cccf3fb
Updated with feedback
7 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
31db4b9f
Fix core changes to UIElements Toggle with compatibility layer
7 年前
ba8fbc25
Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes
Compatibility with Toggle changes in core Unity
7 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
549996da
Allow sub-shaders to tell whether they are compatible with a given render pipeline, and hook it up with the UI support for that such that an error is shown in the event that it's _not_ compatible.
This also adds a check in Update() such that the UI is reloaded when the render pipeline changes.
7 年前
a49a696e
Merge branch 'master' into StackLit2
7 年前
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
630691ab
Merge pull request #1512 from Unity-Technologies/sg/update-window-title-when-after-file-rename
Update window title
6 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
9bf79289
Backport pull request #1529
6 年前
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
c4fb2e1e
Fix TextureSlotControl not accepting Render Textures ( #1569 )
* Allow RT input to TextureSlotControl
* Update changelog
6 年前
05f36802
Merge branch 'master' into HDRP/staging
6 年前
1bce3600
Merge branch 'master' into tests/hdrp/distortion
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Peter Bay Bastian
Tim Cooper
Matt Dean
damian
Jens Holm
GitHub
Patrick Fournier
Natalie Burke
mathieum-unity
Martin Thorzen
Keijiro Takahashi
jensgholm15@gmail.com
Stephane Laroche
Alex Lian
sebastienlagarde
Frédéric Vauchelles
Oliver Schnabel
Remy
Paul Melamed
Thomas
Chris Tchou
Antoine Lelievre
Nerites
Sebastien Lagarde
Aleksandr Kirillov
Yao Xiaoling