Skip to content

Fix change to debug sphere and create a new one just for probes #5512

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

Merged
merged 2 commits into from
Sep 2, 2021
Merged

Fix change to debug sphere and create a new one just for probes #5512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06ab71f
Revert sphere
FrancescoC-unity Sep 2, 2021
6468bb9
New mesh separate for APV
FrancescoC-unity Sep 2, 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
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ public HDRenderPipeline(HDRenderPipelineAsset asset)
ProbeReferenceVolume.instance.Initialize(new ProbeVolumeSystemParameters()
{
memoryBudget = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeMemoryBudget,
probeDebugMesh = defaultResources.assets.sphereMesh,
probeDebugMesh = defaultResources.assets.probeDebugSphere,
probeDebugShader = defaultResources.shaders.probeVolumeDebugShader,
sceneBounds = m_GlobalSettings.GetOrCreateAPVSceneBounds(),
shBands = m_Asset.currentPlatformRenderPipelineSettings.probeVolumeSHBands
Expand Down
2 changes: 2 additions & 0 deletions ...nder-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipelineRuntimeResources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,8 @@ public sealed class AssetResources
public Mesh emissiveQuadMesh;
[Reload("Runtime/RenderPipelineResources/Mesh/Sphere.fbx")]
public Mesh sphereMesh;
[Reload("Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx")]
public Mesh probeDebugSphere;
}

public ShaderResources shaders;
Expand Down
6 changes: 3 additions & 3 deletions ...es.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineRuntimeResources.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,11 @@ MonoBehaviour:
defaultHDRISky: {fileID: 8900000, guid: 8253d41e6e8b11a4cbe77a4f8f82934d, type: 3}
defaultCloudMap: {fileID: 2800000, guid: 57a33fc2476a01644865bfde5f06e2f4, type: 3}
shaderGraphs:
objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38,
type: 3}
objectIDPS: {fileID: -6465566751694194690, guid: 89daf81f8e8f6634da726cbca859ca38, type: 3}
assets:
defaultDiffusionProfile: {fileID: 11400000, guid: 2b7005ba3a4d8474b8cdc34141ad766e, type: 2}
emissiveCylinderMesh: {fileID: 2534964839176971238, guid: accb6d90f0d50fe4ca0f68159b4323de, type: 3}
emissiveQuadMesh: {fileID: 4300000, guid: 1d5a8595286f94f4bb54171d49f473c3, type: 3}
sphereMesh: {fileID: 532591105809680800, guid: f7f013a81640a284ea38df61c509ff9a, type: 3}
sphereMesh: {fileID: 4300000, guid: 9e0af751bc36ea146940ba245193e28c, type: 3}
probeDebugSphere: {fileID: 532591105809680800, guid: b979359990531a2489ebd7a0ef0f9f01, type: 3}
m_Version: 4
3 changes: 3 additions & 0 deletions ...ender-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx
View file
Open in desktop
Git LFS file not shown
105 changes: 105 additions & 0 deletions ...-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/ProbeDebugSphere.fbx.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx
View file
Open in desktop
Git LFS file not shown
47 changes: 18 additions & 29 deletions ...ity.render-pipelines.high-definition/Runtime/RenderPipelineResources/Mesh/Sphere.fbx.meta
View file
Open in desktop

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