@xeokit/xeokit-sdk 2.6.77-slim-rc4 → 2.6.77

package/src/viewer/scene/webgl/Renderer.js

@@ -36,6 +36,7 @@ const Renderer = function (scene, options) {
 
     let postSortDrawableList = [];
     let postCullDrawableList = [];
+    let uiDrawableList       = [];
 
     let drawableListDirty = true;
     let stateSortDirty = true;
@@ -288,14 +289,20 @@ const Renderer = function (scene, options) {
 
     function cullDrawableList() {
         let lenDrawableList = 0;
+        let lenUiList       = 0;
         for (let i = 0, len = postSortDrawableList.length; i < len; i++) {
             const drawable = postSortDrawableList[i];
             drawable.rebuildRenderFlags();
             if (!drawable.renderFlags.culled) {
-                postCullDrawableList[lenDrawableList++] = drawable;
+                if (drawable.isUI) {
+                    uiDrawableList[lenUiList++] = drawable;
+                } else {
+                    postCullDrawableList[lenDrawableList++] = drawable;
+                }
             }
         }
         postCullDrawableList.length = lenDrawableList;
+        uiDrawableList.length       = lenUiList;
     }
 
     function draw(params) {
@@ -539,6 +546,8 @@ const Renderer = function (scene, options) {
             gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         }
 
+        const renderDrawables = function(drawables) {
+
         let normalDrawSAOBinLen = 0;
         let normalEdgesOpaqueBinLen = 0;
         let normalFillTransparentBinLen = 0;
@@ -562,10 +571,9 @@ const Renderer = function (scene, options) {
         //------------------------------------------------------------------------------------------------------
         // Render normal opaque solids, defer others to bins to render after
         //------------------------------------------------------------------------------------------------------
+        for (let i = 0, len = drawables.length; i < len; i++) {
 
-        for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
-
-            drawable = postCullDrawableList[i];
+            drawable = drawables[i];
 
             if (drawable.culled === true || drawable.visible === false) {
                 continue;
@@ -863,6 +871,14 @@ const Renderer = function (scene, options) {
             gl.disable(gl.BLEND);
         }
 
+        };
+
+        renderDrawables(postCullDrawableList);
+        if (uiDrawableList.length > 0) {
+            gl.clear(gl.DEPTH_BUFFER_BIT);
+            renderDrawables(uiDrawableList);
+        }
+
         const endTime = Date.now();
         const frameStats = stats.frame;
 
@@ -1072,8 +1088,9 @@ const Renderer = function (scene, options) {
         const includeEntityIds = params.includeEntityIds;
         const excludeEntityIds = params.excludeEntityIds;
 
-        for (let i = 0, len = postCullDrawableList.length; i < len; i++) {
-            const drawable = postCullDrawableList[i];
+        const renderDrawables = function(drawables) {
+        for (let i = 0, len = drawables.length; i < len; i++) {
+            const drawable = drawables[i];
             if (drawable.culled === true || drawable.visible === false) {
                 continue;
             }
@@ -1088,6 +1105,13 @@ const Renderer = function (scene, options) {
             }
             drawable.drawPickMesh(frameCtx);
         }
+        };
+
+        renderDrawables(postCullDrawableList);
+        if (uiDrawableList.length > 0) {
+            gl.clear(gl.DEPTH_BUFFER_BIT);
+            renderDrawables(uiDrawableList);
+        }
 
         const pix = pickBuffer.read(0, 0);
         const pickID = pix[0] + (pix[1] << 8) + (pix[2] << 16) + (pix[3] << 24);

package/types/plugins/DotBIMLoaderPlugin/DotBIMLoaderPlugin.d.ts

@@ -77,7 +77,7 @@ export declare class DotBIMLoaderPlugin extends Plugin {
    *
    * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
    *
-   * @type {IXKTDefaultDataSource}
+   * @type {IDotBIMDefaultDataSource}
    */
   set dataSource(arg: IDotBIMDefaultDataSource);
 
@@ -86,7 +86,7 @@ export declare class DotBIMLoaderPlugin extends Plugin {
    *
    * Default value is {@link DotBIMDefaultDataSource}, which loads via an XMLHttpRequest.
    *
-   * @type {IXKTDefaultDataSource}
+   * @type {IDotBIMDefaultDataSource}
    */
   get dataSource(): IDotBIMDefaultDataSource;
 
@@ -104,13 +104,6 @@ export declare class DotBIMLoaderPlugin extends Plugin {
    */
   get objectDefaults(): IFCObjectDefaults;
 
-  /**
-   * Loads a .BIM model from a file into this DotBIMLoaderPlugin's {@link Viewer}.
-   *
-   * @param {LoadBIMModel} params Loading parameters.
-   * @returns {VBOSceneModel} Entity representing the model, which will have {@link Entity#isModel} set ````true```` and will be registered by {@link Entity#id} in {@link Scene#models}
-   */
-
   /**
    * Loads a .BIM model from a file into this DotBIMLoaderPlugin's {@link Viewer}.
    *

package/types/plugins/TransformControl/TransformControl.d.ts

@@ -0,0 +1,50 @@
+import { Viewer } from "../../viewer";
+
+export declare type TransformControlHandlers = {
+    /** Optional callback for translation change. */
+    onPosition?: (position: number[]) => void;
+
+    /** Optional callback for rotation change. */
+    onQuaternion?: (quaternion: number[]) => void;
+
+    /** Optional callback for screen scale change. */
+    onScreenScale?: (scale: number[]) => void;
+};
+
+/**
+ * TransformControl is a {@link Viewer} tool for interactive transformation manipulation.
+ */
+export declare class TransformControl {
+    /**
+     * @constructor
+     * @param {Viewer} viewer The Viewer.
+     */
+    constructor(viewer: Viewer);
+
+    /**
+     * Destroys this TransformControl.
+     */
+    destroy(): void;
+
+    /**
+     * Sets handlers for user interactions.
+     * If not provided then TransformControl is not visible.
+     *
+     * @param {TransformControlHandlers} transformation handlers.
+     */
+    setHandlers(handlers?: TransformControlHandlers): void;
+
+    /**
+     * Sets the TransformControl's position.
+     *
+     * @param {number[]} position to set
+     */
+    setPosition(position: number[]): boolean;
+
+    /**
+     * Sets the TransformControl's quaternion.
+     *
+     * @param {number[]} quaternion to set
+     */
+    setQuaternion(quaternion: number[]): boolean;
+}

package/types/plugins/TransformControl/index.d.ts

@@ -0,0 +1 @@
+export * from "./TransformControl";

package/types/plugins/index.d.ts

@@ -14,6 +14,7 @@ export * from "./OBJLoaderPlugin";
 export * from "./SectionPlanesPlugin";
 export * from "./STLLoaderPlugin";
 export * from "./StoreyViewsPlugin";
+export * from "./TransformControl";
 export * from "./TreeViewPlugin";
 export * from "./ViewCullPlugin";
 export * from "./XKTLoaderPlugin";