Paul Melamed
0be6b369
started the decal branch
7 年前
Paul Melamed
650a7ab4
debugging projecting a decal onto geometry
7 年前
Paul Melamed
d9dc83f4
decal projects correctly onto dbuffer albedo surface (test pattern)
7 年前
Paul Melamed
c4761310
color map and normal maps working for decals
7 年前
Paul Melamed
a5eb21ff
cleaned up decal shader, added custom UI for decal shader
7 年前
Paul Melamed
d9d7b2cb
refactor to address all comments by Sebastien in slack conversation.
7 年前
Paul Melamed
ddee46ec
fix decal rendering in editor
7 年前
Paul Melamed
dd2f4c60
Decals work with master and trunk
7 年前
Paul Melamed
8fd4e73b
fix some empty lines and indentation
7 年前
sebastienlagarde
2f16949c
HDRenderPipeline decals: Addressed PR feedback
7 年前
Sebastien Lagarde
472e4d41
Update decal menu
- Move CreateDecal() to Editor folder (was breaking the standalone
build) in a DecalMmenuItems
- New menu to create decal is: GameObject/Render Pipeline/High
Definition/DecalProjector
- Add a null check test iin AddDecal on material
7 年前
GitHub
2e8c02da
Merge pull request #658 from Unity-Technologies/Update-decal
Update decal menu
7 年前
Peter Bay Bastian
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
7 年前
Paul Melamed
1f7d870b
addressed some PR commenst, started adding metal, smoothnes, height to decals.
7 年前
Paul Melamed
6a91487b
Added CullingGroup API functionality for culling decal objects
7 年前
Paul Melamed
50503a53
Merged with master.
integrated decal group culling with HDRenderPipeline
7 年前
Paul Melamed
a1129802
cleaned up gecal group culling code, mask blend uses total material blend
7 年前
Paul Melamed
57775e99
Clean up decal culling. New global shader variable to skip decal contribution when none are visible.
7 年前
Paul Melamed
650e9e97
clean up PR
7 年前
GitHub
ca60bb19
Merge pull request #742 from Unity-Technologies/prototype/decals_no_height
Prototype/decals no height
7 年前
sebastienlagarde
ab7e4641
HDRenderPipeline: Update CreateDecalMesh to CreateCubeMesh to be more generic
And move GetDecalMeshBoundingSphere in DecalSystem class
7 年前
Sebastien Lagarde
cd92c7dc
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
GitHub
eada54f4
Merge pull request #747 from Unity-Technologies/Update-CreateDecalMesh-to-CreateCube
HDRenderPipeline: Update CreateDecalMesh to CreateCubeMesh to be more generic
7 年前
sebastienlagarde
e9e58a8b
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Frédéric Vauchelles
ad68db51
Merge branch 'master' into feature/HDCameraEditor
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
Paul Melamed
907898d9
Fix decal normal to world transform
7 年前
lyndon homewood
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
Paul Melamed
b5295e0e
add some comments explaining the transform from normal map to decal space
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
GitHub
e2485047
Merge pull request #763 from Unity-Technologies/prototype/decals_profiling
Prototype/decals profiling
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
2479dda2
Move world to decal calculation to shaders, remove the need to set property block in c#
7 年前
Paul Melamed
bd31b3cc
Temp commit, 1st attempt at instanced decals is working.
7 年前
Paul Melamed
845cd5ab
Store decals in sets per material and do an instanced draw for each set
7 年前
sebastienlagarde
4d28dda4
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
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 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Paul Melamed
983ccfcb
Using proper instancing path.
Force decals to always draw instanced.
7 年前
Paul Melamed
c6480e96
remove decalset if it has no decals
7 年前
Paul Melamed
5ff3384b
fix PR comments
7 年前
GitHub
1d07f3a6
Merge pull request #808 from Unity-Technologies/prototype/decals_drawinstance
Prototype/decals drawinstance
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
sebastienlagarde
87798701
minor comment/code on decal
7 年前
GitHub
d90fdb95
Merge pull request #815 from Unity-Technologies/minor-comment/code-on-decal
minor comment/code on decal
7 年前
Paul Melamed
e5b34b08
passing normalToWorld in material block properties
7 年前
sebastienlagarde
26147e28
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
d83ceb71
Use material property block to set decal normal to world instanced matrix array instead of calculating it in the shader
7 年前
Paul Melamed
dbdfb0a6
Use decal set KeyMaterial for drawInstanced
7 年前
Paul Melamed
27248787
Don't check textures slots in decal material validation
Add gizmo for selecting decals in scene view
Add material fold out in the DecalProjectorComponent inspector
7 年前
GitHub
6e5bc8c0
Merge pull request #848 from Unity-Technologies/prototype/decals_premult_alpha
Prototype/decals premult alpha
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
02e0282c
Add default decal material + add support dbuffer on lit material
Add DefaultDecalMaterial assign automatically when creating a decal
Add option to disable receiving of decal on materials
7 年前
GitHub
1f961a99
Merge pull request #849 from Unity-Technologies/prototype/decals_workflow
Don't check textures slots in decal material validation
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
ae087b6d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
53c32b8e
fix z/y axis swap to column major
7 年前
Paul Melamed
8c9541db
Filling out HTile mask in DBuffer, fix for material foldout update on decal material change
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
sebastienlagarde
1ad763a2
Fix z/y swap for normal to decal space, unity is column major
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Remy
6d165864
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
sebastienlagarde
579bce35
Add icon for decal component
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 年前
Julien Ignace
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Paul Melamed
afb8df01
Cleanup PR, add decal HTile mask defines
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
GitHub
f3a96513
Merge pull request #885 from Unity-Technologies/prototype/decals_gpu_optimization
Prototype/decals gpu optimization
7 年前
sebastienlagarde
89cfaa68
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-encoding-1212to888
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 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Remy
3d76f69e
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
afca789b
intermediate commit, decal global properties and draw/fade distance
7 年前
Julien Ignace
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
Paul Melamed
8989d3ef
decal culling by distance with fade scale
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
GitHub
6157d668
Merge pull request #896 from Unity-Technologies/decals/distance_culling
Decals/distance culling
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 年前
Paul Melamed
ffd9f57f
intermediate commit, decals pass info to gpu light culling
7 年前
Paul Melamed
8668ed75
decals working on transparency
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
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
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 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
Paul Melamed
db42063a
clustered decal refactor
7 年前
sebastienlagarde
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
ab906785
intemediate commit
7 年前
Paul Melamed
382f92e6
Some refactoring and cleanup of how decal draw data gets prepared
7 年前
Paul Melamed
8f62c9e6
shader ID refactoring and changed from List<> to [] for some decal data structures to speed up performance
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
60d9cb71
address some PR comments
7 年前
GitHub
e8bd5bcf
Merge pull request #966 from Unity-Technologies/decals/clustered
Decals/clustered
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
Robert Srinivasiah
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
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 年前
Paul Melamed
f3c562d5
Refactored decal system API to be able to add, delete and update decals without projector component
7 年前
Paul Melamed
bd99fade
Store material ID instead of material reference in the DecalHandle
7 年前
Thomas
b74496d0
Fixed a leak in the decal system
7 年前
GitHub
b3c966b0
Merge pull request #993 from Unity-Technologies/leak-fix
Fixed a leak in the decal system
7 年前
Thomas
e85e2c70
NPE fix
7 年前
GitHub
ea2b54ca
Merge pull request #995 from Unity-Technologies/decal-system-fix2
NPE fix
7 年前
Peter Bay Bastian
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
Remy
c0e3d9ab
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
Paul Melamed
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Paul Melamed
92ea94ec
clean up api refactor
7 年前
Paul Melamed
b41682f1
Remove old version of UpdateCachedData
7 年前
Paul Melamed
ace24f84
After cleanup set texture atlas and decal mesh to null so that they get recreated.
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
sebastienlagarde
6e72077d
Fix compiler warning for sampling textures without lod in dynamic branch, and fix decal atlas and mesh initialization.
7 年前
Paul Melamed
66660c1e
Fix compiler warning for sampling textures without lod in dynamic branch, and fix decal atlas and mesh initialization.
7 年前
GitHub
456f99ff
Merge pull request #1011 from Unity-Technologies/decals/tex2dlod_and_atlas_fix
Fix compiler warning for sampling textures without lod in dynamic bra…
7 年前
Joel de Vahl
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
Remy
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
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
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
GitHub
d7f4d6ed
Merge pull request #1008 from Unity-Technologies/decals/api_change
Decals/api change. Do not merge, clustered decals on Ps4 are not working, investigating....
7 年前
sebastienlagarde
a12382a2
- Removed useless shadow atlases from HDRP
- Added debug texture name to all our caches
- Fixed a few leaks (rendertexture, materials, ...)
7 年前
Aleksandr Kirillov
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
sebastienlagarde
a0400775
Backport: Decals/api change - Fix issue with decal never removed
7 年前
GitHub
754fc5b7
Merge pull request #1042 from Unity-Technologies/Decals-api-change
Backport: Decals/api change - Fix issue with decal never removed - PR 1008
7 年前
Julien Ignace
2c03d5de
Merge branch '2018.1' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugWindowFixes
7 年前
Julien Ignace
1d0cc9c2
- Removed useless shadow atlases from HDRP
- Added debug texture name to all our caches
- Fixed a few leaks (rendertexture, materials, ...)
7 年前
Remy
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
GitHub
2c6fa5a3
Merge pull request #1047 from Unity-Technologies/Branch_MemoryUsageImprovement
Memory usage improvement and leak fix
7 年前
John Parsaie
40539650
Merge branch '2018.1' into projects/TheLastStand
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 年前
Frédéric Vauchelles
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Paul Melamed
2cf56db5
fix texture lod selection for clustered decals
7 年前
GitHub
eb9c9469
Merge pull request #1125 from Unity-Technologies/decal_compiler_warning_fix
Fix compile warning for decals about using derivatives inside a loop
7 年前
Paul Melamed
45bae982
fix decal projector not reacting to change in transform, add more descriptive comments to DecalUtilities shader code.
7 年前
GitHub
e1279e5b
Merge pull request #1132 from Unity-Technologies/decals/transform_fix
fix decal projector not reacting to change in transform, add more des…
7 年前
Paul Melamed
0c97c0da
initial commit
7 年前
Paul Melamed
76eb75c7
Merge branch 'master' into decals/texture_atlas
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Paul Melamed
22cfa928
added texture2d atlas
7 年前
Paul Melamed
ff3bd5a3
using new texture atlas to store decal textures
7 年前
Paul Melamed
19e30640
changed to use a 2d texture atlas instead of texture 2d array for decals rendered in the transparent pass
7 年前
Paul Melamed
ff3c43c1
add clamping by half a texel when sampling from decal atlas
only rebuild decal atlas if out of space
7 年前
Paul Melamed
7eb40bcb
fix texture allocation success status tracking
7 年前
Paul Melamed
16665d1f
Use HDRenderPipelineAsset for decal atlas dimensions, print an error when decal atlas allocation fails.
7 年前
Paul Melamed
3e88b2e8
intermediate commit, atlas packing optimizations
7 年前
Paul Melamed
ae602283
Somre cleanup and refactoring of adding textures to decal atlas
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Paul Melamed
3f7e7fef
Reset allocation status flag.
7 年前
Paul Melamed
d852d360
address PR comments
7 年前
Felipe Lira
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
7 年前
GitHub
bc2cc021
Merge pull request #1178 from Unity-Technologies/decals/texture_atlas
Decals/texture atlas
7 年前
sebastienlagarde
2e40eff7
Merge remote-tracking branch 'refs/remotes/origin/master' into stacklit
7 年前
Evgenii Golubev
b4708ef6
Merge upstream/master
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
cc685e8d
Add the ability to change decal shape with the handle ui control
7 年前
GitHub
a6d193f9
Merge pull request #1218 from Unity-Technologies/decals/ui_use_handles
Add the ability to change decal shape with the handle ui control
7 年前
Remy
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Stephane Laroche
61ee5830
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
Add debug decal atlas view.
7 年前
Stephane Laroche
1294c23a
Merge branch 'master' into stacklit
7 年前
Paul Melamed
35466812
Only store decal textures to atlas if decal is visible, debounce out of memory decal atlas warning.
7 年前
GitHub
a84a0dc0
Merge pull request #1239 from Unity-Technologies/decals/better_atlas_allocation
Only store decal textures to atlas if decal is visible, debounce out …
7 年前
Remy
9c81e0d8
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
7 年前
Frédéric Vauchelles
d9f5b4f5
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Paul Melamed
930806b1
Fix decal atlas debug display so that it works correctly when both decal and shadow atlas debug views are enabled
7 年前
GitHub
a0fc53f2
Merge pull request #1266 from Unity-Technologies/decals/atlas_view_fix
Fix decal atlas debug display so that it works correctly when both de…
7 年前
sebastienlagarde
b1e7249e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Frédéric Vauchelles
6a14305e
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
Stephane Laroche
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
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 年前
Paul Melamed
ee6c1949
uv tiling working for opaques
7 年前
GitHub
416e73db
Merge pull request #1344 from Unity-Technologies/decals/tiled_uvs
Decals/tiled uvs
7 年前
Stephane Laroche
c551dc12
Merge branch 'master' into stacklit
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
Paul Melamed
34a0dcbf
intermediate commit
7 年前
Paul Melamed
daa031aa
Allow decal projectors with null materials, so that users can still modify projector decals even when HDRP is not set as current pipeline.
7 年前