228 次代码提交 (475f5e3b-e840-4c42-997a-7c5563e74b46)

作者 SHA1 备注 提交日期
Tim Cooper 1b049752 [Material Graph] Rename and reorganise the repository. 8 年前
Tim Cooper ab7317bb [Mat Graph]Run code formatter 8 年前
Tim Cooper 860a7a67 [Material Graph]delete edge + vector 1 node drawing. 8 年前
Tim Cooper 57c91c90 [material graph]Run code formatter. 8 年前
Peter Bay Bastian 85173f43 Added UI for Vector{2,3,4} 8 年前
Peter Bay Bastian 92dd5d89 Replaced MarkDirtyHack with scoped OnModified and optimised preview rendering 8 年前
Tim Cooper 39086dd7 [Mat Graph]Remove light functions and instead have multiple master nodes. 8 年前
Peter Bay Bastian 860cb402 Refactored exposedState control into own NodeDrawData class 8 年前
Tim Cooper 3093c701 upgrading ui 8 年前
Peter Bay Bastian f1abf833 Implemented node collapsing 8 年前
Tim Cooper 313777e5 [Mat Graph] Master Node Inversion refactor 8 年前
Tim Cooper 1c332af5 [mat graph]Fix issue with edges not behaving well 8 年前
Tim Cooper b3888385 Previews work properly again and switch between 2d and 3d properly. 8 年前
GitHub 1172640f Merge pull request #1 from stramit/MasterNode 8 年前
GitHub dc7e686b Merge pull request #2 from stramit/NewUI 8 年前
Tim Cooper 9ea47ed4 working on shader compiler issues 8 年前
Tim Cooper 53ae5d47 Merge branch 'fixingshadercompiler' into HEAD 8 年前
Tim Cooper f62762b2 [mat graph]Move material options into the master node they exist for + add GUID support for selected master node. 8 年前
Tim Cooper 9f1103ac [mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :) 8 年前
Tim Cooper 7ee96660 [mat graph]Start work on remapper 8 年前
Tim Cooper 112ae744 [mat graph]Really rough, but working! remap nodes. 8 年前
Tim Cooper e6cc7289 Merge branch 'RemapAndSubshader' 8 年前
Peter Bay Bastian 70e53ed7 Refined `ModificationScope` with `.Topological` 8 年前
Peter Bay Bastian 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 年前
Peter Bay Bastian 8dd129c5 Extracted type mapping functionality into own class such that it can be re-used for node inspector 8 年前
Tim Cooper e1f379f3 Recreate latest changes from RMGUI from joce 8 年前
Tim Cooper 17429180 Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with. 8 年前
Tim Cooper 0a990a6d allow specifying the UV channel on the UV node. 8 年前
Peter Bay Bastian 4ff1c093 NodeDrawer now derives from Node. 8 年前
joce 3e485a48 DrawData be gone 8 年前
joce cfc167d9 TypeMapper now derives from BaseDataMapper 8 年前
joce 2a1b5b99 TypeMapper => GraphTypeMapper 8 年前
Tim Cooper c0b51820 fixing after merge 8 年前
Florent Guinier ce59a9db Step1 for LevelNode 8 年前
Andre McGrail 2dbd4aa3 Added nodes 8 年前
Florent Guinier 7ae13517 SwizzleNode now working 8 年前
Eduardo Chaves dd8a892c Adding constants node and corresponding presenter Adding Negate Node Adding UVPanner Node 8 年前
vlad 5db9bbb1 Saturate, UV Rotation, and tex2Dlod nodes. 8 年前
Florent Guinier 6edcd801 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Eduardo Chaves 0abd0951 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Eduardo Chaves c30e0ee9 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
RinaldoTjan c8fdeadc Re-Adding BlendMode Presenter definition. 8 年前
vlad b1210c74 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Andre McGrail 172b7d9c -CubeMap preview fix, added mip level input 8 年前
Matt Dean d6b72c9a Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier c51916c9 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty 30bac3ab Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Eduardo Chaves 5eca2dca Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Eduardo Chaves 620b809b Adding the Add node with dynamic inputs and respective presenter (W.I.P) 8 年前
Eduardo Chaves 91c14c31 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Matt Dean 4eca4e2f Menu Reorg: Art & Levels 8 年前
bfogerty 1bba1ba2 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
RinaldoTjan 41da8598 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
MingWai b359c1c7 Let master node to have 2D preview 8 年前
bfogerty cd52a1e3 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
RinaldoTjan 180f53e2 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Andre McGrail 503b7b62 Remap node fix, beginning of toggle node 8 年前
bfogerty 0d1ac07f Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier ec474be5 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
vlad 09332619 Texture Asset node and sampler2D input/output type 8 年前
Matt Dean ebe86c0a [DEBUG] Added a way to generate a shader file for debugging purposes 8 年前
Florent Guinier fac62848 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty c80b6a3a Added an IF node 8 年前
bfogerty 4fcc2e9b Presenter for the If Node 8 年前
Matt Dean 7968bfa6 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty 2f5a98bb We now have a Custom Code Node 8 年前
Jennifer Nordwall 72252143 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
ChrisTchou 45eedc86 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier fe8256e6 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Jennifer Nordwall 2adf665a Added input/output checking 8 年前
vlad 12603c9a Changing all Texture2D types to Teture to allow custom render textures to be added. 8 年前
bfogerty 1f0971d6 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty 331ea7b4 Bug Fix for the Custom Code Node. Nodes will keep the code when reopened. 8 年前
MingWai 660338f9 Gradient node 8 年前
Matt Dean c7fbf38f Added Matrix 2 and 3 types 8 年前
Andre McGrail ee0f0bf6 Tweaked toggle node, now shows on shader as checkbox 8 年前
bfogerty 2df2cc2b Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier 74c4e0ee Convolution filter presenter 8 年前
Florent Guinier ff74ebd2 Convolution filter : fix preview 8 年前
Matt Dean eeb9f4ff Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Matt Dean 3bce395a Added Matrix4 and fixed Matrix multiply 8 年前
Andre McGrail c99dc5e2 REPO FIX 8 年前
MingWai 7d5a2883 Gradient node bug-fix and RGBA 8 年前
Andre McGrail 582b23f2 Added new modes to the Vector1node 8 年前
Matt Dean 718af347 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Andre McGrail 48e29dbb Transform node in master graph presenter 8 年前
ChrisTchou c439053d Custom node with switchable inputs, warp node types and AA checkerboard 8 年前
Matt Dean b2d664e0 Added matrix common and ops 8 年前
MingWai 3ccadfe5 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Natasha Tatarchuk 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). 8 年前
MingWai 3c115bee Scatter node (not ready for use) 8 年前
Eduardo Chaves fed2bb39 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty 995a95bc Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Jennifer Nordwall 475f5e3b Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Eduardo Chaves d48c5531 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier fe87f870 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Natasha Tatarchuk 419516e8 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
vlad 5f08fc4e Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc. 8 年前
Jennifer Nordwall b94d71ca Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
vlad 7d7f4c31 Added the SamplerState presenter 8 年前
RinaldoTjan c5984a7b Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
bfogerty 7a9f1ef2 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
ChrisTchou 683c517e Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017 8 年前
MingWai db8f399d fix gradient serialization 8 年前
ChrisTchou 211cce2b Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier 73112c5a Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
ChrisTchou 189f30e4 SphericalIndentation node, and adding ability to source shader globals in Any nodes 8 年前
bfogerty abec21f1 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Matt Dean eed9ee0e Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
ChrisTchou 5c5083d0 Adding 3d checkerboard & 3d output from sphere dent 8 年前
bfogerty 7d92d077 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
vlad b247c311 Texture assets and related notes work now (Thanks Tim!) 8 年前
MingWai bdfd3b5f Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Florent Guinier 670f4bf3 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
ChrisTchou c19d413a Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Matt Dean 98611b46 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Tim Cooper 3198bd43 Remove Function2Input node as it is no longer needed. 8 年前
Tim Cooper 8df91eb4 Remove function 1 input and function 4 input 8 年前
Tim Cooper 5e6630fb Porting more nodes to not be function nodes 8 年前
Tim Cooper d0d60781 Texture asset is now a real asset type... 7 年前
Peter Bay Bastian 3457c49b Updated to work after merge with trunk 7 年前
Tim Cooper 06b7010b Remove "AnyNode" 7 年前
Tim Cooper 0d9b1e6a Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes) 7 年前
Tim Cooper 0e769105 Merge branch 'hackweek2017' into tidying 7 年前
Tim Cooper b37655bd Update to latest version of graph view. 7 年前
Tim Cooper defd6784 [fix]Partial fix to rendering not being updated. Not complete but getting there. 7 年前
Mads Ronnow 3ecf6537 Cleaned up MaterialGraphPreviewGenerator 7 年前
Tim Cooper 3ff875cf minor tidy of files 7 年前
Tim Cooper 28cf7cb6 Upgrade to trunk based graph view. 7 年前
Yuanxing Cai 77e26863 Merge branch 'master' into crash-fixes 7 年前
Peter Bay Bastian f589fb80 Preview rendering works again for non-time-dependent nodes 7 年前
Peter Bay Bastian d470f1f1 Unify {Abstract,Serializable,Material}GraphEditWindow, {Abstract,Serializable,Material}GraphPresenter and {Serializable,Material}GraphView 7 年前
Peter Bay Bastian f2510f42 #35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones) 7 年前
Peter Bay Bastian 696062ae #35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing 7 年前
Peter Bay Bastian 485654b6 #31 Graph inspector now lives inside graph editor window (also, it works again!) 7 年前
Peter Bay Bastian 47925068 #35 Unify {Graph,Material}NodePresenter 7 年前
Peter Bay Bastian 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 年前
Peter Bay Bastian 315fa5db Missing change for 15eb6b7dabdeb624e8fce79ab693381310a9614c 7 年前
Peter Bay Bastian 693b0aa5 Remove `elements` from MaterialNodePresenter. Sub-presenters are accessed through independent properties now. 7 年前
Peter Bay Bastian b057a909 Clean-up MaterialNodeView a bit 7 年前
Peter Bay Bastian 9dd4edeb #11 #43 Copy, paste & duplicate now works properly and is handled by the window rather than GraphView 7 年前
Peter Bay Bastian 04fedafb Support "Cut" command 7 年前
Peter Bay Bastian 78c22505 Handle delete via window and presenter rather than `MaterialGraphView` 7 年前
Peter Bay Bastian 8bfc6985 Remove needless inheritance from MaterialNodePresenter in GraphControlPresenter 7 年前
Peter Bay Bastian c645f8bc Remove unnecessary inheritance from GraphElementPresenter in NodePreviewPresenter 7 年前
Peter Bay Bastian 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 年前
Tim Cooper 34cc0f15 Start work on making 'sub-graph' work again in an expected way. 7 年前
Peter Bay Bastian 4b24135e #29 Window now tells `MaterialGraphPresenter` to update previews, rather than using schedulers per node 7 年前
Tim Cooper a494cc0c Adding back sub graph support 7 年前
Tim Cooper 793887f9 Working 'convert to subgraph' 7 年前
Peter Bay Bastian f516d811 Merge remote-tracking branch 'origin/subgraph' 7 年前
Peter Bay Bastian 178cb981 Extension method for `INode.RequiresTime` 7 年前
Peter Bay Bastian 7e160ce8 Run `hg format` on repository 7 年前
Peter Bay Bastian a92b64bb #31 UIElements-based graph inspector 7 年前
Peter Bay Bastian 8e1d62b6 Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31) 7 年前
Peter Bay Bastian fbc6eeac Fix node compatibility check (#58) 7 年前
Peter Bay Bastian 2b96084b Move GraphInspector{Presenter,View} into Inspector folder 7 年前
Peter Bay Bastian ff2d3ef8 Change namespace of GraphInspector{Presenter,View} 7 年前
Peter Bay Bastian ed185a44 Preliminary vertex shader support 7 年前
Peter Bay Bastian 24f84a48 Do more efficient look-up of nodes in graph presenter update 7 年前
Tim Cooper 1793f62f Add LW SRP into material graph 7 年前
Peter Bay Bastian 8139e3cb Move GeneratedShader outside Unity project 7 年前
Tim Cooper f6fa3513 Starting to extract properties. 7 年前
Peter Bay Bastian 64c9a49b Purge usage of presenters and datawatch from graph inspector 7 年前
Tim Cooper 8a87c992 More refactoring. 7 年前
Matt Dean fc0d26d6 Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters 7 年前
Peter Bay Bastian bec6cdbb New preview system and master node preview in inspector 7 年前
Peter Bay Bastian a93f2736 Add change notifications for graph, used for managing previews better 7 年前
Tim Cooper 95cdeda0 Merge remote-tracking branch 'origin/master' into refactor-properties 7 年前
Tim Cooper 9e0273b3 Fixing with help from peter 7 年前
GitHub 5f6271d2 Merge pull request #67 from stramit/refactor-properties 7 年前
Tim Cooper 29754ac3 Working light weight unlit master node 7 年前
Peter Bay Bastian 75826752 Add edge change notifications to IGraph 7 年前
Peter Bay Bastian 609307fe MaterialGraphPresenter now relies on change notifications rather than diffing 7 年前
Peter Bay Bastian 8e841bce Remove UpdateData from MaterialGraphPresenter 7 年前
Tim Cooper 779d0288 [MatGraph]Use generated names for properties so that they do not conflict and are formatted properly. 7 年前
Peter Bay Bastian d0f20689 Add initial preview hiding (still being rendered behind the scenes) 7 年前
Tim Cooper 97cfbe75 Working remap node (wood wood) probably still needs a bunch of love. but something is working :) 7 年前
Peter Bay Bastian 6c9cb29a Refactor toolbar (no more presenters, acts a little more like buttons) 7 年前
Tim Cooper 1229aaef Use slot defaults for master nodes. 7 年前
Peter Bay Bastian 65e94a0c Add rate limiting for preview updates 7 年前
Tim Cooper 4a551695 temp 7 年前
Tim Cooper f2cae710 Merge branch 'exposed-prop-subgraph' 7 年前
Peter Bay Bastian a3385c0f Undo/redo prototype 7 年前
Tim Cooper 9557fcee Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph 7 年前
Peter Bay Bastian 3930a641 Remove GraphEditorPresenter 7 年前
damian 73ca4594 No-presenters works: Fractal and Vector1 node creation and deletion. 7 年前
Peter Bay Bastian ff8de4d3 New attribute-based system for node controls 7 年前
damian e9b2550a Added support for checking compatible no-presenter anchors. 7 年前
damian 33ee05ff Fixed compatibleAnchors checks for when starting on a no-presenter anchor. 7 年前
damian a4a72ae8 Added support for connecting edges between 2 no-presenter nodes. 7 年前
Tim Cooper 3da19296 missed files 7 年前
Peter Bay Bastian 811d7dab Color attribute control 7 年前
damian 2ecb0d96 Hooked up MaterialNodeView.OnModified() to main presenter OnModified callback. 7 年前
Peter Bay Bastian fcbee16f Remove commented out node presenters 7 年前
damian 92315882 Fixed deleting edges 7 年前
damian a327462f Converted all nodes to use no-presenter. 7 年前
Peter Bay Bastian f695b6fa Enum attribute control 7 年前
damian d9e85fdf Cleaning up presenter code. 7 年前
Peter Bay Bastian 56967512 Property attribute control 7 年前
damian 17b67cdf More cleanup of presenter code. 7 年前
Peter Bay Bastian 152042bb Comment out IfNode for now 7 年前
damian 20646d1b Removed MaterialNodePresenter. 7 年前
Peter Bay Bastian e6e04a49 Use attribute controls for TransformNode 7 年前
Peter Bay Bastian 7bb42428 Use attribute controls for Matrix nodes 7 年前
Peter Bay Bastian aeedf575 Attribute control for gradient node 7 年前
Peter Bay Bastian 9bf884ab Add object field attribute control 7 年前
Peter Bay Bastian 3790252c Remove last node presenters and also type mapper in MaterialGraphPresenter 7 年前
Peter Bay Bastian 9f5fba90 Merge branch 'attribute-controls' 7 年前
Peter Bay Bastian c5a7e594 Fix integration with Undo by introducing IGraphObject 7 年前
damian 83548475 Merging master. 7 年前
damian 3db84206 Fixed some bugs after master merge. 7 年前
Tim Cooper a5c9b0ce Merge branch 'exposed-prop-subgraph' 7 年前
Tim Cooper 6161fea6 Fix compiler warnings :) 7 年前
GitHub 1d08cd88 Merge pull request #70 from Unity-Technologies/tidyup 7 年前
Peter Bay Bastian b75b4c04 Merge branch 'master' into no-presenters 7 年前
GitHub 5363a614 Merge pull request #71 from Unity-Technologies/no-presenters 7 年前
Patrick Fournier 26e0dad5 Move copy paste boilerplate and event handling to GraphView. 7 年前
Tim Cooper 85affe1f Update lightweight pipeline / SRP version 7 年前
Peter Bay Bastian 95a87cde Clean up MaterialNodeView after merge with presenter 7 年前
Tim Cooper ccf49055 Merge remote-tracking branch 'origin/master' 7 年前
Peter Bay Bastian dac79163 Remove Match(GraphChange) utility function 7 年前
Peter Bay Bastian 80fe7520 Remove generic parameter from MaterialGraphEditWindow 7 年前
Peter Bay Bastian c88791bb Duplication/insert etc. now selects the new elements 7 年前
Peter Bay Bastian 76269a78 Remove un-used presenters 7 年前
Peter Bay Bastian 9dbfb5c3 Move slot compatibility check code into MaterialSlot 7 年前
Peter Bay Bastian c6b895e7 Remove command handling from MaterialGraphPresenter 7 年前
Peter Bay Bastian 46b505fb Move more stuff from MaterialGraphPresenter, also introduce proper constructor 7 年前