diff --git a/Apps/Examples/cesium-primitive-createCube.html b/Apps/Examples/cesium-primitive-createCube.html new file mode 100644 index 00000000..253bbdc9 --- /dev/null +++ b/Apps/Examples/cesium-primitive-createCube.html @@ -0,0 +1,188 @@ + + + + + + + + + Cesium创建立方体 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/cesium-primitive-customAppearance.html b/Apps/Examples/cesium-primitive-customAppearance.html new file mode 100644 index 00000000..219d58e3 --- /dev/null +++ b/Apps/Examples/cesium-primitive-customAppearance.html @@ -0,0 +1,264 @@ + + + + + + + + + Cesium自定义Appearance + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/cesium-primitive-customMaterial.html b/Apps/Examples/cesium-primitive-customMaterial.html new file mode 100644 index 00000000..e5fe15af --- /dev/null +++ b/Apps/Examples/cesium-primitive-customMaterial.html @@ -0,0 +1,370 @@ + + + + + + + + + + Cesium自定义材质 + + + + + + + + +
+ +
+ + + + + + + \ No newline at end of file diff --git a/Apps/Examples/cesium-primitive-customPrimitive.html b/Apps/Examples/cesium-primitive-customPrimitive.html new file mode 100644 index 00000000..73079bcb --- /dev/null +++ b/Apps/Examples/cesium-primitive-customPrimitive.html @@ -0,0 +1,343 @@ + + + + + + + + + Cesium自定义Primitive + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/cesium-primitive-radarEffect.html b/Apps/Examples/cesium-primitive-radarEffect.html new file mode 100644 index 00000000..7d7c72c0 --- /dev/null +++ b/Apps/Examples/cesium-primitive-radarEffect.html @@ -0,0 +1,164 @@ + + + + + + + + + Cesium雷达特效 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-3dtiles-editing.html b/Apps/Examples/earth-3dtiles-editing.html index f10e047d..52f2a373 100644 --- a/Apps/Examples/earth-3dtiles-editing.html +++ b/Apps/Examples/earth-3dtiles-editing.html @@ -19,7 +19,8 @@ margin: 0px; padding: 0px; } - .box span{ + + .box span { display: block; margin-top: 10px; } @@ -59,7 +60,7 @@ diff --git a/Apps/Examples/earth-MVVM-watch.html b/Apps/Examples/earth-MVVM-watch.html index 53e2099b..afc95ba1 100644 --- a/Apps/Examples/earth-MVVM-watch.html +++ b/Apps/Examples/earth-MVVM-watch.html @@ -29,7 +29,7 @@ margin: 5px 0; cursor: pointer; } - + .fly { width: 20px; height: 16px; @@ -112,10 +112,10 @@ var height = 560; var us = setInterval(() => { height += 2; - if (height > 580) { - height = 560; - } - path1.positions.forEach(e => e[2] = height); + if (height > 580) { + height = 560; + } + path1.positions.forEach(e => e[2] = height); }, 100); // 1.1.2 场景配置 @@ -129,6 +129,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path1', @@ -208,7 +209,7 @@ // 1.1.3 跟踪 // 单向绑定的属性,pin将跟踪path1,但pin发生变化path1并不会跟踪! - this._pinUnbind = XE.MVVM.track(pin, 'position' , path1 , 'currentPosition'); + this._pinUnbind = XE.MVVM.track(pin, 'position', path1, 'currentPosition'); this._earth = earth; diff --git a/Apps/Examples/earth-analyzation-clipping.html b/Apps/Examples/earth-analyzation-clipping.html index b1e6df06..34df8136 100644 --- a/Apps/Examples/earth-analyzation-clipping.html +++ b/Apps/Examples/earth-analyzation-clipping.html @@ -5,7 +5,8 @@ - + + 分析-剖切 @@ -19,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -112,7 +113,8 @@ "planes": [ "9ab55d98-32ed-49ad-9004-1940f4903b68" ] - } + }, + "skipLevelOfDetail": false } }, { @@ -135,15 +137,10 @@ "name": "谷歌影像", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali", - "srcCoordType": "WGS84", + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", "dstCoordType": "WGS84", - "rectangle": [ - -3.141592653589793, - -1.5707963267948966, - 3.141592653589793, - 1.5707963267948966 - ] + "maximumLevel": 21, }, } } diff --git a/Apps/Examples/earth-analyzation-flattenning.html b/Apps/Examples/earth-analyzation-flattenning.html index 232cd326..05b5f5fb 100644 --- a/Apps/Examples/earth-analyzation-flattenning.html +++ b/Apps/Examples/earth-analyzation-flattenning.html @@ -5,7 +5,8 @@ - + + 分析-压平 @@ -19,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -43,7 +44,7 @@ } .btnon { - background-color: #1E9FFF; + background-color: #1E9FFF; color: #fff; border: 1px solid #1E9FFF; } @@ -100,7 +101,8 @@ "name": "三维瓦片1x", "url": "../assets/dayanta/tileset.json", "xbsjFlattenGuid": "93916e9b-82dd-4a56-b15e-27303b08e781", - "xbsjClippingPlanes": {} + "xbsjClippingPlanes": {}, + "skipLevelOfDetail": false } }, { @@ -136,8 +138,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.901702007648937,0.5972368795713086,495.4360416207723]; - earth.camera.rotation = [6.283185307179421,-0.7855047653582576,6.283185307179586]; + earth.camera.position = [1.901702007648937, 0.5972368795713086, 495.4360416207723]; + earth.camera.rotation = [6.283185307179421, -0.7855047653582576, 6.283185307179586]; // 1.1.5 数据绑定 // disposers 用来收集资源销毁函数,并在析构时自动调用! @@ -150,6 +152,7 @@ // only for Debug window.earth = earth; + window.tileset = tileset; }, // 1.2 资源销毁 beforeDestroy() { diff --git a/Apps/Examples/earth-analyzation-measurement.html b/Apps/Examples/earth-analyzation-measurement.html index b3c9cb16..a52859e2 100644 --- a/Apps/Examples/earth-analyzation-measurement.html +++ b/Apps/Examples/earth-analyzation-measurement.html @@ -5,7 +5,8 @@ - + + 分析-测量 @@ -36,7 +37,6 @@ .defultbtn:hover { background-color: #b3daf8; } - @@ -82,7 +82,8 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { diff --git a/Apps/Examples/earth-analyzation-video.html b/Apps/Examples/earth-analyzation-video.html index cbf8039d..88de33e6 100644 --- a/Apps/Examples/earth-analyzation-video.html +++ b/Apps/Examples/earth-analyzation-video.html @@ -101,8 +101,8 @@ far: 0, fovH: 0, fovV: 0, - videoUrl:'', - showHelper:true, + videoUrl: '', + showHelper: true, _earth: undefined, // 注意:Earth和Cesium的相关变量放在vue中,必须使用下划线作为前缀! }; }, @@ -119,42 +119,43 @@ "title": "项目2", "isSelected": true, "children": [{ - "czmObject": { - "xbsjType": "Tileset", - "xbsjGuid": "b4137394-d346-4434-a01e-5b2d3730ec9f", - "name": "三维瓦片1x", - "url": "//lab.earthsdk.com/model/f15b9e90ac2d11e99dbd8fd044883638/tileset.json", - "lightColor": null, - "specularEnvironmentMaps": null, - "xbsjPosition": [ - 1.9016974701882112, - 0.5972325152147303, - 425.8641913624607 - ], - "xbsjFlattenGuid": "93916e9b-82dd-4a56-b15e-27303b08e781", - "xbsjClippingPlanes": {} - } - }, - { - "ref": "cameravideo", - "czmObject": { - "xbsjType": "CameraVideo", - "xbsjGuid": "19e84dea-2faa-4949-95c2-8d333a03e0c7", - "name": "视频融合1", - "videoUrl": "//www.earthsdk.com/v/last/XbsjEarthUI/assets/demo.mp4", - "position": [ - 1.9017043698837766, - 0.5972379094016695, - 446.2499351617626 - ], - "rotation": [ - 0.07413323656963833, - -0.933639537288121, - 0.0003900191769634631 - ], - "far": 50 - } + "czmObject": { + "xbsjType": "Tileset", + "xbsjGuid": "b4137394-d346-4434-a01e-5b2d3730ec9f", + "name": "三维瓦片1x", + "url": "//lab.earthsdk.com/model/f15b9e90ac2d11e99dbd8fd044883638/tileset.json", + "lightColor": null, + "specularEnvironmentMaps": null, + "xbsjPosition": [ + 1.9016974701882112, + 0.5972325152147303, + 425.8641913624607 + ], + "xbsjFlattenGuid": "93916e9b-82dd-4a56-b15e-27303b08e781", + "xbsjClippingPlanes": {}, + "skipLevelOfDetail": false } + }, + { + "ref": "cameravideo", + "czmObject": { + "xbsjType": "CameraVideo", + "xbsjGuid": "19e84dea-2faa-4949-95c2-8d333a03e0c7", + "name": "视频融合1", + "videoUrl": "//www.earthsdk.com/v/last/XbsjEarthUI/assets/demo.mp4", + "position": [ + 1.9017043698837766, + 0.5972379094016695, + 446.2499351617626 + ], + "rotation": [ + 0.07413323656963833, + -0.933639537288121, + 0.0003900191769634631 + ], + "far": 50 + } + } ] }] } diff --git a/Apps/Examples/earth-analyzation-viewshed.html b/Apps/Examples/earth-analyzation-viewshed.html index b34c8bdf..47d58301 100644 --- a/Apps/Examples/earth-analyzation-viewshed.html +++ b/Apps/Examples/earth-analyzation-viewshed.html @@ -117,6 +117,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { diff --git a/Apps/Examples/earth-analyzation-volumeMeasurement.html b/Apps/Examples/earth-analyzation-volumeMeasurement.html index a5d15e60..279adcfb 100644 --- a/Apps/Examples/earth-analyzation-volumeMeasurement.html +++ b/Apps/Examples/earth-analyzation-volumeMeasurement.html @@ -5,7 +5,8 @@ - + + 分析-体积测量 @@ -51,7 +52,6 @@ font-size: 16px; padding: 0 5px; } - @@ -157,7 +157,8 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { diff --git a/Apps/Examples/earth-camera-firstpersion.html b/Apps/Examples/earth-camera-firstpersion.html index a4477082..6fe7704f 100644 --- a/Apps/Examples/earth-camera-firstpersion.html +++ b/Apps/Examples/earth-camera-firstpersion.html @@ -158,6 +158,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { diff --git a/Apps/Examples/earth-customPrimitive.html b/Apps/Examples/earth-customPrimitive.html new file mode 100644 index 00000000..bb7f73c4 --- /dev/null +++ b/Apps/Examples/earth-customPrimitive.html @@ -0,0 +1,109 @@ + + + + + + + + + 自定义图元 + + + + + + +
+
+
+ +
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-customPrimitive2.html b/Apps/Examples/earth-customPrimitive2.html new file mode 100644 index 00000000..a8848f22 --- /dev/null +++ b/Apps/Examples/earth-customPrimitive2.html @@ -0,0 +1,243 @@ + + + + + + + + + 自定义图元2 + + + + + + +
+
+
+ +
+ + + + + \ No newline at end of file diff --git a/Apps/Examples/earth-digitalCity.html b/Apps/Examples/earth-digitalCity.html new file mode 100644 index 00000000..447a8697 --- /dev/null +++ b/Apps/Examples/earth-digitalCity.html @@ -0,0 +1,133 @@ + + + + + + + + + 数字城市 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-digitalFactory.html b/Apps/Examples/earth-digitalFactory.html new file mode 100644 index 00000000..a48b6295 --- /dev/null +++ b/Apps/Examples/earth-digitalFactory.html @@ -0,0 +1,134 @@ + + + + + + + + + 数字工厂 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-editing.html b/Apps/Examples/earth-editing.html index e4856040..70e89f17 100644 --- a/Apps/Examples/earth-editing.html +++ b/Apps/Examples/earth-editing.html @@ -5,7 +5,8 @@ - + + 编辑互斥 @@ -19,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -95,7 +96,8 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { @@ -103,7 +105,8 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjPosition": [1.901764255186154, 0.5972325152147303, 425.8641913624607], - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { @@ -116,7 +119,7 @@ var tileset1 = earth.sceneTree.root.children[0].czmObject; var tileset2 = earth.sceneTree.root.children[1].czmObject; - + // only for Debug window.earth = earth; window.tileset1 = tileset1; diff --git a/Apps/Examples/earth-effect-bloom.html b/Apps/Examples/earth-effect-bloom.html index 1a925697..135ed043 100644 --- a/Apps/Examples/earth-effect-bloom.html +++ b/Apps/Examples/earth-effect-bloom.html @@ -29,7 +29,7 @@ margin: 5px 0; cursor: pointer; } - + .shadowbox { width: 20px; height: 16px; @@ -59,7 +59,6 @@ color: #fff; border: 1px solid #1E9FFF; } - @@ -109,37 +108,38 @@ // 默认显示天地图影像 earth.sceneTree.root = { "children": [{ - "ref": 'tileset', - "czmObject": { - "xbsjType": "Tileset", - "name": "白模测试", - "url": "//lab.earthsdk.com/model/908311a0ac2f11e99dbd8fd044883638/tileset.json", - "luminanceAtZenith": 0.8, // 提高亮度 - "xbsjPosition": [ - 2.120577669988032, - 0.545203009169497, - 9.313225746154785e-10 - ], - } - }, { - "czmObject": { - "xbsjType": "Imagery", - "name": "百度暗色风格", - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//api0.map.bdimg.com/customimage/tile?=&x={x}&y={y}&z={z}&scale=1&customid=midnight", - "srcCoordType": "BD09", - "dstCoordType": "WGS84", - "rectangle": [ - -3.141592653589793, - -1.5707963267948966, - 3.141592653589793, - 1.5707963267948966 - ] - }, - } + "ref": 'tileset', + "czmObject": { + "xbsjType": "Tileset", + "name": "白模测试", + "url": "//lab.earthsdk.com/model/908311a0ac2f11e99dbd8fd044883638/tileset.json", + "luminanceAtZenith": 0.8, // 提高亮度 + "xbsjPosition": [ + 2.120577669988032, + 0.545203009169497, + 9.313225746154785e-10 + ], + "skipLevelOfDetail": false + } + }, { + "czmObject": { + "xbsjType": "Imagery", + "name": "百度暗色风格", + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//api0.map.bdimg.com/customimage/tile?=&x={x}&y={y}&z={z}&scale=1&customid=midnight", + "srcCoordType": "BD09", + "dstCoordType": "WGS84", + "rectangle": [ + -3.141592653589793, + -1.5707963267948966, + 3.141592653589793, + 1.5707963267948966 + ] + }, } } + } ] } @@ -147,8 +147,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [2.120069990413752,0.5447829944974025,218.4753177709103]; - earth.camera.rotation = [0.051857712187779015,-0.7346991033500352,0.00020811900760620006]; + earth.camera.position = [2.1204784429287287, 0.5453567434019185, 984.8776452043272]; + earth.camera.rotation = [2.6041692528943043, -0.8105587768466127, 0.002203744534782004]; // 1.1.3 数据绑定 this._enabledUnbind = XE.MVVM.bind(this, 'enabled', earth.postProcess.bloom, 'enabled'); @@ -164,6 +164,7 @@ // only for Debug window.earth = earth; + window.tileset = tileset1; }, methods: { }, diff --git a/Apps/Examples/earth-effect-bloom2.html b/Apps/Examples/earth-effect-bloom2.html deleted file mode 100644 index ac7a8622..00000000 --- a/Apps/Examples/earth-effect-bloom2.html +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - 效果-泛光2 - - - - - - - -
- -
- - - - - \ No newline at end of file diff --git a/Apps/Examples/earth-effect-shadow.html b/Apps/Examples/earth-effect-shadow.html index b97233b7..cad9257e 100644 --- a/Apps/Examples/earth-effect-shadow.html +++ b/Apps/Examples/earth-effect-shadow.html @@ -28,7 +28,7 @@ display: inline-block; cursor: pointer; } - + .shadowbox { width: 20px; height: 16px; @@ -58,7 +58,6 @@ color: #fff; border: 1px solid #1E9FFF; } - @@ -112,21 +111,22 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { - "czmObject": { - "name": '离线影像', - "xbsjType": "Imagery", - "xbsjImageryProvider": XE.Obj.Imagery.defaultImageryProviderConfig, - } + "czmObject": { + "name": '离线影像', + "xbsjType": "Imagery", + "xbsjImageryProvider": XE.Obj.Imagery.defaultImageryProviderConfig, } + } ] } // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.901703278961517,0.5971775186512027,804.7994518114391]; - earth.camera.rotation = [1.5898393712632242e-13,-0.7855880281448457,1.0658141036401503e-14]; + earth.camera.position = [1.901703278961517, 0.5971775186512027, 804.7994518114391]; + earth.camera.rotation = [1.5898393712632242e-13, -0.7855880281448457, 1.0658141036401503e-14]; // 1.1.3 数据绑定 this._enabledUnbind = XE.MVVM.bind(this, 'enabled', earth.effect.shadow, 'enabled'); diff --git a/Apps/Examples/earth-forceSunPos.html b/Apps/Examples/earth-forceSunPos.html new file mode 100644 index 00000000..33fc4d57 --- /dev/null +++ b/Apps/Examples/earth-forceSunPos.html @@ -0,0 +1,194 @@ + + + + + + + + + + 强制光照 + + + + + + + +
+ +
+ + + + + \ No newline at end of file diff --git a/Apps/Examples/earth-heatMap-currentTime.html b/Apps/Examples/earth-heatMap-currentTime.html index e1679850..0993bd33 100644 --- a/Apps/Examples/earth-heatMap-currentTime.html +++ b/Apps/Examples/earth-heatMap-currentTime.html @@ -61,16 +61,16 @@ "isSelected": true, "children": [{ "czmObject": { - "xbsjType": "Imagery", - "enabled": true, - "name": "谷歌影像", - "show": true, - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "xbsjType": "Imagery", + "enabled": true, + "name": "谷歌影像", + "show": true, + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + } } } - } }, { "czmObject": { @@ -81,22 +81,23 @@ 1.9016974701882112, 0.5972325152147303, 58.352576160356152 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'heatMap1', - "czmObject": { - "xbsjType": "HeatMap", - "position": [ - 1.9017007449558452, - 0.5972456941664638, - 63.031468750219 - ], - "currentTime": 0.4 - } + "ref": 'heatMap1', + "czmObject": { + "xbsjType": "HeatMap", + "position": [ + 1.9017007449558452, + 0.5972456941664638, + 63.031468750219 + ], + "currentTime": 0.4 } + } ] }; @@ -105,11 +106,11 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9017007825090926,0.5971781640070272,560.8409616524489]; - earth.camera.rotation = [0.01840316159516142,-0.9757898491558104,0.00010288720237294768]; + earth.camera.position = [1.9017007825090926, 0.5971781640070272, 560.8409616524489]; + earth.camera.rotation = [0.01840316159516142, -0.9757898491558104, 0.00010288720237294768]; // 设置初始值 - heatMap1.imageUrls=["./images/baidu.png","./images/logo.png","./images/sougou.jpg"]; + heatMap1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; // 1.1.5 数据绑定 this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', heatMap1, 'currentTime'); diff --git a/Apps/Examples/earth-heatMap-editing.html b/Apps/Examples/earth-heatMap-editing.html index 0ab3f337..1589eafd 100644 --- a/Apps/Examples/earth-heatMap-editing.html +++ b/Apps/Examples/earth-heatMap-editing.html @@ -20,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: inline-block; margin-top: 10px; } @@ -97,16 +97,16 @@ "isSelected": true, "children": [{ "czmObject": { - "xbsjType": "Imagery", - "enabled": true, - "name": "谷歌影像", - "show": true, - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "xbsjType": "Imagery", + "enabled": true, + "name": "谷歌影像", + "show": true, + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + } } } - } }, { "czmObject": { @@ -117,21 +117,22 @@ 1.9016974701882112, 0.5972325152147303, 58.352576160356152 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'heatMap1', - "czmObject": { - "xbsjType": "HeatMap", - "position": [ - 1.9017007449558452, - 0.5972456941664638, - 63.031468750219 - ], - } + "ref": 'heatMap1', + "czmObject": { + "xbsjType": "HeatMap", + "position": [ + 1.9017007449558452, + 0.5972456941664638, + 63.031468750219 + ], } + } ] }; @@ -140,8 +141,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.901698593871776,0.5971787500035555,373.14370697033013]; - earth.camera.rotation = [0.03593315314102252,-0.7634808012756493,0.00015558788214686814]; + earth.camera.position = [1.901698593871776, 0.5971787500035555, 373.14370697033013]; + earth.camera.rotation = [0.03593315314102252, -0.7634808012756493, 0.00015558788214686814]; // 1.1.5 数据绑定 this._creatingUnbind = XE.MVVM.bind(this, 'creating', heatMap1, 'creating'); diff --git a/Apps/Examples/earth-heatMap-play.html b/Apps/Examples/earth-heatMap-play.html index 5de896ad..1ae4fa00 100644 --- a/Apps/Examples/earth-heatMap-play.html +++ b/Apps/Examples/earth-heatMap-play.html @@ -28,7 +28,7 @@ display: inline-block; cursor: pointer; } - + .play { width: 20px; height: 16px; @@ -62,6 +62,7 @@ .colorbox { width: 50px; } + .inputbox { background-color: white; font-size: 12px; @@ -74,6 +75,7 @@ margin-bottom: 0; width: 346px; } + .input { font-size: 14px; border: none; @@ -91,6 +93,7 @@ margin: 2px; line-height: 30px; } + .arrbox { border-radius: 6px; margin-bottom: 10px; @@ -98,6 +101,7 @@ text-align: left; font-size: 0; } + .spanbox { line-height: 30px; margin: 2px; @@ -113,9 +117,11 @@ overflow: hidden; transition: 0.25s linear; } + .spanbox:hover { padding: 0px 17px 0 3px; } + .spanclose { color: white; padding: 0 10px 0 0; @@ -134,12 +140,14 @@ transition: opacity 0.25s linear; font-style: normal; } + .spanbox:hover .spanclose { padding: 0 10px 5px 0; opacity: 1; -webkit-filter: none; filter: none; } + .spanclose:after { content: "x"; -webkit-font-smoothing: antialiased; @@ -208,16 +216,16 @@ "isSelected": true, "children": [{ "czmObject": { - "xbsjType": "Imagery", - "enabled": true, - "name": "谷歌影像", - "show": true, - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "xbsjType": "Imagery", + "enabled": true, + "name": "谷歌影像", + "show": true, + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + } } } - } }, { "czmObject": { @@ -228,22 +236,23 @@ 1.9016974701882112, 0.5972325152147303, 58.352576160356152 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'heatMap1', - "czmObject": { - "xbsjType": "HeatMap", - "position": [ - 1.9017007449558452, - 0.5972456941664638, - 63.031468750219 - ], - "playing": true - } + "ref": 'heatMap1', + "czmObject": { + "xbsjType": "HeatMap", + "position": [ + 1.9017007449558452, + 0.5972456941664638, + 63.031468750219 + ], + "playing": true } + } ] }; @@ -252,12 +261,12 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.901698836771133,0.5971822607273302,501.17684409661535]; - earth.camera.rotation = [0.03593315314102252,-0.7634808012756493,0.00015558788214686814]; + earth.camera.position = [1.901698836771133, 0.5971822607273302, 501.17684409661535]; + earth.camera.rotation = [0.03593315314102252, -0.7634808012756493, 0.00015558788214686814]; // 设置初始值 - this.labelarr=["./images/baidu.png","./images/logo.png","./images/sougou.jpg"]; - heatMap1.imageUrls=["./images/baidu.png","./images/logo.png","./images/sougou.jpg"]; + this.labelarr = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; + heatMap1.imageUrls = ["./images/baidu.png", "./images/logo.png", "./images/sougou.jpg"]; // 1.1.5 数据绑定 this._playingUnbind = XE.MVVM.bind(this, 'playing', heatMap1, 'playing'); @@ -274,22 +283,22 @@ }, methods: { // 移除标签 - removeitem (index, item) { + removeitem(index, item) { this.labelarr.splice(index, 1); heatMap1.imageUrls = this.labelarr; }, // input回车加入labelarr中 - addlabel () { + addlabel() { this.labelarr.push(this.currentval); this.currentval = '' if (this.labelarr.length > 0) { - this.imageUrls=[]; + this.imageUrls = []; for (let i = 0; i < this.labelarr.length; i++) { - if(this.labelarr[i] !== "") { + if (this.labelarr[i] !== "") { this.imageUrls.push(this.labelarr[i]); } else { return; - } + } } } heatMap1.imageUrls = this.imageUrls; diff --git a/Apps/Examples/earth-imagery-gaode.html b/Apps/Examples/earth-imagery-gaode.html index 90988a61..ccd9dfae 100644 --- a/Apps/Examples/earth-imagery-gaode.html +++ b/Apps/Examples/earth-imagery-gaode.html @@ -41,7 +41,8 @@ "XbsjImageryProvider": { "url": "//webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}", "srcCoordType": "GCJ02", - "dstCoordType": "WGS84" + "dstCoordType": "WGS84", + "maximumLevel": 18, }, } } diff --git a/Apps/Examples/earth-imagery-googleMark.html b/Apps/Examples/earth-imagery-googleMark.html index 3ec3881e..825d73d5 100644 --- a/Apps/Examples/earth-imagery-googleMark.html +++ b/Apps/Examples/earth-imagery-googleMark.html @@ -40,6 +40,7 @@ "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", "srcCoordType": "GCJ02", "dstCoordType": "WGS84", + "maximumLevel": 21, }, } } diff --git a/Apps/Examples/earth-imagery-googleUnmark.html b/Apps/Examples/earth-imagery-googleUnmark.html index 85a0a784..3d6accb3 100644 --- a/Apps/Examples/earth-imagery-googleUnmark.html +++ b/Apps/Examples/earth-imagery-googleUnmark.html @@ -39,7 +39,8 @@ "XbsjImageryProvider": { "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali", "srcCoordType": "GCJ02", - "dstCoordType": "WGS84", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } } diff --git a/Apps/Examples/earth-imagery-imageryCorrection.html b/Apps/Examples/earth-imagery-imageryCorrection.html index 86b75744..c5faf02d 100644 --- a/Apps/Examples/earth-imagery-imageryCorrection.html +++ b/Apps/Examples/earth-imagery-imageryCorrection.html @@ -5,7 +5,8 @@ - + + 影像-纠偏 @@ -19,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -47,14 +48,16 @@ color: #fff; border: 1px solid #1E9FFF; } - .dialog, .tip { + + .dialog, + .tip { position: absolute; width: 84px; min-height: 22px; color: white; padding: 5px; border-radius: 5px; - cursor:pointer; + cursor: pointer; } @@ -122,8 +125,9 @@ 1.9016974701882112, 0.5972325152147303, 8.352576160356152 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": "imagery", @@ -177,7 +181,7 @@ "czmObject": { "name": 'Pin1', "xbsjType": "Pin", - "position": [1.9017393161494873, 0.5972330002724645, 9.313225746154785e-10], + "position": [1.9017393161494873, 0.5972330002724645, 9.313225746154785e-10], "show": false }, }, { @@ -185,7 +189,7 @@ "czmObject": { "name": 'Pin2', "xbsjType": "Pin", - "position": [1.9017217177802577, 0.5971871382500731, 9.313225746154785e-10], + "position": [1.9017217177802577, 0.5971871382500731, 9.313225746154785e-10], "show": false }, }] @@ -237,8 +241,8 @@ // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 // this._earth.camera.position = [1.9016996731582811,0.5972206212385686,891.9777956516596]; // this._earth.camera.rotation = [6.2652663916764455,-1.4855510600618218,6.283185307179586]; - const position = [1.9016996731582811,0.5972206212385686,891.9777956516596]; - const rotation = [6.2652663916764455,-1.4855510600618218,6.283185307179586]; + const position = [1.9016996731582811, 0.5972206212385686, 891.9777956516596]; + const rotation = [6.2652663916764455, -1.4855510600618218, 6.283185307179586]; this._earth.camera.flyTo(position, 0, rotation); } }, diff --git a/Apps/Examples/earth-imagery-zIndex.html b/Apps/Examples/earth-imagery-zIndex.html index d52edf43..1012d5a9 100644 --- a/Apps/Examples/earth-imagery-zIndex.html +++ b/Apps/Examples/earth-imagery-zIndex.html @@ -116,7 +116,10 @@ "show": true, "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, diff --git a/Apps/Examples/earth-mapv-map-point-heatmap.html b/Apps/Examples/earth-mapv-map-point-heatmap.html new file mode 100644 index 00000000..715c9476 --- /dev/null +++ b/Apps/Examples/earth-mapv-map-point-heatmap.html @@ -0,0 +1,76 @@ + + + + + + + + + + mapv-热力图 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-bubble.html b/Apps/Examples/earth-mapv-point-bubble.html new file mode 100644 index 00000000..0db272a1 --- /dev/null +++ b/Apps/Examples/earth-mapv-point-bubble.html @@ -0,0 +1,88 @@ + + + + + + + + + + mapv-气泡 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-category.html b/Apps/Examples/earth-mapv-point-category.html new file mode 100644 index 00000000..abefd47f --- /dev/null +++ b/Apps/Examples/earth-mapv-point-category.html @@ -0,0 +1,78 @@ + + + + + + + + + + mapv-种类 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-choropleth.html b/Apps/Examples/earth-mapv-point-choropleth.html new file mode 100644 index 00000000..53ee48b4 --- /dev/null +++ b/Apps/Examples/earth-mapv-point-choropleth.html @@ -0,0 +1,86 @@ + + + + + + + + + + mapv-点等值线图 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-cluster.html b/Apps/Examples/earth-mapv-point-cluster.html new file mode 100644 index 00000000..f0aed22f --- /dev/null +++ b/Apps/Examples/earth-mapv-point-cluster.html @@ -0,0 +1,75 @@ + + + + + + + + + + mapv-集群 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-density-rect.html b/Apps/Examples/earth-mapv-point-density-rect.html new file mode 100644 index 00000000..8df832c0 --- /dev/null +++ b/Apps/Examples/earth-mapv-point-density-rect.html @@ -0,0 +1,83 @@ + + + + + + + + + + mapv-矩形 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-honeycomb.html b/Apps/Examples/earth-mapv-point-honeycomb.html new file mode 100644 index 00000000..c43bdbf9 --- /dev/null +++ b/Apps/Examples/earth-mapv-point-honeycomb.html @@ -0,0 +1,85 @@ + + + + + + + + + + mapv-蜂窝状 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-point-intensity.html b/Apps/Examples/earth-mapv-point-intensity.html new file mode 100644 index 00000000..16562fc0 --- /dev/null +++ b/Apps/Examples/earth-mapv-point-intensity.html @@ -0,0 +1,80 @@ + + + + + + + + + + mapv-点强度 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-polygon-choropleth.html b/Apps/Examples/earth-mapv-polygon-choropleth.html new file mode 100644 index 00000000..6d12345e --- /dev/null +++ b/Apps/Examples/earth-mapv-polygon-choropleth.html @@ -0,0 +1,106 @@ + + + + + + + + + + mapv-多边形等值线图 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-polygon-intensity.html b/Apps/Examples/earth-mapv-polygon-intensity.html new file mode 100644 index 00000000..3f4609e7 --- /dev/null +++ b/Apps/Examples/earth-mapv-polygon-intensity.html @@ -0,0 +1,96 @@ + + + + + + + + + + mapv-多边形强度 + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-polyline-animation.html b/Apps/Examples/earth-mapv-polyline-animation.html new file mode 100644 index 00000000..f8f0deba --- /dev/null +++ b/Apps/Examples/earth-mapv-polyline-animation.html @@ -0,0 +1,127 @@ + + + + + + + + + + mapv-多段线动画 + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-polyline-simple.html b/Apps/Examples/earth-mapv-polyline-simple.html new file mode 100644 index 00000000..06de7b9b --- /dev/null +++ b/Apps/Examples/earth-mapv-polyline-simple.html @@ -0,0 +1,81 @@ + + + + + + + + + + mapv-简单折线 + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-mapv-webgl-simple.html b/Apps/Examples/earth-mapv-webgl-simple.html new file mode 100644 index 00000000..ccdcbb1d --- /dev/null +++ b/Apps/Examples/earth-mapv-webgl-simple.html @@ -0,0 +1,68 @@ + + + + + + + + + + mapv-webgl + + + + + + + +
+
+ + + + \ No newline at end of file diff --git a/Apps/Examples/earth-model-editing.html b/Apps/Examples/earth-model-editing.html index 5f6d95a5..bdfa0de7 100644 --- a/Apps/Examples/earth-model-editing.html +++ b/Apps/Examples/earth-model-editing.html @@ -97,7 +97,10 @@ "name": "谷歌影像", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali", + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, diff --git a/Apps/Examples/earth-path-currentD.html b/Apps/Examples/earth-path-currentD.html index b92149a0..e49e2150 100644 --- a/Apps/Examples/earth-path-currentD.html +++ b/Apps/Examples/earth-path-currentD.html @@ -29,7 +29,7 @@ margin: 5px 0; cursor: pointer; } - + .fly { width: 20px; height: 16px; @@ -105,6 +105,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path1', @@ -184,7 +185,7 @@ // 1.1.4 跟踪 // 单向绑定的属性,pin将跟踪path1,但pin发生变化path1并不会跟踪! // currentPosition 当前相机位置,形式如:[0, 0, 0] 该数组中的元素分别表示经度(单位弧度)、纬度(单位弧度)、高度(单位米)。 注意该属性,为只读属性! - this._pinUnbind = XE.MVVM.track(pin, 'position' , path1 , 'currentPosition'); + this._pinUnbind = XE.MVVM.track(pin, 'position', path1, 'currentPosition'); this._earth = earth; @@ -204,7 +205,7 @@ cameraAttachedClick() { this.cameraAttached = !this.cameraAttached; // 飞回原始位置 - earth.camera.flyTo([1.9017007350831854,0.5971922118633656,852.1812706303504], 0, [1.794120407794253e-13,-0.7863066183499514,6.283185307179586]); + earth.camera.flyTo([1.9017007350831854, 0.5971922118633656, 852.1812706303504], 0, [1.794120407794253e-13, -0.7863066183499514, 6.283185307179586]); } }, // 1.2 资源销毁 diff --git a/Apps/Examples/earth-path-direction.html b/Apps/Examples/earth-path-direction.html index 94bf12f7..d08f415e 100644 --- a/Apps/Examples/earth-path-direction.html +++ b/Apps/Examples/earth-path-direction.html @@ -20,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -93,6 +93,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path1', @@ -157,8 +158,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9017581050561334,0.5971620000864428,902.9488013429717]; - earth.camera.rotation = [5.68519760929593,-0.6384030801215013,6.280994248737583]; + earth.camera.position = [1.9017581050561334, 0.5971620000864428, 902.9488013429717]; + earth.camera.rotation = [5.68519760929593, -0.6384030801215013, 6.280994248737583]; var tileset = earth.sceneTree.$refs.tileset.czmObject; var path1 = earth.sceneTree.$refs.path1.czmObject; diff --git a/Apps/Examples/earth-path-doubleView.html b/Apps/Examples/earth-path-doubleView.html index 6f3fb763..192954dc 100644 --- a/Apps/Examples/earth-path-doubleView.html +++ b/Apps/Examples/earth-path-doubleView.html @@ -29,7 +29,7 @@ margin: 5px 0; cursor: pointer; } - + .fly { width: 20px; height: 16px; @@ -111,6 +111,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path1', @@ -189,6 +190,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path2', @@ -276,8 +278,8 @@ // 1.1.4 跟踪 // 单向绑定的属性,pin将跟踪path1,但pin发生变化path1并不会跟踪! // currentPosition 当前相机位置,形式如:[0, 0, 0] 该数组中的元素分别表示经度(单位弧度)、纬度(单位弧度)、高度(单位米)。 注意该属性,为只读属性! - this._pin1Unbind = XE.MVVM.track(pin1, 'position' , path1 , 'currentPosition'); - this._pin2Unbind = XE.MVVM.track(pin2, 'position' , path2 , 'currentPosition'); + this._pin1Unbind = XE.MVVM.track(pin1, 'position', path1, 'currentPosition'); + this._pin2Unbind = XE.MVVM.track(pin2, 'position', path2, 'currentPosition'); // 绑定相机 path2.cameraAttached = true; diff --git a/Apps/Examples/earth-path-editing.html b/Apps/Examples/earth-path-editing.html index 58aa5bca..6213940e 100644 --- a/Apps/Examples/earth-path-editing.html +++ b/Apps/Examples/earth-path-editing.html @@ -50,23 +50,29 @@ color: #fff; border: 1px solid #1E9FFF; } + select { font-size: 20px; } + .setbox span:nth-child(1) { font-weight: bold; display: inline-block; margin: 5px 0; } + .ivu-tooltip-popper { left: 20px !important; } + .ivu-select-selection { border-radius: 0; } + .ivu-select-multiple .ivu-tag span:not(.ivu-select-max-tag) { margin-top: 0px; } + button { width: 200px; background: transparent; @@ -77,6 +83,7 @@ font-size: 30px; cursor: pointer; } + .ivu-select-multiple .ivu-select-selection .ivu-select-placeholder { height: 20px; line-height: 20px; @@ -85,14 +92,17 @@ font-size: 20px; font-weight: normal; } + .ivu-select-single .ivu-select-selection .ivu-select-selected-value { height: 20px; line-height: 20px; font-size: 20px; } + .ivu-tag { font-size: 20px; } + .ivu-select-item { font-size: 20px !important; } @@ -188,6 +198,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'path1', @@ -320,15 +331,15 @@ }) var cameraLength = path1.positions.length; - for(var i=0; i - + + 路径-室内漫游 @@ -499,7 +500,8 @@ 0.6965069903408323, 9.831644570475259 ], - "xbsjClippingPlanes": {} + "xbsjClippingPlanes": {}, + "skipLevelOfDetail": false } }, { @@ -526,7 +528,7 @@ path.currentSpeed = 2; // 开始播放 // path.playing = true; - + // 当前相机是否可见 // 当前相机指位于currentPosition处的一个相机。 // 此属性,主要用来显示当前播放的位置,方便调试。 @@ -546,6 +548,7 @@ // only for Debug window.earth = earth; window.path = path; + window.bim = bim; }, filters: { numFilter(value) { diff --git a/Apps/Examples/earth-path-viewshed.html b/Apps/Examples/earth-path-viewshed.html index af61d35d..9e12ae63 100644 --- a/Apps/Examples/earth-path-viewshed.html +++ b/Apps/Examples/earth-path-viewshed.html @@ -5,7 +5,8 @@ - + + 路径-视域分析 @@ -28,7 +29,7 @@ margin: 5px 0; cursor: pointer; } - + .fly { width: 20px; height: 16px; @@ -117,7 +118,8 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { @@ -125,7 +127,7 @@ "xbsjType": "Imagery", "xbsjImageryProvider": XE.Obj.Imagery.defaultImageryProviderConfig, }, - }, { + }, { "ref": "viewshed", "czmObject": { "xbsjType": "Viewshed", diff --git a/Apps/Examples/earth-picking-3dtiles.html b/Apps/Examples/earth-picking-3dtiles.html index ece3b3cb..5500c5ec 100644 --- a/Apps/Examples/earth-picking-3dtiles.html +++ b/Apps/Examples/earth-picking-3dtiles.html @@ -5,7 +5,8 @@ - + + 拾取-3dtiles数据 @@ -86,12 +87,13 @@ "type": 'createTileMapServiceImageryProvider', }, } - }, + }, { "czmObject": { "xbsjType": "Tileset", "name": "BIM测试", "url": "//lab.earthsdk.com/model/d16c1ce0ac2d11e99dbd8fd044883638/tileset.json", + "skipLevelOfDetail": false } } ] @@ -108,7 +110,7 @@ var silhouetteGreen = Cesium.PostProcessStageLibrary.createEdgeDetectionStage(); silhouetteGreen.uniforms.color = Cesium.Color.LIME; silhouetteGreen.uniforms.length = 0.01; - silhouetteGreen.selected = []; + silhouetteGreen.selected = []; earth.czm.scene.postProcessStages.add(Cesium.PostProcessStageLibrary.createSilhouetteStage([silhouetteBlue, silhouetteGreen])); @@ -138,7 +140,7 @@ } // return false; 是否禁用点选效果? }; - + tileset1.onmouseout = () => { if (silhouetteGreen.selected && silhouetteGreen.selected.length > 0) { silhouetteGreen.selected = []; diff --git a/Apps/Examples/earth-pin-div.html b/Apps/Examples/earth-pin-div.html index cdb49dc0..b65ce659 100644 --- a/Apps/Examples/earth-pin-div.html +++ b/Apps/Examples/earth-pin-div.html @@ -5,7 +5,8 @@ - + + Pin-div @@ -32,7 +33,7 @@ background-size: 100% 100%; padding: 5px; border-radius: 5px; - cursor:pointer; + cursor: pointer; } @@ -86,14 +87,15 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'pin1', "czmObject": { "name": 'Pin1', "xbsjType": "Pin", - "position": [1.9017005694855162, 0.5972477268978722, 488.7695178987821], + "position": [1.9017005694855162, 0.5972477268978722, 488.7695178987821], "near": 300, "show": false }, @@ -117,9 +119,9 @@ // xepd: xepositionDistance的缩写 // pin1.position.xepd(earth.camera.position): 计算相机和pin之间的距离 const d = pin1.position.xepd(earth.camera.position); - if(d < 100) { + if (d < 100) { this.showInfo = false; - }else { + } else { this.showInfo = true; } }); diff --git a/Apps/Examples/earth-pin-editing.html b/Apps/Examples/earth-pin-editing.html index a5f72229..3a2cadda 100644 --- a/Apps/Examples/earth-pin-editing.html +++ b/Apps/Examples/earth-pin-editing.html @@ -5,7 +5,8 @@ - + + Pin-编辑 @@ -19,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -97,7 +98,8 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'pin1', @@ -119,7 +121,7 @@ var pin1 = earth.sceneTree.$refs.pin1.czmObject; // 飞入大雁塔 tileset.flyTo(); - + // 1.1.5 数据绑定 this._creatingUnbind = XE.MVVM.bind(this, 'creating', pin1, 'creating'); this._editingUnbind = XE.MVVM.bind(this, 'editing', pin1, 'editing'); @@ -133,6 +135,7 @@ // only for Debug window.earth = earth; window.pin1 = pin1; + window.tileset = tileset; }, filters: { numFilter(value) { diff --git a/Apps/Examples/earth-pin-gif.html b/Apps/Examples/earth-pin-gif.html index 33004ae3..12cab9ed 100644 --- a/Apps/Examples/earth-pin-gif.html +++ b/Apps/Examples/earth-pin-gif.html @@ -7,7 +7,7 @@ - Pin-div + Pin-gif @@ -84,6 +84,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'pin1', diff --git a/Apps/Examples/earth-pin-onclick.html b/Apps/Examples/earth-pin-onclick.html index ca23a307..e59fdac3 100644 --- a/Apps/Examples/earth-pin-onclick.html +++ b/Apps/Examples/earth-pin-onclick.html @@ -5,7 +5,8 @@ - + + Pin-onclick @@ -72,14 +73,15 @@ "name": '大雁塔', "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', - "xbsjUseOriginTransform": false, + "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'pin1', "czmObject": { "name": 'Pin1', "xbsjType": "Pin", - "position": [1.9016974701882112, 0.5972325152147303, 425.8641913624607], + "position": [1.9016974701882112, 0.5972325152147303, 425.8641913624607], "near": 100, }, }, { diff --git a/Apps/Examples/earth-polyline-editing.html b/Apps/Examples/earth-polyline-editing.html index 1cd7c7e2..9943c14b 100644 --- a/Apps/Examples/earth-polyline-editing.html +++ b/Apps/Examples/earth-polyline-editing.html @@ -59,7 +59,6 @@ input { width: 200px; } - @@ -110,6 +109,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "ref": 'polyline1', @@ -153,8 +153,8 @@ // 1.1.3 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9017017971891215,0.5971690064305392,847.4026284894902]; - earth.camera.rotation = [6.283185307179345,-0.7856470997805363,6.283185307179586]; + earth.camera.position = [1.9017017971891215, 0.5971690064305392, 847.4026284894902]; + earth.camera.rotation = [6.283185307179345, -0.7856470997805363, 6.283185307179586]; // 1.1.4 数据绑定 this._creatingUnbind = XE.MVVM.bind(this, 'creating', polyline1, 'creating'); diff --git a/Apps/Examples/earth-restrict.html b/Apps/Examples/earth-restrict.html index 81d37b1a..6188d292 100644 --- a/Apps/Examples/earth-restrict.html +++ b/Apps/Examples/earth-restrict.html @@ -118,6 +118,7 @@ "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", "srcCoordType": "GCJ02", "dstCoordType": "WGS84", + "maximumLevel": 21, }, } } diff --git a/Apps/Examples/earth-scaneline-currentTime.html b/Apps/Examples/earth-scaneline-currentTime.html index 0973d9f9..df04dd39 100644 --- a/Apps/Examples/earth-scaneline-currentTime.html +++ b/Apps/Examples/earth-scaneline-currentTime.html @@ -70,6 +70,7 @@ 0.545203009169497, 9.313225746154785e-10 ], + "skipLevelOfDetail": false }, }, { "ref": 'scanline1', @@ -90,7 +91,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, @@ -102,8 +106,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [2.120534085472877,0.5445599473813671,3486.259508603404]; - earth.camera.rotation = [6.283185307179578,-0.7863374047795091,1.0658141036401503e-14]; + earth.camera.position = [2.120534085472877, 0.5445599473813671, 3486.259508603404]; + earth.camera.rotation = [6.283185307179578, -0.7863374047795091, 1.0658141036401503e-14]; // 1.1.5 数据绑定 this._currentTimeUnbind = XE.MVVM.bind(this, 'currentTime', scanline1, 'currentTime'); diff --git a/Apps/Examples/earth-scaneline-editing.html b/Apps/Examples/earth-scaneline-editing.html index 18510462..ac8b288d 100644 --- a/Apps/Examples/earth-scaneline-editing.html +++ b/Apps/Examples/earth-scaneline-editing.html @@ -20,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: block; margin-top: 10px; } @@ -96,6 +96,7 @@ 0.545203009169497, 9.313225746154785e-10 ], + "skipLevelOfDetail": false }, }, { "ref": 'scanline1', @@ -115,7 +116,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, @@ -127,8 +131,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [2.120534085472877,0.5445599473813671,3486.259508603404]; - earth.camera.rotation = [6.283185307179578,-0.7863374047795091,1.0658141036401503e-14]; + earth.camera.position = [2.120534085472877, 0.5445599473813671, 3486.259508603404]; + earth.camera.rotation = [6.283185307179578, -0.7863374047795091, 1.0658141036401503e-14]; // 1.1.5 数据绑定 this._creatingUnbind = XE.MVVM.bind(this, 'creating', scanline1, 'creating'); diff --git a/Apps/Examples/earth-scaneline-play.html b/Apps/Examples/earth-scaneline-play.html index e26cebd6..05093510 100644 --- a/Apps/Examples/earth-scaneline-play.html +++ b/Apps/Examples/earth-scaneline-play.html @@ -28,7 +28,7 @@ display: inline-block; cursor: pointer; } - + .play { width: 20px; height: 16px; @@ -119,6 +119,7 @@ 0.545203009169497, 9.313225746154785e-10 ], + "skipLevelOfDetail": false }, }, { "ref": 'scanline1', @@ -138,7 +139,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, @@ -150,8 +154,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [2.120534085472877,0.5445599473813671,3486.259508603404]; - earth.camera.rotation = [6.283185307179578,-0.7863374047795091,1.0658141036401503e-14]; + earth.camera.position = [2.120534085472877, 0.5445599473813671, 3486.259508603404]; + earth.camera.rotation = [6.283185307179578, -0.7863374047795091, 1.0658141036401503e-14]; // 1.1.5 数据绑定 this._playingUnbind = XE.MVVM.bind(this, 'playing', scanline1, 'playing'); diff --git a/Apps/Examples/earth-scaneline-show.html b/Apps/Examples/earth-scaneline-show.html index d43a2f05..9aa76693 100644 --- a/Apps/Examples/earth-scaneline-show.html +++ b/Apps/Examples/earth-scaneline-show.html @@ -7,7 +7,7 @@ - 扫描线-播放 + 扫描线-点击 @@ -77,7 +77,6 @@
-
`, @@ -112,6 +111,7 @@ 0.545203009169497, 9.313225746154785e-10 ], + "skipLevelOfDetail": false }, }, { "ref": 'scanline1', @@ -130,7 +130,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, @@ -166,12 +169,12 @@ createdscanline() { let earthapp = this.$refs.earthContainer; console.log(scanline1.timeDuration) - + earthapp.addEventListener('click', function (e) { console.log(e); - scanline1.position = earth.pickPosition({x:e.offsetX,y:e.offsetY}); + scanline1.position = earth.pickPosition({ x: e.offsetX, y: e.offsetY }); scanline1.show = true; - scanline1.loopPlay =false; + scanline1.loopPlay = false; scanline1.playing = true; }); diff --git a/Apps/Examples/earth-subsurface.html b/Apps/Examples/earth-subsurface.html index 9145fedb..8ef3821a 100644 --- a/Apps/Examples/earth-subsurface.html +++ b/Apps/Examples/earth-subsurface.html @@ -90,7 +90,10 @@ "name": "谷歌影像", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali", + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, diff --git a/Apps/Examples/earth-terrain-cesium.html b/Apps/Examples/earth-terrain-cesium.html index a5c7374f..e1bad629 100644 --- a/Apps/Examples/earth-terrain-cesium.html +++ b/Apps/Examples/earth-terrain-cesium.html @@ -37,7 +37,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, diff --git a/Apps/Examples/earth-terrain-china14.html b/Apps/Examples/earth-terrain-china14.html index d496fa92..8818f906 100644 --- a/Apps/Examples/earth-terrain-china14.html +++ b/Apps/Examples/earth-terrain-china14.html @@ -37,7 +37,10 @@ "xbsjType": "Imagery", "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//mt1.google.cn/vt/lyrs=s&hl=zh-CN&x={x}&y={y}&z={z}&s=Gali" + "url": "//www.google.cn/maps/vt?lyrs=s,h&gl=CN&x={x}&y={y}&z={z}", + "srcCoordType": "GCJ02", + "dstCoordType": "WGS84", + "maximumLevel": 21, }, } }, diff --git a/Apps/Examples/earth-tileset-forceDoubleSide.html b/Apps/Examples/earth-tileset-forceDoubleSide.html new file mode 100644 index 00000000..a5d0760e --- /dev/null +++ b/Apps/Examples/earth-tileset-forceDoubleSide.html @@ -0,0 +1,129 @@ + + + + + + + + + + 3dtiles强制双面显示 + + + + + + + +
+ +
+ + + + + + + \ No newline at end of file diff --git a/Apps/Examples/earth-view-multiviewport.html b/Apps/Examples/earth-view-multiviewport.html index f08ae639..a59eb230 100644 --- a/Apps/Examples/earth-view-multiviewport.html +++ b/Apps/Examples/earth-view-multiviewport.html @@ -61,10 +61,12 @@ left: 266px; top: 70px; } + .lefttopButtonActive { background-color: rgba(31, 255, 255, 1); cursor: pointer; } + .righttopButton { width: 17px; height: 17px; @@ -76,10 +78,12 @@ left: 284px; top: 70px; } + .righttopButtonActive { background-color: rgba(31, 255, 255, 1); cursor: pointer; } + .leftbottomButton { width: 17px; height: 17px; @@ -91,10 +95,12 @@ top: 88px; left: 266px; } + .leftbottomButtonActive { background-color: rgba(31, 255, 255, 1); cursor: pointer; } + .rightbottomButton { width: 17px; height: 17px; @@ -106,11 +112,11 @@ top: 88px; left: 284px; } + .rightbottomButtonActive { background-color: rgba(31, 255, 255, 1); cursor: pointer; } - @@ -184,6 +190,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { @@ -198,8 +205,8 @@ // 1.1.3 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9017006607555602,0.5971757872571328,897.6553568768813]; - earth.camera.rotation = [6.2831853071793455,-0.7862324279670445,6.283185307179586]; + earth.camera.position = [1.9017006607555602, 0.5971757872571328, 897.6553568768813]; + earth.camera.rotation = [6.2831853071793455, -0.7862324279670445, 6.283185307179586]; // 1.1.3 数据绑定 // 双向绑定的属性,如果一方发生变化,另一方同样会跟随变化 @@ -224,7 +231,7 @@ viewportshow(v) { this.viewport = v; }, - + }, // 1.2 资源销毁 beforeDestroy() { diff --git a/Apps/Examples/earth-view-navigator.html b/Apps/Examples/earth-view-navigator.html index 35ffbb8e..ac32acd0 100644 --- a/Apps/Examples/earth-view-navigator.html +++ b/Apps/Examples/earth-view-navigator.html @@ -43,6 +43,7 @@ color: #fff; border: 1px solid #1E9FFF; } + input { padding: 5px; width: 60px; @@ -108,6 +109,7 @@ "xbsjType": "Tileset", "url": '../assets/dayanta/tileset.json', "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, }, { "czmObject": { @@ -128,12 +130,12 @@ this._showCompassUnbind = XE.MVVM.bind(this, 'showCompass', earth.camera.navigator, 'showCompass'); this._topCompassUnbind = XE.MVVM.bind(this, 'compasstop', earth.camera.navigator.compassStyle, 'top'); this._rightCompassUnbind = XE.MVVM.bind(this, 'compassright', earth.camera.navigator.compassStyle, 'right'); - this._bottomCompassUnbind = XE.MVVM.bind(this, 'compassbottom', earth.camera.navigator.compassStyle, 'bottom'); + this._bottomCompassUnbind = XE.MVVM.bind(this, 'compassbottom', earth.camera.navigator.compassStyle, 'bottom'); this._leftCompassUnbind = XE.MVVM.bind(this, 'compassleft', earth.camera.navigator.compassStyle, 'left'); this._showDistanceLegendUnbind = XE.MVVM.bind(this, 'showDistanceLegend', earth.camera.navigator, 'showDistanceLegend'); this._topDistanceUnbind = XE.MVVM.bind(this, 'distancetop', earth.camera.navigator.distanceLegendStyle, 'top'); this._rightDistanceUnbind = XE.MVVM.bind(this, 'distanceright', earth.camera.navigator.distanceLegendStyle, 'right'); - this._bottomDistanceUnbind = XE.MVVM.bind(this, 'distancebottom', earth.camera.navigator.distanceLegendStyle, 'bottom'); + this._bottomDistanceUnbind = XE.MVVM.bind(this, 'distancebottom', earth.camera.navigator.distanceLegendStyle, 'bottom'); this._leftDistanceUnbind = XE.MVVM.bind(this, 'distanceleft', earth.camera.navigator.distanceLegendStyle, 'left'); this._earth = earth; diff --git a/Apps/Examples/earth-water-editing.html b/Apps/Examples/earth-water-editing.html index bd757863..098d2c9c 100644 --- a/Apps/Examples/earth-water-editing.html +++ b/Apps/Examples/earth-water-editing.html @@ -107,16 +107,16 @@ "isSelected": true, "children": [{ "czmObject": { - "xbsjType": "Imagery", - "enabled": true, - "name": "谷歌影像", - "show": true, - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "xbsjType": "Imagery", + "enabled": true, + "name": "谷歌影像", + "show": true, + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + } } } - } }, { "czmObject": { @@ -127,28 +127,29 @@ 1.9016974701882112, 0.5972325152147303, 0 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'water1', - "czmObject": { - "xbsjType": "Water", - "positions": [ - 1.90168174313679, - 0.5972732924673276, - 1.9017230593134629, - 0.5972734968580539, - 1.9017177812531605, - 0.5972242141220793, - 1.90168212565758, - 0.5972259534519064 - ], - height: 0.24 - } + "ref": 'water1', + "czmObject": { + "xbsjType": "Water", + "positions": [ + 1.90168174313679, + 0.5972732924673276, + 1.9017230593134629, + 0.5972734968580539, + 1.9017177812531605, + 0.5972242141220793, + 1.90168212565758, + 0.5972259534519064 + ], + height: 0.24 } + } ] }; @@ -156,8 +157,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.901699638033817,0.5972090528439601,268.1942851441749]; - earth.camera.rotation = [0.035912984572358475,-0.8495548404958315,0.00017022824617729526]; + earth.camera.position = [1.901699638033817, 0.5972090528439601, 268.1942851441749]; + earth.camera.rotation = [0.035912984572358475, -0.8495548404958315, 0.00017022824617729526]; // 1.1.5 数据绑定 this._creatingUnbind = XE.MVVM.bind(this, 'creating', water1, 'creating'); diff --git a/Apps/Examples/earth-water-move.html b/Apps/Examples/earth-water-move.html index 8d175ce4..11e42dad 100644 --- a/Apps/Examples/earth-water-move.html +++ b/Apps/Examples/earth-water-move.html @@ -1,4 +1,3 @@ - @@ -107,7 +106,7 @@ "show": true, "xbsjImageryProvider": { "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", } } } @@ -121,28 +120,29 @@ 1.9016974701882112, 0.5972325152147303, 0 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'water1', - "czmObject": { - "xbsjType": "Water", - "positions": [ - 1.90168174313679, - 0.5972732924673276, - 1.9017230593134629, - 0.5972734968580539, - 1.9017177812531605, - 0.5972242141220793, - 1.90168212565758, - 0.5972259534519064 - ], - height: 0.24 - } + "ref": 'water1', + "czmObject": { + "xbsjType": "Water", + "positions": [ + 1.90168174313679, + 0.5972732924673276, + 1.9017230593134629, + 0.5972734968580539, + 1.9017177812531605, + 0.5972242141220793, + 1.90168212565758, + 0.5972259534519064 + ], + height: 0.24 } + } ] }; @@ -150,8 +150,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9016982759594276,0.5972275015346384,39.162930282027936]; - earth.camera.rotation = [6.231624429485172,-0.8839888902059405,6.282930780502687]; + earth.camera.position = [1.9016982759594276, 0.5972275015346384, 39.162930282027936]; + earth.camera.rotation = [6.231624429485172, -0.8839888902059405, 6.282930780502687]; // 1.1.5 数据绑定 this._frequencyUnbind = XE.MVVM.bind(this, 'frequency', water1, 'frequency'); diff --git a/Apps/Examples/earth-water-style.html b/Apps/Examples/earth-water-style.html index a4b990f1..529a557c 100644 --- a/Apps/Examples/earth-water-style.html +++ b/Apps/Examples/earth-water-style.html @@ -20,7 +20,7 @@ padding: 0px; } - .box span{ + .box span { display: inline-block; margin-top: 10px; } @@ -84,8 +84,8 @@ data() { return { _earth: undefined, // 注意:Earth和Cesium的相关变量放在vue中,必须使用下划线作为前缀! - baseWaterColor: [0,0,0,0], - blendColor: [0,0,0,0] + baseWaterColor: [0, 0, 0, 0], + blendColor: [0, 0, 0, 0] }; }, // 1.1 资源创建 @@ -99,16 +99,16 @@ "isSelected": true, "children": [{ "czmObject": { - "xbsjType": "Imagery", - "enabled": true, - "name": "谷歌影像", - "show": true, - "xbsjImageryProvider": { - "XbsjImageryProvider": { - "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + "xbsjType": "Imagery", + "enabled": true, + "name": "谷歌影像", + "show": true, + "xbsjImageryProvider": { + "XbsjImageryProvider": { + "url": "//www.google.cn/maps/vt?lyrs=s&x={x}&y={y}&z={z}", + } } } - } }, { "czmObject": { @@ -119,28 +119,29 @@ 1.9016974701882112, 0.5972325152147303, 0 - ], + ], "xbsjUseOriginTransform": false, + "skipLevelOfDetail": false }, "ref": 'tileset' }, { - "ref": 'water1', - "czmObject": { - "xbsjType": "Water", - "positions": [ - 1.90168174313679, - 0.5972732924673276, - 1.9017230593134629, - 0.5972734968580539, - 1.9017177812531605, - 0.5972242141220793, - 1.90168212565758, - 0.5972259534519064 - ], - height: 0.24 - } + "ref": 'water1', + "czmObject": { + "xbsjType": "Water", + "positions": [ + 1.90168174313679, + 0.5972732924673276, + 1.9017230593134629, + 0.5972734968580539, + 1.9017177812531605, + 0.5972242141220793, + 1.90168212565758, + 0.5972259534519064 + ], + height: 0.24 } + } ] }; @@ -148,8 +149,8 @@ // 设置相机位置 // earth.camera.position.toString()和earth.camera.toAllJSONStr()这两个方法可获取相机位置 - earth.camera.position = [1.9017005861053253,0.5972203009968811,286.26848737110424]; - earth.camera.rotation = [0.053155606800175725,-1.0733469123234674,0.0003493379109942296]; + earth.camera.position = [1.9017005861053253, 0.5972203009968811, 286.26848737110424]; + earth.camera.rotation = [0.053155606800175725, -1.0733469123234674, 0.0003493379109942296]; // 1.1.5 数据绑定 this._baseWaterColorUnbind = XE.MVVM.bind(this, 'baseWaterColor', water1, 'baseWaterColor'); diff --git a/Apps/Examples/earthui-cameraVideo.html b/Apps/Examples/earthui-cameraVideo.html index 9d2cf48a..d225be67 100644 --- a/Apps/Examples/earthui-cameraVideo.html +++ b/Apps/Examples/earthui-cameraVideo.html @@ -5,7 +5,8 @@ - + + 视频融合 +
@@ -32,7 +36,7 @@
`, - data() { + data() { return { _earth: undefined, // 注意:Earth和Cesium的相关变量放在vue中,必须使用下划线作为前缀! }; @@ -69,6 +73,7 @@ 425.8641913624607 ], "xbsjUseOriginTransform": false, // 可以不填写 + "skipLevelOfDetail": false } }, ] @@ -118,4 +123,5 @@ + \ No newline at end of file diff --git a/Apps/assets/GroundVehicle/feiji.glb b/Apps/assets/GroundVehicle/feiji.glb new file mode 100644 index 00000000..9945672c Binary files /dev/null and b/Apps/assets/GroundVehicle/feiji.glb differ diff --git a/Apps/kulun/VertexShad.js b/Apps/kulun/VertexShad.js index 408ceb64..c7d1c120 100644 --- a/Apps/kulun/VertexShad.js +++ b/Apps/kulun/VertexShad.js @@ -77,7 +77,7 @@ function createVertexShad() { function customShader(tileset, attribNum = 3) { if (attribNum > 32) { - throw new Error('attribNum不能大于8!'); + throw new Error('attribNum不能大于32!'); } //注意这个大小和下面必须一致 @@ -119,7 +119,7 @@ function createVertexShad() { ${fsComp} float xbsjvv = smoothstep(u_xbsjCustomParams.x, u_xbsjCustomParams.y, xbsjv); vec4 color = texture2D(u_xbsjCustomTexture, vec2(xbsjvv, u_xbsjCustomParams.w)); - gl_FragColor = vec4(color.xyz, 1.0); + gl_FragColor *= vec4(color.xyz, 1.0); `; tileset._xbsjCustomTexture = t; @@ -128,7 +128,7 @@ function createVertexShad() { } - var unBind = XE.MVVM.watch(czmObject, 'ready', () => { + var unBind = XE.MVVM.watch(czmObject, 'ready', () => { customShader(czmObject._tileset, this.nodeDatas.length); this.setTexture(); this.setParam(); diff --git a/CHANGLES.md b/CHANGLES.md index fff6125d..3867e96c 100644 --- a/CHANGLES.md +++ b/CHANGLES.md @@ -1,8 +1,37 @@ Change Log ========== +### 1.2.4 - 2019-11-2 + +##### Additions :tada: +* 把mapv和cesium结合的示例加到了EarthSDK中; +* Cesium自定义材质增加了几个按钮; +* EarthUI标绘中增加了折线和圆弧; +* 新增了5个Cesium自定义Primitive相关的示例; +* 增加自定义图元功能和相关示例; +* 增加数字城市和数字工厂的示例; +* EarthUI标绘增加更多标绘按钮; + +##### Fixes :wrench: +* 改进地形限制功能,创建时不再需要确定高度; +* 把tileset的skipLevelOfDetail属性修改为了false; +* 修复大雁塔等(无光照模型)不能启用阴影的问题; +* 修复启用阴影后崩溃的问题; +* 影像属性中增加最小最大级别限制; +* 修复PBR材质让部分属性生效; +* 修复点云大小不能设置的问题,并且让3dtiles中其他属性的设置也同时生效; +* 改进旋转编辑的UI交互,让旋转轴清晰可见,并在三维中直接实时动态显示测量结果; +* 修正旋转编辑时角度范围,从-270 - +90变更为-180 - +180; +* 地形限制的编辑交互中不需要设置高度; +* 修复动态加载js文件时报错的问题; + ### 1.2.3 - 2019-10-21 +##### Additions :tada: +* 增加了强制光照示例; +* EarthUI中增加了强制光照功能; +* EarthUI中模型的属性窗口增加了材质底色属性; + ##### Fixes :wrench: * 材质颜色修正 diff --git a/Source/components/MainUIComp.vue b/Source/components/MainUIComp.vue index 26d8479d..1dc26377 100644 --- a/Source/components/MainUIComp.vue +++ b/Source/components/MainUIComp.vue @@ -71,9 +71,15 @@ import ModelTool from "./viztools/ModelTool"; import PolylineTool from "./viztools/PolylineTool"; import GeoCurveArrow from "./viztools/GeoCurveArrow"; import GeoDoubleArrow from "./viztools/GeoDoubleArrow"; +import GeoCircle from "./viztools/GeoCircle"; +import GeoRectangle from "./viztools/GeoRectangle"; +import GeoCurveFlag from "./viztools/GeoCurveFlag"; +import GeoRightAngleFlag from "./viztools/GeoRightAngleFlag"; import GeoPolygon from "./viztools/GeoPolygon"; import GeoSectorSearch from "./viztools/GeoSectorSearch"; import GeoPolylineArrow from "./viztools/GeoPolylineArrow"; +import GeoPolyline from "./viztools/GeoPolyline"; +import GeoArc from "./viztools/GeoArc"; import GeoTriFlag from "./viztools/GeoTriFlag"; import ScanlineTool from "./viztools/ScanlineTool"; @@ -88,6 +94,7 @@ import GlobalColorPicker from "./common/GlobalColorPicker"; import InformationBox from "./utils/InformationBox"; import ModelTreeTool from "./tools/ModelTreeTool"; +import EntityMoreTool from "./tools/EntityMoreTool"; export default { components: { @@ -112,9 +119,15 @@ export default { PolylineTool, GeoCurveArrow, GeoDoubleArrow, + GeoCircle, + GeoRectangle, + GeoCurveFlag, + GeoRightAngleFlag, GeoPolygon, GeoSectorSearch, GeoPolylineArrow, + GeoPolyline, + GeoArc, GeoTriFlag, ScanlineTool, @@ -133,7 +146,8 @@ export default { TilesetStyleEditor, GlobalColorPicker, InformationBox, - ModelTreeTool + ModelTreeTool, + EntityMoreTool }, data: function() { return { @@ -156,8 +170,14 @@ export default { GeoCurveArrow: "GeoCurveArrow", GeoSectorSearch: "GeoSectorSearch", GeoPolylineArrow: "GeoPolylineArrow", + GeoPolyline: "GeoPolyline", + GeoArc: "GeoArc", GeoTriFlag: "GeoTriFlag", GeoDoubleArrow: "GeoDoubleArrow", + GeoCircle: "GeoCircle", + GeoRectangle: "GeoRectangle", + GeoCurveFlag: "GeoCurveFlag", + GeoRightAngleFlag: "GeoRightAngleFlag", GeoPolygon: "GeoPolygon", ["CameraView.View"]: "CameraViewPrp" }, @@ -209,6 +229,10 @@ export default { { component: "ModelTreeTool", ref: "modelTreeTool" + }, + { + component: "EntityMoreTool", + ref: "entitymoreTool" } ], infos: [], diff --git a/Source/components/common/Checkbox/index.vue b/Source/components/common/CheckBox/index.vue similarity index 100% rename from Source/components/common/Checkbox/index.vue rename to Source/components/common/CheckBox/index.vue diff --git a/Source/components/common/ContextMenu/Index.vue b/Source/components/common/ContextMenu/index.vue similarity index 100% rename from Source/components/common/ContextMenu/Index.vue rename to Source/components/common/ContextMenu/index.vue diff --git a/Source/components/controls/MainBarControl/Analysis/Index.vue b/Source/components/controls/MainBarControl/Analysis/index.vue similarity index 100% rename from Source/components/controls/MainBarControl/Analysis/Index.vue rename to Source/components/controls/MainBarControl/Analysis/index.vue diff --git a/Source/components/controls/MainBarControl/Effect/atmosphere.vue b/Source/components/controls/MainBarControl/Effect/Atmosphere.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/atmosphere.vue rename to Source/components/controls/MainBarControl/Effect/Atmosphere.vue diff --git a/Source/components/controls/MainBarControl/Effect/cloud.vue b/Source/components/controls/MainBarControl/Effect/Cloud.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/cloud.vue rename to Source/components/controls/MainBarControl/Effect/Cloud.vue diff --git a/Source/components/controls/MainBarControl/Effect/fog.vue b/Source/components/controls/MainBarControl/Effect/Fog.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/fog.vue rename to Source/components/controls/MainBarControl/Effect/Fog.vue diff --git a/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue b/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue new file mode 100644 index 00000000..6c863fbe --- /dev/null +++ b/Source/components/controls/MainBarControl/Effect/ForceSunPos.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/Source/components/controls/MainBarControl/Effect/lensflare.vue b/Source/components/controls/MainBarControl/Effect/LensFlare.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/lensflare.vue rename to Source/components/controls/MainBarControl/Effect/LensFlare.vue diff --git a/Source/components/controls/MainBarControl/Effect/moon.vue b/Source/components/controls/MainBarControl/Effect/Moon.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/moon.vue rename to Source/components/controls/MainBarControl/Effect/Moon.vue diff --git a/Source/components/controls/MainBarControl/Effect/mosaic.vue b/Source/components/controls/MainBarControl/Effect/Mosaic.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/mosaic.vue rename to Source/components/controls/MainBarControl/Effect/Mosaic.vue diff --git a/Source/components/controls/MainBarControl/Effect/rain.vue b/Source/components/controls/MainBarControl/Effect/Rain.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/rain.vue rename to Source/components/controls/MainBarControl/Effect/Rain.vue diff --git a/Source/components/controls/MainBarControl/Effect/shadow.vue b/Source/components/controls/MainBarControl/Effect/Shadow.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/shadow.vue rename to Source/components/controls/MainBarControl/Effect/Shadow.vue diff --git a/Source/components/controls/MainBarControl/Effect/snow.vue b/Source/components/controls/MainBarControl/Effect/Snow.vue similarity index 100% rename from Source/components/controls/MainBarControl/Effect/snow.vue rename to Source/components/controls/MainBarControl/Effect/Snow.vue diff --git a/Source/components/controls/MainBarControl/Effect/Index.vue b/Source/components/controls/MainBarControl/Effect/index.vue similarity index 95% rename from Source/components/controls/MainBarControl/Effect/Index.vue rename to Source/components/controls/MainBarControl/Effect/index.vue index 8d8b0006..a568de1d 100644 --- a/Source/components/controls/MainBarControl/Effect/Index.vue +++ b/Source/components/controls/MainBarControl/Effect/index.vue @@ -110,7 +110,7 @@ > -
+
{{lang.mosaic}}
+
+
+ {{lang.forceSunPos}} +
+ + -
+ +
{{lang.line}}
@@ -68,6 +72,11 @@
{{lang.face}}
+ +
+
+ {{lang.more}} +
+
+ + +
+
+ + +
+ + + + +
+ +
+ + +
+
+
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoArc/index_locale.js b/Source/components/viztools/GeoArc/index_locale.js new file mode 100644 index 00000000..380b71bc --- /dev/null +++ b/Source/components/viztools/GeoArc/index_locale.js @@ -0,0 +1,26 @@ +const zh = { + title: '圆弧', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + width: '宽度', + color: '颜色' +}; + +const en = { + title: 'GeoArc', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + width: 'width', + color: 'color' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoCircle/index.vue b/Source/components/viztools/GeoCircle/index.vue new file mode 100644 index 00000000..c2d4ed07 --- /dev/null +++ b/Source/components/viztools/GeoCircle/index.vue @@ -0,0 +1,552 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoCircle/index_locale.js b/Source/components/viztools/GeoCircle/index_locale.js new file mode 100644 index 00000000..704707a5 --- /dev/null +++ b/Source/components/viztools/GeoCircle/index_locale.js @@ -0,0 +1,32 @@ +const zh = { + title: '矩形', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + outlineWidth: '边框宽度', + outlineShow: '边框显示', + outlineColor: '边框颜色', + color: '颜色', + transparency: '透明度' +}; + +const en = { + title: 'GeoRectangle', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + outlineWidth: 'width', + outlineShow: 'outlineShow', + outlineColor: 'outlineColor', + color: 'color', + transparency: 'transparency' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoCurveArrow/index.vue b/Source/components/viztools/GeoCurveArrow/index.vue index e07bd5f8..b22694c6 100644 --- a/Source/components/viztools/GeoCurveArrow/index.vue +++ b/Source/components/viztools/GeoCurveArrow/index.vue @@ -179,6 +179,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/GeoCurveFlag/index.vue b/Source/components/viztools/GeoCurveFlag/index.vue new file mode 100644 index 00000000..c2d4ed07 --- /dev/null +++ b/Source/components/viztools/GeoCurveFlag/index.vue @@ -0,0 +1,552 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoCurveFlag/index_locale.js b/Source/components/viztools/GeoCurveFlag/index_locale.js new file mode 100644 index 00000000..150e501c --- /dev/null +++ b/Source/components/viztools/GeoCurveFlag/index_locale.js @@ -0,0 +1,32 @@ +const zh = { + title: '曲面旗标', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + outlineWidth: '边框宽度', + outlineShow: '边框显示', + outlineColor: '边框颜色', + color: '颜色', + transparency: '透明度' +}; + +const en = { + title: 'GeoCurveFlag', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + outlineWidth: 'width', + outlineShow: 'outlineShow', + outlineColor: 'outlineColor', + color: 'color', + transparency: 'transparency' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoDoubleArrow/index.vue b/Source/components/viztools/GeoDoubleArrow/index.vue index bda702b3..49f4df88 100644 --- a/Source/components/viztools/GeoDoubleArrow/index.vue +++ b/Source/components/viztools/GeoDoubleArrow/index.vue @@ -236,6 +236,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/GeoPolygon/index.vue b/Source/components/viztools/GeoPolygon/index.vue index bda702b3..49f4df88 100644 --- a/Source/components/viztools/GeoPolygon/index.vue +++ b/Source/components/viztools/GeoPolygon/index.vue @@ -236,6 +236,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/GeoPolyline/index.vue b/Source/components/viztools/GeoPolyline/index.vue new file mode 100644 index 00000000..871200ac --- /dev/null +++ b/Source/components/viztools/GeoPolyline/index.vue @@ -0,0 +1,497 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoPolyline/index_locale.js b/Source/components/viztools/GeoPolyline/index_locale.js new file mode 100644 index 00000000..47adecc7 --- /dev/null +++ b/Source/components/viztools/GeoPolyline/index_locale.js @@ -0,0 +1,26 @@ +const zh = { + title: '折线', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + width: '宽度', + color: '颜色' +}; + +const en = { + title: 'GeoPolyline', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + width: 'width', + color: 'color' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoPolylineArrow/index.vue b/Source/components/viztools/GeoPolylineArrow/index.vue index 91f4268a..871200ac 100644 --- a/Source/components/viztools/GeoPolylineArrow/index.vue +++ b/Source/components/viztools/GeoPolylineArrow/index.vue @@ -179,6 +179,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/GeoRectangle/index.vue b/Source/components/viztools/GeoRectangle/index.vue new file mode 100644 index 00000000..c2d4ed07 --- /dev/null +++ b/Source/components/viztools/GeoRectangle/index.vue @@ -0,0 +1,552 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoRectangle/index_locale.js b/Source/components/viztools/GeoRectangle/index_locale.js new file mode 100644 index 00000000..704707a5 --- /dev/null +++ b/Source/components/viztools/GeoRectangle/index_locale.js @@ -0,0 +1,32 @@ +const zh = { + title: '矩形', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + outlineWidth: '边框宽度', + outlineShow: '边框显示', + outlineColor: '边框颜色', + color: '颜色', + transparency: '透明度' +}; + +const en = { + title: 'GeoRectangle', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + outlineWidth: 'width', + outlineShow: 'outlineShow', + outlineColor: 'outlineColor', + color: 'color', + transparency: 'transparency' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoRightAngleFlag/index.vue b/Source/components/viztools/GeoRightAngleFlag/index.vue new file mode 100644 index 00000000..c2d4ed07 --- /dev/null +++ b/Source/components/viztools/GeoRightAngleFlag/index.vue @@ -0,0 +1,552 @@ + + + + + \ No newline at end of file diff --git a/Source/components/viztools/GeoRightAngleFlag/index_locale.js b/Source/components/viztools/GeoRightAngleFlag/index_locale.js new file mode 100644 index 00000000..2d0f05b3 --- /dev/null +++ b/Source/components/viztools/GeoRightAngleFlag/index_locale.js @@ -0,0 +1,32 @@ +const zh = { + title: '直角旗标', + name: '名称', + show: '显示', + creating: '创建', + editing: '编辑', + ground: '贴地', + outlineWidth: '边框宽度', + outlineShow: '边框显示', + outlineColor: '边框颜色', + color: '颜色', + transparency: '透明度' +}; + +const en = { + title: 'GeoRightAngleFlag', + name: 'name', + show: 'show', + creating: 'creating', + editing: 'editing', + ground: 'ground', + outlineWidth: 'width', + outlineShow: 'outlineShow', + outlineColor: 'outlineColor', + color: 'color', + transparency: 'transparency' +}; + +export default { + zh, + en +}; \ No newline at end of file diff --git a/Source/components/viztools/GeoSectorSearch/index.vue b/Source/components/viztools/GeoSectorSearch/index.vue index ed032845..c100fbcb 100644 --- a/Source/components/viztools/GeoSectorSearch/index.vue +++ b/Source/components/viztools/GeoSectorSearch/index.vue @@ -180,6 +180,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/GeoTriFlag/index.vue b/Source/components/viztools/GeoTriFlag/index.vue index cb51a02b..04ab627f 100644 --- a/Source/components/viztools/GeoTriFlag/index.vue +++ b/Source/components/viztools/GeoTriFlag/index.vue @@ -237,6 +237,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/ModelTool/index.vue b/Source/components/viztools/ModelTool/index.vue index 33473df3..3e58554e 100644 --- a/Source/components/viztools/ModelTool/index.vue +++ b/Source/components/viztools/ModelTool/index.vue @@ -108,6 +108,12 @@
+
+ +
+ +
+
@@ -136,7 +142,8 @@ export default { xbsjRotation: [0, 0, 0], maximumScale: 0, minimumPixelSize: 0, - attachedPathGuid: "" + attachedPathGuid: "", + luminanceAtZenith: 0 }, pinstyletype: true, langs: languagejs @@ -162,7 +169,8 @@ export default { xbsjPosition: "model.xbsjPosition", maximumScale: "model.maximumScale", minimumPixelSize: "model.minimumPixelSize", - attachedPathGuid: "model.attachedPathGuid" + attachedPathGuid: "model.attachedPathGuid", + luminanceAtZenith: "model.luminanceAtZenith" }; Object.entries(bindData).forEach(([sm, vm]) => { diff --git a/Source/components/viztools/ModelTool/index_locale.js b/Source/components/viztools/ModelTool/index_locale.js index bb569374..457c8a30 100644 --- a/Source/components/viztools/ModelTool/index_locale.js +++ b/Source/components/viztools/ModelTool/index_locale.js @@ -10,9 +10,10 @@ const zh = { weizhi: '位置', flyto: '定位', reset: '重置', - enlargeScale:'放大比例', - minpx:'像素大小', - pathAnimation:'路径动画' + enlargeScale: '放大比例', + minpx: '像素大小', + pathAnimation: '路径动画', + material: '材质底色' } const en = { @@ -27,10 +28,10 @@ const en = { weizhi: 'weizhi', flyto: 'flyto', reset: 'reset', - enlargeScale:'enlargeScale', - minpx:'min px', - pathAnimation:'pathAnimation' - + enlargeScale: 'enlargeScale', + minpx: 'min px', + pathAnimation: 'pathAnimation', + material: 'material' } export default { diff --git a/Source/components/viztools/PathTool/index.vue b/Source/components/viztools/PathTool/index.vue index 3c427747..e2ef71dd 100644 --- a/Source/components/viztools/PathTool/index.vue +++ b/Source/components/viztools/PathTool/index.vue @@ -251,8 +251,8 @@ export default { e.preventDefault(); that._czmObj.creating = false; let obj = e.dataTransfer.getData("obj"); - let arr = [] - arr = JSON.parse(obj).positions + let arr = []; + arr = JSON.parse(obj).positions; that._czmObj.positions = arr; that._czmObj.flyTo(); } @@ -340,6 +340,7 @@ export default { ok() { this.close(); const pathToolObj = this._czmObj; + pathToolObj.editing = false; if (!pathToolObj) { return; } diff --git a/Source/components/viztools/PinDivTool/index.vue b/Source/components/viztools/PinDivTool/index.vue index 5e945441..2380323e 100644 --- a/Source/components/viztools/PinDivTool/index.vue +++ b/Source/components/viztools/PinDivTool/index.vue @@ -199,7 +199,7 @@ export default { 标记文字 `; - console.log(this._czmObj.defaultImgUrl()) + console.log(this._czmObj.defaultImgUrl()); } }, beforeDestroy() { @@ -274,6 +274,7 @@ export default { ok() { this.close(); const pinToolObj = this._czmObj; + pinToolObj.editing = false; if (!pinToolObj) { return; } diff --git a/Source/components/viztools/PinPictureTool/index.vue b/Source/components/viztools/PinPictureTool/index.vue index ba5ebfb0..be3ff8ee 100644 --- a/Source/components/viztools/PinPictureTool/index.vue +++ b/Source/components/viztools/PinPictureTool/index.vue @@ -330,6 +330,7 @@ export default { } this.close(); const pinToolObj = this._czmObj; + pinToolObj.editing = false; if (!pinToolObj) { return; } diff --git a/Source/components/viztools/PinTool/index.vue b/Source/components/viztools/PinTool/index.vue index 34cc33c1..261a13bf 100644 --- a/Source/components/viztools/PinTool/index.vue +++ b/Source/components/viztools/PinTool/index.vue @@ -340,6 +340,7 @@ export default { ok() { this.close(); const pinToolObj = this._czmObj; + pinToolObj.editing = false; if (!pinToolObj) { return; } diff --git a/Source/components/viztools/ScanlineTool/index.vue b/Source/components/viztools/ScanlineTool/index.vue index c3fb3bec..beb21d1d 100644 --- a/Source/components/viztools/ScanlineTool/index.vue +++ b/Source/components/viztools/ScanlineTool/index.vue @@ -239,6 +239,7 @@ export default { ok() { this.close(); const modelToolObj = this._czmObj; + modelToolObj.editing = false; if (!modelToolObj) { return; } diff --git a/Source/components/viztools/WaterTool/index.vue b/Source/components/viztools/WaterTool/index.vue index f2474c0c..6889b3fc 100644 --- a/Source/components/viztools/WaterTool/index.vue +++ b/Source/components/viztools/WaterTool/index.vue @@ -263,6 +263,7 @@ export default { this.close(); const viewshed = this._czmObj; + viewshed.editing = false; if (!viewshed) { return; } diff --git a/Source/images/forcesun.png b/Source/images/forcesun.png new file mode 100644 index 00000000..589f5566 Binary files /dev/null and b/Source/images/forcesun.png differ diff --git a/Source/images/forcesun_on.png b/Source/images/forcesun_on.png new file mode 100644 index 00000000..cd4066b5 Binary files /dev/null and b/Source/images/forcesun_on.png differ diff --git a/Source/managers/MainUI.js b/Source/managers/MainUI.js index 3855f281..734fee8e 100644 --- a/Source/managers/MainUI.js +++ b/Source/managers/MainUI.js @@ -60,6 +60,7 @@ import FeatureProperty from "./tools/FeatureProperty" import LabScene from "./LabScene" import ModelTree from "./tools/ModelTree"; +import EntityMore from "./tools/EntityMore"; /** * EarthUI根管理器 @@ -213,6 +214,7 @@ class MainUI { //模型结构 this._modelTree = new ModelTree(this); + this._entitymore = new EntityMore(this); //其他工具 this._imageryLab = new ImageryLab(this); this._imageryOnline = new ImageryOnline(this); @@ -364,6 +366,16 @@ class MainUI { */ get modelTree() { return mainUI._modelTree; + }, + /** + * 标绘更多结构管理树 + * @readonly + * @type {EntityMore} + * @instance + * @memberof ToolsCollection + */ + get entitymore() { + return mainUI._entitymore; } }; } diff --git a/Source/managers/tools/EntityMore.js b/Source/managers/tools/EntityMore.js new file mode 100644 index 00000000..74eb5136 --- /dev/null +++ b/Source/managers/tools/EntityMore.js @@ -0,0 +1,53 @@ +/** + * 模型结构树面板 + * @class + */ +class EntityMore { + constructor(root) { + this._root = root; + this._comp = root._comp.$refs.entitymoreTool[0]; + + XE.MVVM.extend(this, { + /** + * 是否可见 + * @type {boolean} + * @default false + * @instance + * @memberof EntityMore + */ + show: false, + }); + + var toolbar = root._comp.$refs.mainBarControl.$refs.entity; + this.unbind1 = XE.MVVM.bind( + toolbar, + "EntityMoreShow", + this, + "show" + ); + + this.unbind2 = XE.MVVM.bind( + this._comp, + "show", + this, + "show" + ); + + + } + + isDestroyed() { + return false; + } + + destroy() { + this._showListenerDisposer = this._showListenerDisposer && this._showListenerDisposer(); + + this.unbind1 = this.unbind1 && this.unbind1(); + this.unbind2 = this.unbind2 && this.unbind2(); + + } + +} + +export default EntityMore; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e1a86c80..07ab7b20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xbsj-earthui", - "version": "1.2.2", + "version": "1.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2728,15 +2728,15 @@ } }, "earthsdk": { - "version": "1.2.3", - "resolved": "https://registry.npm.taobao.org/earthsdk/download/earthsdk-1.2.3.tgz?cache=0&sync_timestamp=1571640140030&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fearthsdk%2Fdownload%2Fearthsdk-1.2.3.tgz", - "integrity": "sha1-rO922zhcTfA3uYa5ZTsKeiNhJl8=", + "version": "1.2.4", + "resolved": "https://registry.npm.taobao.org/earthsdk/download/earthsdk-1.2.4.tgz?cache=0&sync_timestamp=1572691122546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fearthsdk%2Fdownload%2Fearthsdk-1.2.4.tgz", + "integrity": "sha1-84DAdE4l86QZ3lYpSBSyFO3HSN0=", "dev": true }, "earthsdk-plotting-symbol": { - "version": "1.0.9", - "resolved": "https://registry.npm.taobao.org/earthsdk-plotting-symbol/download/earthsdk-plotting-symbol-1.0.9.tgz", - "integrity": "sha1-m7uodL5DP+4X9hsqvSy2gJiEyBU=", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/earthsdk-plotting-symbol/-/earthsdk-plotting-symbol-1.0.10.tgz", + "integrity": "sha512-/DwWAdcIqLJaV9z9VCbILLZPhSZepwAUFStcAZGhWloo0CkGuHoyAgT9W8b169HaKcew8qbD//lcrwtsCQlK9w==", "dev": true }, "ecc-jsbn": { diff --git a/package.json b/package.json index 05d1a4b8..cee28d48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xbsj-earthui", - "version": "1.2.3", + "version": "1.2.4", "description": "xbsj-earthui", "main": "index.js", "keywords": [ @@ -45,8 +45,8 @@ "copy-webpack-plugin": "^4.5.2", "cross-env": "^5.1.3", "css-loader": "^0.28.11", - "earthsdk": "1.2.3", - "earthsdk-plotting-symbol": "1.0.9", + "earthsdk": "1.2.4", + "earthsdk-plotting-symbol": "1.0.10", "file-loader": "^1.1.6", "globby": "^10.0.1", "history": "^4.7.2",