deeptwins-engine-3d 0.1.60 → 0.1.61

package/dist/esm/constant.js

@@ -423,7 +423,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '高德影像',
     type: 'raster',
     layers: [{
-      url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+      url: 'https://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+      subdomains: ['1', '2', '3', '4'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'gd_img'
@@ -433,7 +434,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '高德影像注记',
     type: 'raster',
     layers: [{
-      url: 'https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+      url: 'https://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
+      subdomains: ['1', '2', '3', '4'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'gd_img'
@@ -448,7 +450,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '高德电子',
     type: 'raster',
     layers: [{
-      url: 'https://wprd02.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scl=2&style=7',
+      url: 'https://wprd0{s}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scl=2&style=7',
+      subdomains: ['1', '2', '3', '4'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'gd_vec'
@@ -468,7 +471,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '腾讯影像',
     type: 'raster',
     layers: [{
-      url: 'https://p2.map.gtimg.com/sateTiles/{z}/{sx}/{sy}/{x}_{reverseY}.jpg?version=400',
+      url: 'https://p{s}.map.gtimg.com/sateTiles/{z}/{sx}/{sy}/{x}_{reverseY}.jpg?version=400',
+      subdomains: ['0', '1', '2', '3'],
       minimumLevel: 1,
       maximumLevel: 18,
       customTags: {
@@ -481,7 +485,8 @@ export var DEFAULT_BASE_LAYER = {
       },
       credit: 'tx_img_d'
     }, {
-      url: 'https://rt3.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=2&version=297',
+      url: 'https://rt{s}.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=2&version=297',
+      subdomains: ['0', '1', '2', '3'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'tx_img_z'
@@ -491,7 +496,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '腾讯电子',
     type: 'raster',
     layers: [{
-      url: 'https://rt3.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=1&version=297',
+      url: 'https://rt{s}.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=1&version=297',
+      subdomains: ['0', '1', '2', '3'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'tx_vec'
@@ -501,7 +507,8 @@ export var DEFAULT_BASE_LAYER = {
     name: '腾讯电子黑色风格',
     type: 'raster',
     layers: [{
-      url: 'https://rt3.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=4&scene=0',
+      url: 'https://rt{s}.map.gtimg.com/tile?z={z}&x={x}&y={reverseY}&styleid=4&scene=0',
+      subdomains: ['0', '1', '2', '3'],
       minimumLevel: 1,
       maximumLevel: 18,
       credit: 'tx_vec'
@@ -654,6 +661,7 @@ export var DEFAULT_IMAGE_MATERIAL_STYLE = function DEFAULT_IMAGE_MATERIAL_STYLE(
 export var DEFAULT_GLOW_MATERIAL_STYLE = function DEFAULT_GLOW_MATERIAL_STYLE() {
   return {
     color: Cesium.Color.WHITE,
+    repeat: [1, 1],
     glowStrength: 2,
     mixRatio: 0.5
   };

package/dist/esm/graphicLayer/BaseSource.d.ts

@@ -15,7 +15,7 @@ export default class BaseSource {
     remove(): void;
     setData(data: any): this | undefined;
     _toDestroy(): void;
-    static analysisSourceType(data: any): "other" | "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "clampedPolygonGrid";
+    static analysisSourceType(data: any): "wkt" | "sourceId" | "sourceInstance" | "geoJson" | "clampedPolygonGrid" | "other";
     static wktToGeoJon(wkt: string): any;
     static geoJsonToGeoCartesian3Array(geoJson: any): any[];
     static handleFeaturePoint(feature: any): any;

package/dist/esm/index.js

@@ -62,11 +62,11 @@ DEEP_TWINS_BASE_URL && (window.CESIUM_BASE_URL = DEEP_TWINS_BASE_URL);
 // 全局加载css
 loadCss(Cesium.buildModuleUrl('Widgets/widgets.css'));
 // 打印版本信息
-console.log('DeepTwinsEngine3D Version:', "0.1.60");
+console.log('DeepTwinsEngine3D Version:', "0.1.61");
 export var DeepTwinsEngine3D = /*#__PURE__*/_createClass(function DeepTwinsEngine3D() {
   _classCallCheck(this, DeepTwinsEngine3D);
 });
-_defineProperty(DeepTwinsEngine3D, "Version", "0.1.60");
+_defineProperty(DeepTwinsEngine3D, "Version", "0.1.61");
 _defineProperty(DeepTwinsEngine3D, "Map", Map);
 _defineProperty(DeepTwinsEngine3D, "GroundSkyBox", GroundSkyBox);
 _defineProperty(DeepTwinsEngine3D, "RasterLayer", RasterLayer);

package/dist/esm/material/entity/ImageGlowingMaterialProperty.js

@@ -1,4 +1,4 @@
-var _excluded = ["color"];
+var _excluded = ["color", "repeat"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -22,7 +22,7 @@ import { cloneDeep, isEqual, merge } from 'lodash';
 import { DEFAULT_GLOW_MATERIAL_STYLE } from "../../constant";
 import * as utils from "../../tool/utils";
 /* babel-plugin-inline-import '../shader/ImageGlowingShader.glsl' */
-var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\nuniform vec4 color;\nuniform float mixRatio;\n\nczm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n\n    // \u91C7\u6837\u56FE\u7247\n    vec4 texColor = texture(image, st);\n\n    // \u989C\u8272\u6DF7\u5408\uFF1Amix(\u539F\u59CB\u989C\u8272, \u76EE\u6807\u989C\u8272, mixRatio)\n    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);\n\n    // \u53D1\u5149\u589E\u5F3A\n    material.diffuse = mixedColor * glowStrength;\n\n    // \u900F\u660E\u5EA6\u968F\u989C\u8272\u53D8\u5316\n    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);\n\n    return material;\n}\n";
+var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\nuniform vec4 color;\nuniform float mixRatio;\nuniform vec2 repeat;\n\nczm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = fract(materialInput.st * repeat);\n\n    // \u91C7\u6837\u56FE\u7247\n    vec4 texColor = texture(image, st);\n\n    // \u989C\u8272\u6DF7\u5408\uFF1Amix(\u539F\u59CB\u989C\u8272, \u76EE\u6807\u989C\u8272, mixRatio)\n    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);\n\n    // \u53D1\u5149\u589E\u5F3A\n    material.diffuse = mixedColor * glowStrength;\n\n    // \u900F\u660E\u5EA6\u968F\u989C\u8272\u53D8\u5316\n    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);\n\n    return material;\n}\n";
 import BaseMaterialProperty from "./BaseMaterialProperty";
 var ImageGlowingMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty) {
   _inherits(ImageGlowingMaterialProperty, _BaseMaterialProperty);
@@ -76,9 +76,11 @@ var ImageGlowingMaterialProperty = /*#__PURE__*/function (_BaseMaterialProperty)
     key: "handleStyle",
     value: function handleStyle(style) {
       var color = style.color,
+        repeat = style.repeat,
         options = _objectWithoutProperties(style, _excluded);
       var backStyle = _objectSpread({}, options);
       backStyle.color = utils.colorString(color);
+      backStyle.repeat = utils.arrCartesian2(repeat);
       return backStyle;
     }
   }]);

package/dist/esm/material/primitive/ImageGlowingMaterialAppearance.js

@@ -1,4 +1,4 @@
-var _excluded = ["color"];
+var _excluded = ["color", "repeat"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -22,7 +22,7 @@ import { cloneDeep, merge } from 'lodash';
 import { DEFAULT_GLOW_MATERIAL_STYLE, DEFAULT_MATERIAL_APPEARANCE } from "../../constant";
 import * as utils from "../../tool/utils";
 /* babel-plugin-inline-import '../shader/ImageGlowingShader.glsl' */
-var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\nuniform vec4 color;\nuniform float mixRatio;\n\nczm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = materialInput.st;\n\n    // \u91C7\u6837\u56FE\u7247\n    vec4 texColor = texture(image, st);\n\n    // \u989C\u8272\u6DF7\u5408\uFF1Amix(\u539F\u59CB\u989C\u8272, \u76EE\u6807\u989C\u8272, mixRatio)\n    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);\n\n    // \u53D1\u5149\u589E\u5F3A\n    material.diffuse = mixedColor * glowStrength;\n\n    // \u900F\u660E\u5EA6\u968F\u989C\u8272\u53D8\u5316\n    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);\n\n    return material;\n}\n";
+var ImageGlowingShader = "uniform sampler2D image;\nuniform float glowStrength;\nuniform vec4 color;\nuniform float mixRatio;\nuniform vec2 repeat;\n\nczm_material czm_getMaterial(czm_materialInput materialInput) {\n    czm_material material = czm_getDefaultMaterial(materialInput);\n    vec2 st = fract(materialInput.st * repeat);\n\n    // \u91C7\u6837\u56FE\u7247\n    vec4 texColor = texture(image, st);\n\n    // \u989C\u8272\u6DF7\u5408\uFF1Amix(\u539F\u59CB\u989C\u8272, \u76EE\u6807\u989C\u8272, mixRatio)\n    vec3 mixedColor = mix(texColor.rgb, texColor.rgb * color.rgb, mixRatio);\n\n    // \u53D1\u5149\u589E\u5F3A\n    material.diffuse = mixedColor * glowStrength;\n\n    // \u900F\u660E\u5EA6\u968F\u989C\u8272\u53D8\u5316\n    material.alpha = texColor.a * mix(color.a, 1.0, 1.0 - mixRatio);\n\n    return material;\n}\n";
 import BaseMaterialAppearance from "./BaseMaterialAppearance";
 var ImageGlowingMaterialAppearance = /*#__PURE__*/function (_BaseMaterialAppearan) {
   _inherits(ImageGlowingMaterialAppearance, _BaseMaterialAppearan);
@@ -64,9 +64,11 @@ var ImageGlowingMaterialAppearance = /*#__PURE__*/function (_BaseMaterialAppeara
     key: "handleMaterial",
     value: function handleMaterial(style) {
       var color = style.color,
+        repeat = style.repeat,
         options = _objectWithoutProperties(style, _excluded);
       var backStyle = _objectSpread({}, options);
       backStyle.color = utils.colorString(color);
+      backStyle.repeat = utils.arrCartesian2(repeat);
       return backStyle;
     }
   }]);

package/dist/esm/material/shader/ImageGlowingShader.glsl

@@ -2,10 +2,11 @@ uniform sampler2D image;
 uniform float glowStrength;
 uniform vec4 color;
 uniform float mixRatio;
+uniform vec2 repeat;
 
 czm_material czm_getMaterial(czm_materialInput materialInput) {
     czm_material material = czm_getDefaultMaterial(materialInput);
-    vec2 st = materialInput.st;
+    vec2 st = fract(materialInput.st * repeat);
 
     // 采样图片
     vec4 texColor = texture(image, st);