@openglobus/og 0.28.7 → 1.0.0-rc2

package/lib/entity/EntityCollection.d.ts

@@ -1,78 +1,88 @@
-import { BillboardHandler } from "./BillboardHandler";
+import { BillboardHandler } from "./billboard/BillboardHandler";
 import type { EventsHandler } from "../Events";
-import { Entity } from "./Entity";
+import type { Entity } from "./Entity";
 import { Ellipsoid } from "../ellipsoid/Ellipsoid";
-import { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
-import { GeoObjectHandler } from "./GeoObjectHandler";
-import { LabelHandler } from "./LabelHandler";
+import { Extent } from "../Extent";
+import type { EntityCollectionNode } from "../quadTree/EntityCollectionNode";
+import { GeoObjectHandler } from "./geoObject/GeoObjectHandler";
+import { LabelHandler } from "./label/LabelHandler";
 import { Vec3 } from "../math/Vec3";
 import type { NumberArray3 } from "../math/Vec3";
-import { PointCloudHandler } from "./PointCloudHandler";
-import { PolylineHandler } from "./PolylineHandler";
-import { RayHandler } from "./RayHandler";
-import { RenderNode } from "../scene/RenderNode";
-import { StripHandler } from "./StripHandler";
-import { Vector } from "../layer/Vector";
+import { PointCloudHandler } from "./pointCloud/PointCloudHandler";
+import { PolylineHandler } from "./polyline/PolylineHandler";
+import { RayHandler } from "./ray/RayHandler";
+import { Scene } from "../scene/Scene";
+import type { Node } from "../quadTree/Node";
+import { StripHandler } from "./strip/StripHandler";
+import type { Vector } from "../layer/Vector";
+import { type ShadeMode, type ShadeModeInput } from "../shadeModeConstants";
 export type EntityCollectionEvents = EventsHandler<EntityCollectionEventList>;
 interface IEntityCollectionParams {
-    polygonOffsetUnits?: number;
+    depthOffset?: number;
     visibility?: boolean;
     labelMaxLetters?: number;
     pickingEnabled?: boolean;
     scaleByDistance?: NumberArray3;
     pickingScale?: number | NumberArray3;
     opacity?: number;
-    useLighting?: boolean;
+    shadeMode?: ShadeModeInput;
     entities?: Entity[];
     depthOrder?: number;
+    disableCullFace?: boolean;
 }
 /**
  * An observable collection of og.Entity instances where each entity has a unique id.
- * Entity collection provide handlers for each type of entity like billboard, label or 3ds object.
+ * Entity collection provides handlers for each type of entity like billboard, label or 3ds object.
  * @constructor
  * @param {Object} [options] - Entity options:
  * @param {Array.<Entity>} [options.entities] - Entities array.
  * @param {boolean} [options.visibility=true] - Entity visibility.
+ * @param {number} [options.labelMaxLetters] - Maximum label letters per line used by the label handler.
+ * @param {boolean} [options.pickingEnabled] - Enables/disables picking for all entity handlers.
  * @param {Array.<number>} [options.scaleByDistance] - Entity scale by distance parameters. (exactly 3 entries)
  * First index - near distance to the entity, after entity becomes full scale.
  * Second index - far distance to the entity, when entity becomes zero scale.
  * Third index - far distance to the entity, when entity becomes invisible.
+ * @param {number|Array.<number>} [options.pickingScale] - Picking scale value or xyz scale array.
  * @param {number} [options.opacity] - Entity global opacity.
- * @param {boolean} [options.pickingEnabled=true] - Entity picking enable.
- * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset. The default value is 0.
- * //@fires EntityCollection#entitymove
- * @fires EntityCollection#draw
- * @fires EntityCollection#drawend
- * @fires EntityCollection#add
- * @fires EntityCollection#remove
- * @fires EntityCollection#entityadd
- * @fires EntityCollection#entityremove
- * @fires EntityCollection#visibilitychange
- * @fires EntityCollection#mousemove
- * @fires EntityCollection#mouseenter
- * @fires EntityCollection#mouseleave
- * @fires EntityCollection#lclick
- * @fires EntityCollection#rclick
- * @fires EntityCollection#mclick
- * @fires EntityCollection#ldblclick
- * @fires EntityCollection#rdblclick
- * @fires EntityCollection#mdblclick
- * @fires EntityCollection#lup
- * @fires EntityCollection#rup
- * @fires EntityCollection#mup
- * @fires EntityCollection#ldown
- * @fires EntityCollection#rdown
- * @fires EntityCollection#mdown
- * @fires EntityCollection#lhold
- * @fires EntityCollection#rhold
- * @fires EntityCollection#mhold
- * @fires EntityCollection#mousewheel
- * @fires EntityCollection#touchmove
- * @fires EntityCollection#touchstart
- * @fires EntityCollection#touchend
- * @fires EntityCollection#doubletouch
- * @fires EntityCollection#touchleave
- * @fires EntityCollection#touchenter
+ * @param {number|string} [options.shadeMode=1] - Geo object shading mode: `0|none|unlit`, `0.5|phong`, `1|pbr`.
+ * @param {number} [options.depthOrder=0] - Rendering order for grouped vector layer collections.
+ * @param {Number} [options.depthOffset=0.0] - Signed world-space depth offset along the camera ray.
+ * Negative values move geometry closer to the camera, positive values move it farther.
+ * @param {boolean} [options.disableCullFace=false] - Disables back-face culling for geo object rendering.
+ * //@fires entitymove
+ * @fires draw
+ * @fires drawend
+ * @fires add
+ * @fires remove
+ * @fires entityadd
+ * @fires entityremove
+ * @fires visibilitychange
+ * @fires mousemove
+ * @fires mouseenter
+ * @fires mouseleave
+ * @fires lclick
+ * @fires rclick
+ * @fires mclick
+ * @fires ldblclick
+ * @fires rdblclick
+ * @fires mdblclick
+ * @fires lup
+ * @fires rup
+ * @fires mup
+ * @fires ldown
+ * @fires rdown
+ * @fires mdown
+ * @fires lhold
+ * @fires rhold
+ * @fires mhold
+ * @fires mousewheel
+ * @fires touchmove
+ * @fires touchstart
+ * @fires touchend
+ * @fires doubletouch
+ * @fires touchleave
+ * @fires touchenter
  */
 declare class EntityCollection {
     static __counter__: number;
@@ -85,9 +95,9 @@ declare class EntityCollection {
     /**
      * Render node context.
      * @public
-     * @type {RenderNode}
+     * @type {Scene}
      */
-    renderNode: RenderNode | null;
+    scene: Scene | null;
     /**
      * Visibility option.
      * @public
@@ -95,11 +105,13 @@ declare class EntityCollection {
      */
     _visibility: boolean;
     /**
-     * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
+     * Signed world-space depth offset along the camera ray.
+     * Negative values move geometry closer to the camera, positive values move it farther.
+     * 0.0 means no offset.
      * @public
      * @type {Number}
      */
-    polygonOffsetUnits: number;
+    depthOffset: number;
     /**
      * Billboards handler
      * @public
@@ -181,15 +193,22 @@ declare class EntityCollection {
      */
     _layer?: Vector;
     _quadNode?: EntityCollectionNode;
-    _useLighting: number;
+    _shadeMode: ShadeMode;
+    /**
+     * Disables `gl.CULL_FACE` for geo objects rendering passes (opaque/transparent).
+     * Useful for rendering models with inverted/inconsistent triangle winding.
+     * @public
+     * @type {boolean}
+     */
+    disableCullFace: boolean;
     protected _depthOrder: number;
     constructor(options?: IEntityCollectionParams);
     get depthOrder(): number;
     set depthOrder(depghOrder: number);
     isEmpty(): boolean;
     get id(): number;
-    get useLighting(): boolean;
-    set useLighting(f: boolean);
+    get shadeMode(): ShadeMode;
+    set shadeMode(m: ShadeModeInput);
     isEqual(ec: EntityCollection | null): boolean;
     /**
      * Sets collection visibility.
@@ -200,7 +219,7 @@ declare class EntityCollection {
     /**
      * Returns collection visibility.
      * @public
-     * @returns {boolean} -
+     * @returns {boolean} Collection visibility flag.
      */
     getVisibility(): boolean;
     /**
@@ -218,7 +237,7 @@ declare class EntityCollection {
     /**
      * Gets collection opacity.
      * @public
-     * @returns {number} -
+     * @returns {number} Collection opacity.
      */
     getOpacity(): number;
     /**
@@ -229,27 +248,33 @@ declare class EntityCollection {
      * @param {number} [farInvisible] - Entity visibility distance.
      */
     setScaleByDistance(near: number, far: number, farInvisible?: number): void;
+    setVisibleSphere(p: Vec3, r: number): void;
+    /**
+     * Aligns collection entities to terrain.
+     * Currently applies to polyline entities.
+     */
+    applyTerrainCollision(nodes: Node[], visibleExtent: Extent): void;
     appendChildEntity(entity: Entity): void;
     protected _addRecursively(entity: Entity): void;
     /**
      * Adds entity to the collection and returns collection.
      * @public
      * @param {Entity} entity - Entity.
-     * @returns {EntityCollection} -
+     * @returns {EntityCollection} Current collection instance.
      */
     add(entity: Entity): EntityCollection;
     /**
      * Adds entities array to the collection and returns collection.
      * @public
      * @param {Array.<Entity>} entities - Entities array.
-     * @returns {EntityCollection} -
+     * @returns {EntityCollection} Current collection instance.
      */
     addEntities(entities: Entity[]): EntityCollection;
     /**
-     * Returns true if the entity belongs this collection, otherwise returns false.
+     * Returns true if the entity belongs to this collection, otherwise returns false.
      * @public
      * @param {Entity} entity - Entity.
-     * @returns {boolean} -
+     * @returns {boolean} `true` if the entity belongs to this collection.
      */
     belongs(entity: Entity): boolean;
     protected _removeRecursively(entity: Entity): void;
@@ -276,17 +301,17 @@ declare class EntityCollection {
     /**
      * Adds this collection to render node.
      * @public
-     * @param {RenderNode} renderNode - Render node.
-     * @param {boolean} [isHidden] - Uses in vector layers that render in planet render specific function.
-     * @returns {EntityCollection} -
+     * @param {Scene} scene - Render node.
+     * @param {boolean} [isHidden] - Used in vector layers with planet-specific rendering.
+     * @returns {EntityCollection} Current collection instance.
      */
-    addTo(renderNode: RenderNode, isHidden?: boolean): this;
+    addTo(scene: Scene, isHidden?: boolean): this;
     /**
-     * This function is called in the RenderNode assign function.
+     * This function is called in the Scene assign function.
      * @public
-     * @param {RenderNode} renderNode
+     * @param {Scene} scene
      */
-    bindRenderNode(renderNode: RenderNode): void;
+    bindScene(scene: Scene): void;
     protected _onChangeRelativeCenter: (c: Vec3) => void;
     /**
      * Updates coordinates all lonLat entities in collection after collection attached to the planet node.
@@ -317,7 +342,7 @@ declare class EntityCollection {
     /**
      * Gets entity array.
      * @public
-     * @returns {Array.<Entity>} -
+     * @returns {Array.<Entity>} Entity array copy.
      */
     getEntities(): Entity[];
     /**

package/lib/entity/{BaseBillboard.d.ts → billboard/BaseBillboard.d.ts}

@@ -1,17 +1,17 @@
-import { Entity } from "./Entity";
-import { Vec2 } from "../math/Vec2";
-import { Vec3 } from "../math/Vec3";
-import { Vec4 } from "../math/Vec4";
-import type { NumberArray2 } from "../math/Vec2";
-import type { NumberArray3 } from "../math/Vec3";
-import type { NumberArray4 } from "../math/Vec4";
+import { Entity } from "../Entity";
+import { Vec2 } from "../../math/Vec2";
+import { Vec3 } from "../../math/Vec3";
+import { Vec4 } from "../../math/Vec4";
+import type { NumberArray2 } from "../../math/Vec2";
+import type { NumberArray3 } from "../../math/Vec3";
+import type { NumberArray4 } from "../../math/Vec4";
 import { BaseBillboardHandler } from "./BaseBillboardHandler";
 export interface IBaseBillboardParams {
     position?: NumberArray3 | Vec3;
     rotation?: number;
     color?: string | NumberArray4 | Vec4;
     alignedAxis?: NumberArray3 | Vec3;
-    offset?: NumberArray2 | NumberArray3 | Vec2 | Vec3;
+    offset?: NumberArray2 | Vec2;
     visibility?: boolean;
 }
 /**
@@ -22,7 +22,7 @@ export interface IBaseBillboardParams {
  * @param {number} [options.rotation] - Screen angle rotation.
  * @param {Vec4|string|Array.<number>} [options.color] - Billboard color.
  * @param {Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
- * @param {Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
+ * @param {Vec2|Array.<number>} [options.offset] - Billboard center screen offset.
  * @param {boolean} [options.visibility] - Visibility.
  */
 declare class BaseBillboard {
@@ -55,11 +55,11 @@ declare class BaseBillboard {
      */
     protected _alignedAxis: Vec3;
     /**
-     * Billboard center screen space offset. Where x,y - screen space offset and z - depth offset.
+     * Billboard center screen space offset.
      * @public
-     * @type {Vec3}
+     * @type {Vec2}
      */
-    _offset: Vec3;
+    _offset: Vec2;
     /**
      * Billboard visibility.
      * @protected
@@ -117,21 +117,20 @@ declare class BaseBillboard {
      * @public
      * @param {number} x - X offset.
      * @param {number} y - Y offset.
-     * @param {number} [z] - Z offset.
      */
-    setOffset(x: number, y: number, z?: number): void;
+    setOffset(x: number, y: number): void;
     /**
      * Sets screen space offset.
      * @public
      * @param {Vec2} offset - Offset size.
      */
-    setOffset3v(offset: Vec3): void;
+    setOffset2v(offset: Vec2): void;
     /**
      * Returns billboard screen space offset size.
      * @public
-     * @returns {Vec3}
+     * @returns {Vec2}
      */
-    getOffset(): Vec3;
+    getOffset(): Vec2;
     /**
      * Sets billboard screen space rotation in radians.
      * @public

package/lib/entity/{BaseBillboardHandler.d.ts → billboard/BaseBillboardHandler.d.ts}

@@ -1,9 +1,11 @@
-import type { TypedArray } from "../utils/shared";
-import { EntityCollection } from "./EntityCollection";
-import { Renderer } from "../renderer/Renderer";
-import { Vec3 } from "../math/Vec3";
-import { Vec4 } from "../math/Vec4";
-import type { WebGLBufferExt } from "../webgl/Handler";
+import type { TypedArray } from "../../utils/shared";
+import { EntityCollection } from "../EntityCollection";
+import { Renderer } from "../../renderer/Renderer";
+import { Vec2 } from "../../math/Vec2";
+import { Vec3 } from "../../math/Vec3";
+import { Vec4 } from "../../math/Vec4";
+import type { WebGLBufferExt } from "../../webgl/Handler";
+import type { ShaderProgram } from "../../webgl/ShaderProgram";
 import { BaseBillboard } from "./BaseBillboard";
 /**
  * @class BaseBillboardHandler
@@ -20,6 +22,7 @@ declare class BaseBillboardHandler {
     _entityCollection: EntityCollection;
     protected _renderer: Renderer | null;
     protected _billboards: BaseBillboard[];
+    protected _opaqueCounterIndex: number;
     protected _positionHighBuffer: WebGLBufferExt | null;
     protected _positionLowBuffer: WebGLBufferExt | null;
     protected _sizeBuffer: WebGLBufferExt | null;
@@ -40,9 +43,16 @@ declare class BaseBillboardHandler {
     protected _pickingColorArr: Float32Array;
     protected _buffersUpdateCallbacks: Function[];
     protected _changedBuffers: boolean[];
+    protected _configureDepthPass(depthWrite: boolean): void;
+    protected _restoreDepthPass(depthWrite: boolean): void;
     constructor(entityCollection: EntityCollection);
     isEqual(handler: BaseBillboardHandler): boolean;
     static concArr(dest: number[], curr: number[]): void;
+    protected _isBillboardOpaque(billboard: BaseBillboard): boolean;
+    protected _swapArrayItems(arr: Float32Array, itemSize: number, firstIndex: number, secondIndex: number): void;
+    protected _swapBillboardData(firstIndex: number, secondIndex: number): void;
+    protected _insertBillboardByOpacity(billboardIndex: number, isOpaque: boolean): void;
+    protected _updateBillboardOpacityState(billboardIndex: number, isOpaque: boolean): boolean;
     initProgram(): void;
     setRenderer(renderer: Renderer): void;
     refresh(): void;
@@ -51,9 +61,14 @@ declare class BaseBillboardHandler {
     protected _deleteBuffers(): void;
     update(): void;
     add(billboard: BaseBillboard): void;
-    protected _displayPASS(): void;
+    protected _displayPASS(startBillboardIndex: number, endBillboardIndex: number, billboardProgram: ShaderProgram, depthWrite?: boolean): void;
     protected _pickingPASS(): void;
-    draw(): void;
+    drawForward(): void;
+    protected _getOpaqueProgram(): ShaderProgram;
+    protected _getTransparentProgram(): ShaderProgram;
+    drawOpaque(): void;
+    drawTransparent(): void;
+    drawTransparentForward(): void;
     drawPicking(): void;
     reindexBillboardsArray(startIndex: number): void;
     protected _removeBillboard(billboard: BaseBillboard): void;
@@ -62,7 +77,7 @@ declare class BaseBillboardHandler {
     setPositionArr(index: number, positionHigh: Vec3, positionLow: Vec3): void;
     setPickingColorArr(index: number, color: Vec3): void;
     setSizeArr(index: number, width: number, height: number): void;
-    setOffsetArr(index: number, offset: Vec3): void;
+    setOffsetArr(index: number, offset: Vec2): void;
     setRgbaArr(index: number, rgba: Vec4): void;
     setRotationArr(index: number, rotation: number): void;
     setTexCoordArr(index: number, tcoordArr: number[] | TypedArray): void;

package/lib/entity/{Billboard.d.ts → billboard/Billboard.d.ts}

@@ -1,13 +1,14 @@
 import { BaseBillboard } from "./BaseBillboard";
 import type { IBaseBillboardParams } from "./BaseBillboard";
 import { BillboardHandler } from "./BillboardHandler";
-import type { HTMLImageElementExt } from "../utils/ImagesCacheManager";
+import type { HTMLImageElementExt } from "../../utils/ImagesCacheManager";
 export interface IBillboardParams extends IBaseBillboardParams {
     src?: string;
     image?: HTMLImageElement;
-    size?: [number, number];
-    width?: number;
-    height?: number;
+    size?: [number, number] | null;
+    width?: number | null;
+    height?: number | null;
+    scale?: number | null;
 }
 /**
  * Represents basic quad billboard image.
@@ -18,7 +19,7 @@ export interface IBillboardParams extends IBaseBillboardParams {
  * @param {number} [options.rotation] - Screen angle rotation.
  * @param {Vec4|string|Array.<number>} [options.color] - Billboard color.
  * @param {Vec3|Array.<number>} [options.alignedAxis] - Billboard aligned vector.
- * @param {Vec3|Array.<number>} [options.offset] - Billboard center screen offset.
+ * @param {Vec2|Array.<number>} [options.offset] - Billboard center screen offset.
  * @param {boolean} [options.visibility] - Visibility.
  * @param {string} [options.src] - Billboard image url source.
  * @param {Image} [options.image] - Billboard image object.
@@ -39,9 +40,9 @@ declare class Billboard extends BaseBillboard {
      * @protected
      * @type {Object}
      */
-    protected _image: HTMLImageElement & {
+    protected _image: (HTMLImageElement & {
         __nodeIndex?: number;
-    } | null;
+    }) | null;
     protected _scale: number;
     /**
      * Billboard screen width.
@@ -56,6 +57,7 @@ declare class Billboard extends BaseBillboard {
      */
     _height: number;
     constructor(options?: IBillboardParams);
+    protected _applyImageSize(image: HTMLImageElementExt | HTMLImageElement | null): void;
     /**
      * Sets billboard image url source.
      * @public
@@ -77,6 +79,8 @@ declare class Billboard extends BaseBillboard {
      * @param {number} height - Billboard height.
      */
     setSize(width: number, height: number): void;
+    getScale(): number;
+    setOffset(x: number, y: number): void;
     /**
      * Returns billboard screen size.
      * @public

package/lib/entity/{BillboardHandler.d.ts → billboard/BillboardHandler.d.ts}

@@ -1,6 +1,6 @@
 import { BaseBillboardHandler } from "./BaseBillboardHandler";
 import { Billboard } from "./Billboard";
-import { EntityCollection } from "./EntityCollection";
+import { EntityCollection } from "../EntityCollection";
 /**
  * @class BillboardHandler
  */

package/lib/entity/{GeoObject.d.ts → geoObject/GeoObject.d.ts}

@@ -1,14 +1,14 @@
-import { Entity } from "./Entity";
-import { Quat, Vec3, Vec4 } from "../math/index";
+import { Entity } from "../Entity";
+import { Quat } from "../../math/Quat";
+import { Vec3, type NumberArray3 } from "../../math/Vec3";
+import { Vec4, type NumberArray4 } from "../../math/Vec4";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 import { InstanceData } from "./InstanceData";
-import type { NumberArray3 } from "../math/Vec3";
-import type { NumberArray4 } from "../math/Vec4";
-import { Object3d } from "../Object3d";
+import { Object3d } from "../../Object3d";
 export declare const LOCAL_FORWARD: Vec3;
 /**
  * Interface for GeoObject parameters.
- * @typedef {Object} IGeoObjectParams
+ * @interface IGeoObjectParams
  * @property {Object3d} [object3d] - 3D object associated with the geo object.
  * @property {string} [objSrc] - Source url of the 3D object.
  * @property {string} [tag] - Unique instancing drawing identifier tag.
@@ -153,6 +153,7 @@ declare class GeoObject {
      * @param {boolean} visibility - Visibility flag.
      */
     setVisibility(visibility: boolean): void;
+    get instanceData(): InstanceData | null;
     /**
      * Returns geo object visibility.
      * @public

package/lib/entity/{GeoObjectHandler.d.ts → geoObject/GeoObjectHandler.d.ts}

@@ -1,12 +1,14 @@
-import { EntityCollection } from "./EntityCollection";
+import type { TypedArray } from "../../utils/shared";
+import type { EntityCollection } from "../EntityCollection";
 import { GeoObject } from "./GeoObject";
-import { Vec3 } from "../math/Vec3";
-import { Vec4 } from "../math/Vec4";
-import { Quat } from "../math/Quat";
-import { Object3d } from "../Object3d";
+import { Vec3 } from "../../math/Vec3";
+import { Vec4 } from "../../math/Vec4";
+import { Quat } from "../../math/Quat";
+import { Object3d } from "../../Object3d";
 import { InstanceData } from "./InstanceData";
-import { Renderer } from "../renderer/Renderer";
-import { RenderNode } from "../scene/RenderNode";
+import type { Renderer } from "../../renderer/Renderer";
+import type { Scene } from "../../scene/Scene";
+import type { ShaderProgram } from "../../webgl/ShaderProgram";
 export declare const VERTEX_BUFFER = 0;
 export declare const RTC_POSITION_BUFFER = 1;
 export declare const RGBA_BUFFER = 2;
@@ -29,7 +31,7 @@ export declare class GeoObjectHandler {
      */
     pickingEnabled: boolean;
     protected _entityCollection: EntityCollection;
-    _renderNode: RenderNode | null;
+    _scene: Scene | null;
     _renderer: Renderer | null;
     protected _geoObjects: GeoObject[];
     protected _instanceDataMap: Map<string, InstanceData>;
@@ -38,18 +40,32 @@ export declare class GeoObjectHandler {
     protected _relativeCenter: Vec3;
     protected _rtcEyePositionHigh: Float32Array;
     protected _rtcEyePositionLow: Float32Array;
+    /**
+     * @param {EntityCollection} entityCollection - Parent entity collection.
+     */
     constructor(entityCollection: EntityCollection);
+    protected _isOpaqueAlpha(alpha: number): boolean;
+    protected _markPerInstanceBuffersChanged(tagData: InstanceData): void;
+    protected _swapArrayItems(arr: number[] | TypedArray, itemSize: number, firstIndex: number, secondIndex: number): void;
+    protected _swapInstanceData(tagData: InstanceData, firstIndex: number, secondIndex: number): void;
+    protected _insertInstanceByOpacity(tagData: InstanceData, instanceIndex: number, isOpaque: boolean): void;
+    protected _updateInstanceOpacityState(tagData: InstanceData, instanceIndex: number, isOpaque: boolean): boolean;
     initProgram(): void;
-    setRenderNode(renderNode: RenderNode): void;
+    bindScene(scene: Scene): void;
     setColorTextureTag(src: string | HTMLImageElement, tag: string): void;
     setNormalTextureTag(src: string | HTMLImageElement, tag: string): void;
     setMetallicRoughnessTextureTag(src: string | HTMLImageElement, tag: string): void;
+    setAmbientOcclusionTextureTag(src: string | HTMLImageElement, tag: string): void;
     setObjectSrc(src: string, tag: string): void;
     _updateInstanceData(object: Object3d, tag: string): void;
     protected _addGeoObjectToArray(geoObject: GeoObject): void;
-    protected _bindCommon(): void;
+    protected _bindCommon(p: ShaderProgram): void;
+    protected _bindForwardParams(p: ShaderProgram): void;
+    protected _bindAtmosphereParams(p: ShaderProgram): void;
     _displayOpaquePASS(): void;
     _displayTransparentPASS(): void;
+    _displayTransparentForwardPASS(): void;
+    _displayForwardPASS(): void;
     protected _depthPASS(): void;
     drawDepth(): void;
     drawPicking(): void;
@@ -69,8 +85,10 @@ export declare class GeoObjectHandler {
     getRTCPosition(pos: Vec3, rtcPositionHigh: Vec3, rtcPositionLow: Vec3): void;
     setRelativeCenter(c: Vec3): void;
     protected _updateRTCEyePosition(): void;
-    draw(): void;
+    drawForward(): void;
+    drawOpaque(): void;
     drawTransparent(): void;
+    drawTransparentForward(): void;
     add(geoObject: GeoObject): void;
     remove(geoObject: GeoObject): void;
     _clearDataTagQueue(): void;

package/lib/entity/{InstanceData.d.ts → geoObject/InstanceData.d.ts}

@@ -1,21 +1,25 @@
 import { GeoObject } from "./GeoObject";
-import type { WebGLBufferExt, WebGLTextureExt } from "../webgl/Handler";
-import type { TypedArray } from "../utils/shared";
-import { Program } from "../webgl/Program";
+import type { WebGLBufferExt, WebGLTextureExt } from "../../webgl/Handler";
+import type { TypedArray } from "../../utils/shared";
+import { ShaderProgram } from "../../webgl/ShaderProgram";
 import { GeoObjectHandler } from "./GeoObjectHandler";
 export declare class InstanceData {
     isFree: boolean;
     _geoObjectHandler: GeoObjectHandler;
     geoObjects: GeoObject[];
     numInstances: number;
+    _opaqueInstanceCount: number;
     _colorTexture: WebGLTextureExt | null;
     _normalTexture: WebGLTextureExt | null;
+    _ambientOcclusionTexture: WebGLTextureExt | null;
     _metallicRoughnessTexture: WebGLTextureExt | null;
     _colorTextureSrc: string | null;
     _normalTextureSrc: string | null;
+    _ambientOcclusionTextureSrc: string | null;
     _metallicRoughnessTextureSrc: string | null;
     _colorTextureImage: HTMLImageElement | null;
     _normalTextureImage: HTMLImageElement | null;
+    _ambientOcclusionTextureImage: HTMLImageElement | null;
     _metallicRoughnessTextureImage: HTMLImageElement | null;
     _objectSrc?: string;
     _sizeArr: number[] | TypedArray;
@@ -46,20 +50,20 @@ export declare class InstanceData {
     _localPositionBuffer: WebGLBufferExt | null;
     _buffersUpdateCallbacks: Function[];
     _changedBuffers: boolean[];
-    _materialParams: Float32Array;
-    _materialShininess: number;
+    _materialProperties: Float32Array;
     constructor(geoObjectHandler: GeoObjectHandler);
-    setMaterialAmbient(r: number, g: number, b: number): void;
-    setMaterialDiffuse(r: number, g: number, b: number): void;
-    setMaterialSpecular(r: number, g: number, b: number): void;
-    setMaterialShininess(shininess: number): void;
-    setMaterialParams(ambient: Float32Array, diffuse: Float32Array, specular: Float32Array, shininess: number): void;
-    drawOpaque(p: Program): void;
-    drawTransparent(p: Program): void;
-    protected _drawElementsInstanced(p: Program): void;
+    setMetallic(metallic: number): void;
+    setRoughness(roughness: number): void;
+    setAmbientOcclusion(ambientOcclusion: number): void;
+    setMaterialProperties(ambientOcclusion: number, roughness: number, metallic: number): void;
+    drawOpaque(p: ShaderProgram): void;
+    drawForwardAll(p: ShaderProgram): void;
+    drawTransparent(p: ShaderProgram): void;
+    protected _drawElementsInstanced(p: ShaderProgram, startInstance: number, instanceCount: number): void;
     loadColorTexture(): Promise<void>;
     loadNormalTexture(): Promise<void>;
     loadMetallicRoughnessTexture(): Promise<void>;
+    loadAmbientOcclusionTexture(): Promise<void>;
     clear(): void;
     _deleteBuffers(): void;
     createVertexBuffer(): void;
@@ -79,4 +83,5 @@ export declare class InstanceData {
     private _createColorTexture;
     private _createNormalTexture;
     private _createMetallicRoughnessTexture;
+    private _createAmbientOcclusionTexture;
 }