Skip to content

2d/shadow mesh upgrade #4278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 35 commits into
base: master
Choose a base branch
from
+41,461 −459
Draft

2d/shadow mesh upgrade #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
94e008a
In progress shadow refactor
unity-cchu Jan 16, 2021
553f400
Fixed code to support single channel shadows
unity-cchu Jan 19, 2021
9f87928
Fixed shadows on the alpha channel
unity-cchu Jan 19, 2021
81e6084
Remaining issue with single color channel, and removed added vertex
unity-cchu Jan 19, 2021
36459ce
Initial Checkin
unity-cchu Jan 20, 2021
91f7f80
Fixed a number of issues with shadow rendering
unity-cchu Jan 22, 2021
b439562
Added versioning code for ShadowCaster2D
unity-cchu Jan 22, 2021
f19d02f
in progress work..
unity-cchu Jan 26, 2021
a0e1aff
Merge branch 'master' into 2d/shadow-refactor-jan
unity-cchu Mar 7, 2021
81a6e83
Revert "Added versioning code for ShadowCaster2D"
unity-cchu Mar 7, 2021
9341272
Revert "Revert "Added versioning code for ShadowCaster2D""
unity-cchu Mar 7, 2021
e2b0d06
Fixed orthographic shadow projection for arbitrary rotation
unity-cchu Mar 7, 2021
9429cf4
Fixed perspective issue for shadow
unity-cchu Mar 7, 2021
e391623
Fixed another perspective issue with shadows
unity-cchu Mar 7, 2021
9590864
Updated a comment
unity-cchu Mar 7, 2021
d76f961
Fixed a few more issues. Seems to be working pretty well again
unity-cchu Mar 7, 2021
3738fc2
Fixed some issues with culling
unity-cchu Mar 10, 2021
a403ab6
Removed debug pragma
unity-cchu Mar 10, 2021
00aec05
Can now use channels when prerendering shadow casting lights
unity-cchu Mar 10, 2021
4528b71
Fixed problem with not creating shadow texture
unity-cchu Mar 11, 2021
86af676
Fixed versioning
unity-cchu Mar 11, 2021
93099e4
Fixed formatting
unity-cchu Mar 11, 2021
52e58f0
Merge branch 'master' into 2d/shadow-refactor-jan
unity-cchu Mar 11, 2021
dde29cf
Added profiling sampling per channel to Shadow Rendering
unity-cchu Mar 12, 2021
42d565e
Fixed a bug in ShadowProjectVertex.hlsl
unity-cchu Mar 12, 2021
77af365
In progress Shadow Prerendering Test.
unity-cchu Mar 14, 2021
7482e8c
Update prererendering test
unity-cchu Mar 15, 2021
a3477b1
Merge branch 'master' into 2d/shadow-refactor-jan
unity-cchu Apr 21, 2021
74e5e31
Merge branch 'master' into 2d/shadow-refactor-jan
unity-cchu Apr 21, 2021
4d0710a
Compilation Fix
unity-cchu Apr 22, 2021
8313550
Reverted back to the old shadow casting mesh
unity-cchu Apr 22, 2021
88d1997
Fixed up bounding sphere
unity-cchu Apr 22, 2021
9eb22e8
Fixes to creation of shadow materials
unity-cchu Apr 22, 2021
1a86c80
Revert "Fixed up bounding sphere"
unity-cchu Apr 22, 2021
4a12b97
Revert "Reverted back to the old shadow casting mesh"
unity-cchu Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: a1279a4e92c2a4dd3b60baa458c01606, type: 2}
- {fileID: 11400000, guid: 01247c41aba2d4bc0ad94a11af8bdb11, type: 2}
- {fileID: 11400000, guid: 04618ff2d33c0432a81d00fdee3fae55, type: 2}
- {fileID: 11400000, guid: eae387d1d2a20a946ae2441e0319f1a0, type: 2}
m_DefaultRendererIndex: 2
m_RequireDepthTexture: 1
m_RequireOpaqueTexture: 1
Expand Down
3 changes: 3 additions & 0 deletions ...eferenceImages/Linear/WindowsEditor/Direct3D11/None/072_Shadow_Prerendering.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 97 additions & 0 deletions ...ets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/072_Shadow_Prerendering.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/056_2D_Lights/New 2D Renderer Data.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 0
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 1, z: 0}
m_HDREmulationScale: 1
Expand Down Expand Up @@ -45,8 +46,11 @@ MonoBehaviour:
type: 3}
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3}
m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302,
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00,
type: 3}
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6,
type: 3}
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3,
type: 3}
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd,
type: 3}
Expand Down
20 changes: 6 additions & 14 deletions .../Assets/Scenes/069_2D_Forward_Shader_Compatibility/2D_Renderer_Shader_Compatibility.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 0
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 1, z: 0}
m_HDREmulationScale: 1
Expand All @@ -22,27 +23,15 @@ MonoBehaviour:
- name: Default
maskTextureChannel: 0
blendMode: 1
customBlendFactors:
multiplicative: 0
additive: 0
- name: Blend Style 1
maskTextureChannel: 0
blendMode: 1
customBlendFactors:
multiplicative: 0
additive: 0
- name: Blend Style 2
maskTextureChannel: 0
blendMode: 1
customBlendFactors:
multiplicative: 0
additive: 0
- name: Blend Style 3
maskTextureChannel: 0
blendMode: 1
customBlendFactors:
multiplicative: 0
additive: 0
m_UseDepthStencilBuffer: 1
m_UseCameraSortingLayersTexture: 0
m_CameraSortingLayersTextureBound: -1
Expand All @@ -57,8 +46,11 @@ MonoBehaviour:
type: 3}
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3}
m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302,
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00,
type: 3}
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6,
type: 3}
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3,
type: 3}
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd,
type: 3}
Expand Down
7 changes: 5 additions & 2 deletions ...ts/UniversalGraphicsTest_2D/Assets/Scenes/071_2D_Sort_Mode/CustomSortMode2DRenderer.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ MonoBehaviour:
type: 3}
m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3}
m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302,
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00,
type: 3}
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6,
type: 3}
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3,
type: 3}
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd,
type: 3}
Expand Down
8 changes: 8 additions & 0 deletions TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/072_Shadow_Prerendering.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading