earthsdk3 3.0.5 → 3.0.6-beta.2

package/dist/types/ESJTypes/properties/ESJMaterialType.d.ts

@@ -8,16 +8,16 @@ export type ESJMaterialType = {
     unlit?: boolean;
     alphaMode?: "OPAQUE" | "MASK" | "BLEND";
     baseColorTexture?: {
-        value: "";
-        offset: ESJVector2D;
-        scale: ESJVector2D;
-        rotate: number;
+        value?: "";
+        offset?: ESJVector2D;
+        scale?: ESJVector2D;
+        rotate?: number;
     };
     normalTexture?: {
-        value: "";
-        offset: ESJVector2D;
-        scale: ESJVector2D;
-        rotate: number;
+        value?: "";
+        offset?: ESJVector2D;
+        scale?: ESJVector2D;
+        rotate?: number;
     };
     magFilter?: 'LINEAR' | 'NEAREST';
     minFilter?: 'LINEAR' | 'NEAREST' | 'NEAREST_MIPMAP_NEAREST' | 'LINEAR_MIPMAP_NEAREST' | 'NEAREST_MIPMAP_LINEAR' | 'LINEAR_MIPMAP_LINEAR';

package/dist/types/ESObjects/general/ES3DTileset/index.d.ts

@@ -21,7 +21,7 @@ export declare class ES3DTileset extends ESVisualObject {
         rotation: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         czmImageBasedLightingFactor: import("xbsj-base").ReactiveVariable<ESJVector2D>;
         /**
-         * @deprecated czmLuminanceAtZenith已弃用，请使用atmosphereScatteringIntensity代替
+         * @deprecated czmLuminanceAtZenith已弃用，请使用czmAtmosphereScatteringIntensity代替
          */
         czmLuminanceAtZenith: number;
         czmAtmosphereScatteringIntensity: number;
@@ -181,8 +181,8 @@ export declare class ES3DTileset extends ESVisualObject {
     get resetFeatureStyleEvent(): Event<[]>;
     resetFeatureStyle(): void;
     private _setMaterialEvent;
-    get setMaterialEvent(): Event<[ESJMaterialType]>;
-    setMaterial(options: ESJMaterialType): void;
+    get setMaterialEvent(): Event<["default" | ESJMaterialType]>;
+    setMaterial(options: ESJMaterialType | 'default'): void;
     private _clippingPlanesId;
     get clippingPlanesId(): string;
     set clippingPlanesId(value: string);
@@ -253,7 +253,7 @@ export declare namespace ES3DTileset {
         rotation: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         czmImageBasedLightingFactor: import("xbsj-base").ReactiveVariable<ESJVector2D>;
         /**
-         * @deprecated czmLuminanceAtZenith已弃用，请使用atmosphereScatteringIntensity代替
+         * @deprecated czmLuminanceAtZenith已弃用，请使用czmAtmosphereScatteringIntensity代替
          */
         czmLuminanceAtZenith: number;
         czmAtmosphereScatteringIntensity: number;

package/dist/types/ESObjects/general/ESGeoJson/index.d.ts

@@ -127,7 +127,7 @@ export declare class ESGeoJson extends ESVisualObject {
         dataSource: (NumberProperty | EnumProperty<string> | JsonProperty<string>)[];
         location: never[];
         coordinate: never[];
-        style: (GroupProperty | StringProperty | NumberProperty | BooleanProperty | EnumProperty<string> | ColorProperty | Number2Property | JsonProperty<string> | JsonProperty<{}>)[];
+        style: (GroupProperty | StringProperty | NumberProperty | BooleanProperty | EnumProperty<string> | ColorProperty | JsonProperty<string> | Number2Property | JsonProperty<{}>)[];
     };
     getProperties(language?: string): import("../../../ESJTypes").Property[];
     get strokeWidth(): number;

package/dist/types/ESObjects/general/ESGltfModel.d.ts

@@ -1,6 +1,6 @@
 import { Event, SceneObjectKey, ReactivePropsToNativePropsAndChanged } from "xbsj-base";
 import { ESObjectWithLocation } from "../base";
-import { ESJColor, ESJMaterialType, ESJResource, ESJVector3D } from "../../ESJTypes";
+import { ESJColor, ESJMaterialType, ESJResource, ESJVector2D, ESJVector3D } from "../../ESJTypes";
 import { ESJInstances } from "../../ESJTypes/properties/ESJInstances";
 type ModelNodeTransformation = {
     translationX: number;
@@ -27,6 +27,8 @@ export declare class ESGltfModel extends ESObjectWithLocation {
         czmColor: import("xbsj-base").ReactiveVariable<ESJColor>;
         allowPicking: boolean;
         instances: import("xbsj-base").ReactiveVariable<ESJInstances | undefined>;
+        czmImageBasedLightingFactor: import("xbsj-base").ReactiveVariable<ESJVector2D>;
+        czmAtmosphereScatteringIntensity: number;
         position: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         rotation: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         scale: import("xbsj-base").ReactiveVariable<ESJVector3D>;
@@ -75,8 +77,8 @@ export declare class ESGltfModel extends ESObjectWithLocation {
     get printDebugInfoEvent(): Event<[]>;
     printDebugInfo(): void;
     private _setMaterialEvent;
-    get setMaterialEvent(): Event<[ESJMaterialType]>;
-    setMaterial(options: ESJMaterialType): void;
+    get setMaterialEvent(): Event<["default" | ESJMaterialType]>;
+    setMaterial(options: ESJMaterialType | 'default'): void;
     static defaults: {
         url: string;
         instances: never[];
@@ -107,6 +109,8 @@ export declare namespace ESGltfModel {
         czmColor: import("xbsj-base").ReactiveVariable<ESJColor>;
         allowPicking: boolean;
         instances: import("xbsj-base").ReactiveVariable<ESJInstances | undefined>;
+        czmImageBasedLightingFactor: import("xbsj-base").ReactiveVariable<ESJVector2D>;
+        czmAtmosphereScatteringIntensity: number;
         position: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         rotation: import("xbsj-base").ReactiveVariable<ESJVector3D>;
         scale: import("xbsj-base").ReactiveVariable<ESJVector3D>;

package/dist/types/ESObjects/general/ESRtsFeatureEditing/index.d.ts

@@ -1,4 +1,4 @@
-import { PartialWithUndefinedReactivePropsToNativeProps, ReactivePropsToNativePropsAndChanged, SceneObjectKey } from "xbsj-base";
+import { JsonValue, SceneObjectKey, UniteChanged } from "xbsj-base";
 import { ES3DTileset } from "../ES3DTileset";
 import { ESRtsTileset } from "../ESRtsTileset";
 import { ESSceneObject } from "../../../ESObjects/base";
@@ -26,7 +26,7 @@ export declare class ESRtsFeatureEditing extends ES3DTileset {
         czmAtmosphereScatteringIntensity: number;
         czmMaximumMemoryUsage: number;
         czmClassificationType: string;
-        czmStyleJson: import("xbsj-base").ReactiveVariable<import("xbsj-base").JsonValue>;
+        czmStyleJson: import("xbsj-base").ReactiveVariable<JsonValue>;
         czmBackFaceCulling: boolean;
         czmDebugShowBoundingVolume: boolean;
         czmDebugShowContentBoundingVolume: boolean;
@@ -45,21 +45,21 @@ export declare class ESRtsFeatureEditing extends ES3DTileset {
         flyInParam: import("xbsj-base").ReactiveVariable<import("../../../ESJTypes").ESJFlyInParam | undefined>;
         name: string;
         ref: string | undefined;
-        extras: import("xbsj-base").ReactiveVariable<import("xbsj-base").JsonValue>;
+        extras: import("xbsj-base").ReactiveVariable<JsonValue>;
         devTags: import("xbsj-base").ReactiveVariable<string[] | undefined>;
         execOnceFuncStr: string | undefined;
         updateFuncStr: string | undefined;
         toDestroyFuncStr: string | undefined;
     };
-    get json(): JsonType;
-    set json(value: JsonType);
+    get json(): JsonValue;
+    set json(value: JsonValue);
     combinationClass: boolean;
     mainClass: undefined | ESSceneObject;
     getMainClass(): ESSceneObject;
     init(eSRtsTileset: ESRtsTileset, featureId: string): Promise<void>;
     constructor(id?: SceneObjectKey);
     static defaults: {
-        layerConfig: JsonType;
+        layerConfig: JsonValue;
         url: string;
         actorTag: string;
         materialMode: string;
@@ -99,7 +99,7 @@ export declare namespace ESRtsFeatureEditing {
         czmAtmosphereScatteringIntensity: number;
         czmMaximumMemoryUsage: number;
         czmClassificationType: string;
-        czmStyleJson: import("xbsj-base").ReactiveVariable<import("xbsj-base").JsonValue>;
+        czmStyleJson: import("xbsj-base").ReactiveVariable<JsonValue>;
         czmBackFaceCulling: boolean;
         czmDebugShowBoundingVolume: boolean;
         czmDebugShowContentBoundingVolume: boolean;
@@ -118,16 +118,12 @@ export declare namespace ESRtsFeatureEditing {
         flyInParam: import("xbsj-base").ReactiveVariable<import("../../../ESJTypes").ESJFlyInParam | undefined>;
         name: string;
         ref: string | undefined;
-        extras: import("xbsj-base").ReactiveVariable<import("xbsj-base").JsonValue>;
+        extras: import("xbsj-base").ReactiveVariable<JsonValue>;
         devTags: import("xbsj-base").ReactiveVariable<string[] | undefined>;
         execOnceFuncStr: string | undefined;
         updateFuncStr: string | undefined;
         toDestroyFuncStr: string | undefined;
     };
 }
-export interface ESRtsFeatureEditing extends ReactivePropsToNativePropsAndChanged<ReturnType<typeof ESRtsFeatureEditing.createDefaultProps>> {
+export interface ESRtsFeatureEditing extends UniteChanged<ReturnType<typeof ESRtsFeatureEditing.createDefaultProps>> {
 }
-type JsonType = PartialWithUndefinedReactivePropsToNativeProps<ReturnType<typeof ESRtsFeatureEditing.createDefaultProps> & {
-    type: string;
-}>;
-export {};

package/dist/types/ESObjects/general/ESRtsTileset/index.d.ts

@@ -1,4 +1,4 @@
-import { Event, JsonValue, PartialWithUndefinedReactivePropsToNativeProps, ReactivePropsToNativePropsAndChanged, SceneObjectKey } from "xbsj-base";
+import { Event, JsonValue, SceneObjectKey, UniteChanged } from "xbsj-base";
 import { LayerType } from "./types";
 import { ESRtsFeatureEditing } from "../ESRtsFeatureEditing";
 import { ES3DTileset } from "../ES3DTileset";
@@ -46,8 +46,8 @@ export declare class ESRtsTileset extends ES3DTileset {
         toDestroyFuncStr: string | undefined;
         layerConfig: import("xbsj-base").ReactiveVariable<JsonValue[] | undefined>;
     };
-    get json(): JsonType;
-    set json(value: JsonType);
+    get json(): JsonValue;
+    set json(value: JsonValue);
     combinationClass: boolean;
     getMainClass(): ES3DTileset;
     private _es3DTileset;
@@ -153,9 +153,5 @@ export declare namespace ESRtsTileset {
         layerConfig: import("xbsj-base").ReactiveVariable<JsonValue[] | undefined>;
     };
 }
-export interface ESRtsTileset extends ReactivePropsToNativePropsAndChanged<ReturnType<typeof ESRtsTileset.createDefaultProps>> {
+export interface ESRtsTileset extends UniteChanged<ReturnType<typeof ESRtsTileset.createDefaultProps>> {
 }
-type JsonType = PartialWithUndefinedReactivePropsToNativeProps<ReturnType<typeof ESRtsTileset.createDefaultProps> & {
-    type: string;
-}>;
-export {};

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "earthsdk3",
-  "version": "3.0.5",
+  "version": "3.0.6-beta.2",
   "description": "地球可视化实验室 (EarthSDK&CesiumLab) https://www.bjxbsj.cn",
-  "1main": "./src/index.ts",
   "main": "dist/earthsdk3.cjs",
   "module": "dist/earthsdk3.mjs",
   "types": "dist/types/index.d.ts",

package/dist/earthsdk3.cjs.LICENSE.txt

@@ -1,29 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-
-/**
-     * splaytree v3.1.2
-     * Fast Splay tree for Node and browser
-     *
-     * @author Alexander Milevski <info@w8r.name>
-     * @license MIT
-     * @preserve
-     */

package/dist/earthsdk3.js.LICENSE.txt

@@ -1,29 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-
-/**
-     * splaytree v3.1.2
-     * Fast Splay tree for Node and browser
-     *
-     * @author Alexander Milevski <info@w8r.name>
-     * @license MIT
-     * @preserve
-     */

package/dist/earthsdk3.mjs.LICENSE.txt

@@ -1,29 +0,0 @@
-/*
-object-assign
-(c) Sindre Sorhus
-@license MIT
-*/
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-
-/**
-     * splaytree v3.1.2
-     * Fast Splay tree for Node and browser
-     *
-     * @author Alexander Milevski <info@w8r.name>
-     * @license MIT
-     * @preserve
-     */