update examples

examples/index.css

@@ -119,6 +119,7 @@ body {
 }
 
 
+
 @media (max-width: 768px) {
   .btn-box,.check-wrapper{
     left: 20px !important;

examples/list.js

@@ -219,8 +219,8 @@ const EXAMPLE_LIST = [
     ],
   },
   {
-    name: '基础要素',
-    folder: 'overlay',
+    name: '矢量要素',
+    folder: 'vector',
     children: [
       {
         name: '点',
@@ -230,10 +230,6 @@ const EXAMPLE_LIST = [
         name: '图标点',
         page: 'point_icon.html',
       },
-      {
-        name: 'html点',
-        page: 'point_html.html',
-      },
       {
         name: '文字点',
         page: 'point_text.html',
@@ -395,12 +391,120 @@ const EXAMPLE_LIST = [
   {
     name: '图元要素',
     folder: 'primitive',
-    children: [],
+    children: [
+      {
+        name: '点',
+        page: 'point.html',
+      },
+      {
+        name: '线',
+        page: 'polyline.html',
+      },
+      {
+        name: '流动线',
+        page: 'flow_line.html',
+      },
+      {
+        name: '流动线(竖)',
+        page: 'flow_line_v.html',
+      },
+      {
+        name: '图标',
+        page: 'billboard.html',
+      },
+      {
+        name: '图标(大数量)',
+        page: 'billboard_m.html',
+      },
+      {
+        name: '跳动图标',
+        page: 'bounce_billboard.html',
+      },
+      {
+        name: '标签',
+        page: 'label.html',
+      },
+      {
+        name: '跳动标签',
+        page: 'bounce_label.html',
+      },
+      {
+        name: '扫描圆',
+        page: 'scan_circle.html',
+      },
+      {
+        name: '扩散墙',
+        page: 'wall_diffuse.html',
+      },
+      {
+        name: '电弧球',
+        page: 'elec_ellipsoid.html',
+      },
+      {
+        name: '发光柱',
+        page: 'light_cylinder.html',
+      },
+      {
+        name: '云',
+        page: 'cloud.html',
+      },
+      {
+        name: '水',
+        page: 'water.html',
+      },
+      {
+        name: '视频',
+        page: 'video.html',
+      },
+    ],
   },
   {
     name: '模型要素',
     folder: 'model',
-    children: [],
+    children: [
+      {
+        name: '模型（矢量）',
+        page: 'model_vector.html',
+      },
+      {
+        name: '动画模型（矢量）',
+        page: 'model_vector_d.html',
+      },
+      {
+        name: '模型（图元）',
+        page: 'model_primitive.html',
+      },
+      {
+        name: '3dtiles-3dmax',
+        page: '3dtiles_3dmax.html',
+      },
+      {
+        name: '3dtiles-osgb',
+        page: '3dtiles_osgb.html',
+      },
+      {
+        name: '3dtiles-shp',
+        page: '3dtiles_shp.html',
+      },
+      {
+        name: '3dtiles-自定shader',
+        page: '3dtiles_custom_shader.html',
+      },
+      {
+        name: '3dtiles-样式和自定shader',
+        page: '3dtiles_style_and_shader.html',
+      },
+    ],
+  },
+  {
+    name: 'DOM要素',
+    folder: 'html',
+    children: [
+      {
+        name: 'html点',
+        page: 'point_html.html',
+      },
+    ],
   },
   {
     name: '场景动画',

examples/model/3dmax_yqz.html → examples/model/3dtiles_3dmax.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -19,9 +18,9 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
-      crs:"WGS84"
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.TilesetLayer('layer')
@@ -32,7 +31,7 @@
     layer.addOverlay(tileset)
     viewer.flyTo(tileset)
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/model/shp_custom_shader.html → examples/model/3dtiles_custom_shader.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -19,9 +18,13 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer()
-     baseLayer.defaultBrightness = 0.1
-    viewer.addBaseLayer( baseLayer)
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness : 0.1
+    })
     let layer = new DC.TilesetLayer('layer')
     viewer.addLayer(layer)
     let build = new DC.Tileset(
@@ -47,7 +50,7 @@
     layer.addOverlay(build)
     viewer.flyTo(build)
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/model/osgb_dyt.html → examples/model/3dtiles_osgb.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -19,9 +18,9 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
-      crs:"WGS84"
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.TilesetLayer('layer')

examples/model/shp.html → examples/model/3dtiles_shp.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -19,9 +18,9 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
-      crs:"WGS84"
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.TilesetLayer('layer')
@@ -46,7 +45,7 @@
     layer.addOverlay(tileset)
     viewer.flyTo(tileset)
   }
-    DC.ready({
+ DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/model/shp_style_and_shader.html → examples/model/3dtiles_style_and_shader.html

@@ -5,23 +5,9 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
-  <script src='/libs/dc-sdk/dc.base.min.js'></script>
-  <script src='/libs/dc-sdk/dc.core.min.js'></script>
-
-  <script>DC.baseUrl='../libs/dc-sdk/resources/'</script>
-  <link href='/libs/dc-sdk/dc.core.min.css' type='text/css' rel='stylesheet'>
+  <script src='/libs/dc-sdk/dc.min.js'></script>
+  <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
-  <style>
-    *{
-      margin: 0;
-      padding: 0;
-    }
-    html,body,#viewer-container{
-      width: 100%;
-      height: 100%;
-      overflow: hidden;
-    }
-  </style>
 </head>
 
 <body>
@@ -32,9 +18,13 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer()
-     baseLayer.defaultBrightness = 0.1
-    viewer.addBaseLayer( baseLayer)
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness : 0.1
+    })
     let layer = new DC.TilesetLayer('layer')
     viewer.addLayer(layer)
     let tileset = new DC.Tileset(
@@ -74,7 +64,7 @@
     layer.addOverlay(tileset)
     viewer.flyTo(tileset)
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/model/model_pm.html

@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>dc-example</title>
-  <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
-  <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
-  <link href='../index.css' type='text/css' rel='stylesheet'>
-</head>
-
-<body>
-
-<div id="viewer-container" class="viewer-container"></div>
-<script>
-  let viewer = undefined
-
-  function generatePosition(num) {
-    var list = []
-    for (var i = 0; i < num; i++) {
-      var lng = 120.38105869 + Math.random() * 0.5
-      var lat = 31.10115627 + Math.random() * 0.5
-      list.push(new DC.Position(lng, lat))
-    }
-    return list
-  }
-
-  function initViewer() {
-    viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createBaiduImageryLayer({
-      style: 'dark'
-    })
-     baseLayer.defaultBrightness = 0.3
-    viewer.addBaseLayer( baseLayer)
-    let layer = new DC.VectorLayer('layer')
-    viewer.addLayer(layer)
-    let positions = generatePosition(1)
-    positions.forEach(item => {
-      let model = new DC.Model(item, 'examples/data/model/ParcLeadMine.glb')
-      layer.addOverlay(model)
-    })
-
-    viewer.flyTo(layer)
-  }
-    DC.ready({
-    baseUrl:'../libs/dc-sdk/resources/'
-  }).then(initViewer)
-</script>
-</body>
-</html>

examples/model/model_primitive.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -29,11 +28,15 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer()
-     baseLayer.defaultBrightness = 0.3
-    viewer.addBaseLayer( baseLayer)
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness:0.1
+    })
     let layer = new DC.PrimitiveLayer('layer').addTo(viewer)
-    let positions = generatePosition(100)
+    let positions = generatePosition(1000)
     positions.forEach(item => {
       let model = new DC.ModelPrimitive(item,"../assets/data/Cesium_Air.glb")
       model.setStyle({scale:50})
@@ -42,7 +45,7 @@
    viewer.flyToPosition("120.82005120445152,30.903795335982288,60975.10826917929,341.02,-50.29")
 
   }
-    DC.ready({
+ DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/model/model_vector.html

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <title>dc-example</title>
+  <script src='/libs/dc-sdk/dc.min.js'></script>
+  <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
+  <link href='../index.css' type='text/css' rel='stylesheet'>
+</head>
+
+<body>
+
+<div id="viewer-container" class="viewer-container"></div>
+<script>
+  let viewer = undefined
+
+  function generatePosition(num) {
+    let list = []
+    for (let i = 0; i < num; i++) {
+      let lng = 120.38105869 + Math.random() * 0.5
+      let lat = 31.10115627 + Math.random() * 0.5
+      list.push(new DC.Position(lng, lat))
+    }
+    return list
+  }
+
+  function initViewer() {
+    viewer = new DC.Viewer('viewer-container')
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness:0.1
+    })
+    let layer = new DC.VectorLayer('layer')
+    viewer.addLayer(layer)
+    let positions = generatePosition(1)
+    positions.forEach(item => {
+      let model = new DC.Model(item, '../assets/data/ParcLeadMine.glb')
+      layer.addOverlay(model)
+    })
+
+    viewer.flyTo(layer)
+  }
+  DC.ready({
+    baseUrl:'../libs/dc-sdk/resources/'
+  }).then(initViewer)
+</script>
+</body>
+</html>

examples/model/model_gv.html → examples/model/model_vector_d.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -29,9 +28,13 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer()
-     baseLayer.defaultBrightness = 0.3
-    viewer.addBaseLayer( baseLayer)
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness:0.1
+    })
     let layer = new DC.VectorLayer('layer')
     viewer.addLayer(layer)
     let positions = generatePosition(1)

examples/model/tileset_split.html

@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>dc-example</title>
-  <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
-  <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
-  <link href='../index.css' type='text/css' rel='stylesheet'>
-</head>
-
-<body>
-
-<body>
-
-<div id="viewer-container" class="viewer-container"></div>
-<script>
-  let viewer = undefined
-
-  function initViewer() {
-    viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
-      crs:"WGS84"
-    })
-    viewer.addBaseLayer( baseLayer)
-    let layer = new DC.TilesetLayer('layer')
-    viewer.addLayer(layer)
-    let tileset = new DC.Tileset(
-      '//resource.dvgis.cn/data/3dtiles/dayanta/tileset.json'
-    )
-    tileset.setHeight(-420)
-    tileset.setSplitDirection(-1)
-
-    layer.addOverlay(tileset)
-
-    let tileset_right = new DC.Tileset(
-      '//resource.dvgis.cn/data/3dtiles/dayanta/tileset.json'
-    )
-    tileset_right.setStyle(new DC.TilesetStyle({
-      color : {
-        conditions : [
-          ['true', 'rgba(255,255,0,0.8)']
-        ]
-      },
-    })
-    )
-    tileset_right.setHeight(-420)
-    tileset_right.setSplitDirection(1)
-    viewer.tilesetSplit.enable = true
-    viewer.tilesetSplit.addTileset(tileset_right)
-    addGuiController()
-    viewer.flyTo(tileset)
-  }
-
-  function addGuiController(){
-    let controls = {
-      enable :true,
-    }
-    let gui = new dat.GUI();
-    gui.add(controls,'enable',).onChange(value=>{
-      viewer.tilesetSplit.enable = value
-    })
-  }
-    DC.ready({
-    baseUrl:'../libs/dc-sdk/resources/'
-  }).then(initViewer)
-</script>
-</body>
-</html>

