handle undefined behavior

reearth · Jun 28, 2023 · 03746b6 · 03746b6
1 parent bd2fd59
commit 03746b6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/web/src/beta/lib/core/engines/Cesium/types.ts b/web/src/beta/lib/core/engines/Cesium/types.ts
@@ -4,12 +4,12 @@ import type { Cesium3DTileFeature, Cesium3DTilePointFeature, Globe, Model } from
 export type InternalCesium3DTileFeature = Cesium3DTileFeature | Cesium3DTilePointFeature | Model;
 
 export type PrivateCesiumGlobe = Globe & {
-  _surface: {
-    _tileProvider: {
+  _surface?: {
+    _tileProvider?: {
       materialUniformMap?: Record<string, () => unknown>;
     };
   };
-  _surfaceShaderSet: {
-    baseFragmentShaderSource: ShaderSource;
+  _surfaceShaderSet?: {
+    baseFragmentShaderSource?: ShaderSource;
   };
 };
diff --git a/web/src/beta/lib/core/engines/Cesium/useOverrideGlobeShader.ts b/web/src/beta/lib/core/engines/Cesium/useOverrideGlobeShader.ts
@@ -61,9 +61,16 @@ export const useOverrideGlobeShader = ({
     const globe = cesium.current.cesiumElement.scene.globe as PrivateCesiumGlobe;
 
     const surfaceShaderSet = globe._surfaceShaderSet;
+    if (!surfaceShaderSet) {
+      if (import.meta.env.DEV) {
+        throw new Error("`globe._surfaceShaderSet` could not found");
+      }
+      return;
+    }
+
     const baseFragmentShaderSource = surfaceShaderSet.baseFragmentShaderSource;
 
-    const GlobeFS = baseFragmentShaderSource.sources[baseFragmentShaderSource.sources.length - 1];
+    const GlobeFS = baseFragmentShaderSource?.sources[baseFragmentShaderSource.sources.length - 1];
 
     if (!GlobeFS) {
       if (import.meta.env.DEV) {
@@ -90,6 +97,13 @@ export const useOverrideGlobeShader = ({
       return;
     }
 
+    if (!globe?._surface?._tileProvider?.materialUniformMap) {
+      if (import.meta.env.DEV) {
+        throw new Error("`globe._surface._tileProvider.materialUniformMap` could not found");
+      }
+      return;
+    }
+
     makeGlobeShadersDirty(globe);
 
     globe._surface._tileProvider.materialUniformMap = {