Skip to content

Commit d2984f6

Browse files
committed
Add null check / nitialization for point cloud shading
1 parent 5137c75 commit d2984f6

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

Runtime/Cesium3DTileset.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ public bool ignoreKhrMaterialsUnlit
617617
}
618618

619619
[SerializeField]
620-
private CesiumPointCloudShading _pointCloudShading;
620+
private CesiumPointCloudShading _pointCloudShading = new CesiumPointCloudShading();
621621

622622
/// <summary>
623623
/// The CesiumPointCloudShading attached to this tileset. If the tileset

Runtime/CesiumPointCloudRenderer.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ private void UpdateAttenuationParameters()
131131
5.0f :
132132
this._tileset.maximumScreenSpaceError;
133133

134-
if (this._tileset.pointCloudShading.maximumAttenuation > 0.0f)
134+
CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;
135+
136+
if (pointCloudShading.maximumAttenuation > 0.0f)
135137
{
136138
maximumPointSize = this._tileset.pointCloudShading.maximumAttenuation;
137139
}
@@ -142,8 +144,6 @@ private void UpdateAttenuationParameters()
142144
maximumPointSize *= Screen.dpi / 150;
143145
}
144146

145-
CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;
146-
147147
float geometricError = this.GetGeometricError(pointCloudShading);
148148
geometricError *= pointCloudShading.geometricErrorScale;
149149

@@ -227,7 +227,8 @@ private void DrawPointsWithAttenuation()
227227

228228
void Update()
229229
{
230-
if (this._tileset.pointCloudShading.attenuation)
230+
CesiumPointCloudShading pointCloudShading = this._tileset.pointCloudShading;
231+
if (pointCloudShading != null && pointCloudShading.attenuation)
231232
{
232233
this.DrawPointsWithAttenuation();
233234
this._meshRenderer.enabled = false;

0 commit comments

Comments
 (0)