examples/overlay/primitive_billboard.html → examples/primitive/billboard.html

@@ -28,7 +28,8 @@
   }
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
       crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
@@ -42,7 +43,7 @@
     })
     viewer.flyToPosition("120.8226729498609,31.268693185250438,114716.63624611919,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_billboard_m.html → examples/primitive/billboard_m.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -57,7 +56,8 @@
   }
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
       crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
@@ -71,7 +71,7 @@
     })
     viewer.flyToPosition("120.8226729498609,31.268693185250438,114716.63624611919,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_bounce_billboard.html → examples/primitive/bounce_billboard.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -32,7 +31,8 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
       crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
@@ -49,7 +49,7 @@
     })
     viewer.flyToPosition("120.8226729498609,31.268693185250438,114716.63624611919,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_bounce_label.html → examples/primitive/bounce_label.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -28,7 +27,7 @@
   }
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
       style:'img',
       crs:'WGS84'
     })
@@ -49,7 +48,7 @@
     })
     viewer.flyToPosition("120.8226729498609,31.268693185250438,114716.63624611919,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_cloud.html → examples/primitive/cloud.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -28,7 +27,7 @@
   }
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
       style:'img',
       crs:'WGS84'
     })
@@ -53,9 +52,9 @@
       })
       layer.addOverlay(cloud)
     })
