@openglobus/og 0.23.0 → 0.24.1

package/lib/js/entity/Billboard.d.ts

@@ -1,6 +1,7 @@
-import { BaseBillboard, IBaseBillboardParams } from "./BaseBillboard";
+import { BaseBillboard } from "./BaseBillboard";
+import type { IBaseBillboardParams } from "./BaseBillboard";
 import { BillboardHandler } from "./BillboardHandler";
-import { HTMLImageElementExt } from "../utils/ImagesCacheManager";
+import type { HTMLImageElementExt } from "../utils/ImagesCacheManager";
 export interface IBillboardParams extends IBaseBillboardParams {
     src?: string;
     image?: HTMLImageElement;

package/lib/js/entity/Entity.d.ts

@@ -1,17 +1,28 @@
-import { Billboard, IBillboardParams } from "./Billboard";
-import { EntityCollection, EntityCollectionEvents } from "./EntityCollection";
+import { Billboard } from "./Billboard";
+import { EntityCollection } from "./EntityCollection";
+import type { IBillboardParams } from "./Billboard";
+import type { EntityCollectionEvents } from "./EntityCollection";
 import { Extent } from "../Extent";
-import { Geometry, IGeometryParams } from "./Geometry";
-import { GeoObject, IGeoObjectParams } from "./GeoObject";
+import { Geometry } from "./Geometry";
+import { GeoObject } from "./GeoObject";
+import type { IGeometryParams } from "./Geometry";
+import type { IGeoObjectParams } from "./GeoObject";
 import { LonLat } from "../LonLat";
-import { Label, ILabelParams } from "./Label";
-import { NumberArray3, Vec3 } from "../math/Vec3";
-import { NumberArray2 } from "../math/Vec2";
-import { IPointCloudParams, PointCloud } from "./PointCloud";
-import { IPolylineParams, Polyline } from "./Polyline";
-import { IRayParams, Ray } from "./Ray";
-import { Strip, IStripParams } from "./Strip";
-import { Vector, VectorEventsType } from "../layer/Vector";
+import { Label } from "./Label";
+import type { ILabelParams } from "./Label";
+import { Vec3 } from "../math/Vec3";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray2 } from "../math/Vec2";
+import { PointCloud } from "./PointCloud";
+import { Polyline } from "./Polyline";
+import type { IPointCloudParams } from "./PointCloud";
+import type { IPolylineParams } from "./Polyline";
+import { Ray } from "./Ray";
+import type { IRayParams } from "./Ray";
+import { Strip } from "./Strip";
+import type { IStripParams } from "./Strip";
+import { Vector } from "../layer/Vector";
+import type { VectorEventsType } from "../layer/Vector";
 import { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
 import { Quat } from "../math/Quat";
 /**
@@ -37,7 +48,8 @@ import { Quat } from "../math/Quat";
  * @property {number} [yaw] - Rotation around local Y-axis.
  * @property {number} [roll] - Rotation around local Z-axis.
  * @property {number | Vec3 | NumberArray3} [scale] - Scaling factor.
- * @property {boolean} [forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
+ * @property {boolean} [forceGlobalPosition] - Forces global position for entity make the same position as its parent.
+ * @property {boolean} [forceGlobalRotation] - Forces global rotation for the entity make the same rotation as its parent.
  */
 export interface IEntityParams {
     name?: string;
@@ -61,6 +73,8 @@ export interface IEntityParams {
     roll?: number;
     scale?: number | Vec3 | NumberArray3;
     forceGlobalPosition?: boolean;
+    forceGlobalRotation?: boolean;
+    forceGlobalScale?: boolean;
     localPosition?: Vec3 | NumberArray3;
 }
 /**
@@ -85,11 +99,13 @@ export interface IEntityParams {
  * @param {Strip | IStripParams} [options.strip] - Strip object or parameters.
  * @param {boolean} [options.independentPicking] - Independent picking flag.
  * @param {boolean} [options.relativePosition] - Parent relative position flag, otherwise position is absolute.
- * @param {number} [options.pitch] - Rotation around local X-axis.
- * @param {number} [options.yaw] - Rotation around local Y-axis.
- * @param {number} [options.roll] - Rotation around local Z-axis.
+ * @param {number} [options.pitch] - Rotation around local X-axis in radians.
+ * @param {number} [options.yaw] - Rotation around local Y-axis in radians.
+ * @param {number} [options.roll] - Rotation around local Z-axis in radians.
  * @param {number | Vec3 | NumberArray3} [options.scale] - Scaling factor.
- * @param {boolean} [options.forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
+ * @param {boolean} [options.forceGlobalPosition] - Forces global position for the entity make the same position as its parent.
+ * @param {boolean} [options.forceGlobalRotation] - Forces global rotation for the entity make the same rotation as its parent.
+ * @param {boolean} [options.forceGlobalScale] - Forces global scale for the entity make the same scale as its parent.
  */
 declare class Entity {
     static __counter__: number;
@@ -112,6 +128,8 @@ declare class Entity {
      */
     childEntities: Entity[];
     forceGlobalPosition: boolean;
+    forceGlobalRotation: boolean;
+    forceGlobalScale: boolean;
     /**
      * Parent entity.
      * @public
@@ -238,9 +256,6 @@ declare class Entity {
     strip: Strip | null;
     _nodePtr?: EntityCollectionNode;
     protected _relativePosition: boolean;
-    protected _pitch: number;
-    protected _yaw: number;
-    protected _roll: number;
     protected _pitchRad: number;
     protected _yawRad: number;
     protected _rollRad: number;
@@ -386,72 +401,72 @@ declare class Entity {
     setRotation(rot: Quat): void;
     /**
      * Sets the pitch rotation of the entity.
-     * @param {number} val - The new pitch angle in degrees.
+     * @param {number} val - The new pitch angle in radians.
      */
     setPitch(val: number): void;
     /**
      * Sets the yaw rotation of the entity.
-     * @param {number} val - The new yaw angle in degrees.
+     * @param {number} val - The new yaw angle in radians.
      */
     setYaw(val: number): void;
     /**
      * Sets the roll rotation of the entity.
      * @public
-     * @param {number} val - The new roll angle in degrees.
+     * @param {number} val - The new roll angle in radians.
      */
     setRoll(val: number): void;
     /**
      * Gets the pitch angle of the entity.
      * @public
-     * @returns {number} The pitch angle in degrees.
+     * @returns {number} The pitch angle in radians.
      */
     getPitch(): number;
     /**
      * Gets the yaw angle of the entity.
      * @public
-     * @returns {number} The yaw angle in degrees.
+     * @returns {number} The yaw angle in radians.
      */
     getYaw(): number;
     /**
      * Gets the roll angle of the entity.
      * @public
-     * @returns {number} The roll angle in degrees.
+     * @returns {number} The roll angle in radians.
      */
     getRoll(): number;
     /**
      * Sets the absolute pitch of the entity.
      * @public
-     * @param {number} val - The absolute pitch angle in degrees.
+     * @param {number} val - The absolute pitch angle in radians.
      */
     setAbsolutePitch(val: number): void;
     /**
      * Sets the absolute yaw of the entity.
      * @public
-     * @param {number} val - The absolute yaw angle in degrees.
+     * @param {number} val - The absolute yaw angle in radians.
      */
     setAbsoluteYaw(val: number): void;
     /**
      * Sets the absolute roll of the entity.
      * @public
-     * @param {number} val - The absolute roll angle in degrees.
+     * @param {number} val - The absolute roll angle in radians.
      */
     setAbsoluteRoll(val: number): void;
     /**
      * Gets the absolute pitch angle of the entity.
      * @public
-     * @returns {number} The absolute pitch angle in degrees.
+     * @returns {number} The absolute pitch angle in radians.
      */
     getAbsolutePitch(): number;
     /**
      * Gets the absolute yaw angle of the entity.
      * @public
-     * @returns {number} The absolute yaw angle in degrees.
+     * @returns {number} The absolute yaw angle in radians.
      */
     getAbsoluteYaw(): number;
     /**
      * Gets the absolute roll angle of the entity.
      * @public
-     * @returns {number} The absolute roll angle in degrees.
+     * @returns {number} The absolute roll angle in radians.
      */
     getAbsoluteRoll(): number;
     protected _getScaleByDistance(): number;

package/lib/js/entity/Entity.js

@@ -12,7 +12,7 @@ import { Polyline } from "./Polyline";
 import { Ray } from "./Ray";
 import { Strip } from "./Strip";
 import { Quat } from "../math/Quat";
-import { RADIANS, clamp, DEGREES } from "../math";
+import { clamp } from "../math";
 /**
  * Entity instances aggregate multiple forms of visualization into a single high-level object.
  * They can be created manually and added to entity collection.
@@ -35,11 +35,13 @@ import { RADIANS, clamp, DEGREES } from "../math";
  * @param {Strip | IStripParams} [options.strip] - Strip object or parameters.
  * @param {boolean} [options.independentPicking] - Independent picking flag.
  * @param {boolean} [options.relativePosition] - Parent relative position flag, otherwise position is absolute.
- * @param {number} [options.pitch] - Rotation around local X-axis.
- * @param {number} [options.yaw] - Rotation around local Y-axis.
- * @param {number} [options.roll] - Rotation around local Z-axis.
+ * @param {number} [options.pitch] - Rotation around local X-axis in radians.
+ * @param {number} [options.yaw] - Rotation around local Y-axis in radians.
+ * @param {number} [options.roll] - Rotation around local Z-axis in radians.
  * @param {number | Vec3 | NumberArray3} [options.scale] - Scaling factor.
- * @param {boolean} [options.forceGlobalPosition] - Forces global position for children entities make them the same position as the parent.
+ * @param {boolean} [options.forceGlobalPosition] - Forces global position for the entity make the same position as its parent.
+ * @param {boolean} [options.forceGlobalRotation] - Forces global rotation for the entity make the same rotation as its parent.
+ * @param {boolean} [options.forceGlobalScale] - Forces global scale for the entity make the same scale as its parent.
  */
 class Entity {
     constructor(options = {}) {
@@ -50,6 +52,8 @@ class Entity {
         this.childEntities = [];
         this.parent = null;
         this.forceGlobalPosition = options.forceGlobalPosition || false;
+        this.forceGlobalRotation = options.forceGlobalRotation || false;
+        this.forceGlobalScale = options.forceGlobalScale || false;
         this._cartesian = utils.createVector3(options.cartesian);
         this._rootCartesian = new Vec3();
         this._localPosition = utils.createVector3(options.localPosition);
@@ -65,12 +69,9 @@ class Entity {
         this._pickingColor = new Vec3(0, 0, 0);
         this._independentPicking = options.independentPicking || false;
         this._relativePosition = options.relativePosition || false;
-        this._pitch = options.pitch || 0;
-        this._yaw = options.yaw || 0;
-        this._roll = options.roll || 0;
-        this._pitchRad = this._pitch * RADIANS;
-        this._yawRad = this._yaw * RADIANS;
-        this._rollRad = this._roll * RADIANS;
+        this._pitchRad = options.pitch || 0;
+        this._yawRad = options.yaw || 0;
+        this._rollRad = options.roll || 0;
         this._scale = utils.createVector3(options.scale, new Vec3(1, 1, 1));
         this._qFrame = Quat.IDENTITY;
         this._qRot = Quat.IDENTITY;
@@ -270,7 +271,13 @@ class Entity {
         this._scale.copy(scale);
         this.geoObject && this.geoObject.setScale3v(this._scale);
         for (let i = 0; i < this.childEntities.length; i++) {
-            this.childEntities[i].setScale3v(this.childEntities[i].getScale());
+            let chi = this.childEntities[i];
+            if (chi.forceGlobalScale) {
+                chi.setScale3v(this._scale);
+            }
+            else {
+                chi.setScale3v(this.childEntities[i].getScale());
+            }
         }
     }
     /**
@@ -282,7 +289,13 @@ class Entity {
         this._scale.set(val, val, val);
         this.geoObject && this.geoObject.setScale(val);
         for (let i = 0; i < this.childEntities.length; i++) {
-            this.childEntities[i].setScale3v(this.childEntities[i].getScale());
+            let chi = this.childEntities[i];
+            if (chi.forceGlobalScale) {
+                chi.setScale(val);
+            }
+            else {
+                chi.setScale3v(this.childEntities[i].getScale());
+            }
         }
     }
     /**
@@ -351,64 +364,61 @@ class Entity {
     }
     /**
      * Sets the pitch rotation of the entity.
-     * @param {number} val - The new pitch angle in degrees.
+     * @param {number} val - The new pitch angle in radians.
      */
     setPitch(val) {
-        this._pitch = val;
-        this._pitchRad = val * RADIANS;
+        this._pitchRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * Sets the yaw rotation of the entity.
-     * @param {number} val - The new yaw angle in degrees.
+     * @param {number} val - The new yaw angle in radians.
      */
     setYaw(val) {
-        this._yaw = val;
-        this._yawRad = val * RADIANS;
+        this._yawRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * Sets the roll rotation of the entity.
      * @public
-     * @param {number} val - The new roll angle in degrees.
+     * @param {number} val - The new roll angle in radians.
      */
     setRoll(val) {
-        this._roll = val;
-        this._rollRad = val * RADIANS;
+        this._rollRad = val;
         this._updateAbsolutePosition();
     }
     /**
      * Gets the pitch angle of the entity.
      * @public
-     * @returns {number} The pitch angle in degrees.
+     * @returns {number} The pitch angle in radians.
      */
     getPitch() {
-        return this._pitch;
+        return this._pitchRad;
     }
     /**
      * Gets the yaw angle of the entity.
      * @public
-     * @returns {number} The yaw angle in degrees.
+     * @returns {number} The yaw angle in radians.
      */
     getYaw() {
-        return this._yaw;
+        return this._yawRad;
     }
     /**
      * Gets the roll angle of the entity.
      * @public
-     * @returns {number} The roll angle in degrees.
+     * @returns {number} The roll angle in radians.
      */
     getRoll() {
-        return this._roll;
+        return this._rollRad;
     }
     /**
      * Sets the absolute pitch of the entity.
      * @public
-     * @param {number} val - The absolute pitch angle in degrees.
+     * @param {number} val - The absolute pitch angle in radians.
      */
     setAbsolutePitch(val) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(val * RADIANS, this.getAbsoluteYaw() * RADIANS, this.getAbsoluteRoll() * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(val, this.getAbsoluteYaw(), this.getAbsoluteRoll(), this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -418,11 +428,11 @@ class Entity {
     /**
      * Sets the absolute yaw of the entity.
      * @public
-     * @param {number} val - The absolute yaw angle in degrees.
+     * @param {number} val - The absolute yaw angle in radians.
      */
     setAbsoluteYaw(val) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch() * RADIANS, val * RADIANS, this.getAbsoluteRoll() * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch(), val, this.getAbsoluteRoll(), this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -432,11 +442,11 @@ class Entity {
     /**
      * Sets the absolute roll of the entity.
      * @public
-     * @param {number} val - The absolute roll angle in degrees.
+     * @param {number} val - The absolute roll angle in radians.
      */
     setAbsoluteRoll(val) {
         if (this._relativePosition) {
-            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch() * RADIANS, this.getAbsoluteYaw() * RADIANS, val * RADIANS, this._qFrame);
+            this._absoluteQRot.setPitchYawRoll(this.getAbsolutePitch(), this.getAbsoluteYaw(), val, this._qFrame);
             this._updatePitchYawRoll();
         }
         else {
@@ -446,35 +456,35 @@ class Entity {
     /**
      * Gets the absolute pitch angle of the entity.
      * @public
-     * @returns {number} The absolute pitch angle in degrees.
+     * @returns {number} The absolute pitch angle in radians.
      */
     getAbsolutePitch() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getPitch() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getPitch();
         }
-        return this._pitch;
+        return this._pitchRad;
     }
     /**
      * Gets the absolute yaw angle of the entity.
      * @public
-     * @returns {number} The absolute yaw angle in degrees.
+     * @returns {number} The absolute yaw angle in radians.
      */
     getAbsoluteYaw() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getYaw() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getYaw();
         }
-        return this._yaw;
+        return this._yawRad;
     }
     /**
      * Gets the absolute roll angle of the entity.
      * @public
-     * @returns {number} The absolute roll angle in degrees.
+     * @returns {number} The absolute roll angle in radians.
      */
     getAbsoluteRoll() {
         if (this.parent && this._relativePosition) {
-            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getRoll() * DEGREES;
+            return this._qFrame.conjugate().inverse().mul(this._absoluteQRot).getRoll();
         }
-        return this._roll;
+        return this._rollRad;
     }
     _getScaleByDistance() {
         let scd = 1;
@@ -553,9 +563,9 @@ class Entity {
             this._pitchRad = this._qRot.getPitch();
             this._yawRad = this._qRot.getYaw();
             this._rollRad = this._qRot.getRoll();
-            this._pitch = this._pitchRad * DEGREES;
-            this._yaw = this._yawRad * DEGREES;
-            this._roll = this._rollRad * DEGREES;
+            // this._pitch = this._pitchRad * DEGREES;
+            // this._yaw = this._yawRad * DEGREES;
+            // this._roll = this._rollRad * DEGREES;
             if (this.geoObject) {
                 this.geoObject.setRotation(this._absoluteQRot);
             }
@@ -579,7 +589,12 @@ class Entity {
             if (this._entityCollection && this._entityCollection.renderNode) {
                 this._qFrame = this._entityCollection.renderNode.getFrameRotation(this._cartesian);
             }
-            this._qRot.setPitchYawRoll(this._pitchRad, this._yawRad, this._rollRad, this._qFrame);
+            if (parent && this.forceGlobalRotation) {
+                this._qRot.setPitchYawRoll(parent._pitchRad, parent._yawRad, parent._rollRad, this._qFrame);
+            }
+            else {
+                this._qRot.setPitchYawRoll(this._pitchRad, this._yawRad, this._rollRad, this._qFrame);
+            }
             this._absoluteQRot.copy(this._qRot);
             this._rootCartesian.copy(this._cartesian);
             this._absoluteLocalPosition.copy(this._localPosition);

package/lib/js/entity/EntityCollection.d.ts

@@ -1,11 +1,12 @@
 import { BillboardHandler } from "./BillboardHandler";
-import { EventsHandler } from "../Events";
+import type { EventsHandler } from "../Events";
 import { Entity } from "./Entity";
 import { Ellipsoid } from "../ellipsoid/Ellipsoid";
 import { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 import { LabelHandler } from "./LabelHandler";
-import { Vec3, NumberArray3 } from "../math/Vec3";
+import { Vec3 } from "../math/Vec3";
+import type { NumberArray3 } from "../math/Vec3";
 import { PointCloudHandler } from "./PointCloudHandler";
 import { PolylineHandler } from "./PolylineHandler";
 import { RayHandler } from "./RayHandler";
@@ -152,7 +153,7 @@ declare class EntityCollection {
      * Second index - far distance to the entity, when entity becomes zero scale.
      * Third index - far distance to the entity, when entity becomes invisible.
      * @public
-     * @type {Array.<number>} - (exactly 3 entries)
+     * @type {Array.<number>}
      */
     scaleByDistance: NumberArray3;
     pickingScale: Float32Array;

package/lib/js/entity/GeoObject.d.ts

@@ -2,8 +2,8 @@ import { Entity } from "./Entity";
 import { Quat, Vec3, Vec4 } from "../math/index";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 import { InstanceData } from "./InstanceData";
-import { NumberArray3 } from "../math/Vec3";
-import { NumberArray4 } from "../math/Vec4";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray4 } from "../math/Vec4";
 import { Object3d } from "../Object3d";
 export declare const LOCAL_FORWARD: Vec3;
 /**
@@ -13,9 +13,6 @@ export declare const LOCAL_FORWARD: Vec3;
  * @property {string} [objSrc] - Source url of the 3D object.
  * @property {string} [tag] - Unique instancing drawing identifier tag.
  * @property {Vec3 | NumberArray3} [position] - Position in Cartesian coordinates.
- * @property {number} [pitch] - Rotation around X-axis in degrees.
- * @property {number} [yaw] - Rotation around Y-axis in degrees.
- * @property {number} [roll] - Rotation around Z-axis in degrees.
  * @property {number | Vec3 | NumberArray3} [scale] - Scale of the object.
  * @property {Vec3 | NumberArray3} [translate] - Translation offset.
  * @property {Vec4 | NumberArray4 | string} [color] - RGBA color or HTML color string.
@@ -26,9 +23,6 @@ export interface IGeoObjectParams {
     objSrc?: string;
     tag?: string;
     position?: Vec3 | NumberArray3;
-    pitch?: number;
-    yaw?: number;
-    roll?: number;
     scale?: number | Vec3 | NumberArray3;
     translate?: Vec3 | NumberArray3;
     color?: Vec4 | NumberArray4 | string;
@@ -42,9 +36,6 @@ export interface IGeoObjectParams {
  * @param {string} [options.objSrc] - Source url of the 3D object.
  * @param {string} [options.tag] - Unique instancing drawing identifier tag.
  * @param {Vec3 | NumberArray3} [options.position] - Position in Cartesian coordinates.
- * @param {number} [options.pitch=0] - Rotation around X-axis in degrees.
- * @param {number} [options.yaw=0] - Rotation around Y-axis in degrees.
- * @param {number} [options.roll=0] - Rotation around Z-axis in degrees.
  * @param {number | Vec3 | NumberArray3} [options.scale=1] - Scale of the object.
  * @param {Vec3 | NumberArray3} [options.translate] - Translation offset.
  * @param {Vec4 | NumberArray4 | string} [options.color] - RGBA color or HTML color string.

package/lib/js/entity/GeoObject.js

@@ -10,9 +10,6 @@ export const LOCAL_FORWARD = new Vec3(0.0, 0.0, -1.0);
  * @param {string} [options.objSrc] - Source url of the 3D object.
  * @param {string} [options.tag] - Unique instancing drawing identifier tag.
  * @param {Vec3 | NumberArray3} [options.position] - Position in Cartesian coordinates.
- * @param {number} [options.pitch=0] - Rotation around X-axis in degrees.
- * @param {number} [options.yaw=0] - Rotation around Y-axis in degrees.
- * @param {number} [options.roll=0] - Rotation around Z-axis in degrees.
  * @param {number | Vec3 | NumberArray3} [options.scale=1] - Scale of the object.
  * @param {Vec3 | NumberArray3} [options.translate] - Translation offset.
  * @param {Vec4 | NumberArray4 | string} [options.color] - RGBA color or HTML color string.

package/lib/js/entity/Geometry.d.ts

@@ -1,9 +1,10 @@
 import { Entity } from "./Entity";
 import { Extent } from "../Extent";
 import { GeometryHandler } from "./GeometryHandler";
-import { NumberArray4, Vec4 } from "../math/Vec4";
-import { NumberArray2 } from "../math/Vec2";
-import { NumberArray3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import type { NumberArray4 } from "../math/Vec4";
+import type { NumberArray2 } from "../math/Vec2";
+import type { NumberArray3 } from "../math/Vec3";
 export declare enum GeometryTypeEnum {
     POINT = 1,
     LINESTRING = 2,

package/lib/js/entity/GeometryHandler.d.ts

@@ -1,10 +1,11 @@
 import { Extent } from "../Extent";
-import { Handler, WebGLBufferExt } from "../webgl/Handler";
+import { Handler } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 import { Vector } from "../layer/Vector";
 import { Node } from "../quadTree/Node";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
-import { CoordinatesType, Geometry } from "./Geometry";
+import type { CoordinatesType, Geometry } from "./Geometry";
 declare class GeometryHandler {
     static __counter__: number;
     protected __id: number;

package/lib/js/entity/InstanceData.d.ts

@@ -1,6 +1,6 @@
 import { GeoObject } from "./GeoObject";
-import { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
-import { TypedArray } from "../utils/shared";
+import type { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
+import type { TypedArray } from "../utils/shared";
 import { Program } from "../webgl/Program";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 export declare class InstanceData {

package/lib/js/entity/InstanceData.js

@@ -156,17 +156,20 @@ export class InstanceData {
     }
     createColorTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._colorTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._colorTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     createNormalTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._normalTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._normalTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     createMetallicRoughnessTexture(image) {
         if (this._geoObjectHandler && this._geoObjectHandler._renderer) {
-            this._metallicRoughnessTexture = this._geoObjectHandler._renderer.handler.createTextureDefault(image);
+            let h = this._geoObjectHandler._renderer.handler;
+            this._metallicRoughnessTexture = h.createTextureDefault(image, null, h.gl.REPEAT);
         }
     }
     clear() {

package/lib/js/entity/Label.d.ts

@@ -1,5 +1,7 @@
-import { BaseBillboard, IBaseBillboardParams } from "./BaseBillboard";
-import { NumberArray4, Vec4 } from "../math/Vec4";
+import { BaseBillboard } from "./BaseBillboard";
+import type { IBaseBillboardParams } from "./BaseBillboard";
+import { Vec4 } from "../math/Vec4";
+import type { NumberArray4 } from "../math/Vec4";
 import { FontAtlas } from "../utils/FontAtlas";
 import { LabelHandler } from "./LabelHandler";
 export interface ILabelParams extends IBaseBillboardParams {

package/lib/js/entity/LabelHandler.d.ts

@@ -1,7 +1,7 @@
 import { Label } from "./Label";
 import { BaseBillboardHandler } from "./BaseBillboardHandler";
 import { EntityCollection } from "./EntityCollection";
-import { WebGLBufferExt } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
 type LabelWorkerCallbackData = {

package/lib/js/entity/PointCloud.d.ts

@@ -3,7 +3,7 @@ import { PointCloudHandler } from "./PointCloudHandler";
 import { RenderNode } from "../scene/RenderNode";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
-import { WebGLBufferExt } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 import { EntityCollection } from "./EntityCollection";
 export interface IPointCloudParams {
     visibility?: boolean;