834fc657
[shader graph] start porting to new graph framework.
9 年前
a184cf99
[shader graph]Working node connections.
9 年前
5a34322a
[Shader Graph] Previews rendering.
9 年前
3da9634f
[Shader graph]working delete + connect of nodes / edges
9 年前
d0d0f462
[shader graph] Fix edge connection so that it removes input edges before connecting new input edges.
9 年前
5090feee
[shader graph] Add context menu for adding nodes.
9 年前
c55aaff6
[shader graph]
Tidy up canvas texture generation (do not leak textures / only regenerate when needed)
Mark time dependent nodes dirty all the time
Tidy up Window code slightly
9 年前
4b137787
[shader graph]Reenable node UI. Not amazingly laid out yet, but it will get there.
9 年前
ff4d4704
[shader graph]fix layout.
9 年前
76820cdf
[shader graph] fix null ref exception.
9 年前
229ce4f5
[shader graph]Fix fix up defaults for node inputs. Moving towards typed inputs.
9 年前
7f682001
[Shader Graph] Add channel types. This allows for visual errors if you try to promote vectors.
9 年前
70760866
[shader graph]more support for multiple correct channeling.
9 年前
acfc64fe
[Shader graph]Add some texture panning.
9 年前
4d5ee48d
[shader graph]Start adding UI to the graph view.
9 年前
bb779dab
[shadergraph]Make export button that works.
9 年前
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 年前
51ceebd2
[shader graph]optimise for GC
9 年前
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 年前
371b3dba
[Material graph]Update to latest canvas2d version
9 年前
a99eb964
[shader graph]Add default input UI support (very alpha)
9 年前
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 年前
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 年前
798bca64
[shader graph]
*Use GUID for node identifier instead of instance ID (Stable between runs)
*Cash hash of last generated preview shader string, do not regenerate if it's the same
*Serialize node preview shaders / materials / last generated shader hash (load time optimisation)
*Add node property: canDeleteNode returns false by default. True for pixel master node
*Rarrange popup menu
9 年前
d1eb6888
[shader graph]
*properly initialize new graphs
*Reenable combine node.
9 年前
68752636
[shader graph] Add missing API.
9 年前
af2e75ab
[shader graph]Data refactor 3
9 年前
34db823b
[shader graph]Data refactor 4 (working kind of now)
9 年前
a2b27b3c
[Shader graph]Working on getting previews again.
9 年前
159a13a8
[shader graph]Renable delete. Fix guids so shaders generate properly.
9 年前
418682b1
[Material Graph]Refactoring graph architecture.
8 年前
7a1ca7ce
[material graph]Compiles again.
8 年前
cf6628c6
[material graph]Fix serialization issues + start adding unit tests
8 年前
ed811c3c
[material graph]Tidy slot reference usages + update tests.
8 年前
0de2d9bd
[Material Graph] Mode node collecton code to NodeUtils away from member functions
8 年前
2630ebd1
[Material Graph]Material graph does not need reference to owner + more tests.
8 年前
404ea34c
[material graph]Moving namespaces / extract things to interface
8 年前
1b5c5494
[Material Graph]Refactoring drawing. Working general drawing.
8 年前
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.
8 年前
98e18802
Fix position or Node preview
8 年前
01366ee3
Custom UI for PixelShaderNode.
Add Slot priority + tests
Make shader generation static functions (they do not need to be members
8 年前
da4824f7
Readd all existing nodes.
Most nodes are now correct. Some still need UI work (texture).
Missing some of the 'art' nodes still.
8 年前
c522adcc
[material graph]Working on texture preview / regeneration of drawing layer workflow.
8 年前
cea17e49
[Material graph] Tidy up asset handling (generic graph drawer that can be used by all graphs)
8 年前
25971c00
[material Graph] Fix non detected renames and add subgraph nodes.
8 年前
8e10c8cb
[mat graph]Sub graph is working again.
8 年前
62377747
[Material graph] Working subGraph now. Copies function / properties etc.
8 年前
40ac12ad
[Material Graph]Add copy paste support via serializing temp graph and rewriting internal connectors. Next step: auto create sub graph.
8 年前
0e9ee494
[Material Graph]Tidy + small Refactorings. Add more tests.
8 年前
cc192491
[Material Graph]Adding property node tests + pixel node tests + tidy API as I go (light functions specifically)
8 年前
e7cb2abf
[Material Graph]fix issue with pixel shader UI
8 年前
553fedbf
[Format]Run code formatting
8 年前
95b250d2
[material graph] Fix newline issues.
8 年前
31fa7c60
[Material Graph]Readd export button. Fix issue with sub graph exports.
8 年前
6cf280f3
[Material Graph]Add image comparison tests. Just add graph to UnityShaderEditor/Tests/IntegrationTests/Graphs
8 年前
3313d8c4
trying new UI
8 年前
9fb975a4
[mat graph]Remove Canvas2D from repository.
8 年前
8c5f323e
fixing node drawing
8 年前
01630326
drawing preview now.
8 年前
c565a8d4
fix formatting
8 年前
8736b714
color node now updates dependent nodes when the color is modified.
8 年前
51f6cf0b
[Material graph] Fix control id issues when there are two nodes of the same type
8 年前
a8d80b3f
[Material graph]Add imgui block for texture controls. Fix controls so they have the correct height.
8 年前
1b049752
[Material Graph] Rename and reorganise the repository.
8 年前
ab7317bb
[Mat Graph]Run code formatter
8 年前
2ea489dd
[Material Graph] Tidy view + fix css + add time update nodes in again.
8 年前
860a7a67
[Material Graph]delete edge + vector 1 node drawing.
8 年前
57c91c90
[material graph]Run code formatter.
8 年前
bfb2bedd
[Material graph]ctrl + F1 save graph (temp)
8 年前
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 年前
cdc2bd79
Extracted NodePreviewDrawer from MaterialNodeDrawer
8 年前
88700be8
MaterialNodeDrawer no longer uses MarkDirtyHack for time-dependent nodes, instead only re-painting
8 年前
85173f43
Added UI for Vector{2,3,4}
8 年前
54caa127
Fixed a bug causing nodes without previews to have zero width
8 年前
a848031a
Added NodeModificationScope for the onNodeModifiedCallback
Currently it is not used anywhere and all the places making the
callbacks are passing ShaderRegeneration. Need to analyse which
properties actually causes ShaderRegeneration as well as actually use
this callback to regenerate shaders rather than checking against node
version.
8 年前
92dd5d89
Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering
8 年前
39086dd7
[Mat Graph]Remove light functions and instead have multiple master nodes.
8 年前
860cb402
Refactored exposedState control into own NodeDrawData class
8 年前
3093c701
upgrading ui
8 年前
f6ff69e4
[Mat Graph]More porting to new CSS
8 年前
f4c0b482
[mat graph]More CSS
8 年前
da353adb
MaterialNodeDrawer might have been not cleaning up old stuff if the dataProvider was null
8 年前
14f32a76
Fix visual selection issue (no border + title disappearing) and extract header into its own drawer
8 年前
f1abf833
Implemented node collapsing
8 年前
313777e5
[Mat Graph] Master Node Inversion refactor
8 年前
1c332af5
[mat graph]Fix issue with edges not behaving well
8 年前
4dd59714
[mat graph]Fix style sheet issues
8 年前
b3888385
Previews work properly again and switch between 2d and 3d properly.
8 年前
3a45f192
[mat graph]Fix up previews a bit more.
8 年前
1172640f
Merge pull request #1 from stramit/MasterNode
Master node
8 年前
dc7e686b
Merge pull request #2 from stramit/NewUI
New ui
8 年前
190ab48a
Improved node collapsing performance a lot
8 年前
9ea47ed4
working on shader compiler issues
8 年前
38b41ed7
Re-imported MaterialGraph USS
8 年前
6f6d8b45
Fixed data watching for HeaderDrawer
8 年前
e7cb8660
Added collapsing of not-connected slots
8 年前
53ae5d47
Merge branch 'fixingshadercompiler' into HEAD
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Manipulators/NodeExpander.cs.meta
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/Styles/SerializableGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/NewUI/Editor/Views/GraphView.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Styles/MaterialGraph.uss.imported.asset.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/Nodes/TextureNode.cs
8 年前
07fa7d87
Fix compilation with runtime merge
8 年前
bb982188
Remove imported.asset files
8 年前
f62762b2
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
8 年前
9f1103ac
[mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :)
8 年前
c90ddfc2
USS clean-up for nodes
8 年前
780c7cc1
Updated styling to look like Hugo's mockup + fixes
- HeaderDrawer now extends from DataWatchContainer rather than
GraphElement (don’t do the latter for things that are inside nodes)
8 年前
7ee96660
[mat graph]Start work on remapper
8 年前
112ae744
[mat graph]Really rough, but working! remap nodes.
8 年前
e6cc7289
Merge branch 'RemapAndSubshader'
8 年前
70e53ed7
Refined `ModificationScope` with `.Topological`
`Topological` represents something that changes the topology of the
graph, i.e. something that causes e.g. edge removal.
8 年前
22ea3bd8
It is now possible to mark a master node as active in a shader graph (but not in others like sub graphs or remap graphs)
8 年前
5960f11a
Added basic inspector for graph editor and added the selected nodes to the graph asset
It currently just shows the names of the currently selected nodes
8 年前
8dd129c5
Extracted type mapping functionality into own class such that it can be re-used for node inspector
8 年前
e1f379f3
Recreate latest changes from RMGUI from joce
8 年前
e69e0431
Foundation has been laid for node inspectors (partially implemented for surface master)
8 年前
af604cb5
Set background to constant color
Might make more sense to not use GridBackground (though it’s a great
example of custom style properties!)
8 年前
2483a684
Added preview of first selected node in inspector
8 年前
a2959466
Implemented node pinning
8 年前
e5c4ffb6
Inspector now listens for changes to node relevant to the previewed node. It is now possible to pin the selected node, while another node is pinned (to avoid having to click 2 times). Constant re-paint is now only turned on if any relevant nodes require time.
8 年前
ddc991d7
Removed un-pin functionality, such that a node is always pinned (defaults to active master node). Also improved interface for AbstractGraphInspector.
8 年前
7343f497
Added IDisposable functionality to ObjectPool (and ListPool)
8 年前
cb87ed84
Minor improvements to graph inspector
8 年前
e6b70122
[Material Graph]Show slot default inputs in the inspector.
8 年前
e895baa6
Make added nodes appear under mouse cursor
Signed-off-by: joce <joce@unity3d.com>
8 年前
0ef45c8c
Merge pull request #5 from stramit/issues-fix
Issues fix
8 年前
e73c926b
Disable ReSharper warning about delegate subtraction as it is not valid for our use case
8 年前
663e90f3
If no node is pinned in graph inspector, display message rather than hiding the preview completely
8 年前
2eace1c5
Extracted abstract base class from MaterialGraphInspector
8 年前
adc4b060
Added graph inspectors for sub and remap graphs
8 年前
fc03abf6
Fixed a bug causing frequent, unneeded serialization of the entire graph in the graph inspector
8 年前
17429180
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
8 年前
0a990a6d
allow specifying the UV channel on the UV node.
8 年前
4ff1c093
NodeDrawer now derives from Node.
And all the superfluous files have been removed.
Signed-off-by: joce <joce@unity3d.com>
8 年前
98e645eb
Make Node and NodePresenter members private
They still accessible through public (and in the case of Node, virtual)
interfaces.
Signed-off-by: joce <joce@unity3d.com>
8 年前
574bc97d
First implementation of node collapsing for MG
Signed-off-by: joce <joce@unity3d.com>
8 年前
3e485a48
DrawData be gone
Signed-off-by: joce <joce@unity3d.com>
8 年前
cfc167d9
TypeMapper now derives from BaseDataMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
c5baafe7
Integrate latest GraphView
Signed-off-by: joce <joce@unity3d.com>
8 年前
2a1b5b99
TypeMapper => GraphTypeMapper
Signed-off-by: joce <joce@unity3d.com>
8 年前
ab990b62
TypeMapper and ScriptableObjectFactory
Only used in AbstractGraphInspector for now
8 年前
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 年前
591ca2fd
Start upgrade to new graph view.
7 年前
c0b51820
fixing after merge
7 年前
ce59a9db
Step1 for LevelNode
7 年前
1896e42f
[Improvements]Change workflow to work with new montreal importer work (scriptable importer)
7 年前
2dbd4aa3
Added nodes
-Ceil
-Exponential
-Floor
-Frac
-HSVtoRGB
-Hue
-InverseLerp
-OneMinus
-Remap
-RGBtoHCV
-RGBtoHSV
-Round
-Sign
-SquareRoot
-Step
-Trunc
-FMod
-Log
WIP Nodes
-ComponentSplitNode
-Cubemap
-Function1in3out
7 年前
3094ee75
Merge branch 'new-importer-workflow' into hackweek2017
7 年前
7ae13517
SwizzleNode now working
7 年前
dd8a892c
Adding constants node and corresponding presenter Adding Negate Node Adding UVPanner Node
7 年前
5db9bbb1
Saturate, UV Rotation, and tex2Dlod nodes.
7 年前
6edcd801
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
0abd0951
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c30e0ee9
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c8fdeadc
Re-Adding BlendMode Presenter definition.
Re-Adding BlendMode Presenter Definition.
7 年前
b1210c74
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
172b7d9c
-CubeMap preview fix, added mip level input
-Resurrected the remap node, was lost to the sea of git for a while……
7 年前
d6b72c9a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c51916c9
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
30bac3ab
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
5eca2dca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
620b809b
Adding the Add node with dynamic inputs and respective presenter (W.I.P)
7 年前
91c14c31
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
4eca4e2f
Menu Reorg: Art & Levels
7 年前
1bba1ba2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
41da8598
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
b359c1c7
Let master node to have 2D preview
7 年前
cd52a1e3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
180f53e2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
503b7b62
Remap node fix, beginning of toggle node
7 年前
0d1ac07f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
ec474be5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
09332619
Texture Asset node and sampler2D input/output type
7 年前
ebe86c0a
[DEBUG] Added a way to generate a shader file for debugging purposes
7 年前
fac62848
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c80b6a3a
Added an IF node
7 年前
4fcc2e9b
Presenter for the If Node
7 年前
7968bfa6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
2f5a98bb
We now have a Custom Code Node
7 年前
72252143
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
45eedc86
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
fe8256e6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
2adf665a
Added input/output checking
7 年前
12603c9a
Changing all Texture2D types to Teture to allow custom render textures to be added.
7 年前
1f0971d6
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
331ea7b4
Bug Fix for the Custom Code Node. Nodes will keep the code when reopened.
7 年前
435b3c0e
Add names to property nodes in the editor
7 年前
af4518e0
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
660338f9
Gradient node
7 年前
c7fbf38f
Added Matrix 2 and 3 types
7 年前
ee0f0bf6
Tweaked toggle node, now shows on shader as checkbox
Added expose and HDR check box to colour node
Initial work on float types
7 年前
2df2cc2b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
74c4e0ee
Convolution filter presenter
7 年前
ff74ebd2
Convolution filter : fix preview
7 年前
eeb9f4ff
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
3bce395a
Added Matrix4 and fixed Matrix multiply
7 年前
c99dc5e2
REPO FIX
7 年前
7d5a2883
Gradient node bug-fix and RGBA
7 年前
582b23f2
Added new modes to the Vector1node
-Float(usual behaviour)
-Toggle(changes to a toggle on both node and shader)
-Range(adds a slider and min max values to both node and shader)
-PowerSlider(same as above with the addition of a power value to give a curve growth) - DO NOT USE AS SPAMS CONSOLE ERRORS
7 年前
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
48e29dbb
Transform node in master graph presenter
Fixed power slider
7 年前
c439053d
Custom node with switchable inputs, warp node types and AA checkerboard
7 年前
b2d664e0
Added matrix common and ops
7 年前
3ccadfe5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
0cbb50e7
parallax occlusion mapping node, currently purely samples the height texture, no height scale controls or other input slots (uses texture asset for inner loop sampling).
7 年前
3c115bee
Scatter node (not ready for use)
7 年前
fed2bb39
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
995a95bc
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
475f5e3b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
d48c5531
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
419516e8
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
5f08fc4e
Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc.
7 年前
b94d71ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
7d7f4c31
Added the SamplerState presenter
7 年前
c5984a7b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
7a9f1ef2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
683c517e
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
7 年前
db8f399d
fix gradient serialization
7 年前
211cce2b
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
73112c5a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
189f30e4
SphericalIndentation node, and adding ability to source shader globals in Any nodes
7 年前
abec21f1
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
eed9ee0e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
5c5083d0
Adding 3d checkerboard & 3d output from sphere dent
7 年前
7d92d077
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
b247c311
Texture assets and related notes work now (Thanks Tim!)
7 年前
bdfd3b5f
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
670f4bf3
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
c19d413a
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
98611b46
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
7 年前
3198bd43
Remove Function2Input node as it is no longer needed.
7 年前
8df91eb4
Remove function 1 input and function 4 input
7 年前
5e6630fb
Porting more nodes to not be function nodes
7 年前
5e3b99fe
working on better workflow (double click shader to open in edit window)
7 年前
eac70c08
Graph edit window now survives serialization.
7 年前
d0d60781
Texture asset is now a real asset type...
7 年前
3457c49b
Updated to work after merge with trunk
7 年前
06b7010b
Remove "AnyNode"
7 年前
6e2d612e
Update to latest GraphView
7 年前
0d9b1e6a
Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes)
7 年前
f52ba9a6
Minor changes to MaterialNodeDrawer
7 年前
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 年前
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 年前
b37655bd
Update to latest version of graph view.
7 年前
b1c4e62a
Post merge tidy.
7 年前
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
bdd1ae34
Make MaterialGraphPreviewGenerator disposable
7 年前
87be495a
Getting rid of PreviewRenderUtility
Still a bit draft like. Needs to be properly checked for disposing of
data correctly.
Added checkboard background to preview. B
Bug: checkerboard disappears after windows loses and regains focus and
the node is moved around.
7 年前
3ecf6537
Cleaned up MaterialGraphPreviewGenerator
7 年前
3ff875cf
minor tidy of files
7 年前
28cf7cb6
Upgrade to trunk based graph view.
7 年前
77e26863
Merge branch 'master' into crash-fixes
7 年前
a1e42ea7
Fixed the shortcut problem in a proper way.
7 年前
ea281f24
Merge pull request #41 from stramit/crash-fixes
Crash fixes
7 年前
72c6ad7a
Push NodeDrawer members down into MaterialNodeDrawer
7 年前
f589fb80
Preview rendering works again for non-time-dependent nodes
7 年前
d470f1f1
Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView
7 年前
f2510f42
#35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones)
7 年前
ecb231e6
#35 Pull AbstractGraphInspector into AbstractMaterialGraphInspector
7 年前
696062ae
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
7 年前
485654b6
#31 Graph inspector now lives inside graph editor window (also, it works again!)
7 年前
11134a7d
Remove old inspector
7 年前
47925068
#35 Unify {Graph,Material}NodePresenter
7 年前
45e02be9
Rename *Drawer to *View
7 年前
1513eb00
Tidy up presenters folder, such that all the actual node presenters (i.e. corresponding to an actual node) lives inside their own folder
7 年前
315fa5db
Missing change for 15eb6b7dabdeb624e8fce79ab693381310a9614c
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 年前
c645f8bc
Remove unnecessary inheritance from GraphElementPresenter in NodePreviewPresenter
7 年前
06494dc3
Ensure tests are run with the same preview lighting.
7 年前
a3cbf332
#29 Propagate `requiresTime` in `MaterialGraphPresenter.UpdateData` rather than computing it on-the-fly (+ rename a bunch of variables in said method to match new conventions)
7 年前
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 年前
a494cc0c
Adding back sub graph support
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 年前
178cb981
Extension method for `INode.RequiresTime`
7 年前
8568c86c
#28 Set window title to asset name when window is created
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 年前
931a7f8b
Re-create presenter if it's null during update ( #37 , #39 )
7 年前
3c039bfd
Add save dialog when closing window
7 年前
dbebb5a9
Fix null reference exception
7 年前
10cced5d
Log error instead of warning when failing to instantiate node instance
7 年前
4cf36072
Enabling pretty printing of shader graph JSON
7 年前
817240b1
Fix preview rendering ( #48 )
7 年前
9fb6ad45
Temporary fix to open sub graphs in correct window class
7 年前
fbc6eeac
Fix node compatibility check ( #58 )
7 年前
62f36e79
Frame all after opening window ( #52 )
7 年前
ac0a8cfe
Frame all when graph "restarts"
7 年前
2b96084b
Move GraphInspector{Presenter,View} into Inspector folder
7 年前
1f174bad
Move GraphEditorPresenter creation into method
7 年前
ff2d3ef8
Change namespace of GraphInspector{Presenter,View}
7 年前
a76aadd7
Remove a few todos in code
7 年前
f6a7d3b4
Remove ScriptableObjectFactory and make fallback type optional in TypeMapper
7 年前
c884fe33
Make TypeMapper data-driven rather than generic and remove old inspector things from GraphInspectorPresenter
7 年前
064bacae
Add back surface master node editor in inspector
7 年前
34d1b3f1
Make preview re-generate when changing master node options
7 年前
ed185a44
Preliminary vertex shader support
7 年前
5b7af74e
Fix node repainting
7 年前
3ffdcd59
Right click no longer deselects nodes
7 年前
24f84a48
Do more efficient look-up of nodes in graph presenter update
7 年前
1793f62f
Add LW SRP into material graph
7 年前
0f6b7c44
Fixed graph name passed to GetFullShader in Master nodes
7 年前
25ed3aaf
Graph inspector now only shows editor for at most 1 node
7 年前
a39f97cc
Update to work with latest GraphView
7 年前
8139e3cb
Move GeneratedShader outside Unity project
7 年前
4f6745e0
Add utility function for calculating hash codes
7 年前
f6fa3513
Starting to extract properties.
7 年前
64c9a49b
Purge usage of presenters and datawatch from graph inspector
7 年前
8a87c992
More refactoring.
7 年前
960a174b
Move stuff out from Views and Presenters in Drawing/Inspector
7 年前
354517e6
Partially working new master node architecture.
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 年前
a93f2736
Add change notifications for graph, used for managing previews better
7 年前
a2353fbb
Fix property gathering in preview rendering
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 年前
699f1e8d
temp commit
7 年前
9e0273b3
Fixing with help from peter
7 年前
0818f178
temp
7 年前
735c401b
Working: Properties window + new master node.
7 年前
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
29754ac3
Working light weight unlit master node
7 年前
75826752
Add edge change notifications to IGraph
Move time-dependent preview tracking into PreviewSystem
7 年前
0b56c45b
first pass.
7 年前
609307fe
MaterialGraphPresenter now relies on change notifications rather than diffing
7 年前
8d5e6fd1
texture exposition working
7 年前
8e841bce
Remove UpdateData from MaterialGraphPresenter
7 年前
5b4c9be5
Move things around in preview generator
7 年前
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
d0f20689
Add initial preview hiding (still being rendered behind the scenes)
7 年前
76430e32
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
7 年前
97cfbe75
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
7 年前
6c9cb29a
Refactor toolbar (no more presenters, acts a little more like buttons)
7 年前
1229aaef
Use slot defaults for master nodes.
7 年前
65e94a0c
Add rate limiting for preview updates
7 年前
4a551695
temp
7 年前
3b205c79
UIElements-based shader properties in inspector
7 年前
df04d0ce
Use current ambient probe for preview rendering
7 年前
33e9b11f
Log warning with source when shader has error
7 年前
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
19ff14c7
remove c#4 features.
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 年前
79841e4c
Starting to work layer graph
7 年前
3930a641
Remove GraphEditorPresenter
7 年前
7809cfe9
refactoring material graph to allow for layered materials.
7 年前
73ca4594
No-presenters works: Fractal and Vector1 node creation and deletion.
7 年前
4e26b4fc
First pass working layered graph :)
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 年前
2c1b60e0
compiling
7 年前
ddc1113a
Resize handle added only to preview node
7 年前
1125f7df
Common attribute control for floaty properties
7 年前
33ee05ff
Fixed compatibleAnchors checks for when starting on a no-presenter anchor.
7 年前
24923996
misc fixes afer changes
7 年前
2bfaf109
Default control attribute (so far only for floats)
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 年前
3da19296
missed files
7 年前
811d7dab
Color attribute control
7 年前
2ecb0d96
Hooked up MaterialNodeView.OnModified() to main presenter OnModified callback.
7 年前
fcbee16f
Remove commented out node presenters
7 年前
92315882
Fixed deleting edges
7 年前
a327462f
Converted all nodes to use no-presenter.
7 年前
f695b6fa
Enum attribute control
7 年前
d9e85fdf
Cleaning up presenter code.
7 年前
56967512
Property attribute control
7 年前
17b67cdf
More cleanup of presenter code.
7 年前
152042bb
Comment out IfNode for now
7 年前
20646d1b
Removed MaterialNodePresenter.
7 年前
e6e04a49
Use attribute controls for TransformNode
7 年前
7e977d50
Fixed inspector and node position is now saved.
7 年前
7bb42428
Use attribute controls for Matrix nodes
7 年前
aeedf575
Attribute control for gradient node
7 年前
9bf884ab
Add object field attribute control
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 年前
c5a7e594
Fix integration with Undo by introducing IGraphObject
7 年前
83548475
Merging master.
7 年前
3b4b0eb6
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
7 年前
3db84206
Fixed some bugs after master merge.
7 年前
a8f898e3
Fix serialization
7 年前
6a03177d
Merge branch 'master' into no-presenters
7 年前
e0963bb8
More serialization fix
7 年前
1b331496
Merge branch 'master' into no-presenters
7 年前
e3cb9212
Undo handling for adding/removing shader properties
7 年前
d4bf2988
Update to work with latest Editor
7 年前
99701f90
UIElements-based controls for color and vector controls
7 年前
39d3dc25
Undo support for all node controls
7 年前
a15cfa1d
Minor changes to VectorControl
7 年前
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 年前
145b4d5f
Get rid of presenter for graph inspector
7 年前
6161fea6
Fix compiler warnings :)
7 年前
3bcd87d8
Add progress bar during shader compilation
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 年前
e39f99bb
Add "(i/total)" to shader compile progress
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 年前
3d3acb64
Fix bug causing inspector preview to stop working after undo/redo
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 年前
85affe1f
Update lightweight pipeline / SRP version
7 年前
95a87cde
Clean up MaterialNodeView after merge with presenter
7 年前
ccf49055
Merge remote-tracking branch 'origin/master'
7 年前
dac79163
Remove Match(GraphChange) utility function
7 年前
80fe7520
Remove generic parameter from MaterialGraphEditWindow
Minor clean-up here and there
7 年前
ab269bcc
Fix issues that should have caused compile errors
7 年前
c88791bb
Duplication/insert etc. now selects the new elements
7 年前
76269a78
Remove un-used presenters
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 年前
ae4febc2
Use rendering settings from current scene
7 年前
2ecc2e08
Add copy to clipboard for selected node
7 年前
706ca05d
Add null check for serialized object in MaterialGraphEditWindow
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 年前
0f07c1c0
Add mesh selection for master node preveiw
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 年前
401ef689
Set error texture filtermode to point
7 年前
81d2a867
Add drag and drop to graph for Texture2D and subgraphs
7 年前
e4b6371d
Add undo step for drag and dropping sub-graphs
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 年前
fe4745b9
Input Part 4
- Organised Input/Texture
- Added TextureAsset
- Added TextureControl
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 年前
35d08f0d
Add OnVlaueChanged callback to preview mesh picker for master node
7 年前
d2b246fa
Allow mesh in preview to be null / none selected as default sphere mesh
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 年前
bbb186d6
Remove Gradient nodes and asset type :(
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 年前
59ca63f8
Remove defaults value section in inspector
7 年前
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
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 年前
a1cb65d5
Working scripted importer version.
7 年前
00dbcd47
Clear shader errors before updating.
7 年前
a00f148d
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
7 年前
c3f4ae78
Store master node preview mesh in GraphInspectorView persistent data
7 年前
fd1a979a
Center preview mesh
7 年前
9e5cc1af
rename anchor > port
7 年前
84f8f35e
Fixing 'convert to subgraph'
7 年前
42b8ed85
Fix lingering preview shaders with errors
7 年前
67c85cbe
Fix preview dirty'ing
7 年前
ec2df61b
Fix preview position in 2D previews
Turn off pixel caching for nodes
7 年前
8ff15259
Fix preview centering for custom meshes
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 年前
7492cebb
Change tracking using undo system
7 年前
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
69616da6
Color slots (a vec4 slot with a different input control)
7 年前
95cfcc60
Move actual preview rendering into PreviewManager
7 年前
7d0fabce
Pre-sort preview data into 2D and 3D previews to make loop simpler
7 年前
2ced9041
Make property control label go away so that the enum field takes up entire width
7 年前
711f81fa
Added Channel Mixer Node
7 年前
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
82573de4
Remove special path for master nodes in PreviewManager
7 年前
b14c1f98
Merge branch 'master' into node-artistic-adjustment
7 年前
13948f2d
Channel Mask Node
7 年前
c06cd050
Fixes for PR
Also made function reusable for different node insatnces
7 年前
406da125
Add INodeModificationListener which allows control views to be notified of node change
7 年前
6c7ced70
Merge branch 'master' into node-artistic-mask
7 年前
00061ee8
ChannelEnumControl fixes
- Add modification listener
- Add slot ID to attribute
- Cleanup
7 年前
2cc3b58e
Fix Channel Mask node
- Convert to Abstract derived
- Move channel validation check to node side
- Cleanup
7 年前
bd9683ea
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
7 年前
2fa06117
Implemented uber shader
7 年前
4f1955f3
Fix preview dirty'ing in inspector
7 年前
af2552b3
Enable pixel cache for nodes again
7 年前
dd6f9d47
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
7 年前
2cf7a518
Fix bug caused by using LogWarningFormat instead of LogWarning
Put output id uniform first in MaterialPropertyBlock, so that it's hit early when setting it for every node
7 年前
66129542
Log time elapsed when compiling shaders
7 年前
61fab094
Update to work with trunk
7 年前
d21cc6ad
Fix change tracking so that it doesn't prompt you to save when closing right after you clicked save
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 年前
20cf4421
Flip Node
- Added ToggleControl (first pass)
7 年前
4e0aa7d7
Fixed default expanded state
7 年前
016d19e2
Enable pixel cache on PortInputView
7 年前
96fb4fb6
Flip Node Improvements
- Pass flip as an argument to method
- Switch to abs(flip - value)
- Handle preview rendering path
- Handle reuse of method
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 年前
a8dfafe4
Merge pull request #84 from Unity-Technologies/node-artistic-mask
Node Artistic Mask
7 年前
da15e457
dirty first pass pass architecture.
7 年前
dadccc50
Merge branch 'master' into node-channel
7 年前
0d6ff9c3
Flip change check in EnumControlView and remove unused field
7 年前
6f035d8a
hack and slash.
7 年前
5131e8e1
Fixes for PR
7 年前
fe10dc56
Fix bug causing preview to be now shown after creating a node
7 年前
f559320c
'working' previews.
7 年前
9aa25c1e
Change preview render resolution to 200*200, as that is the size of the preview at a 100% zoom
7 年前
f14af0f4
Added Cubemap nodes
7 年前
1d641fec
For final shader generation use the master node.
7 年前
9d6fad5e
Make "convert to subgraph" undoable (doesn't delete the sub graph though)
7 年前
a0602cf5
Generalised PBR / Unlit master
7 年前
9284e11f
Calculate bounds of nodes converted to subgraph and use for placement of subgraph node and nodes inside the subgraph #46 #47
7 年前
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
7 年前
1b3ac398
Merge branch 'master' into node-artistic-adjustment
7 年前
5e47b629
Fixes for PR
7 年前
3fdee329
ShaderGraph window now loads properly between Editor sessions #49
7 年前
7be0bdf0
Close ShaderGraph window if it fails to load asset from serialized guid
7 年前
9ddf9039
Merge pull request #85 from Unity-Technologies/node-channel
Node Channel
7 年前
d8578f92
Merge pull request #82 from Unity-Technologies/node-artistic-adjustment
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 年前
e5a6f66e
Serialize preview mesh in graph asset instead of through GraphInspectorView persistent data
7 年前
128c6db4
Add sub-graphs to node search menu
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 年前
2f0a0145
Remove layer graph + remap graph for beta1
7 年前
da0d10c8
Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame)
7 年前
d2e30d64
Update right click menu.
7 年前
00f3fcff
Merge branch 'master' into node-validate-current
7 年前
94202c55
Assembly Definition Files
7 年前
944c3654
Dispose resources when an exception is thrown during Update or ChangeSelection, such that we don't run out of preview scenes and ruin previews for everyone
7 年前
9604758c
Fix inconsistent persistence key causing SG to not maintain zoom and position sometimes
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 年前
c467fab5
Make color space conversion node controls a bit neater
7 年前
211cf575
Refactor ColorspaceConversionControl to work on enums in general and implement it for TransformNode
7 年前
5a69c812
Merge branch 'master' into node-bugfixes
7 年前
72c4bdea
Move contextual actions from node search menu into actual context menu
7 年前
67d2fd02
Merge master
7 年前
016cdba4
Remove mesh from preview render data and check for preview mesh in preview manager
7 年前
fd5fa964
Merge Master
7 年前
cbc52afe
Add rotation to inspector mesh preview
7 年前
8acafef9
Add scroll mouse manipulator
7 年前
682d177b
Add zoom/scale to preview mesh and refactor preview data into seperate class
7 年前
a5b781b9
Merge pull request #93 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
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 年前
ae8e0962
starting to update nodes to new library.
7 年前
02c12a94
Fix order of things when adding slots ( fixes #111 )
7 年前
ce26a5b8
Copy node title or property name for properties created inside sub-graph when converting to sub-graph ( fixes #114 )
7 年前
e3bd536c
Merge branch 'master' into HDMaster
7 年前
5546123e
Merge branch 'master' into node-bugfixes
7 年前
7a9a255f
More work on porting node library across to new shader library.
7 年前
03aee46f
Add null check for OnDestroy
7 年前
890a9ece
More correct order of things in MaterialNodeView initialization
7 年前
8a16933b
Minor refactor of preview mesh rotation and scale according to PR comments
7 年前
0fca7431
Rename Texture2D and Cubemap nodes
7 年前
1f9b882d
Fix up linar / gamma state of color nodes when they get inlined.
7 年前
2ce394e7
Trigger OnModified on master node when preview is rotated or scaled
7 年前
e8ae5340
Merge pull request #129 from Unity-Technologies/node-bugfixes
Rename Texture2D and Cubemap nodes
7 年前
f4e6a374
Merge pull request #130 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
d1d69177
Merge pull request #131 from Unity-Technologies/LinearColorFix
Linear color fix
7 年前
8454398a
Center rotationin of preveiw mesh and fix serialization of preview mesh
7 年前
a4e8458d
Remove zooming in inspector preview
7 年前
923666b0
Improve applied scale to inspector preveiw
7 年前
b2224d93
Move remaining files out of SerializableGraph folder and remove a few unused files
7 年前
1ebe97b0
Merge pull request #132 from Unity-Technologies/squash-serializablegraph
Squash SerializableGraph into AbstractMaterialGraph
7 年前
8e31e809
Merge branch 'master' into inspector-preview-mesh
7 年前
1f3752d8
Merge pull request #133 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
c2183225
Make GetChannelCount return an integer rather than a number enum thingie
7 年前
38e4110f
Move static methods out of AbstractMaterialNode
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 年前
8bd7923f
Add check for capture when draggable manipulator releases
7 年前
89613602
Move addition of resize handle higher in inspector prevewi window to cause it to overlay other elements
7 年前
4978e50e
Put resize handles as invisible bars on edges of inspector window
7 年前
429a5f71
Make resizeing from left and top not move the inspector window when reaching minimum size
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 年前
1a6d34eb
Output shader errors to console when uber shader has error
7 年前
e72aef5a
Add resize handle class and reuse some resize handle uss styling in 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 年前
ea126eba
Update shader error message
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 年前
2587263f
Remove resize function from GraphInspectorView
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 年前
ff694d9c
Add resize handles to corner of inspector window
7 年前
a5f98a7d
Remove log messages when resizing inspector
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 年前
11b8912f
Make resize side handle determine own uss classes
7 年前
55869a0b
Make class for adding resize handles along the border of a visual element
7 年前
3e4f3590
Channel Mask node to Mask Field (prt 1)
7 年前
682af7b6
Fix uss class for resize top-let hadle in resize handle
7 年前
29e04332
Channel Mask node to Mask Field (prt 2)
7 年前
9b1d3da9
Make maste node preview a separate window
7 年前
259c7ce1
Changing sub graphs to use functions instead of inlining.
7 年前
2888f1c2
-When we validate a subgraph node we also need to validate the subgraph (generates the concrete values).
-Allow promotion of vector types. v2->v3/v4 v3->v4. Rule is alpha channel gets 1, other channels get 0.
7 年前
455b4075
Merge pull request #145 from Unity-Technologies/FixingSubGraphs
Fixing sub graphs (+ fix 2D/3D preview bug)
7 年前
8f22e3a7
Boolean node and type (part 1)
7 年前
93fa2455
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
2f6e839e
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
7 年前
50adcc7c
Remove old functions from GraphInspectorView
7 年前
87638b44
Merge pull request #149 from Unity-Technologies/node-bugfixes
Node bugfixes
7 年前
8ea43935
Add HDR Color
- Add HDR Color node
- Add new constructor to ColorShaderProperty
- Add hdr flag to ColorControl
- Add HDR Color property to GraphInspectorView
7 年前
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
5f6443a4
Add draggable manipulator for floating windows
7 年前
cfb57499
Add Slider
ShaderProperty, Control, Node and property list entry
7 年前
428479b6
Make floating windows dock to closest corner
7 年前
b73f8bc1
Created the functionality of creating Nodes directly when hitting spacebar. Simplified to not have to right click and click create node.
7 年前
28df6957
Upgrade Slider UI to UIElements
7 年前
b3954895
Merge pull request #155 from Unity-Technologies/CreateNodeOnSpace
Created the functionality of creating Nodes directly when hitting spa…
7 年前
fb18c249
Refactor Channel Mixer UI
7 年前
81985612
Fix/change slider property view UI
7 年前
7c4730ca
PR Fixes
- Add boolean slot control view
- Add nodes And/Nand/Or
- Fix Branch node defaults
- Add USS for boolean slot
7 年前
450a5759
[FIX] #88 Added a forcedRedrawPreviews flag that will redraw the graph and update the nodes to reflect changes properly when an external source has been re-imported.
7 年前
21d73861
Improve ChannelMixerControl callbacks
7 年前
f7209064
Switch control's HDR argument to enum
7 年前
f243e1cf
[FIX] #157 Removed the check for Master node which casued the Exception.
7 年前
7e22f269
Update ToggleControl to UIElements
Cosmetic fixes to
- InvertColors node
- ChannelMixer node
- Blend node
7 年前
25109a19
Extend PBR master functionality
- Add Fade and Multiply blend modes
- Expose culling options
- Change UV enum to caps
- Add camel case string converter to utils
- Convert camel case on CodeFunctionNode
7 年前
7f9b3b2c
Remove eyedropper from Color fields
7 年前
6e105759
Fix toggle control defaults
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 年前
6f373878
Remove unused function in MasterNodeView
7 年前
29adf637
Merge pull request #172 from Unity-Technologies/fix-hanging-edges
Fix hanging edges (fixes #142 , fixes #152 , fixes #158 )
7 年前
90e67259
Repaint property node control when name changes
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 年前
4e8c00e0
Make reisze handels and window draggable manipulator respect minimum dimensions of target
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 年前
16ddad23
Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace
Fixes #159 , fixes #88 , fixes #157 , fixes #162
7 年前
fa558b34
Add changes according to PR feedback
7 年前
8e8beb43
Merge pull request #174 from Unity-Technologies/tim-bug-fixes
Misc bug fixes
7 年前
a4d567f1
[FIX] Fixed a bug where the master preview didn't update properly after a node got deleted and then undo-ed.
7 年前
e71bf6a6
[FIX] fixes #123 Added a m_colorSpace variable to remember what the user had, and if they change we redraw the window.
7 年前
725a1ea9
Merge branch 'master' into sliders
7 年前
602ef408
Add callback in resize handles that notifies when the mouse button is released
7 年前
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
70d12230
[FIX] Moved the initialization of this var into update()
7 年前
d00ca780
Merge branch 'master' into blackboard
7 年前
739c124a
Merge branch 'master' into sliders
7 年前
d51ff20e
Add callback in WindowDraggable to notify when the mouse button is released
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 年前
1c0c24b4
Merge pull request #151 from Unity-Technologies/sliders
Sliders, Integers and HDR Color
7 年前
4cfaf738
Add serialization for blackboard layout
7 年前
1a06a11e
Merge pull request #179 from Unity-Technologies/fix-preview-after-color-space-switch
[FIX] fixes #123 Added a m_colorSpace variable to remember what the u…
7 年前
0534342e
Added support for reordering properties in blackboard
7 年前
8984577a
Merge branch 'master' into node-input
7 年前
da883fa2
Merge pull request #181 from Unity-Technologies/fix-master-preview-after-undo
[FIX] Fixed a bug where the master preview didn't update properly after a node got deleted and then undo-ed.
7 年前
abe82146
Added support for drag and dropping properties to the graph
7 年前
93aa1de8
Refactor Dielectric Specular node for UI changes
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 年前
84072c18
Add undo actions for blackboard
7 年前
42cd9d1b
Make resize handels properly stay handle parent layout bounds ( fixes #183 )
7 年前
2fc16a9a
Make blackboard only be draggable from the header to avoid conflicts with fields
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 年前
c35229be
Add class for holding window docking layout
7 年前
a4c6f50d
Add functions in WindowDockingLayout to compute relative corner offset and get back layout relative to parent layout
7 年前
e9df888c
Merge pull request #189 from Unity-Technologies/blackboard
Blackboard improvements
7 年前
e3f843c0
Make WindowDraggable use WindowDockingLayout internally to track closest corner
7 年前
758a90e4
Merge pull request #170 from Unity-Technologies/node-input
Various nodes
7 年前
358c118c
Change floating window serialization to track offset to closest corner rather than just position
7 年前
86e92a04
Merge pull request #191 from Unity-Technologies/fixes-for-blackboard
Fixes for blackboard
7 年前
5d0155ff
Add Blackboard support for Boolean
7 年前
12be2cf3
Update master preview rendertexture size when layout has finished changeing
7 年前
affdcadf
Add HDR color support to Blackboard
7 年前
6b956d8e
Add dimension check when master preview is resized
When themaster review is resized, the new size is checked, and if it has not changed, the rendertexture is not changed.
7 年前
4df636c0
Merge pull request #188 from Unity-Technologies/window-layout-docking
Change window position serialization to track closest corner
7 年前
484b4f58
* Add individual properties to node search
* Remove dropdown from property node
* Add all compatible slots to node search when dragging into empty space
*
7 年前
0292ae36
Color control refactor
- Add mode enum to ControlView
- Remove HDR Color node
- Switch Color node value to struct
- Update USS
7 年前
af26c91a
Add flag in resize handle to maintain aspect ratio
7 年前
7ab634f3
Apply remapping to all serialzied types
7 年前
78db5ef1
Refactor float based shader properties
7 年前
b49f21d7
Tidy up resize handle
7 年前
4ad43705
Vector1 property refactor and types
7 年前
d54f7422
Fix typo in ResizeHandle
7 年前
395c3ec5
Merge pull request #193 from Unity-Technologies/properties-in-search
Improvements to node search
7 年前
78f31c8e
Fix adding Slider and Int properties from inline node conversion
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 年前
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
038d4d90
Remove property node from search results
7 年前
6e895b76
Tidied up the Master Preview View
Uni-36221
7 年前
a4f6c1fd
Merge pull request #194 from Unity-Technologies/master-preview-rendertexture-rescale
Make rendertexture on master adapt resolution on rescale
7 年前
d2b1d4db
Fix UXML paths
7 年前
a1cc908e
Fixes #198 - only dirty nodes were being used as starting point for PreviewMode propagation
7 年前
92a10806
Merge pull request #202 from Unity-Technologies/peter-fixes
Various fixes
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 年前
2b211e7e
Merge pull request #205 from Unity-Technologies/tidy-master-preview
Tidied up the Master Preview View
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 年前
f7c18c9a
Add scrollable manipulator
7 年前
625ddde1
Add zoom to master preview
7 年前
341a6fc3
Merge pull request #211 from Unity-Technologies/master-preview-zoom
Master preview zoom
7 年前
9696454d
Make floating windows not rescale when parent window becomes too small to fit them
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 年前
40d78c85
Implement aspect ratio maintaining for vertical resize handles
7 年前
0a42bbd9
Merge pull request #214 from keijiro/fix-delete-node
Clear node selection when deleting nodes.
7 年前
9647fad6
Make blackboard resize handles stay within the parent bounds
7 年前
507d1fc8
Add maintained aspect ratio in corner resize side handles
7 年前
e20fd08b
Fix matrix defaults
7 年前
f19eae8b
Split handling of resize in ResizeSideHandle into each direction
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 年前
82db6687
Make master preview dirty when mouse wheel is scrolled (zoom changes)
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 年前
d3b6cb07
Make master preview dirty after rendertexture is resized ( fixes #235 )
7 年前
f187d743
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
7 年前
c595547c
Fixes #217 by searching all assemblies in the app domain
7 年前
5dd3e527
Updated so it is only left mouse click that can open using the double click
7 年前
dd879e77
Make master preview refresh rendertexture on play mode change and check if rendertexture is null
7 年前
e7218ad7
Remove unused variables and classes and rework how master preview resizing is handled
7 年前
9c44af93
Add hide flags to master preview rendertexture ( fixed #225 )
7 年前
f57c8cab
Merge pull request #238 from Unity-Technologies/master-preview-fixes
Master preview missing RenderTexture fixes
7 年前
9f659780
Merge pull request #240 from Unity-Technologies/fix-217
Fixes #217
7 年前
6d5e2c25
Merge with master
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 年前
00a8f677
Fixes #242 by initalizing the color space field properly
7 年前
3a64dab9
Merge pull request #245 from Unity-Technologies/fix-242
Fixes #242 by initalizing the color space field properly
7 年前
c1e7625e
Hide debug outputs behind a define
7 年前
e2675d66
Merge pull request #246 from Unity-Technologies/devmode-define
Devmode define
7 年前
7aa1b896
Added null-checks to master preview.
7 年前
f7374d45
Merge pull request #247 from keijiro/fix-null-preview
Fix for NullReferenceException in master preview.
7 年前
e7ecacd5
Rename package folder to match package name
7 年前
00564880
Fix shader include paths, update gitignore, add meta files and replace UNITY_SHADERGRAPH_DEVMODE with an optional DebugOutput directory
7 年前
286d82a6
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
7 年前
532c8de0
Add control view for bound input types
7 年前
f5ae4e88
Merge with master
7 年前
714075ca
Update WindowDraggable to work with the latest changes to PostLayoutEvent in Editor code
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 年前
a2bafb38
Fix float serialization in Constant Node to not be affected by system locale (was comma as decimal separator causing shader errors)
7 年前
c5f3e96c
Removed unused parameter scaling
7 年前
5d32dbf0
Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView
7 年前
40495e65
Merge pull request #261 from Unity-Technologies/fix-constant-node
Fix Constant Node code gen
7 年前
c880667e
Merge pull request #260 from Unity-Technologies/geometrychangedevent
PostLayoutEvent -> GeometryChangedEvent
7 年前
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
7 年前
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
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 年前
57b10b82
[FIX] # 288 Updated the ChannelEnum and ChannelEnumMask controls to use their own uss files. This solves the 5pixels extra width on the nodes using them.
7 年前
13a428be
More trunk compatibility fixes
7 年前
d36a05a1
Fix issues after merge with master
7 年前
685fecd6
Merge pull request #286 from Unity-Technologies/trunk-compatibility
More trunk compatibility fixes
7 年前
839077f9
Refactor WindowDraggable to use posiiton left and position right properties
7 年前
cfd61180
New node settings. Moved the createsettingselement to the master node
7 年前
0d17d3ed
Merge pull request #291 from Unity-Technologies/uss-for-channel-enum-mask-control
[FIX] # 288
7 年前
d411c659
Refactor resize side handels to use absolute position properties
7 年前
eae8c0fc
Merge pull request #293 from Unity-Technologies/vector-input-fields
Vector input fields and IMayRequirePosition
7 年前
6a079706
Add function in WinowDockingLayout to apply layout position or size
7 年前
b0ebffa3
Started the work on adding path functionality to shaders.
7 年前
11eb245d
Add acess to master previews texture view and add default size for preveiw in uss
7 年前
dbf93edc
Updated teh Graph path functionality. It now saves the path and reads it back
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 年前
88b45aa5
Added functionality so that you cannot have properties with the same name. It appends (*) to your property where * is just the next sequential number.
7 年前
9c29a0c6
Added functionality to search window and made the path's sanitized.
7 年前
adf3203d
Fix typo in resizeBorderFrame name
7 年前
a53fbcc2
Updated with new property sheet and row functionality plus added the .css files for them
7 年前
ff7c4856
Fix serialisation of preview properties in Gradient Asset node
7 年前
ad7f7e58
Ignore the subjected property when sanitizing name
7 年前
bea679f1
Fixed an extra line whch was not needed
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 年前
f3467681
Make master preview collapse relative to mouse position and afterwards recalculate new docking position
7 年前
67b4a259
Allow SubGraphOutputNode to supply shader data to master preview view
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 年前
f7274b83
Make the master preview dirty output nodes in subgraphs
7 年前
43f24a85
Remove checks for within parent bonds in resize handles
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 年前
c268bca4
Merge pull request #303 from Unity-Technologies/fix-empty-strings-blackboard
Blackboard Property fixes.
7 年前
a2b1f9e5
Fix warnings
7 年前
312d23e1
Merge pull request #304 from Unity-Technologies/sub-graph-preview-fix
Sub graph preview fix
7 年前
f20e7691
Update Gradient UIs to UIElements
7 年前
9cc55c03
Merge branch 'master' into path-for-shaders
7 年前
23cc01bd
Merge pull request #302 from Unity-Technologies/path-for-shaders
Change path for graphs
7 年前
a7cb2893
Allow GraphView to copy when only elements of type BlackboardField are selected
7 年前
67827c5c
Remove unnecessary serialized properties
7 年前
082d7d93
Replacing soon-to-be deprecated API Resources.Load(string) for Resources.Load<T>(string)
7 年前
03c0b504
Remove uses of .NET 4+ only API
7 年前
74039530
Allow sahder properties to be copied and pasted between graphs
7 年前
ea90628a
Fix trunk warnings
7 年前
09124350
Merge pull request #309 from Unity-Technologies/fix-net35
Fix legacy scripting backend compatibility
7 年前
74c313c2
Add copy function in IShaderProperty, and implement this in all property classes
7 年前
b68215c9
Add text field on properties to allow a custom reference name
7 年前
ee59804c
Update ChannelEnumControl to UIElements and USS
7 年前
8201871e
Add meta properties in the CopyPasteGraph
7 年前
26deb2a4
Merge pull request #308 from Unity-Technologies/fixes/update-deprecated-resources-api
Update deprecated Resources API
7 年前
ed5436e4
Make custom property names dirty the graph
7 年前
cb9ab96f
Prevent GC allocation when popup doesnt need to be recreated
7 年前
42451460
Make reference names editable throught text field and add reference name sanitation
7 年前
02587bed
Add conditional includes in MaterialGraphWindow and MaterialGraphView
7 年前
82435f05
Enforce underscore in overriden property names and allow rest by supplying empty string
7 年前
2e2f5f9e
Simplify regex for checking valid property reference
7 年前
6aca31dc
Check property referecne name when the property is created
7 年前
1703288d
Make the property name text field delayed
7 年前
7f9416d0
Make use of the generic duplicate name handling funciton when editing property and reference names
7 年前
2f658454
Make the modified property names bold through uss
7 年前
f86ab019
Add toggle for whether properties are exposed or not
7 年前
24edf725
Merge pull request #314 from Unity-Technologies/channel-enum-control
Update ChannelEnumControl to UIElements and USS
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 年前
82aecff4
Needed to add .uss file to make things display correctly
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 年前
753d4c0f
Merge pull request #349 from Unity-Technologies/blackboard-uss-fixes
Fix font sizes in blackboard
7 年前
9696a5d1
Merge pull request #326 from Unity-Technologies/editable-property-reference-names
Editable property reference names
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 年前
3a802291
Capturemouse event and trickle down enum has changed and this is a fix for that so it is compatible with older versions.
7 年前
d657628e
Merge pull request #361 from Unity-Technologies/fix-obsolete-methods
Fix obsolete warnings
7 年前
36539f3e
Merge pull request #359 from Unity-Technologies/node-placement-copy
Node placement copy
7 年前
ac20b304
Fix null refs in search window provider
7 年前
cd8caf84
Merge pull request #366 from Unity-Technologies/fix-null-refs-in-search-provider
Fix null refs in search window provider
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 年前
7b43adb3
Update DoRepaint for UIElements change in trunk
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
6 年前
495c97b8
Search window respects shader stage
7 年前
2b11377f
Merge pull request #1352 from Unity-Technologies/sg/blackboard-deserialization-safeguard
Ensure the blackboard remains in view after deserialization
6 年前
10d61e23
Started the functionality for opening shader code in user set, text editor
6 年前
529163c8
Fixed drag and drop for texture2d, cubemap, subgraph and updated the blackboardfield drag and drop
6 年前
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.
6 年前
8c691503
Removed the old Drag and Drop methods
6 年前
b3ee7f83
Merge branch 'master' into stacklit
6 年前
42b09806
Add first pass Texture2DArray and Texture3D support
6 年前
7688ce53
Updated with the PR feedback
6 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
6 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
9498fe0b
Merge branch 'master' into stacklit
6 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
6 年前
df14a156
Merge pull request #1353 from Unity-Technologies/sg/fix-drag-n-drop
Fix drag and drop
6 年前
927000b8
Merge branch 'master' into sg/texture-types
6 年前
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
6 年前
55a261e5
Fix drag and drop support
6 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
6 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
6 年前
57c37d06
Merge pull request #1355 from Unity-Technologies/sg/show-generated-code
Show generated code for shader graph
6 年前
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...
6 年前
99d825bc
first pass fixing paths
6 年前
fafb59af
Run code formatter.
6 年前
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
6 年前
804a560f
Fix Shader Graph toolbar not showing up
6 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
6 年前
29b369e0
Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs
Remove 2018.1 compatibility code from Shader Graph
6 年前
ca71f84b
Remove use of deprecated method Dirty()
6 年前
b0322fa0
Merge pull request #1421 from Unity-Technologies/sg/texture-array-control-trunk-compat
Fix trunk compatibility for TextureArrayControl
6 年前
11cbbe0d
Removed the ObjectControl and added ( sub) to the name of the sub graph node
6 年前
05d6a1be
Removed old unneccessary code that prevented the spacebar to create node functionality to work as intended.
6 年前
b3577726
Merge pull request #1424 from Unity-Technologies/sg/fix-create-node-using-spacebar
Fix for node creation on spacebar
6 年前
2274ce9d
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
6 年前
8f9bff6a
Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph
Fixes for Subgraph
6 年前
58554194
Remove old "update dependencies" code from window class
6 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
6 年前
8cec3344
Fix a compile warning in GraphEditorView
6 年前
1ee9283d
Merge pull request #1442 from Unity-Technologies/sg/fix-compile-warning
Fix a compile warning in GraphEditorView
6 年前
848b6b57
fix for case #987330 now the preview is behind the outline.
6 年前
51a1873e
Merge branch 'master' into update-changelog
6 年前
3a4763ba
Merge pull request #1467 from Unity-Technologies/sg/fix-for-preview-being-infront-of-outliner
Outliner and preview fix
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
6 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
f8fc4b16
Added functionality for updating the title of the shader graph window
6 年前
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
6 年前
93058019
Re-added this functionality since I will remove it in another PR
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
67f8b052
Removing this, since it has been added into another PR
6 年前
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.
6 年前
9cccf3fb
Updated with feedback
6 年前
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
6 年前
31db4b9f
Fix core changes to UIElements Toggle with compatibility layer
6 年前
ba8fbc25
Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes
Compatibility with Toggle changes in core Unity
6 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
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.
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
8bf93fba
Fix dielectric specular control
It was resetting control values
6 年前
5ec7bc49
Fix acceptable IOR range for Dielectric Specular node
6 年前
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 年前
2801eb36
Merge pull request #1568 from Unity-Technologies/sg/fix-dielectric-specular-control
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 年前
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
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 年前
0d207da9
Fix for prompting dirty shader graph
Wen a shader graph is dirty it will now tell you the name of it.
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 年前
d638cb4b
one more new line
Added another new line character since that is how the save dirty scene looks like
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 年前
58ccb0db
Merge pull request #1744 from Unity-Technologies/sg/fix-for-saving-dirty-shader-graph
Fix for saving dirty shader graph
6 年前
170858df
Merge master
6 年前
4294530e
Fixes for previews not updating ( #1737 )
Added a bool for frame all.
Dirty the nodes after Geometry changed event.
6 年前
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
468989ad
Merge branch 'master' into pyramid-rework
6 年前
aae1a458
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
6 年前
Tim Cooper
Peter Bay Bastian
GitHub
julienf-unity
joce
Florent Guinier
Andre McGrail
Eduardo Chaves
vlad
RinaldoTjan
Matt Dean
bfogerty
MingWai
Jennifer Nordwall
ChrisTchou
Natasha Tatarchuk
Mads Ronnow
Yuanxing Cai
damian
Jens Holm
Patrick Fournier
Natalie Burke
mathieum-unity
Martin Thorzen
Keijiro Takahashi
jensgholm15@gmail.com
JavDevGames
Stephane Laroche
Alex Lian
sebastienlagarde
Frédéric Vauchelles
Oliver Schnabel
Remy
Paul Melamed
Thomas
Chris Tchou
Antoine Lelievre
Nerites
Sebastien Lagarde
Aleksandr Kirillov
martint-unity
Yao Xiaoling
egomeh
Yao Xiao Ling