-   viewer.flyToPosition('120.3813868519986,31.101849248610826,990,225,13.26')
+   viewer.zoomToPosition('120.3813868519986,31.101849248610826,990,225,13.26')
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/parabola.html → examples/primitive/flow_line.html

@@ -68,7 +68,7 @@
     })
     viewer.flyToPosition("121.4941629,31.2091462,1859.56,0,-28.71")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/v_line.html → examples/primitive/flow_line_v.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>

examples/overlay/primitive_label.html → examples/primitive/label.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -28,7 +27,7 @@
   }
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
       style:'img',
       crs:'WGS84'
     })
@@ -46,7 +45,7 @@
     })
     viewer.flyToPosition("120.8226729498609,31.268693185250438,114716.63624611919,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_light_cylinder.html → examples/primitive/light_cylinder.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -29,12 +28,13 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style:"img",
-      crs:"WGS84"
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
+    viewer.addBaseLayer( baseLayer,{
+      brightness : 0.1
     })
-     baseLayer.defaultBrightness = 0.2
-    viewer.addBaseLayer( baseLayer)
     let layer = new DC.PrimitiveLayer('layer')
     viewer.addLayer(layer)
     let positions = generatePosition(10)
@@ -45,7 +45,7 @@
     })
     viewer.flyToPosition("120.36996122465003,31.124781668674515,1341.4084927106128,71.5,-24")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_point.html → examples/primitive/point.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -29,9 +28,9 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style:"img",
