Skip to content

Prevent access on null CesiumPointCloudShading #605

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Prevent access on null CesiumPointCloudShading #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2984f6
Add null check / nitialization for point cloud shading
j9liu Aug 22, 2025
7ba7d40
Update changelog
j9liu Aug 22, 2025
e82673d
Merge branch 'main' into point-shading-null-check
j9liu Aug 26, 2025
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 CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
##### Fixes :wrench:

- Fixed a bug where `CesiumCreditSystem` did not accurately track the loading progress of images, which could result in missing credits.
- Fixed a bug where `CesiumPointCloudRenderer` could dereference a null `CesiumPointCloudShading` on `Cesium3DTileset`.

## v1.17.0 - 2025-08-01

Expand Down
2 changes: 1 addition & 1 deletion Runtime/Cesium3DTileset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ public bool ignoreKhrMaterialsUnlit
}

[SerializeField]
private CesiumPointCloudShading _pointCloudShading;
private CesiumPointCloudShading _pointCloudShading = new CesiumPointCloudShading();

/// <summary>
/// The CesiumPointCloudShading attached to this tileset. If the tileset
Expand Down
9 changes: 5 additions & 4 deletions Runtime/CesiumPointCloudRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ private void UpdateAttenuationParameters()
5.0f :
this._tileset.maximumScreenSpaceError;

if (this._tileset.pointCloudShading.maximumAttenuation > 0.0f)
CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;

if (pointCloudShading.maximumAttenuation > 0.0f)
{
maximumPointSize = this._tileset.pointCloudShading.maximumAttenuation;
}
Expand All @@ -142,8 +144,6 @@ private void UpdateAttenuationParameters()
maximumPointSize *= Screen.dpi / 150;
}

CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;

float geometricError = this.GetGeometricError(pointCloudShading);
geometricError *= pointCloudShading.geometricErrorScale;

Expand Down Expand Up @@ -227,7 +227,8 @@ private void DrawPointsWithAttenuation()

void Update()
{
if (this._tileset.pointCloudShading.attenuation)
CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;
if (pointCloudShading != null && pointCloudShading.attenuation)
{
this.DrawPointsWithAttenuation();
this._meshRenderer.enabled = false;
Expand Down
Loading