1. adapt to CesiumJS version 1.125

2. fix Spector.js CDN URL
RaymanNg · Jan 21, 2025 · 615f122 · 615f122
1 parent f7dbbc5
commit 615f122
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/Cesium-3D-Wind/glsl/trailDraw.frag b/Cesium-3D-Wind/glsl/trailDraw.frag
@@ -25,5 +25,5 @@ void main() {
     if (trailsDepth < globeDepth) {
         gl_FragColor = gl_FragColor + trailsColor;
     }
-    gl_FragDepthEXT = min(pointsDepth, trailsDepth);
+    gl_FragDepth = min(pointsDepth, trailsDepth);
 }
diff --git a/Cesium-3D-Wind/index.html b/Cesium-3D-Wind/index.html
@@ -9,11 +9,11 @@
       left: 5px;
     }
   </style>
-  <script src="https://cdn.jsdelivr.net/npm/cesium@1.83.0/Build/Cesium/Cesium.js"></script>
-  <link href="https://cdn.jsdelivr.net/npm/cesium@1.83.0/Build/Cesium/Widgets/widgets.css" rel="stylesheet">
+  <script src="https://cdn.jsdelivr.net/npm/cesium@1.125.0/Build/Cesium/Cesium.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cesium@1.125.0/Build/Cesium/Widgets/widgets.css">
   <script src="https://www.lactame.com/lib/netcdfjs/0.7.0/netcdfjs.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/[email protected]/build/dat.gui.min.js"></script>
-  <script src="https://spectorcdn.babylonjs.com/spector.bundle.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/spector.bundle.min.js"></script>
 </head>
 
 <body>

diff --git a/Cesium-3D-Wind/wind3D.js b/Cesium-3D-Wind/wind3D.js
@@ -9,7 +9,10 @@ class Wind3D {
             fullscreenElement: 'cesiumContainer',
             // useBrowserRecommendedResolution can be set to false to improve the render quality
             // useBrowserRecommendedResolution: false,
-            scene3DOnly: true
+            scene3DOnly: true,
+            contextOptions: {
+                requestWebgl1: true,
+            },
         }
 
         if (mode.debug) {
@@ -85,10 +88,12 @@ class Wind3D {
         var globeLayer = userInput.globeLayer;
         switch (globeLayer.type) {
             case "NaturalEarthII": {
-                this.viewer.imageryLayers.addImageryProvider(
-                    new Cesium.TileMapServiceImageryProvider({
-                        url: Cesium.buildModuleUrl('Assets/Textures/NaturalEarthII')
-                    })
+                this.viewer.imageryLayers.add(
+                    Cesium.ImageryLayer.fromProviderAsync(
+                        Cesium.TileMapServiceImageryProvider.fromUrl(
+                            Cesium.buildModuleUrl("Assets/Textures/NaturalEarthII"),
+                        )
+                    )
                 );
                 break;
             }
@@ -103,10 +108,10 @@ class Wind3D {
                 break;
             }
             case "WorldTerrain": {
-                this.viewer.imageryLayers.addImageryProvider(
-                    new Cesium.IonImageryProvider({ assetId: 3954 })
+                this.viewer.imageryLayers.add(
+                    Cesium.ImageryLayer.fromProviderAsync(Cesium.IonImageryProvider.fromAssetId(3954))
                 );
-                this.viewer.terrainProvider = Cesium.createWorldTerrain();
+                this.viewer.scene.setTerrain(Cesium.Terrain.fromWorldTerrain());
                 break;
             }
         }

diff --git a/demo/index.html b/demo/index.html
@@ -9,11 +9,11 @@
             left: 5px;
         }
     </style>
-    <script src="https://cdn.jsdelivr.net/npm/cesium@1.65.0/Build/Cesium/Cesium.js"></script>
-    <link href="https://cdn.jsdelivr.net/npm/cesium@1.65.0/Build/Cesium/Widgets/widgets.css" rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/npm/cesium@1.125.0/Build/Cesium/Cesium.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/cesium@1.125.0/Build/Cesium/Widgets/widgets.css">
     <script src="https://www.lactame.com/lib/netcdfjs/0.7.0/netcdfjs.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/build/dat.gui.min.js"></script>
-    <script src="https://spectorcdn.babylonjs.com/spector.bundle.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/spector.bundle.min.js"></script>
 </head>
 
 <body>