-      crs:"WGS84"
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.PrimitiveLayer('layer')
@@ -43,7 +42,7 @@
     })
     viewer.flyToPosition("120.71194923787839,31.416199224240913,160990.91306777575,0,-90")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_polyline.html → examples/primitive/polyline.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -22,9 +21,9 @@
     viewer.setOptions({
       enableFxaa:true
     })
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
       style:'img',
-      crs:"WGS84"
+      crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.PrimitiveLayer('layer')
@@ -49,7 +48,7 @@
     })
     layer.addOverlay(polyline)
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/scan_circle.html → examples/primitive/scan_circle.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -56,7 +55,7 @@
 
     viewer.flyToPosition("121.4941629,31.2091462,1859.56,0,-28.71")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/primitive_video.html → examples/primitive/video.html

@@ -6,24 +6,24 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
 
 <body>
-
-<div id="viewer-container">
-  <video id="video" muted autoplay loop crossorigin controls>
-    <source src="../assets/data/demo.mp4" type="video/mp4" />
-  </video>
-</div>
+<video id="video" muted autoplay loop crossorigin controls>
+  <source src="../assets/data/demo.mp4" type="video/mp4" />
+</video>
+<div id="viewer-container" class="viewer-container"></div>
 <script>
   let viewer = undefined
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer()
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
+      crs:'WGS84'
+    })
     viewer.addBaseLayer( baseLayer)
     let layer = new DC.PrimitiveLayer('layer')
     viewer.addLayer(layer)

examples/overlay/wall_diffuse.html → examples/primitive/wall_diffuse.html

@@ -6,7 +6,6 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title>dc-example</title>
   <script src='/libs/dc-sdk/dc.min.js'></script>
-  <script src="../dat.gui.min.js"></script>
   <link href='/libs/dc-sdk/dc.min.css' type='text/css' rel='stylesheet'>
   <link href='../index.css' type='text/css' rel='stylesheet'>
 </head>
@@ -19,12 +18,13 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
       crs:'WGS84'
     })
-     baseLayer.defaultBrightness = 0.2
-    viewer.addBaseLayer( baseLayer)
+    viewer.addBaseLayer( baseLayer,{
+      brightness : 0.1
+    })
     let layer = new DC.PrimitiveLayer('layer')
     viewer.addLayer(layer)
 
@@ -46,7 +46,7 @@
     layer.addOverlay(wall)
     viewer.flyToPosition("121.17008196721969,30.97885778607079,24403.084,3,-50.2,0.2")
   }
