@xeokit/xeokit-sdk 2.6.65 → 2.6.67

package/src/viewer/scene/materials/EmphasisMaterial.js

@@ -224,7 +224,7 @@ class EmphasisMaterial extends Material {
      * @param {Number[]} [cfg.edgeColor=[0.2,0.2,0.2]]  RGB color of xray edges.
      * @param {Number} [cfg.edgeAlpha=0.5] Transparency of xray edges. A value of ````0.0```` indicates fully transparent, ````1.0```` is fully opaque.
      * @param {Number} [cfg.edgeWidth=1] Width of xray edges, in pixels.
-     * @param {String} [cfg.preset] Selects a preset EmphasisMaterial configuration - see {@link EmphasisMaterial#presets}.
+     * @param {String} [cfg.preset] Deprecated - will be removed in future releases - Selects a preset EmphasisMaterial configuration - see {@link EmphasisMaterial#presets}.
      * @param {Boolean} [cfg.backfaces=false] Whether to render geometry backfaces when emphasising.
      * @param {Boolean} [cfg.glowThrough=true] Whether to make the emphasized object appear to float on top of other objects, as if it were "glowing through" them.
      */
@@ -563,6 +563,7 @@ class EmphasisMaterial extends Material {
     }
 
     /**
+     * @deprecated
      * Selects a preset EmphasisMaterial configuration.
      *
      * Default value is "default".
@@ -570,6 +571,7 @@ class EmphasisMaterial extends Material {
      * @type {String}
      */
     set preset(value) {
+        console.warn("EmphasisMaterial.preset is deprecated and will be removed in future versions.");
         value = value || "default";
         if (this._preset === value) {
             return;
@@ -591,6 +593,7 @@ class EmphasisMaterial extends Material {
     }
 
     /**
+     * @deprecated
      * Gets the current preset EmphasisMaterial configuration.
      *
      * Default value is "default".
@@ -598,6 +601,7 @@ class EmphasisMaterial extends Material {
      * @type {String}
      */
     get preset() {
+        console.warn("EmphasisMaterial.preset is deprecated and will be removed in future versions.");
         return this._preset;
     }
 

package/src/viewer/scene/math/math.js

@@ -1965,7 +1965,7 @@ const math = {
      * @param {Number[]} mat The 4x4 matrix.
      * @param {String} order Desired Euler angle order: "XYZ", "YXZ", "ZXY" etc.
      * @param {Number[]} [dest] Destination Euler angles, created by default.
-     * @returns {Number[]} The Euler angles.
+     * @returns {Number[]} The Euler angles (in degrees).
      */
     mat4ToEuler(mat, order, dest = math.vec4()) {
         const clamp = math.clamp;
@@ -2057,6 +2057,10 @@ const math = {
             }
         }
 
+        dest[0] *= math.RADTODEG;
+        dest[1] *= math.RADTODEG;
+        dest[2] *= math.RADTODEG;
+
         return dest;
     },
 
@@ -2866,7 +2870,7 @@ const math = {
     /**
      * Initializes a quaternion from Euler angles.
      *
-     * @param {Number[]} euler The Euler angles.
+     * @param {Number[]} euler The Euler angles (in degrees).
      * @param {String} order Euler angle order: "XYZ", "YXZ", "ZXY" etc.
      * @param {Number[]} [dest] Destination quaternion, created by default.
      * @returns {Number[]} The quaternion.

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

@@ -1563,6 +1563,7 @@ export class SceneModel extends Component {
     set matrix(value) {
         this._matrix.set(value || DEFAULT_MATRIX);
         math.decomposeMat4(this._matrix, this._position, this._quaternion, this._scale);
+        math.quaternionToEuler(this._quaternion, "XYZ", this._rotation);
         this._matrixDirty = false;
         this._setWorldMatrixDirty();
         this._sceneModelDirty();

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

@@ -1,5 +1,6 @@
 import {ENTITY_FLAGS} from './ENTITY_FLAGS.js';
 import {math} from "../math/math.js";
+import { Material } from '../materials/Material.js';
 
 const tempFloatRGB = new Float32Array([0, 0, 0]);
 const tempIntRGB = new Uint16Array([0, 0, 0]);
@@ -48,6 +49,7 @@ export class SceneModelEntity {
         this.meshes = meshes;
 
         this._numPrimitives = 0;
+        this._capMaterial = null;
 
         for (let i = 0, len = this.meshes.length; i < len; i++) {  // TODO: tidier way? Refactor?
             const mesh = this.meshes[i];
@@ -649,6 +651,30 @@ export class SceneModelEntity {
         return this.model.saoEnabled;
     }
 
+    /**
+     * Sets the SceneModelEntity's capMaterial that will be used on the caps generated when this entity is sliced
+     *
+     * Default value is ````null````.
+     *
+     * @type {Material}
+     */
+    set capMaterial(value) {
+        if(!this.scene.readableGeometryEnabled) return;
+        this._capMaterial = value instanceof Material ? value : null;
+        this.scene._capMaterialUpdated(this.id, this.model.id);
+    }
+
+    /**
+     * Gets the SceneModelEntity's capMaterial.
+     *
+     * Default value is ````null````.
+     *
+     * @type {Material}
+     */
+    get capMaterial() {
+        return this._capMaterial;
+    }
+
     getEachVertex(callback) {
         for (let i = 0, len = this.meshes.length; i < len; i++) {
             this.meshes[i].getEachVertex(callback)

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

@@ -313,6 +313,10 @@ export class SceneModelMesh {
         }
     }
 
+    isSolid() {
+        return this.layer.solid;
+    }
+
     /**
      * Returns the volume of this SceneModelMesh.
      * @returns {number}

package/src/viewer/scene/model/dtx/triangles/DTXTrianglesLayer.js

@@ -1170,7 +1170,7 @@ export class DTXTrianglesLayer {
     }
 
     _updateBackfaceCull(renderFlags, frameCtx) {
-        const backfaces = this.model.backfaces || renderFlags.sectioned;
+        const backfaces = true; // See XCD-230
         if (frameCtx.backfaces !== backfaces) {
             const gl = frameCtx.gl;
             if (backfaces) {

package/src/viewer/scene/model/vbo/batching/triangles/VBOBatchingTrianglesLayer.js

@@ -929,7 +929,7 @@ export class VBOBatchingTrianglesLayer {
     }
 
     _updateBackfaceCull(renderFlags, frameCtx) {
-        const backfaces = this.model.backfaces || (!this.solid) || renderFlags.sectioned;
+        const backfaces = true; // See XCD-230
         if (frameCtx.backfaces !== backfaces) {
             const gl = frameCtx.gl;
             if (backfaces) {

package/src/viewer/scene/model/vbo/batching/triangles/renderers/TrianglesColorRenderer.js

@@ -221,7 +221,10 @@ export class TrianglesColorRenderer extends TrianglesBatchingRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled) {
-            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    float dx = dFdx(vFragDepth);")
+            src.push("    float dy = dFdy(vFragDepth);")
+            src.push("    float diff = sqrt(dx*dx+dy*dy);");
+            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth + diff ) * logDepthBufFC * 0.5;");
         }
 
         if (this._withSAO) {

package/src/viewer/scene/model/vbo/instancing/triangles/VBOInstancingTrianglesLayer.js

@@ -843,7 +843,7 @@ export class VBOInstancingTrianglesLayer {
     }
 
     _updateBackfaceCull(renderFlags, frameCtx) {
-        const backfaces = this.model.backfaces || (!this.solid) || renderFlags.sectioned;
+        const backfaces = true; // See XCD-230
         if (frameCtx.backfaces !== backfaces) {
             const gl = frameCtx.gl;
             if (backfaces) {

package/src/viewer/scene/model/vbo/instancing/triangles/renderers/TrianglesColorRenderer.js

@@ -234,7 +234,10 @@ class TrianglesColorRenderer extends TrianglesInstancingRenderer {
         }
 
         if (scene.logarithmicDepthBufferEnabled) {
-            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth ) * logDepthBufFC * 0.5;");
+            src.push("    float dx = dFdx(vFragDepth);")
+            src.push("    float dy = dFdy(vFragDepth);")
+            src.push("    float diff = sqrt(dx*dx+dy*dy);");
+            src.push("    gl_FragDepth = isPerspective == 0.0 ? gl_FragCoord.z : log2( vFragDepth + diff ) * logDepthBufFC * 0.5;");
         }
 
         // Doing SAO blend in the main solid fill draw shader just so that edge lines can be drawn over the top

package/src/viewer/scene/scene/Scene.js

@@ -19,6 +19,7 @@ import {SAO} from "../postfx/SAO.js";
 import {CrossSections} from "../postfx/CrossSections.js";
 import {PointsMaterial} from "../materials/PointsMaterial.js";
 import {LinesMaterial} from "../materials/LinesMaterial.js";
+import {SectionCaps} from '../sectionCaps/SectionCaps.js';
 
 // Enables runtime check for redundant calls to object state update methods, eg. Scene#_objectVisibilityUpdated
 const ASSERT_OBJECT_STATE_UPDATE = false;
@@ -887,6 +888,8 @@ class Scene extends Component {
             dontClear: true // Never destroy this component with Scene#clear();
         });
 
+        this._sectionCaps = new SectionCaps(this);
+
         // Default lights
 
         new AmbientLight(this, {
@@ -988,6 +991,10 @@ class Scene extends Component {
     // Scene. Violates Hollywood Principle, where we could just filter on type in _addComponent,
     // but this is faster than checking the type of each component in such a filter.
 
+    _capMaterialUpdated(entityId, modelId) {
+        this._sectionCaps._onCapMaterialUpdated(entityId, modelId);
+    }
+
     _sectionPlaneCreated(sectionPlane) {
         this.sectionPlanes[sectionPlane.id] = sectionPlane;
         this.scene._sectionPlanesState.addSectionPlane(sectionPlane._state);
@@ -1994,7 +2001,13 @@ class Scene extends Component {
     get xrayMaterial() {
         return this.components["default.xrayMaterial"] || new EmphasisMaterial(this, {
             id: "default.xrayMaterial",
-            preset: "sepia",
+            fill: true,
+            fillColor: [0.970588207244873, 0.7965892553329468, 0.6660899519920349],
+            fillAlpha: 0.4,
+            edges: true,
+            edgeColor: [0.529411792755127, 0.4577854573726654, 0.4100345969200134],
+            edgeAlpha: 1.0,
+            edgeWidth: 1,
             dontClear: true
         });
     }
@@ -2013,7 +2026,13 @@ class Scene extends Component {
     get highlightMaterial() {
         return this.components["default.highlightMaterial"] || new EmphasisMaterial(this, {
             id: "default.highlightMaterial",
-            preset: "yellowHighlight",
+            fill: true,
+            fillColor: [1.0, 1.0, 0.0],
+            fillAlpha: 0.5,
+            edges: true,
+            edgeColor: [1.0, 1.0, 1.0],
+            edgeAlpha: 1.0,
+            edgeWidth: 1,
             dontClear: true
         });
     }
@@ -2032,7 +2051,13 @@ class Scene extends Component {
     get selectedMaterial() {
         return this.components["default.selectedMaterial"] || new EmphasisMaterial(this, {
             id: "default.selectedMaterial",
-            preset: "greenSelected",
+            fill: true,
+            fillColor: [0.0, 1.0, 0.0],
+            fillAlpha: 0.5,
+            edges: true,
+            edgeColor: [1.0, 1.0, 1.0],
+            edgeAlpha: 1.0,
+            edgeWidth: 1,
             dontClear: true
         });
     }
@@ -2051,7 +2076,10 @@ class Scene extends Component {
     get edgeMaterial() {
         return this.components["default.edgeMaterial"] || new EdgeMaterial(this, {
             id: "default.edgeMaterial",
-            preset: "default",
+            fill: true,
+            fillColor: [0.4, 0.4, 0.4],
+            fillAlpha: 0.2,
+            edges: true,
             edgeColor: [0.0, 0.0, 0.0],
             edgeAlpha: 1.0,
             edgeWidth: 1,
@@ -2067,7 +2095,13 @@ class Scene extends Component {
     get pointsMaterial() {
         return this.components["default.pointsMaterial"] || new PointsMaterial(this, {
             id: "default.pointsMaterial",
-            preset: "default",
+            fill: true,
+            fillColor: [0.4, 0.4, 0.4],
+            fillAlpha: 0.2,
+            edges: true,
+            edgeColor: [0.2, 0.2, 0.2],
+            edgeAlpha: 0.5,
+            edgeWidth: 1,
             dontClear: true
         });
     }
@@ -2080,7 +2114,13 @@ class Scene extends Component {
     get linesMaterial() {
         return this.components["default.linesMaterial"] || new LinesMaterial(this, {
             id: "default.linesMaterial",
-            preset: "default",
+            fill: true,
+            fillColor: [0.4, 0.4, 0.4],
+            fillAlpha: 0.2,
+            edges: true,
+            edgeColor: [0.2, 0.2, 0.2],
+            edgeAlpha: 0.5,
+            edgeWidth: 1,
             dontClear: true
         });
     }
@@ -2796,6 +2836,9 @@ class Scene extends Component {
             }
         }
 
+        //destroy section caps separately because it's not a component
+        this._sectionCaps.destroy();
+
         this.canvas.gl = null;
 
         // Memory leak prevention
@@ -2818,6 +2861,7 @@ class Scene extends Component {
         this._highlightedObjectIds = null;
         this._selectedObjectIds = null;
         this._colorizedObjectIds = null;
+        this._sectionCaps = null;
         this.types = null;
         this.components = null;
         this.canvas = null;