@xeokit/xeokit-sdk 2.4.0-alpha-101 → 2.4.0-alpha-104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.4.0-alpha-101",
+  "version": "2.4.0-alpha-104",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/viewer/scene/Bitmap/Bitmap.js

@@ -94,7 +94,10 @@ class Bitmap extends Component {
         this._rtcPos = math.vec3();
         this._imageSize = math.vec2();
 
-        this._texture = new Texture(this);
+        this._texture = new Texture(this, {
+            flipY: true
+        });
+
         this._image = new Image();
 
         if (this._type !== "jpg" && this._type !== "png") {

package/src/viewer/scene/CameraControl/lib/handlers/MousePickHandler.js

@@ -56,12 +56,13 @@ class MousePickHandler {
             }
 
             const hoverSubs = cameraControl.hasSubs("hover");
+            const hoverEnterSubs = cameraControl.hasSubs("hoverEnter");
             const hoverOutSubs = cameraControl.hasSubs("hoverOut");
             const hoverOffSubs = cameraControl.hasSubs("hoverOff");
             const hoverSurfaceSubs = cameraControl.hasSubs("hoverSurface");
             const hoverSnapOrSurfaceSubs = cameraControl.hasSubs("hoverSnapOrSurface");
 
-            if (hoverSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {
+            if (hoverSubs || hoverEnterSubs || hoverOutSubs || hoverOffSubs || hoverSurfaceSubs || hoverSnapOrSurfaceSubs) {
 
                 pickController.pickCursorPos = states.pointerCanvasPos;
                 pickController.schedulePickEntity = true;

package/src/viewer/scene/LineSet/LineSet.js

@@ -3,6 +3,7 @@ import {Mesh} from "../mesh/Mesh.js";
 import {PhongMaterial} from "../materials/PhongMaterial.js";
 import {math} from "../math/math.js";
 import {VBOGeometry} from "../geometry/VBOGeometry.js";
+import {worldToRTCPositions} from "../math";
 
 /**
  * A set of 3D line segments.
@@ -78,8 +79,10 @@ class LineSet extends Component {
         super(owner, cfg);
 
         this._positions = cfg.positions || [];
-
-        this._origin = math.vec3(cfg.origin || [0, 0, 0]);
+        const rtcPositions = new Float32Array(this._positions.length);
+        const rtcCenter = math.vec3();
+        const cellSize = 100;
+        const rtcNeeded = worldToRTCPositions(this._positions, new Float32Array(this._positions.length), rtcCenter, cellSize);
 
         if (cfg.indices) {
             this._indices = cfg.indices;
@@ -97,9 +100,9 @@ class LineSet extends Component {
             collidable: cfg.collidable,
             geometry: new VBOGeometry(this, {
                 primitive: "lines",
-                positions: this._positions,
+                positions: rtcNeeded ? rtcPositions : this._positions,
                 indices: this._indices,
-                origin: cfg.origin
+                origin: rtcNeeded ? rtcCenter : null
             }),
             material: new PhongMaterial(this, {
                 diffuse: cfg.color || [0, 0, 0],

package/src/viewer/scene/LineSet/LineSet.new.js

@@ -0,0 +1,160 @@
+import {Component} from '../Component.js';
+import {math} from "../math/math.js";
+import {SceneModel} from "../model";
+
+/**
+ * A set of 3D line segments.
+ *
+ * * Creates a set of 3D line segments.
+ * * Registered by {@link LineSet#id} in {@link Scene#lineSets}.
+ * * Configure color using the {@link LinesMaterial} located at {@link Scene#linesMaterial}.
+ * * {@link BCFViewpointsPlugin} will save and load Linesets in BCF viewpoints.
+ *
+ * ## Usage
+ *
+ * In the example below, we'll load the Schependomlaan model, then use
+ * a ````LineSet```` to show a grid underneath the model.
+ *
+ * [<img src="http://xeokit.github.io/xeokit-sdk/assets/images/LineSet_grid.png">](/examples/#LineSet_grid)
+ *
+ * [[Run this example](/examples/#LineSet_grid)]
+ *
+ * ````javascript
+ * import {Viewer, XKTLoaderPlugin, LineSet, buildGridGeometry} from "https://cdn.jsdelivr.net/npm/@xeokit/xeokit-sdk/dist/xeokit-sdk.es.min.js";
+ *
+ * const viewer = new Viewer({
+ *      canvasId: "myCanvas",
+ *      transparent: true
+ *  });
+ *
+ * const camera = viewer.camera;
+ *
+ * viewer.camera.eye = [-2.56, 8.38, 8.27];
+ * viewer.camera.look = [13.44, 3.31, -14.83];
+ * viewer.camera.up = [0.10, 0.98, -0.14];
+ *
+ * const xktLoader = new XKTLoaderPlugin(viewer);
+ *
+ * const model = xktLoader.load({
+ *      id: "myModel",
+ *      src: "../assets/models/xkt/v8/ifc/Schependomlaan.ifc.xkt",
+ *      position: [0,1,0],
+ *      edges: true,
+ *      saoEnabled: true
+ *  });
+ *
+ * const geometryArrays = buildGridGeometry({
+ *      size: 100,
+ *      divisions: 30
+ *  });
+ *
+ * new LineSet(viewer.scene, {
+ *      positions: geometryArrays.positions,
+ *      indices: geometryArrays.indices
+ * });
+ * ````
+ */
+class LineSet extends Component {
+
+    /**
+     * Creates a new LineSet.
+     *
+     * Registers the LineSet in {@link Scene#lineSets}; causes Scene to fire a "lineSetCreated" event.
+     *
+     * @constructor
+     * @param {Component} [owner]  Owner component. When destroyed, the owner will destroy this ````LineSet```` as well.
+     * @param {*} [cfg]  ````LineSet```` configuration
+     * @param {String} [cfg.id] Optional ID, unique among all components in the parent {@link Scene}, generated automatically when omitted.
+     * @param {Number[]} cfg.positions World-space 3D vertex positions.
+     * @param {Number[]} [cfg.indices] Indices to connect ````positions```` into line segments. Note that these are separate line segments, not a polyline.
+     * @param {Number[]} [cfg.color=[0,0,0]] The color of this ````LineSet````. This is both emissive and diffuse.
+     * @param {Boolean} [cfg.visible=true] Indicates whether or not this ````LineSet```` is visible.
+     * @param {Number} [cfg.opacity=1.0] ````LineSet````'s initial opacity factor.
+     */
+    constructor(owner, cfg = {}) {
+
+        super(owner, cfg);
+
+        this._positions = cfg.positions || [];
+
+        this._origin = math.vec3(cfg.origin || [0, 0, 0]);
+
+        if (cfg.indices) {
+            this._indices = cfg.indices;
+        } else {
+            this._indices = [];
+            for (let i = 0, len = (this._positions.length / 3) - 1; i < len; i += 2) {
+                this._indices.push(i);
+                this._indices.push(i + 1);
+            }
+        }
+        this._sceneModel = new SceneModel(this, { id: `${this.id}.lineset.scenemodel`});
+        this._sceneModel.createMesh({
+            id: `${this.id}.lineset.mesh`,
+            primitive: "lines",
+            positions: cfg.positions,
+            indices: cfg.indices,
+            color: cfg.color || [0, 0, 0],
+            clippable: false,
+            collidable: true
+        });
+        this._sceneModel.createEntity({
+            id: `${this.id}.lineset.entity`,
+            meshIds: [`${this.id}.lineset.mesh`]
+        });
+        this._sceneModel.finalize();
+        this.scene._lineSetCreated(this);
+    }
+
+    /**
+     * Sets if this ````LineSet```` is visible.
+     *
+     * Default value is ````true````.
+     *
+     * @param {Boolean} visible Set ````true```` to make this ````LineSet```` visible.
+     */
+    set visible(visible) {
+        this._sceneModel.visible = visible;
+    }
+
+    /**
+     * Gets if this ````LineSet```` is visible.
+     *
+     * Default value is ````true````.
+     *
+     * @returns {Boolean} Returns ````true```` if visible.
+     */
+    get visible() {
+        return this._sceneModel.visible;
+    }
+
+    /**
+     * Gets the 3D World-space vertex positions of the lines in this ````LineSet````.
+     *
+     * @returns {Number[]}
+     */
+    get positions() {
+        return this._positions;
+    }
+
+    /**
+     * Gets the vertex indices of the lines in this ````LineSet````.
+     *
+     * @returns {Number[]}
+     */
+    get indices() {
+        return this._indices;
+    }
+
+    /**
+     * Destroys this ````LineSet````.
+     *
+     * Removes the ```LineSet```` from {@link Scene#lineSets}; causes Scene to fire a "lineSetDestroyed" event.
+     */
+    destroy() {
+        super.destroy();
+        this.scene._lineSetDestroyed(this);
+    }
+}
+
+export {LineSet};

package/src/viewer/scene/model/SceneModel.js

@@ -2245,7 +2245,7 @@ export class SceneModel extends Component {
             cfg.primitive = "triangles";
         }
         if (cfg.primitive !== "points" && cfg.primitive !== "lines" && cfg.primitive !== "triangles" && cfg.primitive !== "solid" && cfg.primitive !== "surface") {
-            this.error(`[createGeometry] Unsupported value for 'primitive': '${primitive}' - supported values are 'points', 'lines', 'triangles', 'solid' and 'surface'. Defaulting to 'triangles'.`);
+            this.error(`[createGeometry] Unsupported value for 'primitive': '${cfg.primitive}' - supported values are 'points', 'lines', 'triangles', 'solid' and 'surface'. Defaulting to 'triangles'.`);
             return;
         }
         if (!cfg.positions && !cfg.positionsCompressed && !cfg.buckets) {

package/src/viewer/scene/model/dtx/triangles/renderers/TrianglesDataTextureColorRenderer.js

@@ -330,9 +330,9 @@ export class TrianglesDataTextureColorRenderer {
 
         src.push("uniform int renderPass;");
 
-        if (scene.entityOffsetsEnabled) {
-            src.push("in vec3 offset;");
-        }
+        // if (scene.entityOffsetsEnabled) {
+        //     src.push("in vec3 offset;");
+        // }
 
         src.push("uniform mat4 sceneModelWorldMatrix;");
         src.push("uniform mat4 viewMatrix;");

package/src/viewer/scene/model/dtx/triangles/renderers/TrianglesDataTextureEdgesColorRenderer.js

@@ -65,8 +65,7 @@ export class TrianglesDataTextureEdgesColorRenderer {
         if (gotOrigin || gotPosition) {
             const rtcOrigin = tempVec3a;
             if (gotOrigin) {
-                const rotatedOrigin = tempVec3b;
-                math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
+                const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b);
                 rtcOrigin[0] = rotatedOrigin[0];
                 rtcOrigin[1] = rotatedOrigin[1];
                 rtcOrigin[2] = rotatedOrigin[2];
@@ -335,7 +334,7 @@ export class TrianglesDataTextureEdgesColorRenderer {
         // get XYZ offset
         src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");
 
-      //  src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
+        src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
 
         src.push("      vec4 viewPosition  = viewMatrix * worldPosition; ");
 

package/src/viewer/scene/model/dtx/triangles/renderers/TrianglesDataTextureEdgesRenderer.js

@@ -7,7 +7,6 @@ const defaultColor = new Float32Array([0, 0, 0, 1]);
 
 const tempVec3a = math.vec3();
 const tempVec3b = math.vec3();
-const tempVec3c = math.vec3();
 const tempVec3d = math.vec3();
 const tempMat4a = math.mat4();
 
@@ -70,8 +69,7 @@ export class TrianglesDataTextureEdgesRenderer {
         if (gotOrigin || gotPosition) {
             const rtcOrigin = tempVec3a;
             if (gotOrigin) {
-                const rotatedOrigin = tempVec3b;
-                math.transformPoint3(rotationMatrix, origin, rotatedOrigin);
+                const rotatedOrigin = math.transformPoint3(rotationMatrix, origin, tempVec3b);
                 rtcOrigin[0] = rotatedOrigin[0];
                 rtcOrigin[1] = rotatedOrigin[1];
                 rtcOrigin[2] = rotatedOrigin[2];
@@ -253,9 +251,9 @@ export class TrianglesDataTextureEdgesRenderer {
 
         src.push("uniform int renderPass;");
 
-        if (scene.entityOffsetsEnabled) {
-            src.push("in vec3 offset;");
-        }
+        // if (scene.entityOffsetsEnabled) {
+        //     src.push("in vec3 offset;");
+        // }
 
         src.push("uniform mat4 sceneModelWorldMatrix;");
         src.push("uniform mat4 viewMatrix;");
@@ -340,7 +338,7 @@ export class TrianglesDataTextureEdgesRenderer {
         // get XYZ offset
         src.push("vec4 offset = vec4(texelFetch (uTexturePerObjectIdOffsets, objectIndexCoords, 0).rgb, 0.0);");
 
-        src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz;");
+        src.push("worldPosition.xyz = worldPosition.xyz + offset.xyz + vec3(110.0,50.0, 10.0);");
 
         src.push("      vec4 viewPosition  = viewMatrix * worldPosition; ");