-    DC.ready({
+  DC.ready({
     baseUrl:'../libs/dc-sdk/resources/'
   }).then(initViewer)
 </script>

examples/overlay/water.html → examples/primitive/water.html

@@ -18,8 +18,8 @@
 
   function initViewer() {
     viewer = new DC.Viewer('viewer-container')
-    let  baseLayer = DC.ImageryLayerFactory.createAmapImageryLayer({
-      style: 'img',
+    let baseLayer = DC.ImageryLayerFactory.createImageryLayer(DC.ImageryType.AMAP,{
+      style:'img',
       crs:'WGS84'
     })
     viewer.addBaseLayer( baseLayer)

src/modules/layer/type/PrimitiveLayer.js

@@ -18,9 +18,7 @@ class PrimitiveLayer extends Layer {
     this._labels = this._delegate.add(new Cesium.LabelCollection())
     this._billboards = this._delegate.add(new Cesium.BillboardCollection())
     this._polylines = this._delegate.add(new Cesium.PolylineCollection())
-    if (Cesium.CloudCollection) {
-      this._clouds = this._delegate.add(new Cesium.CloudCollection())
-    }
+    this._clouds = this._delegate.add(new Cesium.CloudCollection())
     this._state = State.INITIALIZED
   }
 
@@ -58,9 +56,7 @@ class PrimitiveLayer extends Layer {
     this._labels = this._delegate.add(new Cesium.LabelCollection())
     this._billboards = this._delegate.add(new Cesium.BillboardCollection())
     this._polylines = this._delegate.add(new Cesium.PolylineCollection())
-    if (Cesium.CloudCollection) {
-      this._clouds = this._delegate.add(new Cesium.CloudCollection())
-    }
+    this._clouds = this._delegate.add(new Cesium.CloudCollection())
     this._cache = {}
     this._state = State.CLEARED
     return this

src/modules/overlay/Overlay.js

@@ -166,13 +166,14 @@ class Overlay {
     // for Primitive
     else if (this._layer?.delegate?.add) {
       let collection = this._getLayerCollection(this.type)
-
       if (collection) {
         this._delegate && (this._delegate = collection.add(this._delegate))
+        // for bounce primitive
         if (this['update'] && this['destroy']) {
           this._layer.delegate.add(this)
         }
-      } else if (this._delegate.then) {
+      } else if (this._delegate && this._delegate.then) {
+        // for 3dtiles
         this._delegate.then((obj) => {
           this._layer.delegate.add(obj)
         })
@@ -202,18 +203,20 @@ class Overlay {
     else if (this._layer?.delegate?.remove) {
       let collection = this._getLayerCollection(this.type)
       if (collection) {
-        collection.remove(this._delegate)
+        this._delegate && collection.remove(this._delegate)
+        // for bounce primitive
         if (this['update'] && this['destroy']) {
           this._layer.delegate.remove(this)
         }
-      } else if (this._delegate.then) {
+      } else if (this._delegate && this._delegate.then) {
+        // for 3dtiles
         this._delegate.then((obj) => {
           this._layer.delegate.add(obj)
         })
       } else if (this['update'] && this['destroy']) {
         this._layer.delegate.remove(this)
       } else {
-        this._layer.delegate.remove(this._delegate)
+        this._delegate && this._layer.delegate.remove(this._delegate)
       }
     }
     this._removedHook && this._removedHook()

src/modules/overlay/primitive/DiffuseWallPrimitive.js

@@ -37,7 +37,6 @@ class DiffuseWallPrimitive extends Overlay {
 
   set center(position) {
     this._center = Parse.parsePosition(position)
-    return this
   }
 
   get center() {
@@ -46,7 +45,6 @@ class DiffuseWallPrimitive extends Overlay {
 
   set radius(radius) {
     this._radius = radius
-    return this
   }
 
   get radius() {
@@ -55,7 +53,6 @@ class DiffuseWallPrimitive extends Overlay {
 
   set height(height) {
     this._height = height
-    return this
   }
 
   get height() {
@@ -96,14 +93,14 @@ class DiffuseWallPrimitive extends Overlay {
   /**
    *
    * @param length
-   * @param hegiht
+   * @param height
    * @returns {*[]}
    * @private
    */
-  _getHeights(length, hegiht) {
+  _getHeights(length, height) {
     let heights = []
     for (let i = 0; i < length; i++) {
-      heights.push(hegiht)
+      heights.push(height)
     }
     return heights
   }