unity-tech-cn
/
ScriptableRenderPipeline
29
0
派生 4
代码 合并请求 版本发布
19 提交
85 分支
28 Plastic标签
目录树: 99e8024a
分支列表 标签列表
${ item.name }
创建分支 ${ searchTerm }
从 '99e8024a'
${ noResults }

910 次代码提交 (99e8024a-0038-4632-a83c-19bdb81dbfda)

作者 SHA1 备注 提交日期
Julien Ignace 06725f27 Added GBuffer Debug shader. 8 年前
Julien Ignace 5551e27f Compile fix after last merge 8 年前
sebastienlagarde acd11ee0 HDRenderLoop Rename DisneyGGX to Li and convert to whitesapce convention 8 年前
Sebastien Lagarde bb06ff58 HDRenderLoop: Update Debug view mode for new parameters 8 年前
Sebastien Lagarde de43ba96 HDRenderLoop: Add automatic support for material propery debug 8 年前
Julien Ignace 730f9523 LayeredLit shader first version (no custom GUI, only shader code + framework) 8 年前
sebastienlagarde b2a49403 HDRenderLoop; start support of reflection probe 8 年前
sebastienlagarde fe99ce30 HDRenderLoop: Add PreLightData concept (optimization) 8 年前
vlad-andreev bf6e54c5 tabs -> spaces 8 年前
sebastienlagarde feca166f Merge remote-tracking branch 'origin/master' 8 年前
sebastienlagarde 02b23d6e HDRenderloop: fix issue after merging 8 年前
Sebastien Lagarde ba76c316 HDRenderLoop: Move a lot of files for better classification 8 年前
sebastienlagarde fb24c2f6 HDRenderLoop: Remove Assets/ScriptableRenderLoop/ShaderLibrary from header path 8 年前
Sebastien Lagarde 3ff1088c HDRenderLoop: More misc change + try to compile meta pass (not working yet) 8 年前
GitHub ca67bebf Merge pull request #5 from Unity-Technologies/LightmapSupport 8 年前
Sebastien Lagarde 00afee16 HDRenderLoop: Lot of stuffs - try to prepare for various lighting architecture 8 年前
Paul Demeulenaere 93fd6e5e Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
GitHub 89924c46 Merge pull request #7 from Unity-Technologies/ShadowMapSupport 8 年前
Paul Demeulenaere a87df4d4 Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
sebastienlagarde fd7cfe17 HDRenderLoop: Move file/create file/Rename stuff - Related to lighting and shadow 8 年前
Paul Demeulenaere f68e8b7c Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Sebastien Lagarde e3c7667f HDRenderLoop: Renmae PositionHS to PositionCS + another pass on shadow design 8 年前
Paul Demeulenaere 2c436ffd Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Sebastien Lagarde e7a1bb1b HDRenderLoop: Update to new texture abstraction everywhere 8 年前
Paul Demeulenaere d6e910a1 Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Sebastien Lagarde 40f9dda4 HDRenderLoop: Update for velociy buffer + several stuff/fix/refactor 8 年前
sebastienlagarde ea867c72 HDRenderLoop: Remove Shaders folder and move all files at root + rename XXXDefault.shader to XXX.shader 8 年前
sebastienlagarde ddd7203e HDRenderLoop: Loop now work in standalone win64 player 8 年前
sebastienlagarde 996cc98f HDRenderLoop: Move FragInput is now global to share code + reorganise debug attributes 8 年前
sebastienlagarde a919228a Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL 8 年前
Julien Ignace 2d47017c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Evgenii Golubev 290723c7 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into UpdateAreaLightImpl 8 年前
Paul Demeulenaere e7df382c Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
runes 1ff2ff4b Moved debug rendering of tile lists to separate shader pass 8 年前
sebastienlagarde 8cac0660 HDRenderLoop: Clean some formatting error + fix issue with define 8 年前
Evgenii Golubev fc0cb9a4 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem 8 年前
Paul Demeulenaere ab48557b Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Evgenii Golubev 2df9af84 Merge branch 'SkySystem' 8 年前
sebastienlagarde 898ec83d HDRenderLoop: Misc fix for making cluster FPTL work, still not working 8 年前
GitHub 3560d0cf Merge pull request #29 from Unity-Technologies/merge-FPTL-cluster 8 年前
Julien Ignace 668f9372 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Sebastien Lagarde 4f89be71 HDRenderLoop: minor convention cleanup 8 年前
Sebastien Lagarde 62c01cdd HDRenderLoop: First no working version of cluster FPTL 8 年前
Julien Ignace c1b2cb24 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Paul Demeulenaere f44b8fd2 Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
runes 6d7d07de TilePass support for arealights 8 年前
runes 36e49e0d Minor refactoring in HDRenderLoop: Renamed light types are now referred to as volumes and light models are now referred to as light categories 8 年前
sebastienlagarde d0ebdb4a Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-lightloop 8 年前
Sebastien Lagarde 546401a2 HDRenderLoop: Version that compile and display something 8 年前
Sebastien Lagarde 1b338186 HDRenderLoop: SinglePAss work but Tile is broken... 8 年前
GitHub 8337fa69 Merge pull request #34 from Unity-Technologies/Refactor-lightloop 8 年前
Evgenii Golubev e7cb98c6 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Felipe Lira 462e7b4d Merge branch 'master' into scriptablerenderloop-graphicssettings 8 年前
Paul Demeulenaere 267b0349 Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Sebastien Lagarde 39c9f7ed HDRenderLoop: First draft not working of depth pixel offset 8 年前
Sebastien Lagarde 521b51c7 HDRenderLoop: Big refactor to preprate for depthOffsetVs 8 年前
runes 0a35dbf2 Tile debugging 2.0 8 年前
Sebastien Lagarde 383c4443 HDRenderLoop: Fix issue wih debug param after refactor 8 年前
GitHub 53173cc7 Merge pull request #43 from Unity-Technologies/tiledebugging2 8 年前
Sebastien Lagarde 2de194b0 Merge remote-tracking branch 'refs/remotes/origin/master' into pixel-depth-offset 8 年前
Sebastien Lagarde ef03a8a7 HDRenderLoop: Make it compile after merge 8 年前
GitHub 9690c7b7 Merge pull request #44 from Unity-Technologies/pixel-depth-offset 8 年前
Sebastien Lagarde 5e3a413d HDRenderLoop: Fix debugViewtiles compilation 8 年前
Sebastien Lagarde 5d839c48 HDRenderLoop: Fix depthVS issue + introduce HDCamera 8 年前
GitHub bdc9840a Merge pull request #45 from Unity-Technologies/Fix-depthVS 8 年前
Julien Ignace 2ec18892 Merge branch 'master' into SkyFramework 8 年前
Sebastien Lagarde d1bf008e HDRenderLoop: Add distortion pass control + depth offset support 8 年前
GitHub 6b8997e6 Merge pull request #46 from Unity-Technologies/Add-distortion/DepthOffset 8 年前
Evgenii Golubev 8bbe4289 Merge remote-tracking branch 'upstream/master' 8 年前
sebastienlagarde b890244e HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline 8 年前
GitHub 23f2ee44 Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop 8 年前
Felipe Lira 782077fb Merge branch 'master' into lowendmobile 8 年前
Julien Ignace 0f63e44e Merge branch 'master' into LayeredLit 8 年前
Arnaud Carre 66610d8f Merge remote-tracking branch 'origin/master' into batch_rendering 8 年前
Tim Cooper 2b3f2f91 [refactor namespace] 8 年前
GitHub 4925d00e Merge pull request #77 from Unity-Technologies/namespace-refactor 8 年前
Evgenii Golubev f38f5e1a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Julien Ignace c5bf4cfb Merge branch 'master' into LayeredLit 8 年前
Julien Ignace 7b7eb3b4 Fixed a number of compilation issue with PS4. 8 年前
GitHub a04d917d Merge pull request #92 from Unity-Technologies/Branch_fix-ps4-hdrenderloop 8 年前
Evgenii Golubev 74657c39 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
sebastienlagarde 886b32ec HDRenderPipeline: update unlit shader 8 年前
GitHub 7f00e9f5 Merge pull request #96 from Unity-Technologies/Changed-transparent-opaque-Unlit-pass 8 年前
Felipe Lira 05e84b23 Merge branch 'master' into lowendmobile 8 年前
Sebastien Lagarde 1cc45a08 HDRenderPipeline: Push various error and warning fix 8 年前
GitHub 531082c1 Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement 8 年前
Julien Ignace c83f3d4a Merge branch 'master' into Branch_fix-ps4-hdrenderloop 8 年前
Juho Oravainen 4320bff0 Initial metal support kickoff. Tweaked shader pragma targets from 5.0 to 4.5. Added metal to only_renderers lists. Added initial platform header API/Metal.hlsl. Couple of include paths changed to absolute until a bugfix lands on Unity side. 8 年前
GitHub 2ba6f819 Merge pull request #108 from Unity-Technologies/metal 8 年前
Sebastien Lagarde 6c05ce51 HDRenderPipeline: Fix compil issue + discrepencey forward deferred 8 年前
GitHub 2c21b8bb Merge pull request #111 from Unity-Technologies/Fix-Discrenpency-forward-deferred 8 年前
Evgenii Golubev 087242cd Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Evgenii Golubev 21be7561 Merge branch 'master' into SSSSS 8 年前
Tim Cooper d4271c8c Merge remote-tracking branch 'origin/master' into preview-cameras 8 年前
Tim Cooper 171302ee Merge branch 'preview-cameras' into refactor-hdloop 8 年前
Paul Demeulenaere 40290c81 Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph 8 年前
Julien Ignace 3fdb1fb7 Missing files 8 年前
Sebastien Lagarde 0ba2f558 HDRenderPipeline: Fix issue with cluster rendering - enable by default with tile for opaque 8 年前
GitHub 58e4eacd Merge pull request #120 from Unity-Technologies/Enable-Cluster-rendering 8 年前
Tim Cooper 8ff712ff Merge branch 'master' into refactor-hdloop 8 年前
Arnaud Carre 2cdff1ec Merge branch 'master' into batch_rendering 8 年前
Felipe Lira be52007a Merge branch 'master' into lowendmobile 8 年前
Evgenii Golubev ac23a82e Merge branch 'master' into SSSSS 8 年前
Evgenii Golubev 9fc5bc97 Fix typos 8 年前
Evgenii Golubev 0ca79425 Merge branch 'SSSSS' 8 年前
GitHub d00136e3 Merge pull request #128 from EvgeniiG/master 8 年前
Julien Ignace df95d960 Merge branch 'master' into Branch_DebugShadows 8 年前
sebastienlagarde b2595e70 Merge remote-tracking branch 'origin/master' 8 年前
sebastienlagarde 9cecdb2e Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior 8 年前
GitHub b702ac53 Merge pull request #129 from Unity-Technologies/Branch_DebugShadows 8 年前
sebastienlagarde 264abb2c Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior 8 年前
Julien Ignace fe794f54 - Fixed shadow map debug max slider value with the correct number of visible shadows 8 年前
Evgenii Golubev f43fbd7c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Julien Ignace aab6d427 - Fixed last directional cascade to not be fully shadowed. 8 年前
Julien Ignace 62fe15a4 Refactored current debug structures to be consistent with how Shadow Debug worked and correctly split Settings and Debug Parameters 8 年前
Antti Tapaninen 8c1ebfeb explicitly set _CameraDepthTexture precision 8 年前
GitHub e2f52112 Merge pull request #132 from Unity-Technologies/metal 8 年前
sebastienlagarde f3984098 Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior 8 年前
Julien Ignace 506c1212 Merge branch 'master' into Branch_DebugShadows 8 年前
GitHub 4a64529d Merge pull request #130 from Unity-Technologies/Branch_DebugShadows 8 年前
Julien Ignace 0da32ed1 Merge branch 'master' into Branch_DebugLighting 8 年前
runes 3b9f1e7d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Sebastien Lagarde 9db3e981 Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior 8 年前
Julien Ignace 60dd6c48 Implemented lighting debug in the shader. 8 年前
Evgenii Golubev 538bf3b2 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
GitHub c66d98c1 Merge pull request #135 from Unity-Technologies/Branch_DebugLighting 8 年前
Evgenii Golubev c962132e Properly capitalize "Full Screen" 8 年前
sebastienlagarde 64b996ea Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior 8 年前
Evgenii Golubev c13b75bb Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
sebastienlagarde 66d474dd Merge remote-tracking branch 'refs/remotes/origin/master' into Add-Blend-Mask-Tiling-param 8 年前
Chman 1d022582 Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp 8 年前
Arnaud Carré arnaud@unity3d.com ca6b7f62 Merge branch 'master' into batch_rendering 8 年前
Arnaud Carre 89d05b25 Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering 8 年前
Sebastien Lagarde a1e0f1e9 Rename scriptableRenderLoop Folder to ScriptableRenderPipeline 8 年前
GitHub f67aaaa4 Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder 8 年前
uygar c8a27740 Merge branch 'master' into shadows 8 年前
runes 2ce17b6c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Evgenii Golubev ff92221a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Felipe Lira 0905d0bc Merge branch 'master' into lowendmobile 8 年前
Julien Ignace 2a8e9ce0 Renamed all XXXParametrers class to XXXSettings for consistency. 8 年前
GitHub 207a9a78 Merge pull request #161 from Unity-Technologies/Branch_SceneSettings 8 年前
Evgenii Golubev 672495ee Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
uygar 77102a68 Merge branch 'master' into shadows 8 年前
Arnaud Carre 3c290788 Merge branch 'master' into batch_rendering 8 年前
runes cb7bce50 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Julien Ignace 6f47c87f Moved SSS settings to HDRenderPipeline asset (because it's an engine settings, not per scene). 8 年前
GitHub da56ca63 Merge pull request #169 from Unity-Technologies/Branch_SssSettings 8 年前
Julien Ignace 2b3c73fa Changed the way we handle reading into the bound depth buffer. 8 年前
Evgenii Golubev 9470df9a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
GitHub 5cb0e855 Merge pull request #173 from Unity-Technologies/Branch_CopyDepthTexture 8 年前
Julien Ignace d11b8e6e Added an option in Lighting debug to display the sky reflection probe cubemap. 8 年前
GitHub 1a16747f Merge pull request #176 from Unity-Technologies/Branch_DebugSkyReflection 8 年前
Julien Ignace 17a9cbd9 Added a lighting debug mode to visualize Cascaded shadow splits. 8 年前
GitHub 3b62a805 Merge pull request #180 from Unity-Technologies/Branch_DebugCascade 8 年前
Evgenii Golubev 664b2fb6 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
runes 84860a17 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Arnaud Carre b38bced1 Merge branch 'master' into batch_rendering 8 年前
runes c445e599 Explicit tile coordinates in GetPositionInput. 8 年前
Antti Tapaninen bfd69072 Merge branch 'master' into metal-ios 8 年前
Antti Tapaninen 2cce2981 Merge branch 'master' into metal 8 年前
sebastienlagarde ddd7d5d5 HDRenderPipeline: Change all include shader absolute path to relative path 8 年前
GitHub 86dbe5d8 Merge pull request #192 from Unity-Technologies/Update-To-relative-path 8 年前
Rune Stubbe e210fc3a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
runes 12d98082 fixed tile debugging dropdown 8 年前
sebastienlagarde 0628ecc1 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Antti Tapaninen 764e5269 Merge branch 'master' into metal-ios 8 年前
uygar cefe8b15 Merge branch 'master' into shadows 8 年前
Felipe Lira 557acdfd Merge branch 'master' into lowendmobile 8 年前
Antti Tapaninen 0574ef6b Merge branch 'master' into metal 8 年前
Tim Cooper c30d33b8 [Format]Reformat via format.pl to match the new conventions 8 年前
Antti Tapaninen a261aadf Merge branch 'master' into metal-ios 8 年前
Antti Tapaninen 06aa5d1c Merge branch 'master' into metal 8 年前
Evgenii Golubev 9d4c2988 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
Arnaud Carre 66e32153 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering 8 年前
runes 918c1797 Feature flags now also include material/gbuffer flags. 8 年前
Evgenii Golubev ed990060 Merge from upstream 8 年前
Antti Tapaninen 101239a7 Merge branch 'master' into metal-ios 8 年前
Julien Ignace 954a22ef Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ExportSky 8 年前
Antti Tapaninen c46cb0b5 Merge branch 'master' into metal 8 年前
vlad-andreev 3a5b105e Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
uygar 8db09493 Merge branch 'master' into shadows 8 年前
Filip Iliescu 6e428acc Merge branch 'metal' into classicDeferredMobile 8 年前
Julien Ignace 0682d57b - Implemented first debug menu items (bool and float) in the player 8 年前
Julien Ignace 54b035df First version of DebugItemDrawer 8 年前
Julien Ignace 0339b072 - Debug item can be added to a menu given by name (no need to create a new class anymore) 8 年前
Julien Ignace f2d353ad Added support for Enum Debug Items 8 年前
Julien Ignace ef9383f3 Added Color debug item (readonly at runtime for now) 8 年前
Julien Ignace fb1650c5 Added support for readonly and dynamically displayed debug items. 8 年前
sebastienlagarde ed55ce8f HDRenderPipeline: Clean debgu settings 8 年前
GitHub c53cba39 Merge pull request #229 from Unity-Technologies/Clean-debug-settings 8 年前
Sebastien Lagarde 4ec50247 HDRenderPipeline: Revert a small change about DebugViewMaterialGBuffer.shader 8 年前
Evgenii Golubev 42530415 Merge branch 'master' 8 年前
Sebastien Lagarde 3185a7c5 HDRenderPipeline: Replace TILE_SIZE MACRO by GetTileSize() 8 年前
Julien Ignace c31d6106 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu 8 年前
Julien Ignace 5708842d Fixed compilation after merge and small menu layout mistake. 8 年前
GitHub 96d89b41 Merge pull request #236 from Unity-Technologies/Branch_DebugMenu 8 年前
Arnaud Carre 833d6910 Merge remote-tracking branch 'refs/remotes/origin/master' into Branch_Batching2 8 年前
Julien Ignace 25092737 Simplified (hopefully) the way we display material and lighting debug modes. 8 年前
GitHub 05b08a59 Merge pull request #239 from Unity-Technologies/Branch_DebugMenu 8 年前
Sebastien Lagarde b27de01a Merge remote-tracking branch 'refs/remotes/origin/master' into Tetrahedron-encoding-for-normal 8 年前
Sebastien Lagarde 58f36f39 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows 8 年前
runes 3b96f39a Moved tiled lighting debug to separate function so that it also works for forward. 8 年前
Evgenii Golubev 6c224d47 Merge branch 'master' 8 年前
Sebastien Lagarde 8eeef7b8 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows 8 年前
Sebastien Lagarde 5769cd84 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows 8 年前
Tim Cooper 582adf08 Merge remote-tracking branch 'origin/master' into test-framework 8 年前
Filip Iliescu 3a226917 merged master 8 年前
Arnaud Carre f27d26c4 Merge branch 'master' into Branch_Batching2 8 年前
sebastienlagarde dc6d3e84 HDRenderPipeline: Re-enable shadow atlas visualization + some clean 8 年前
GitHub 72659709 Merge pull request #258 from Unity-Technologies/Update-shadow 8 年前
Sebastien Lagarde 89a7c17b Clenaup of folders, renaming and warning fix (see details in description) 8 年前
GitHub c185048e Merge pull request #259 from Unity-Technologies/Shadow-debug-and-cleanup 8 年前
Filip Iliescu 8eef028b merged master 8 年前
Julien Ignace 20413141 First version of debug menu serialization and undo/redo 8 年前
Julien Ignace 6fd2dc66 Renamed debug menu classes for consistency 8 年前
Julien Ignace c25417c7 Created an override for the Lighting debug panel. 8 年前
GitHub d3bd8f2f Merge pull request #272 from Unity-Technologies/Branch_DebugMenu2 8 年前
sebastienlagarde 77b7d74b Merge remote-tracking branch 'refs/remotes/origin/master' into Remove-lightloop-asset 8 年前
sebastienlagarde b088bb9a HDRenderPipeline: Moive all shaders/compute into resources asset 8 年前
GitHub 9ba974dc Merge pull request #274 from Unity-Technologies/Remove-Resources-folder 8 年前
Sebastien Lagarde dee59c09 Merge branch 'master' into ssao-test 8 年前
Sebastien Lagarde 36142eb8 HDRenderPipeline: Update SSAO effect 8 年前
Arnaud Carre df0c1521 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2 8 年前
GitHub 55be83e9 Merge pull request #275 from Unity-Technologies/ssao-test 8 年前
Filip Iliescu dda281fd Merge branch 'master' into classicDeferredMobile 8 年前
David Rogers 85744e59 Local merge 8 年前
David Rogers 36baac01 Revert "Local merge" 8 年前
Sebastien Lagarde bc69fad2 HDRenderPipeline: Change material framework 8 年前
Sebastien Lagarde 53adf662 HDRenderPipeline: Small fix on the debug material generated path 8 年前
Sebastien Lagarde 0c9cfa60 HDRenderPipeline: Fix small issue with Assert trigger when it shouldn't 8 年前
Sebastien Lagarde d06af446 HDrenderPipeline: Update stencil bits 8 年前
Filip Iliescu 9c290707 merge changes from remote to local branch 8 年前
GitHub 1b926dca Merge pull request #286 from Unity-Technologies/Update-material-framework 8 年前
Julien Ignace 6b2abb76 - Updated FrameRate/Time debug view with using SmoothDT 8 年前
Julien Ignace 278154db Added FullScreenDebug modes and implemented it for SSAO. 8 年前
Evgenii Golubev 70499455 Switch to HDCamera matrices (WIP, shadows have not yet been fixed) 8 年前
Julien Ignace 205fb8de Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2 8 年前
GitHub 79b5e7b2 Merge pull request #288 from Unity-Technologies/Branch_DebugMenu2 8 年前
Julien Ignace 560cef2c Missing files 8 年前
Julien Ignace 8db13baa Refactored shadow map debug views. Now ShadowMap implementation is responsible for display. 8 年前
GitHub 112869b3 Merge pull request #289 from Unity-Technologies/Branch_DebugMenu2 8 年前
Julien Ignace e20b9e23 Removed Material from Shadow Debug API (it's now held by the shadow system) 8 年前
Julien Ignace 70b0ab1e User can now display shadow map of the currently selected light. 8 年前
GitHub fb10c3b0 Merge pull request #292 from Unity-Technologies/Branch_DebugMenu2 8 年前
Rune Stubbe 8b51c69a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 8 年前
uygar 0cf2dd7b Added min/max values to the shadowmap debug drawer to control the output value range. Also added controls for the new values to the lightingdebug panel. 8 年前
Evgenii Golubev 63a49ce7 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into upstream 8 年前
Arnaud Carre d070d1b8 Merge branch 'master' into Branch_Batching2 8 年前
Evgenii Golubev 0a7924ff Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix 8 年前
Filip Iliescu 74f56073 create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere 8 年前
GitHub 1fb45557 Merge pull request #318 from EvgeniiG/hdrp_matrix 8 年前
Filip Iliescu cd024be6 Merge branch 'master' into OnTileDeferred 8 年前
Arnaud Carre b7e36e2f Merge branch 'master' into Branch_Batching2 8 年前
sebastienlagarde 78c4dd18 HDRenderPipeline: Fix tile debug mode for light 7 年前
sebastienlagarde adeee295 Clean and comment some code 7 年前
GitHub fbef3912 Merge pull request #338 from Unity-Technologies/Update-material-classification 7 年前
Thomas Hourdel fbdc6add Merge branch 'master' into taa 7 年前
Evgenii Golubev 62076a23 Merge branch 'master' 7 年前
sebastienlagarde 0baf8247 Add debug view mode to know which objects have tessellation 7 年前
sebastienlagarde 6b6d2b53 Add view mode properties for lightmap, depth offset and per pixel displacement 7 年前
GitHub af12bde1 Merge pull request #341 from Unity-Technologies/Add-tessellatoin-debug-mode 7 年前
Julien Ignace 292b0868 Moved tile debug modes into debug settings (and debug menu). 7 年前
Thomas Hourdel a512c881 Added a fullscreen debug view for motion vectors 7 年前
GitHub 06c76f2d Merge pull request #343 from Unity-Technologies/Branch_TileDebugInMenu 7 年前
Thomas Hourdel c4976158 Added a NaN/Inf tracker to the debug modes 7 年前
GitHub fc525a52 Merge pull request #344 from Unity-Technologies/movecs-debugview 7 年前
GitHub a5a09659 Merge pull request #345 from Unity-Technologies/nan-debugviews 7 年前
Filip Iliescu 4adbf45e Merge branch 'master' into OnTileDeferred 7 年前
Filip Iliescu 23202e49 merge in OnTileDeferredBranch after merging in master to it 7 年前
Arnaud Carre 4fcf88bb Merge branch 'master' into Branch_Batching2 7 年前
sebastienlagarde 5ba18d3a Add variant for material classification + clean split lighting evaluation 7 年前
GitHub 7fd91c5d Merge pull request #347 from Unity-Technologies/Cleaning-SplitEvaluation-+-classification 7 年前
Arnaud Carre 924bf6c0 Merge branch 'master' into Branch_Batching2 7 年前
sebastienlagarde 2016f575 HDRenderPipeline: Move ShaderConfig.cs.hlsl to ShaderVariables.hlsl 7 年前
Evgenii Golubev a04a82ab Merge branch 'master' 7 年前
Julien Ignace 5a6b2e9c Various fix for debug modes: 7 年前
GitHub 3e56725a Update DebugViewMaterialGBuffer.shader 7 年前
GitHub 3997328c Merge pull request #357 from Unity-Technologies/Branch_DebugViewFixes 7 年前
Arnaud Carre ad0fb3d8 Merge branch 'master' into Branch_Batching2 7 年前
Filip Iliescu 28a25cc0 merged master 7 年前
Julien Ignace f9fe42af Split FullScreenDebugMode in the debug menu between Lighting and Rendering panels 7 年前
GitHub b72cd5a6 Merge pull request #376 from Unity-Technologies/Branch_SplitFullScreenDebug 7 年前
Evgenii Golubev 5bf0af64 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 7 年前
Felipe Lira 7d62ca8f Merge branch 'master' into LightweightPipeline 7 年前
Peter Bay Bastian a1133cd9 Update #includes of ShaderLibrary to new path 7 年前
GitHub 05ffcc95 Merge pull request #379 from Unity-Technologies/restructuring 7 年前
Felipe Lira 024a70fc Merged master. 7 年前
Tim Cooper e0e3492b Merge remote-tracking branch 'origin/master' into sample_game 7 年前
Peter Bay Bastian a4ea9ff8 Merge branch 'master' into prepare-filtering 7 年前
Julien Ignace d4b9dd15 Split directional shadow resolution in a different pass to reduce VGPR pressure during tile lighting. 7 年前
GitHub 02239cb4 Merge pull request #398 from Unity-Technologies/Branch_DeferredDirShadow 7 年前
Peter Andreasen 69c448b2 Merge remote-tracking branch 'origin/master' into sample_game 7 年前
Felipe Lira e56800ee Merge branch 'master' into LightweightPipeline 7 年前
sebastienlagarde 5d0125b2 HDRenderPipeline: Rename diplacement to vertex displacement and add a per pixel dispalcement scale (not done) 7 年前
GitHub 4d5e7be6 Merge pull request #433 from Unity-Technologies/Add-support-of-vertex-displacement 7 年前
GitHub c540af87 Merge pull request #434 from Unity-Technologies/Unity-2017.3 7 年前
Julien Ignace 674d0efe Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling 7 年前
sebastienlagarde 5a6d78c4 Update project from sratch 7 年前
sebastienlagarde cd5fd6d3 merge latest 2017.3 7 年前
Thomas 2cdd3c12 Moved most of HDRP utilities to Core 7 年前
GitHub bbaee114 Merge pull request #440 from Unity-Technologies/refactor-episode-1 7 年前
Sebastien Lagarde 78609ffc Merge branch 'Unity-2017.3' into YibingProject 7 年前
GitHub 1137cfb3 Merge pull request #441 from Unity-Technologies/Unity-2017.3 7 年前
Frédéric Vauchelles 90b2eb1e Added refraction, roughness refraction and transparency absorption 7 年前
sebastienlagarde df6297b3 Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale 7 年前
GitHub 58da4099 Merge pull request #442 from Unity-Technologies/feature/transparency 7 年前
Thomas ed806be2 Merge branch 'Unity-2017.3' into refactor-episode-2 7 年前
GitHub ae958d8a Merge pull request #445 from Unity-Technologies/Unity-2017.3 7 年前
sebastienlagarde 5e3b6e01 Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale 7 年前
Evgenii Golubev e86a361e Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3 7 年前
Thomas 076b0d65 Cleaned up unused usings 7 年前
Evgenii Golubev e2fd5eac Update the render state of full screen passes 7 年前
GitHub 034c6675 Merge pull request #446 from EvgeniiG/Unity-2017.3 7 年前
Thomas 9fc4d697 Merge branch 'Unity-2017.3' into refactor-episode-2 7 年前
GitHub 89072748 Merge pull request #449 from Unity-Technologies/refactor-episode-2 7 年前
sebastienlagarde 71713559 Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3 7 年前
GitHub f49bc2d1 Merge pull request #450 from Unity-Technologies/Unity-2017.3 7 年前
Peter Andreasen 2ef7d649 merged with master 7 年前
Thomas 9582c28d Moved back GetRenderPipelineMaterialList to HDUtils as it's HDRP specific 7 年前
GitHub 720185a2 Merge pull request #451 from Unity-Technologies/refactor-episode-3 7 年前
sebastienlagarde 0e87ca3f Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Distortion-cleanup-and-transparent-depth-pass 7 年前
Sebastien Lagarde f62941c5 Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale 7 年前
Evgenii Golubev 8d403196 Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop 7 年前
Evgenii Golubev ea93b8f4 Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop 7 年前
sebastienlagarde 551e98f0 Refactor the UI to have vertex, pixel and tessellation displacement 7 年前
Felipe Lira 5f970d63 Merge branch 'Unity-2017.3' into LightweightPipeline 7 年前
Julien Ignace 664681f9 Renaming and small fixes for Debug Window framework. 7 年前
GitHub e352f7e8 Merge pull request #459 from Unity-Technologies/Branch_DebugMenuSmallFixes 7 年前
sebastienlagarde 956f0a26 Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale 7 年前
Julien Ignace 6b716493 Added global fog toggle. 7 年前
sebastienlagarde b466af28 Merge remote-tracking branch 'refs/remotes/origin/Add-Per-Pixel-scale' into Add-Per-Pixel-Scale-Seb 7 年前
sebastienlagarde 3ccbb95a Merge remote-tracking branch 'refs/remotes/origin/Add-Per-Pixel-scale' into Add-Per-Pixel-Scale-Seb-Pixel-displacement 7 年前
GitHub 2002ee68 Merge pull request #466 from Unity-Technologies/Add-Per-Pixel-scale 7 年前
Evgenii Golubev 86fe9ae4 Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3 7 年前
GitHub 6213cc0b Merge pull request #470 from Unity-Technologies/Unity-2017.3 7 年前
Felipe Lira cdc50657 Merge branch 'Unity-2017.3' into LightweightPipeline 7 年前
Peter Andreasen e2332032 Merge remote-tracking branch 'origin/master' into sample_game 7 年前
Sebastien Lagarde 9f87b816 Remove file path header from shader generator generated files as it depends on users folder and cause conflict 7 年前
Sebastien Lagarde 913bffab Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Change-SSS-profile-to-16 7 年前
Sebastien Lagarde 87019308 Remove old SSAO code 7 年前
Sebastien Lagarde a0915eb9 Move ambient occlusion code from LightingLoopContext to lit.hlsl 7 年前
GitHub 105fa740 Merge pull request #494 from Unity-Technologies/Update-SSAO 7 年前
Frédéric Vauchelles bb7f87de Added debug display for pyramids 7 年前
Frédéric Vauchelles 1e32285e Renamed PreTransparent to PreRefraction 7 年前
Frédéric Vauchelles 8e549215 Updated tonemapping for depth pyramid debug 7 年前
Frédéric Vauchelles 9c88dfd3 Updated keywords of materials 7 年前
GitHub 4d41fcaa Merge pull request #496 from Unity-Technologies/feature/transparentPrepass 7 年前
sebastienlagarde 522098e8 Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3 7 年前
Julien Ignace 1e8876bf Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky 7 年前
GitHub 6ef6a1b3 Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky 7 年前
GitHub 2df3e46a Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending 7 年前
Evgenii Golubev 733171ce Merge branch 'Unity-2017.3' 7 年前
GitHub bd071d2c Merge pull request #515 from Unity-Technologies/Unity-2017.3 7 年前
Robert Srinivasiah 7998bfa7 Merge remote-tracking branch 'origin/master' into xr-hdrp 7 年前
Felipe Lira 6ddf3f73 Merge branch 'Unity-2017.3' into LightweightPipeline 7 年前
Mikko Strandborg a2a3c47b Add vulkan to the list of only_renderers in all the shaders 7 年前
GitHub 18d42f5f Merge pull request #524 from Unity-Technologies/vulkan 7 年前
sebastienlagarde bcd7b928 HDRenderPipeline: Add debug mode for SSAO/GTAO 7 年前
Remy cffd854a Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests 7 年前
Sebastien Lagarde a4fddf9c Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject 7 年前
GitHub 06f28ec2 Merge pull request #538 from Unity-Technologies/Unity-2017.3 7 年前
Sebastien Lagarde 36f3cfd4 merge unity 2017.3 7 年前
Sebastien Lagarde 69f19bc0 HDRenderPipeline: Add support of shadow mask (Disabled in 2017.3) - require C++ change 7 年前
sebastienlagarde df9f236e HDRendeRPipeline: Use Last member for enum 7 年前
GitHub 59ecf389 Merge pull request #563 from Unity-Technologies/prepare-code-for-shadowmask 7 年前
Evgenii Golubev 6e30e2d6 Merge branch 'Unity-2017.3' 7 年前
GitHub aeb0b914 Merge pull request #565 from Unity-Technologies/Unity-2017.3 7 年前
Salvador Jacobi 4bd00346 Merge branch 'master' into organize-menu-items 7 年前
Julien Ignace 11c1d9a8 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap 7 年前
Evgenii Golubev 6374ac14 Remove the redundant +1 7 年前
Evgenii Golubev b452c309 Merge branch 'Unity-2017.3' 7 年前
Julien Ignace 220e0aff Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3 7 年前
GitHub 9ef5873f Merge pull request #571 from Unity-Technologies/Unity-2017.3 7 年前
Evgenii Golubev 6cea0d27 Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3 7 年前
Peter Andreasen f052451a merged from master 7 年前
Felipe Lira e4ffdd2d Merge branch 'Unity-2017.3' into LightweightPipeline 7 年前
Evgenii Golubev d1c74bcb Merge branch 'master' 7 年前
Julien Ignace 0a60dd2a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap 7 年前
Paul Melamed d31d3ab4 Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals 7 年前
Evgenii Golubev 13210372 Use macros instead of directly referencing matrix variables 7 年前
GitHub e4a9c3c8 Merge pull request #587 from EvgeniiG/master 7 年前
Evgenii Golubev a3165a72 Merge branch 'master' 7 年前
Sebastien Lagarde 0765c21b Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Peter Andreasen 5d36f104 Merged master 7 年前
Peter Bay Bastian 9dd5e5c5 Change shader include paths to take advantage of Core being an include path now 7 年前
Sebastien Lagarde 2b182986 HDRenderPipeline: Update tile/cluster debug menu 7 年前
Sebastien Lagarde a1452574 Move RenderLightingDebug to RenderDebugOverlay 7 年前
GitHub 894dac3c Merge pull request #591 from Unity-Technologies/Remove-clustered-opaque-option 7 年前
sebastienlagarde 43c10ade HDRenderPipeline: Added screen position parameter to GBuffer function 7 年前
GitHub 4f47fa6e Merge pull request #592 from Unity-Technologies/Add-screen-position-parameter-to-gbuffer-functions 7 年前
Peter Andreasen 1432e316 Merge remote-tracking branch 'origin/master' into sample_game 7 年前
Evgenii Golubev 7b797ff7 Merge branch 'master' 7 年前
Peter Bay Bastian 85e38a3c Merge branch 'master' into shader-include-paths-2 7 年前
Antti Tapaninen f53de9f7 unify only_renderers list, fix typos 7 年前
GitHub 8e4b370d Merge pull request #596 from Unity-Technologies/metal 7 年前
Sebastien Lagarde 407e1d7d Merge remote-tracking branch 'refs/remotes/origin/master' into Implement-depth-post-pass 7 年前
Evgenii Golubev e84fe4b6 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Evgenii Golubev 6f8ec8c3 Global rename: 'depthRaw' -> 'deviceDepth', 'depthVS -> linearDepth' 7 年前
Evgenii Golubev 87e85612 Refactor math constant defines 7 年前
Peter Bay Bastian b7db3ef9 Merge branch 'shader-include-paths-2' 7 年前
GitHub d6a58e9c Merge pull request #594 from EvgeniiG/master 7 年前
GitHub 1ba061ab Revert " Reduce the number of dependent texture reads for SSS" 7 年前
GitHub bcdbf637 Merge pull request #606 from Unity-Technologies/revert-594-master 7 年前
GitHub 39cb603c Revert "Revert " Reduce the number of dependent texture reads for SSS"" 7 年前
GitHub b529a548 Merge pull request #607 from Unity-Technologies/revert-606-revert-594-master 7 年前
Frédéric Vauchelles fe773302 Merge master 7 年前
Remy 39c80121 Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests 7 年前
Julien Ignace 1308feb1 Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap 7 年前
Evgenii Golubev 0ed1b80b Global rename 7 年前
Julien Ignace 2b609ae4 - Split Debug classes in separate files 7 年前
GitHub bd823915 Merge pull request #616 from EvgeniiG/master 7 年前
Remy c22205d7 Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests 7 年前
Evgenii Golubev 8ee2d44f Merge 'master' 7 年前
Robert Srinivasiah d71a9b3a Debug option to disable stereo paths 7 年前
Julien Ignace 5a107310 Renamed TilePass to LightLoop 7 年前
Robert Srinivasiah 450bb70b Fix mismatched option name and debug menu item 7 年前
GitHub 1e9184b9 Merge pull request #621 from Unity-Technologies/feature/realtimeCubemap 7 年前
Julien Ignace 92a18712 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameTilePass 7 年前
Julien Ignace d50d5989 Post merge fix 7 年前
GitHub d45213dd Merge pull request #624 from Unity-Technologies/Branch_RenameTilePass 7 年前
Sebastien Lagarde d6a7fcd6 HDRenderPipeline; Clean include of Color.hlsl 7 年前
Sebastien Lagarde e5ebb9cb Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS 7 年前
Evgenii Golubev 228fd56b Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Julien Ignace ec66382f - Moved GGX Convolution related files to Material/GGXConvolution 7 年前
GitHub 01f3693c Merge pull request #630 from Unity-Technologies/Branch_MoveGGXConvolution 7 年前
Evgenii Golubev 18cc40b5 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
sebastienlagarde b0813df9 Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS 7 年前
Remy 5b6ad5e8 Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests 7 年前
Frédéric Vauchelles 6541de0b Merge master 7 年前
Peter Andreasen b6423cf9 merge 7 年前
runes da8acc5e Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 7 年前
Robert Srinivasiah ea2646a5 Merge remote-tracking branch 'origin/master' into xr-hdrp_options 7 年前
Felipe Lira e45df6b6 Merge branch 'master' into LightweightPipeline 7 年前
Robert Srinivasiah 55125293 FIx up after merge 7 年前
GitHub f3a217df Merge pull request #635 from Unity-Technologies/xr-hdrp_options 7 年前
sebastienlagarde f142c657 Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS 7 年前
Julien Ignace 256c35aa Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume 7 年前
Paul Melamed 68425c93 Merge branch 'master' into prototype/decals 7 年前
sebastienlagarde 0feb39a6 HDRenderPipeline: Add xboxone support 7 年前
Felipe Lira 711a16fb Merge branch 'master' into LightweightPipeline 7 年前
GitHub 4b15e9fc Merge pull request #651 from Unity-Technologies/add-xbone-one-support 7 年前
Evgenii Golubev 81d62eb8 Merge branch 'master' 7 年前
sebastienlagarde 04b2dec6 Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals 7 年前
Julien Ignace 1ce75e59 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume 7 年前
Raymond Graham 1118c956 Merge branch 'master' into motionVectorSupport 7 年前
Arnaud Carre efa76805 added some required "using UnityEngine.Rendering" (now SRP API is not in Experimental namespace anymore) 7 年前
Evgenii Golubev 4cd2d228 Replace all sampler macros with SAMPLER 7 年前
GitHub f080e1c3 Merge pull request #672 from EvgeniiG/master 7 年前
Remy 79cf2e14 Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests 7 年前
Evgenii Golubev c16681df Merge branch 'master' 7 年前
Sebastien Lagarde 1240cc88 Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code 7 年前
Frédéric Vauchelles fb318542 (wip) reflection probe editor 7 年前
sebastienlagarde a8480a83 First draft 7 年前
GitHub 10e23187 Merge branch 'master' into volume-improvements 7 年前
Sebastien Lagarde b8b6dd9b Push second draft 7 年前
sebastienlagarde 1dc58532 Add global/local/debug system (Working version) 7 年前
sebastienlagarde cf6142d2 Another no compiling draft 7 年前
sebastienlagarde db2bdfc0 More dfraft 7 年前
Julien Ignace 71f453af Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume 7 年前
Felipe Lira ddeb54b6 Merge branch 'master' into LightweightPipeline 7 年前
Sebastien Lagarde 9bf2a15f Add a static function to register framesettings to debug windows 7 年前
GitHub 77ea5426 Merge pull request #688 from Unity-Technologies/Refactor-frameSettings 7 年前
Sebastien Lagarde 5f2183f6 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/ReflectionProbeEditor 7 年前
Julien Ignace c02d593d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume 7 年前
Frédéric Vauchelles 156f44e6 [ReflectionProbeEditor] Moved resources 7 年前
Evgenii Golubev 78563feb Merge branch 'master' 7 年前
GitHub 05de367f Merge pull request #686 from Unity-Technologies/feature/ReflectionProbeEditor 7 年前
Julien Ignace ff4605c7 Fixed Lighting Debug panel (issue caused by split of core/hdrp in different assemblies) 7 年前
GitHub 89e5441b Merge pull request #697 from Unity-Technologies/Branch_FixDebugMenu 7 年前
Frédéric Vauchelles ac97e406 Merge branch 'master' into feature/ReflectionProbeEditor 7 年前
GitHub 7bfbe6b8 Merge pull request #700 from Unity-Technologies/feature/ReflectionProbeEditor 7 年前
runes 364ad2cc Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop 7 年前
Paul Melamed db6f48d8 Merge branch 'master' into prototype/decals 7 年前
Evgenii Golubev 2e30e761 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics 7 年前
Peter Andreasen 87c36d52 merged with master 7 年前
Julien Ignace 65bd8e1d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride 7 年前
sebastienlagarde 4b26e012 Move all core file to subfolder CoreRP + update shader include path to CoreRP/ShaderLibrary 7 年前
GitHub 3be07b99 Merge pull request #710 from Unity-Technologies/Move-Core-to-CoreRP 7 年前
lyndon homewood 430ca284 Added mip debugging support 7 年前
Julien Ignace 713d15c0 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride 7 年前
lyndon homewood 595016ea Moved MipMap Debug rendering to its own mode. 7 年前
sebastienlagarde 15efd9d7 Merge branch 'master' into Convert-shaderLibrary-to-half-float-support 7 年前
Frédéric Vauchelles e239e312 Merge branch 'master' into feature/ReflectionProbeEditor 7 年前
Robert Srinivasiah 0c9c55a9 Merge in master, with lots of fixups 7 年前
Remy ca0020dd Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests 7 年前
Paul Melamed 8efbc8a6 Merge branch 'master' into prototype/decals_no_height 7 年前
Felipe Lira c6543428 Merge branch 'master' into LightweightPipeline 7 年前
Mike Wuetherick 767eac9b Merge branch 'LightweightPipeline' into projects/TheLastStand 7 年前
lyndon homewood 064d57c1 Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug 7 年前
lyndon homewood 497b961d Removed feature requiring c++ support 7 年前
Evgenii Golubev c86b3214 Merge branch 'master' 7 年前
Evgenii Golubev 8a70dc3b Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
sebastienlagarde 1b720002 HDRenderPipeline: Fix issue with debug menu and graphic test 7 年前
Frédéric Vauchelles 790cee43 Merge branch 'master' into feature/PlanarReflection 7 年前
Sebastien Lagarde f97342c5 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug 7 年前
lyndon homewood ef4b0aa9 Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug 7 年前
Julien Ignace 43f6d6eb Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization 7 年前
GitHub ed6465fd Merge pull request #749 from Unity-Technologies/feature/mip-debug 7 年前
Raymond Graham d1c64b56 Merge branch 'master' into gpuInstancingSupport 7 年前
Julien Ignace 4919b7ad Merge branch 'master' into Branch_ScreenSpaceShadows 7 年前
Kay Chang 42c358c5 Added Switch support for SRP sample project. 7 年前
Evgenii Golubev 77f9f167 Merge branch 'master' 7 年前
Peter Andreasen 3ccf74cc merged from master 7 年前
Remy 3b815534 Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools 7 年前
GitHub 273faca1 Merge pull request #795 from Unity-Technologies/gpuInstancingSupport 7 年前
Sebastien Lagarde 1ebf9456 Merge remote-tracking branch 'refs/remotes/origin/master' into FixFix_TestFrameworkTools 7 年前
Sebastien Lagarde a79042e5 Merge branch 'master' into pr/798 7 年前
GitHub 9d3b9c14 Merge pull request #801 from Unity-Technologies/pr/798 7 年前
Remy 2289f880 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
sebastienlagarde d1c884e4 Add Lux meter debug mode 7 年前
sebastienlagarde a0d8e8b4 Add support of debug font for debugging 7 年前
Evgenii Golubev 7d2031ec Merge branch 'master' 7 年前
Paul Melamed 6deb71dc Merge branch 'master' into prototype/decals_drawinstance 7 年前
Frédéric Vauchelles 86df6636 Merge master 7 年前
Julien Ignace 4172199d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows 7 年前
Arnaud Carre 074f76bb Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher 7 年前
Sebastien Lagarde 2549f4ea Update font debug code, support char, int and float 7 年前
Sebastien Lagarde 8820a5f9 Update LuxMeter debugview 7 年前
sebastienlagarde 6c8462a0 Refactor all the code of colorpicking to make a more general version 7 年前
GitHub 4b7581e9 Merge pull request #811 from Unity-Technologies/Add-physical-Light-unit-2 7 年前
sebastienlagarde 3bf6049c HDRenderPipeline: push small improvement to color Picker debug mode 7 年前
GitHub 5bf4aa76 Merge pull request #812 from Unity-Technologies/small-improvement-to-color-picker-debug-mode 7 年前
Sebastien Lagarde 128f5158 Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2 7 年前
Remy afb74a48 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Paul Melamed c5fce3e3 Merge branch 'master' into prototype/decals_premult_alpha 7 年前
Frédéric Vauchelles ca10cd2f Merge 7 年前
sebastienlagarde 64b952d8 Add sRGB support for color picker debug 7 年前
GitHub 803b9604 Merge pull request #829 from Unity-Technologies/Add-sRGB-support-for-color-picker-debug 7 年前
Felipe Lira c51ce48c Merged master 7 年前
Frédéric Vauchelles 5f6876d6 Merge branch 'master' into feature/PlanarReflection 7 年前
John dea94b9d Merge branch 'master' into LW-ScreenSpaceShadows 7 年前
Paul Melamed 15162b54 Merge branch 'master' into prototype/decals_premult_alpha 7 年前
Sebastien Lagarde 7c20e2e8 Add instancing property view mode 7 年前
GitHub 829ff2f1 Merge pull request #838 from Unity-Technologies/Add-instancing-property-view-mode 7 年前
Sebastien Lagarde 90e761b6 HDRenderPipeline: Fix misc compiler warning 7 年前
Sebastien Lagarde b32a2d17 Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests 7 年前
Evgenii Golubev 75799cbf Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline 7 年前
Remy c3c7eec1 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Sebastien Lagarde a5003db5 Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection 7 年前
Frédéric Vauchelles df67690c [PlanarRelfection] Fixed projection for plaanr reflection, added debug mode for proxy volumes 7 年前
sebastienlagarde 1d94ca60 Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow 7 年前
John cf25c602 Merge master 7 年前
sebastienlagarde 174630e7 Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2 7 年前
sebastienlagarde 9269e0af First draft 7 年前
uygar 81cb95dc Merge branch 'master' into shadows-biasing 7 年前
sebastienlagarde 5fadfa91 minor change 7 年前
sebastienlagarde 25cb23c4 Fix various issue, remove previous code 7 年前
sebastienlagarde 114acd41 Fix color picker in game 7 年前
GitHub 39528822 Merge pull request #859 from Unity-Technologies/Fix-flip-issue 7 年前
John ba0245c3 Merge branch 'master' into LW-ScreenSpaceShadows 7 年前
Remy 6d165864 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
sebastienlagarde c6524756 HDRenderPipeline: Update NaN check visual 7 年前
sebastienlagarde f80ece87 Fix NaN checker pass that can't work with intrinsic isnan (as it require /Gic) 7 年前
Frédéric Vauchelles d6743fba Merge branch 'master' into feature/PlanarReflection 7 年前
John 3023e8c8 Merge Screen Space Shadows 7 年前
Peter Andreasen 8b8ef607 Merge remote-tracking branch 'origin/master' into sample_game 7 年前
Remy d731c271 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
sebastienlagarde 7c8c80ac HDRenderPipeline: Add NaN support in DrawFloat dbug function 7 年前
Remy d9f6c7dd Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
sebastienlagarde ad00b16a Merged GetPositionInput and UpdatePositionInput into one set of GetPositionInput overloads. 7 年前
Julien Ignace 19029ddd Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring 7 年前
Frédéric Vauchelles f7bd8fd7 Merge branch 'master' into feature/PlanarReflection 7 年前
sebastienlagarde 8677e68d Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID 7 年前
Julien Ignace 39692887 - Fixed Gaussian/Depth pyramid rendering and debug 7 年前
Frédéric Vauchelles 0cf502ba Merge branch 'master' into feature/PlanarReflection 7 年前
GitHub 84e022c3 Merge pull request #834 from Unity-Technologies/feature/PlanarReflection 7 年前
sebastienlagarde 2bae089c Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing 7 年前
Evgenii Golubev 7e4a3052 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
GitHub fe0284c8 Merge branch 'master' into HDRP_GraphicTests 7 年前
sebastienlagarde 6feb2d00 Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID 7 年前
Paul Melamed 19876ed2 Merge branch 'master' into prototype/decals_gpu_optimization 7 年前
sebastienlagarde c3198024 Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa 7 年前
Frédéric Vauchelles 42e300fe [PlanarProbe] Provide full size array of available VP matrices to shaders 7 年前
GitHub 9f95e73a Merge pull request #880 from Unity-Technologies/feature/ReflectionRefraction 7 年前
Frédéric Vauchelles eba4a6c3 [PyramidBuffer] use screen size for depth pyramid 7 年前
sebastienlagarde 69ae5cb4 Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID 7 年前
sebastienlagarde a4930170 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing 7 年前
Frédéric Vauchelles 08ea5f15 [ColorPyramid] Added debug mips for color pyramid 7 年前
Frédéric Vauchelles f84484dc [ScreenSpaceProjection] added debug modes 7 年前
Paul Melamed 3441b497 Merge branch 'master' into prototype/decals_gpu_optimization 7 年前
Remy 2136ed15 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Tim Cooper 803d7f40 Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction 7 年前
John 89a55fab Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows 7 年前
sebastienlagarde 9afa4d41 First draft 7 年前
Sebastien Lagarde c24ba107 Few adjustement 7 年前
John 0bfdddfc Merge Screen Shadows 7 年前
GitHub cf19b804 Merge pull request #887 from Unity-Technologies/Add-global-override-of-properties-for-debug 7 年前
Remy 3d76f69e Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Julien Ignace 950b560d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring 7 年前
Julien Ignace fa58b33b Fixed some of the remaining problematic full screen passes (shadow and debug) 7 年前
sebastienlagarde 83b753ad Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2 7 年前
sebastienlagarde 4a7e93dd HDRenderPipeline: Small NaN correction (naming and test) 7 年前
sebastienlagarde bca8be27 HDRenderPipeline: NaN correction - missing file 7 年前
GitHub 9f5cddad Merge pull request #892 from Unity-Technologies/feature/ReflectionRefraction 7 年前
sebastienlagarde aea87dab HDRenderPipeline: Fix display of debug pyramid 7 年前
GitHub 7d777161 Merge pull request #894 from Unity-Technologies/Fix-display-of-depth-pyramid 7 年前
sebastienlagarde 5498f33f Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Frédéric Vauchelles 672c909b Merge branch 'master' into feature/ScreenSpaceProjection 7 年前
Frédéric Vauchelles 56d74148 (wip) added debug for screen space tracing 7 年前
Remy aa273d7e Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Frédéric Vauchelles 8a772b86 [ScreenSpaceTracing] fixed dirVS, added debugs 7 年前
sebastienlagarde 18cd3660 Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label 7 年前
Sebastien Lagarde eca15a2d Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance- 7 年前
sebastienlagarde bdc460b0 fix signed/unsigned warning 7 年前
sebastienlagarde 360cf23b Remove potentially unitialized variable message 7 年前
GitHub 1bdc9335 Merge pull request #899 from Unity-Technologies/Suppress-various-hlsl-warning 7 年前
sebastienlagarde b8604365 Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance- 7 年前
Remy dd1d4224 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Julien Ignace 85039c4d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring 7 年前
Julien Ignace a4625b1c Fixed Depth/Color pyramid after last merge 7 年前
Julien Ignace b7720c36 Fixed an issue with debug menu item for Pyramid mips and another one with planar reflection render texture initialization. 7 年前
Alex Lian 950e29d3 Merge remote-tracking branch 'origin/master' into build/automation 7 年前
sebastienlagarde 046a77ef Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing 7 年前
GitHub a6688080 Merge pull request #878 from Unity-Technologies/Branch_RTRefactoring 7 年前
Frédéric Vauchelles 78ba9e5b Merge master 7 年前
Frédéric Vauchelles 17eb7e3c [ScreenSpaceTracing] (wip) step by step debugging 7 年前
Frédéric Vauchelles 210bb00c (wip) screen space tracing debug 7 年前
sebastienlagarde 9801577c Change code generation to allow multiple debug case for the same field. allow debug view normal 7 年前
Frédéric Vauchelles 177273e3 (wip) screen space tracing debug - using a RT instead of a StructuredBuffer for UAV target in pixel shader 7 年前
GitHub 2d823db6 Merge pull request #914 from Unity-Technologies/Add-normal-in-view-space-debug-mode 7 年前
sebastienlagarde b1b2e631 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing 7 年前
Julien Ignace ffbd199e - Fixed objects motion vectors (they were upside down) 7 年前
Julien Ignace ed3443be Revert "- Fixed objects motion vectors (they were upside down)" 7 年前
Julien Ignace 43ed7b97 - Fixed objects motion vectors (they were upside down) 7 年前
Julien Ignace 9d44213c - Fixed Sky Reflection bad behavior when having no light in the scene and a preview (the main scene view would keep the preview scene directional) 7 年前
Julien Ignace d04d893b Fix object motions vectors and a few warnings. 7 年前
Sebastien Lagarde e2c88f24 update code 7 年前
GitHub 40d29e93 Merge pull request #925 from Unity-Technologies/Branch_FixObjectMotionVectors 7 年前
GitHub a7190d7e Merge pull request #926 from Unity-Technologies/Branch_FixSkyReflectionSunReset 7 年前
Robert Srinivasiah 44fabb65 Merge branch 'master' into hdrp-xr-initial 7 年前
John 3174776d Merge branch 'master' into LW-ScreenSpaceShadows 7 年前
John 0a72692b Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand 7 年前
sebastienlagarde 8edea279 HDRenderPipeline: Fix various warning 7 年前
sebastienlagarde 301dbf72 Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading 7 年前
sebastienlagarde 3717cdb2 add correct support of float 7 年前
sebastienlagarde 532d1c75 fix issue 7 年前
GitHub 7dbf5279 Merge pull request #937 from Unity-Technologies/add-correct-support-of-float 7 年前
sebastienlagarde 5e5e46c8 Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence 7 年前
Remy 619cd52e Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade 7 年前
sebastienlagarde 35560656 Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing 7 年前
Paul Melamed 75b17fab Merge branch 'master' into decals/clustered 7 年前
Evgenii Golubev 070349c8 Merge branch 'master' 7 年前
sebastienlagarde a450e83a Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2 7 年前
Tim Cooper aeefe219 Merge branch 'master2' into LW-LightOptimizations 7 年前
Robert Srinivasiah 7427bb14 Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting 7 年前
Sebastien Lagarde dae7599d Remove modification on convertSurfaceDataToBSDFData and EncodeToGBuffer 7 年前
Evgenii Golubev e768893e Merge branch 'master' 7 年前
Thomas 45dc22f9 Refactored the debug menu 7 年前
Peter Andreasen 04b933d9 merged with master 7 年前
GitHub 4ce28f8a Merge pull request #970 from Unity-Technologies/debug-menu-refactor 7 年前
Evgenii Golubev 3ad3c7d7 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Julien Ignace 4b17c74c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling 7 年前
Robert Srinivasiah 6f2b52f2 Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting 7 年前
Remy 2001df3c Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade 7 年前
sebastienlagarde 8d0fc95d Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2 7 年前
John Parsaie 8cc0d941 Merge SRP 2018.1 7 年前
Sebastien Lagarde 60bcac15 Fix several shader and C# warning 7 年前
Sebastien Lagarde edfea7bc Fix several shader and C# warning 7 年前
GitHub a29f9db9 Merge pull request #1010 from Unity-Technologies/fix-shader-warning 7 年前
sebastienlagarde fb2d62e1 Fix wrong pragma 7 年前
Joel de Vahl 56f21e1e Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades 7 年前
sebastienlagarde 00c5c204 Fix wrong pragma 7 年前
Remy 50623c84 Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader 7 年前
sebastienlagarde 003ed8ce Add pipeline subshader tags for HD 7 年前
sebastienlagarde 9630d754 Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader 7 年前
GitHub 47d42b36 Merge pull request #1 from Unity-Technologies/master 7 年前
Matt Dean 938ae294 Add pipeline subshader tags for HD 7 年前
sebastienlagarde 2e64322b Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader 7 年前
GitHub 41034aa7 Merge pull request #1016 from Unity-Technologies/pr/1014 7 年前
Robert Srinivasiah 7733d48a Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile 7 年前
Frédéric Vauchelles fd3d298d Merge branch 'master' into feature/ReflectionProbeBaking 7 年前
Paul Melamed 07ab7b09 Merge branch 'master' into decals/api_change 7 年前
sebastienlagarde bcc645de Fixed various issues with debug window 7 年前
Aleksandr Kirillov 34c25f1b Merge branch 'master' into LowEndPerf 7 年前
John Parsaie 0fe793d7 Merge 2018.1 7 年前
Julien Ignace 5007f081 Fixed various issues with debug window 7 年前
sebastienlagarde 3daab8a8 Fix DebugColorPicker warning 7 年前
GitHub b0109a5e Merge pull request #1044 from Unity-Technologies/Branch_DebugWindowFixes 7 年前
Remy cc4d54eb Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Felipe Lira e630eecd Merge branch 'master' into LW-Bugfix 7 年前
sebastienlagarde efbc1aed Fix DebugColorPicker warning 7 年前
John Parsaie 40539650 Merge branch '2018.1' into projects/TheLastStand 7 年前
sebastienlagarde 88378544 Bring back dynamic branch for cluster/tile in forward to reduce the number of shader variant 7 年前
sebastienlagarde fa95ec27 Reduce number of variant by bring back FPTL/CLuster choice with dynamic branch for forward 7 年前
sebastienlagarde aa772a18 Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered 7 年前
Evgenii Golubev 720c8a19 Merge branch 'master' 7 年前
Evgenii Golubev dd8b51a8 Merge branch 'master' 7 年前
Julien Ignace 8c4ec6a4 - Visualize Cascade debug mode now fades to white instead of black 7 年前
Frédéric Vauchelles d1dfdb4e Merge branch 'master' into feature/ScreenSpaceProjection 7 年前
Frédéric Vauchelles 080df525 Fixed indentation 7 年前
sebastienlagarde e519cc25 HDRenderPipeline: Add specular color debug override 7 年前
Frédéric Vauchelles 801f262f debug fixes 7 年前
GitHub 82d0e98b Merge pull request #1099 from Unity-Technologies/Add-specular-color-debug-override 7 年前
Frédéric Vauchelles fb9b45ba Update screen space tracing for refractions 7 年前
GitHub 992a18a3 Merge pull request #1100 from Unity-Technologies/Branch_VariousFixes 7 年前
Frédéric Vauchelles ae245c12 Updated debug for screen space tracing 7 年前
sebastienlagarde 113d9c54 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Frédéric Vauchelles 4e3afe4c Updated debugs 7 年前
Frédéric Vauchelles c2126e91 Added bruteforce screen space tracing 7 年前
Frédéric Vauchelles 070dec58 Added int to switch between raymarching algorithm for testing purpose 7 年前
Frédéric Vauchelles a30e7108 Fixed HiZ raymarching 7 年前
Frédéric Vauchelles 5ab7101f Moved algorithm selection to shader variant 7 年前
uygar 32641789 Enabled support for rendering into slices as the runtime supports it now. 7 年前
Frédéric Vauchelles 54c257c8 Force update on debug statistics panel 7 年前
GitHub 218a34d2 Merge pull request #1103 from Unity-Technologies/shadows-fixes 7 年前
Frédéric Vauchelles 26ba0cae Renamed properly variables 7 年前
Felipe Lira c1ce89b5 Merge branch 'master' into lw/shader-optimization 7 年前
Julien Ignace 845f068a Fixed shadow and reflection debug overlay being flipped in game view. 7 年前
Julien Ignace 36fb4e21 Added debug exposure parameter to several debug modes. 7 年前
GitHub f79d38be Merge pull request #1108 from Unity-Technologies/Branch_FixOverlayDebugFlip 7 年前
Julien Ignace 51790cf9 (WIP) Added debug exposure to material debug views. 7 年前
Evgenii Golubev 2202a083 Remove UnityPerCamera, introduce UnityPerView 7 年前
lyndon homewood dc5e1aa0 Enabled the texture streaming debugging update in 2018.2 7 年前
Evgenii Golubev a3e9bdfc Improve the support of orthographic rendering 7 年前
Evgenii Golubev 1d711357 Merge 'upstream/master' 7 年前
Remy 75cf5fa5 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
GitHub fcb12503 Merge pull request #1112 from Unity-Technologies/Branch_DebugExposure 7 年前
Julien Ignace a851ac6e Hide debug exposure entry when no related debug mode is enabled. 7 年前
Matt Dean f98f82d0 Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass 7 年前
GitHub 5854bde8 Merge pull request #1138 from Unity-Technologies/Branch_HideDebugExposure 7 年前
Paul Melamed d37105f2 Merge branch 'master' into decals/texture_atlas 7 年前
Frédéric Vauchelles 085e9237 (wip) Refactored screen space tracing for refraction 7 年前
Frédéric Vauchelles 253790d4 Renamed properly buffer pyramid variables 7 年前
Frédéric Vauchelles 4fbb1c4f (wip) Added refraction model 7 年前
GitHub 77f8a26a Merge pull request #1143 from Unity-Technologies/feature/RefactorBufferPyramidVariables 7 年前
Frédéric Vauchelles 4f1b9eae Merge branch 'master' into feature/PlanarReflectionUI 7 年前
Frédéric Vauchelles 412bd010 Merge master 7 年前
Stephane Laroche 5ad6a9db Merge branch 'master' into StackLitWork 7 年前
Frédéric Vauchelles 5ef1d97f (wip) Added debug for proxy and hiz refraction modes 7 年前
Frédéric Vauchelles c96eb98a (wip) Fixed refraction with sky proxy 7 年前
Frédéric Vauchelles 66076676 Added debug for HiZ SSRT 7 年前
Frédéric Vauchelles 2169fc40 Added debug hints 7 年前
Frédéric Vauchelles 7c52d2d3 Renamed Flags.ForceUpdate => Flags.EditorForceUpdate 7 年前
Frédéric Vauchelles f3b17b2a Fixed debug issue 7 年前
GitHub a2790a45 Merge pull request #1159 from Unity-Technologies/feature/RefractionModes 7 年前
Frédéric Vauchelles 659b634a Added wip pass for SSReflection 7 年前
Frédéric Vauchelles 3b63c854 wip SSR 7 年前
Evgenii Golubev 8d663ac4 Merge upstream/master 7 年前
Frédéric Vauchelles ae848a9d fixed forward SSR 7 年前
Paul Melamed 5e4ad2d7 Merge branch 'master' into decals/texture_atlas 7 年前
Frédéric Vauchelles 4474977e (wip) deferred SSR 7 年前
Felipe Lira 65fc1c54 Merge branch 'master' into LWRP 7 年前
Sebastien Lagarde 016a2305 HDRenderPipeline: Fix shader and C# warning + re-arrange lightloop for env 7 年前
GitHub 60d3b875 Merge pull request #1205 from Unity-Technologies/Fix-warning 7 年前
Frédéric Vauchelles 4bd00e90 Merge master 7 年前
GitHub 858b64ad Merge pull request #1197 from EvgeniiG/rename_unity_per_camera 7 年前
Evgenii Golubev 999f9fa8 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
sebastienlagarde 9298afe1 Remove osbole debug mode: EnvironmentProxyVolume and EnvironmentSampleCoordinates 7 年前
sebastienlagarde fbf1ccab Remove indirect GTAO debug mode 7 年前
GitHub 879617b1 Merge pull request #1213 from Unity-Technologies/Sharing-envlight-code 7 年前
sebastienlagarde ce90ed04 Factor AmbientOcclusion code 7 年前
GitHub fa4597b9 Merge pull request #1214 from Unity-Technologies/Factore-AmbientOcclusionCode 7 年前
GitHub 362e32d7 Merge branch 'master' into expose-numlights-per-cluster 7 年前
Kay Chang 53b01e3a WIP adding Switch support. 7 年前
Kay Chang f5303717 Revert "WIP adding Switch support." 7 年前
Remy 256e6c9c Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Kay Chang c279dc9c Re-added modified files for Switch without BOM. 7 年前
Frédéric Vauchelles 09596c67 Merge branch 'master' into feature/SSR 7 年前
Frédéric Vauchelles b6f0098d (wip) SSR for deferred 7 年前
Stephane Laroche 61ee5830 Merge branch 'master' into stacklit 7 年前
sebastienlagarde 5799a070 Fix issue with override value in debug 7 年前
GitHub 6c9988ce Merge pull request #1226 from Unity-Technologies/Fix-issue-with-override-value-in-debug 7 年前
Stephane Laroche e1727d9d Merge branch 'master' into stacklit 7 年前
Paul Melamed cef12462 Add debug decal atlas view. 7 年前
GitHub 19df472b Merge pull request #1228 from Unity-Technologies/decals/debug_atlas_view 7 年前
Stephane Laroche 1294c23a Merge branch 'master' into stacklit 7 年前
Remy 9c81e0d8 Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests 7 年前
Frédéric Vauchelles d9f5b4f5 Merge branch 'master' into feature/SSR 7 年前
Frédéric Vauchelles a7658549 Various fixes 7 年前
Frédéric Vauchelles 41dc00b0 Various fixes 7 年前
Frédéric Vauchelles fa865764 Updated: small fixes 7 年前
GitHub 3ab57ba8 Merge pull request #1116 from lyndon-unity/master 7 年前
Evgenii Golubev 9b95d6ea Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
sebastienlagarde e03580d8 Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental 7 年前
Frédéric Vauchelles 8676f2e5 Merge master 7 年前
Felipe Lira 533beaae Merge branch 'master' into LWRP 7 年前
Frédéric Vauchelles b222ccef Added linear raymarching in HiZ 7 年前
Frédéric Vauchelles 7df2f723 Refactoring and adding linear raymarch for Hiz and proxy 7 年前
Frédéric Vauchelles dd47524a Removed iteration blending for linear raymarching 7 年前
sebastienlagarde f5c6eec7 Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support 7 年前
GitHub f8e74a10 Merge pull request #1277 from Unity-Technologies/switch_support 7 年前
Stephane Laroche 10f8090a Merge branch 'stacklit' into stacklit_vl_merge 7 年前
Stephane Laroche ecc9d71b Merge remote-tracking branch 'mainrepo/master' into stacklit 7 年前
sebastienlagarde 2c1c78cf Merge branch 'master' into 2018.1-experimental 7 年前
Yao Xiaoling cb671fbb Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain 7 年前
Raymond Graham 4e9dca70 Merge branch 'master' into volumetric-lighting-updates 7 年前
Evgenii Golubev 91dc696c Merge upstream/master 7 年前
sebastienlagarde 89270e64 Rename _MainDepthTexture to _CameraDepthTexture (For builtin compatibility) 7 年前
Frédéric Vauchelles 4bfaa623 merge master 7 年前
Frédéric Vauchelles 201a9b48 Debug fixes 7 年前
Frédéric Vauchelles 1d5f8d15 fixed SSR artifacts 7 年前
GitHub ffbc0097 Merge pull request #1308 from Unity-Technologies/Rename-_MainDepthTexture-to-_CameraDepthTexture 7 年前
sebastienlagarde 1b094ec9 Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental 7 年前
Frédéric Vauchelles 576ebd36 HiZ: Raymarch behind surfaces 7 年前
Frédéric Vauchelles 638799d0 Fixed hit weight calculate 7 年前
Evgenii Golubev cace3d6d Merge upstream/master 7 年前
Frédéric Vauchelles 842b295a Added debug for sampled color in raymarching 7 年前
Frédéric Vauchelles 27865707 Reproject SSR with motion vectors 7 年前
Frédéric Vauchelles f994c6c3 displaye sampled color in HiZ for debug 7 年前
Frédéric Vauchelles 262145d7 Added debugs 7 年前
Frédéric Vauchelles 96917261 Fixed game view debug for SSRT 7 年前
Frédéric Vauchelles d5c1a104 Added toggle to raymarch behind objects 7 年前
Stephane Laroche e0b3d217 Merge branch 'master' into stacklit 7 年前
Felipe Lira 25e45b36 Merge branch 'master' into LWRP 7 年前
Felipe Lira 63a6fe03 Merge branch 'LWRP' into lw/api-refactor-v1 7 年前
Frédéric Vauchelles 3932faa4 Merge branch 'master' into feature/SSR 7 年前
GitHub bdeba039 Merge pull request #1270 from Unity-Technologies/feature/SSR 7 年前
Tim Cooper 2c4a517b Merge remote-tracking branch 'origin/master' into build/automation 7 年前
Tim Cooper fafb59af Run code formatter. 7 年前
Frédéric Vauchelles 4d7f78f1 Merge branch 'master' into feature/SSR 7 年前
sebastienlagarde 67c1ca49 Remove UNITY_2018_2_OR_NEWER define (as we are on 2018.2) 7 年前
GitHub 7914a34a Merge pull request #1407 from Unity-Technologies/remove-UNITY_2018_2_OR_NEWER 7 年前
sebastienlagarde ded6bbde Homegenize code of motion vector + fix discrepency between object and camera motion blur 7 年前
GitHub c2d39705 Merge pull request #1418 from Unity-Technologies/Update-veloicty-vector 7 年前
Antoine Lelievre c19674c0 Added false color debug mode 7 年前
Antoine Lelievre 9bdeb7cf Moved and renamed InverseLerp to RangeRemap in Common.hlsl 7 年前
Antoine Lelievre edaa6a3d Added VisualizeShadowMasks mode in Lighting debug 7 年前
GitHub 961e2a42 Merge pull request #1497 from Unity-Technologies/FalseColorMode 7 年前
Sebastien Lagarde c95b7c47 Merge branch 'master' into normal-buffer-support 7 年前
Paul Melamed 29ce571e Merge branch 'master' into decals/ss3_channel_mask 7 年前
GitHub f82aef0c Merge branch 'master' into VisualizeShadowMasks 7 年前
GitHub bf69fe62 Merge pull request #1503 from Unity-Technologies/VisualizeShadowMasks 7 年前
sebastienlagarde 97c94087 Update HDRP asset + add Cull none on debug shader 7 年前
Antoine Lelievre b3d835fa Begin to fix the color picker intensity for luxmeter (not enough precision right now) 7 年前
Antoine Lelievre 7aa394fc Finished simple compression algorithm 7 年前
sebastienlagarde 0e0c9931 Merge branch 'master' into normal-buffer-support 7 年前
Stephane Laroche 7842bbf8 Merge remote-tracking branch 'mainrepo/master' into StackLit2 7 年前
Oliver Schnabel ecdbdcab Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2 7 年前
Remy 98989fb6 Merge branch 'master' into HDRP-Tests 7 年前
Felipe Lira 7193e88e Merge branch 'master' into lw/bugfixes 7 年前
Thomas 01ee049b Merge branch 'master' into gfx-tests-postfx 7 年前
GitHub 1e1467c4 Merge pull request #1515 from Unity-Technologies/FixColorPickerPrecisionLimit 7 年前
Chris Tchou 6408007a Merge branch 'master' into hdrpcleanup 7 年前
Sebastien Lagarde ba6fd164 Factor Lit and StackLit code 7 年前
GitHub 28c52421 Merge pull request #1520 from Unity-Technologies/Factor-Lit-and-stacklit-code 7 年前
Antoine Lelievre 516b896c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Stephane Laroche a49a696e Merge branch 'master' into StackLit2 7 年前
Remy 9db2a137 Merge branch 'master' into HDRP-Tests 7 年前
GitHub 3a6a4e59 Merge branch 'master' into sg/spheremasknode 7 年前
Nerites 4b5c5d5c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 7 年前
Yao Xiaoling 7ba05ba9 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards. 6 年前
Julien Ignace 1d575195 - Frame Settings debug panel now uses foldouts 6 年前
GitHub bbaf4dfd Merge pull request #1678 from Unity-Technologies/Branch_FrameSettingFoldout 6 年前
Julien Ignace 176e4109 Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPPCopy 6 年前
GitHub 7c6394fe Merge pull request #1702 from Unity-Technologies/HDRP/staging 6 年前
Remy 1bce3600 Merge branch 'master' into tests/hdrp/distortion 6 年前
Aleksandr Kirillov 4695f235 Merge branch 'master' into lw/terrain_optimization 6 年前
GitHub 7281fe31 Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui 6 年前
Stephane Laroche 73aab246 Merge branch 'hdrp/staging' into StackLit2_TrunkTest 6 年前
Nerites 4c6e512a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
Nerites 7a18f28e Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings" 6 年前
Nerites 5182ab18 Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"" 6 年前
GitHub 80d748f5 Add light linking support (#1758) 6 年前
GitHub a2d7bf8d Merge pull request #1759 from Unity-Technologies/Add-Light-Layers 6 年前
GitHub 31e46703 Merge pull request #1761 from Unity-Technologies/HDRP/staging 6 年前
Remy be0eb3c8 Merge branch 'master' into tests/hdrp/distortion 6 年前
Julien Ignace 5bfcc8cd Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking 6 年前
Yao Xiaoling 4d7a5d51 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain 6 年前
Nerites b088283d Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
GitHub 7b744594 Merge branch 'master' into xrsettings 6 年前
Antoine Lelievre 03c9b17a Add option to disable light by type in the debug menu 6 年前
Antoine Lelievre c278bbee Simplified Show light type debug settings 6 年前
GitHub c4a34c26 Merge pull request #1781 from Unity-Technologies/DisableLightTypeDebugMenu 6 年前
sebastienlagarde 4c23a388 Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/staging 6 年前
sebastienlagarde fc996ba1 Merge branch 'HDRP/staging' into Improve-bakeDiffuseLighting-code 6 年前
sebastienlagarde 10164527 Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/clean-proxy-volume 6 年前
GitHub de2e6ea2 Merge pull request #1783 from Unity-Technologies/HDRP/staging 6 年前
Remy b364cfd3 Merge branch 'hdrp/staging' into tests/hdrp/distortion 6 年前
sebastienlagarde 26c608bb Move files to screenspace lighting and move Reflection enum in it 6 年前
GitHub f09cd77a Merge pull request #1799 from Unity-Technologies/Create-screenspace-lighting-folder 6 年前
GitHub c3119430 Merge pull request #1803 from Unity-Technologies/HDRP/staging 6 年前
Yao Xiaoling a11976bf Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain 6 年前
GitHub b400b1c1 Merge branch 'master' into lw/terrain_optimization 6 年前
Antoine Lelievre 7c21615a Added Luminance meter 6 年前
GitHub 625f8762 Merge pull request #1824 from Unity-Technologies/LuminanceMeter 6 年前
GitHub ee4e73a4 Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter 6 年前
sebastienlagarde f75e94af Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop 6 年前
GitHub 1d48127a Merge pull request #1827 from Unity-Technologies/HDRP/staging 6 年前
Sebastien Lagarde 72141169 Merge branch 'master' into lighting-arealigh-fixup 6 年前
Sebastien Lagarde 05036cac Merge branch 'HDRP/staging' into HDLightExplorerExtension 6 年前
sebastienlagarde 4a415b0c rename deferredShadow => screenspaceshadow + change to RG16 6 年前
GitHub 9577f3da Merge pull request #1842 from Unity-Technologies/rename-deferredShadow-screenspaceshadow 6 年前
Frédéric Vauchelles ce4065fd Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors 6 年前
RSlysz 05f23629 Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors 6 年前
GitHub 5c6caff1 Merge pull request #1846 from Unity-Technologies/HDRP/staging 6 年前
GitHub 01fdbb38 Merge branch 'master' into fix/coupling-hdlight-workflow 6 年前
egomeh 507df163 Merge branch 'master' into lw/light-attenuation 6 年前
Paul Melamed 9dbd8998 Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer 6 年前
Anis Benyoub e30715d6 Implement an option to display the light volumes of Point, Spot, Line, Rectangular Lights and Reflection probes 6 年前
Anis Benyoub 39c3c58d Pull request review corrections 6 年前
GitHub ef3dbfb8 Merge pull request #1861 from Unity-Technologies/DebugLightVolumes 6 年前
Paul Melamed f1d163d5 Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer 6 年前
GitHub 3e6c15b0 Merge pull request #1870 from Unity-Technologies/HDRP/staging 6 年前
Anis Benyoub d5d59b01 PS4 DebugLightVolume Fix 6 年前
GitHub 680e60a9 Merge pull request #1871 from Unity-Technologies/fix_debug_light_vol_ps4 6 年前
Yao Xiao Ling cfd45cf1 Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain 6 年前
sebastienlagarde 38a3e185 Merge branch 'master' into HDRP/add-LightLayer-in-probes 6 年前
egomeh e7c59a70 Resolve merge conflicts 6 年前
Anis Benyoub 8d756ae8 Fixing a warning in the fabric shader compilation 6 年前
Anis Benyoub ee3cb531 Type error fix in the debug light volume shader 6 年前
GitHub ac20dcb1 Merge pull request #1877 from Unity-Technologies/fabric-light-vol-fix 6 年前
GitHub 7cfc2ed0 Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph 6 年前
Yao Xiao Ling 6e836668 Implement mipmap debug mode for terrain. 6 年前
GitHub f44d2214 Bump post version (#1883) 6 年前
egomeh 170858df Merge master 6 年前
GitHub a6854ec4 Merge pull request #1875 from Unity-Technologies/gpu-terrain 6 年前
egomeh 93afc87c Merge remote-tracking branch 'origin/master' into lw/light-attenuation 6 年前
Yao Xiao Ling 5eed6e3a Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain 6 年前
Thomas 468989ad Merge branch 'master' into pyramid-rework 6 年前
GitHub aae1a458 Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr 6 年前