@shapediver/viewer.shared.types 2.12.7 → 3.0.0

package/src/implementation/material/AbstractMaterialData.ts

@@ -1,11 +1,16 @@
-import { AbstractTreeNodeData, ITreeNodeData } from '@shapediver/viewer.shared.node-tree'
-import { IMapData } from '../../interfaces/data/material/IMapData';
-import { IMaterialAbstractData, IMaterialAbstractDataProperties, MATERIAL_ALPHA, MATERIAL_SHADING, MATERIAL_SIDE } from '../../interfaces/data/material/IMaterialAbstractData';
+import { AbstractTreeNodeData } from '@shapediver/viewer.shared.node-tree';
 import { Color } from '../../types';
-
+import { IMapData } from '../../interfaces/data/material/IMapData';
+import {
+  IMaterialAbstractData,
+  IMaterialAbstractDataProperties,
+  MATERIAL_ALPHA,
+  MATERIAL_SHADING,
+  MATERIAL_SIDE
+} from '../../interfaces/data/material/IMaterialAbstractData';
 
 export abstract class AbstractMaterialData extends AbstractTreeNodeData implements IMaterialAbstractData {
-  // #region Properties (17)
+  // #region Properties (21)
 
   #alphaCutoff: number = 0;
   #alphaMap?: IMapData;
@@ -15,19 +20,21 @@ export abstract class AbstractMaterialData extends AbstractTreeNodeData implemen
   #bumpMap?: IMapData;
   #bumpScale: number = 1.0;
   #color: Color = '#ffffff';
+  #depthTest?: boolean;
+  #depthWrite?: boolean;
   #emissiveMap?: IMapData;
   #emissiveness: Color = '#000000';
-  #materialOutput: boolean = false;
   #map?: IMapData;
+  #materialOutput: boolean = false;
   #name?: string;
   #normalMap?: IMapData;
   #normalScale: number = 1.0;
   #opacity = 1.0;
   #shading: MATERIAL_SHADING = MATERIAL_SHADING.SMOOTH;
   #side: MATERIAL_SIDE = MATERIAL_SIDE.DOUBLE;
-  #threeJsObject: { [key: string]: THREE.Material } = {};
+  #transparent?: boolean;
 
-  // #endregion Properties (17)
+  // #endregion Properties (21)
 
   // #region Constructors (1)
 
@@ -52,6 +59,8 @@ export abstract class AbstractMaterialData extends AbstractTreeNodeData implemen
     if (properties.bumpMap !== undefined) this.bumpMap = properties.bumpMap;
     if (properties.bumpScale !== undefined) this.bumpScale = properties.bumpScale;
     if (properties.color !== undefined) this.color = properties.color;
+    if (properties.depthTest !== undefined) this.depthTest = properties.depthTest;
+    if (properties.depthWrite !== undefined) this.depthWrite = properties.depthWrite;
     if (properties.emissiveMap !== undefined) this.emissiveMap = properties.emissiveMap;
     if (properties.emissiveness !== undefined) this.emissiveness = properties.emissiveness;
     if (properties.shading !== undefined) this.shading = properties.shading;
@@ -61,11 +70,12 @@ export abstract class AbstractMaterialData extends AbstractTreeNodeData implemen
     if (properties.normalScale !== undefined) this.normalScale = properties.normalScale;
     if (properties.opacity !== undefined) this.opacity = properties.opacity;
     if (properties.side !== undefined) this.side = properties.side;
+    if (properties.transparent !== undefined) this.transparent = properties.transparent;
   }
 
   // #endregion Constructors (1)
 
-  // #region Public Accessors (34)
+  // #region Public Getters And Setters (42)
 
   public get alphaCutoff(): number {
     return this.#alphaCutoff;
@@ -131,6 +141,22 @@ export abstract class AbstractMaterialData extends AbstractTreeNodeData implemen
     this.#color = value;
   }
 
+  public get depthTest(): boolean | undefined {
+    return this.#depthTest;
+  }
+
+  public set depthTest(value: boolean | undefined) {
+    this.#depthTest = value;
+  }
+
+  public get depthWrite(): boolean | undefined {
+    return this.#depthWrite;
+  }
+
+  public set depthWrite(value: boolean | undefined) {
+    this.#depthWrite = value;
+  }
+
   public get emissiveMap(): IMapData | undefined {
     return this.#emissiveMap;
   }
@@ -210,31 +236,33 @@ export abstract class AbstractMaterialData extends AbstractTreeNodeData implemen
   public set side(value: MATERIAL_SIDE) {
     this.#side = value;
   }
-  
-  public get threeJsObject(): { [key: string]: THREE.Material } {
-    return this.#threeJsObject;
+
+  public get transparent(): boolean | undefined {
+    return this.#transparent;
   }
 
-  // #endregion Public Accessors (34)
+  public set transparent(value: boolean | undefined) {
+    this.#transparent = value;
+  }
 
-  // #region Public Abstract Methods (1)
+  // #endregion Public Getters And Setters (42)
 
-  /**
-   * Reset the material data.
-   */
-  public abstract reset(): void;
+  // #region Public Abstract Methods (3)
 
   /**
    * Clones the scene graph data.
    */
   public abstract clone(): IMaterialAbstractData;
-
   /**
    * Copy all properties of another material data object.
    * 
    * @param source 
    */
   public abstract copy(source: IMaterialAbstractData): void;
+  /**
+   * Reset the material data.
+   */
+  public abstract reset(): void;
 
-  // #endregion Public Abstract Methods (1)
+  // #endregion Public Abstract Methods (3)
 }

package/src/implementation/material/MapData.ts

@@ -4,13 +4,15 @@ import { IMapData, TEXTURE_FILTERING, TEXTURE_WRAPPING } from '../../interfaces/
 import { Color } from '../../types';
 
 export class MapData extends AbstractTreeNodeData implements IMapData {
-    // #region Properties (11)
+    // #region Properties (15)
 
+    #asData: boolean = false;
     #blob?: Blob;
     #center: vec2 = vec2.fromValues(0, 0);
     #color?: Color;
+    #data?: number[];
     #flipY: boolean = true;
-    #image: HTMLImageElement;
+    #image: HTMLImageElement | ArrayBuffer;
     #magFilter: TEXTURE_FILTERING = TEXTURE_FILTERING.NONE;
     #minFilter: TEXTURE_FILTERING = TEXTURE_FILTERING.NONE;
     #offset: vec2 = vec2.fromValues(0, 0);
@@ -20,13 +22,15 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
     #wrapS: TEXTURE_WRAPPING = TEXTURE_WRAPPING.REPEAT;
     #wrapT: TEXTURE_WRAPPING = TEXTURE_WRAPPING.REPEAT;
 
-    // #endregion Properties (11)
+    // #endregion Properties (15)
 
     // #region Constructors (1)
 
     constructor(
-      image: HTMLImageElement,
+      image: HTMLImageElement | ArrayBuffer,
       properties?: {
+        asData?: boolean,
+        data?: number[],
         blob?: Blob,
         wrapS?: TEXTURE_WRAPPING,
         wrapT?: TEXTURE_WRAPPING,
@@ -45,6 +49,8 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
     ) {
       super(id, version);
       this.#image = image;
+      this.#asData = properties && properties.asData !== undefined ? properties.asData : false;
+      this.#data = properties ? properties.data : undefined;
       this.#blob = properties ? properties.blob : undefined;
       this.#wrapS = properties && properties.wrapS !== undefined ? properties.wrapS : TEXTURE_WRAPPING.REPEAT;
       this.#wrapT = properties && properties.wrapT !== undefined ? properties.wrapT : TEXTURE_WRAPPING.REPEAT;
@@ -61,7 +67,15 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
 
     // #endregion Constructors (1)
 
-    // #region Public Accessors (11)
+    // #region Public Getters And Setters (30)
+
+    public get asData(): boolean {
+      return this.#asData;
+    }
+
+    public set asData(value: boolean) {
+      this.#asData = value;
+    }
 
     public get blob(): Blob | undefined {
       return this.#blob;
@@ -87,6 +101,14 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       this.#color = value;
     }
 
+    public get data(): number[] | undefined {
+      return this.#data;
+    }
+
+    public set data(value: number[] | undefined) {
+      this.#data = value;
+    }
+
     public get flipY(): boolean {
       return this.#flipY;
     }
@@ -95,11 +117,11 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       this.#flipY = value;
     }
 
-    public get image(): HTMLImageElement {
+    public get image(): HTMLImageElement | ArrayBuffer {
       return this.#image;
     }
 
-    public set image(value: HTMLImageElement) {
+    public set image(value: HTMLImageElement | ArrayBuffer) {
       this.#image = value;
     }
 
@@ -167,7 +189,7 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       this.#wrapT = value;
     }
 
-    // #endregion Public Accessors (11)
+    // #endregion Public Getters And Setters (30)
 
     // #region Public Methods (1)
 
@@ -175,6 +197,8 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       return new MapData(
         <HTMLImageElement>this.image, 
         {
+          asData: this.asData,
+          data: this.data,
           blob: this.blob, 
           wrapS: this.wrapS, 
           wrapT: this.wrapT, 

package/src/implementation/material/MaterialBasicLineData.ts

@@ -0,0 +1,99 @@
+import { AbstractMaterialData } from './AbstractMaterialData';
+import { IMaterialBasicLineData, IMaterialBasicLineDataProperties } from '../../interfaces/data/material/IMaterialBasicLineData';
+import { MATERIAL_ALPHA, MATERIAL_SHADING, MATERIAL_SIDE } from '../../interfaces/data/material/IMaterialAbstractData';
+
+export class MaterialBasicLineData extends AbstractMaterialData implements IMaterialBasicLineData {
+    // #region Constructors (1)
+
+    /**
+     * Creates a material data object.
+     * 
+     * @param _attributes the attributes of the material
+     * @param id the id
+     */
+    constructor(
+        properties?: IMaterialBasicLineDataProperties,
+        id?: string,
+        version?: string
+    ) {
+        super(properties, id, version);
+        if (!properties) return;
+    }
+
+    // #endregion Constructors (1)
+
+    // #region Public Methods (3)
+
+    public clone(): IMaterialBasicLineData {
+        return new MaterialBasicLineData({
+            alphaMap: this.alphaMap,
+            alphaCutoff: this.alphaCutoff,
+            alphaMode: this.alphaMode,
+            aoMap: this.aoMap,
+            aoMapIntensity: this.aoMapIntensity,
+            bumpMap: this.bumpMap,
+            bumpScale: this.bumpScale,
+            color: this.color,
+            depthTest: this.depthTest,
+            depthWrite: this.depthWrite,
+            emissiveMap: this.emissiveMap,
+            emissiveness: this.emissiveness,
+            shading: this.shading,
+            map: this.map,
+            name: this.name,
+            normalMap: this.normalMap,
+            normalScale: this.normalScale,
+            opacity: this.opacity,
+            side: this.side,
+            transparent: this.transparent
+        }, this.id, this.version);
+    }
+
+    public copy(source: MaterialBasicLineData): void {
+        this.alphaCutoff = source.alphaCutoff;
+        this.alphaMap = source.alphaMap;
+        this.alphaMode = source.alphaMode;
+        this.aoMap = source.aoMap;
+        this.aoMapIntensity = source.aoMapIntensity;
+        this.bumpMap = source.bumpMap;
+        this.bumpScale = source.bumpScale;
+        this.color = source.color;
+        this.depthTest = source.depthTest;
+        this.depthWrite = source.depthWrite;
+        this.emissiveMap = source.emissiveMap;
+        this.emissiveness = source.emissiveness;
+        this.materialOutput = source.materialOutput;
+        this.map = source.map;
+        this.normalMap = source.normalMap;
+        this.normalScale = source.normalScale;
+        this.opacity = source.opacity;
+        this.shading = source.shading;
+        this.side = source.side;
+        this.transparent = source.transparent;
+    }
+
+    public reset(): void {
+        this.alphaCutoff = 0;
+        this.alphaMap = undefined;
+        this.alphaMode = MATERIAL_ALPHA.OPAQUE;
+        this.aoMap = undefined;
+        this.aoMapIntensity = 1.0;
+        this.bumpMap = undefined;
+        this.bumpScale = 1.0;
+        this.color = '#ffffff';
+        this.depthTest = undefined;
+        this.depthWrite = undefined;
+        this.emissiveMap = undefined;
+        this.emissiveness = '#000000';
+        this.materialOutput = false;
+        this.map = undefined;
+        this.normalMap = undefined;
+        this.normalScale = 1.0;
+        this.opacity = 1.0;
+        this.shading = MATERIAL_SHADING.SMOOTH;
+        this.side = MATERIAL_SIDE.DOUBLE;
+        this.transparent = undefined;
+    }
+
+    // #endregion Public Methods (3)
+}

package/src/implementation/material/MaterialGemData.ts

@@ -198,6 +198,8 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
             bumpMap: this.bumpMap,
             bumpScale: this.bumpScale,
             color: this.color,
+            depthTest: this.depthTest,
+            depthWrite: this.depthWrite,
             emissiveMap: this.emissiveMap,
             emissiveness: this.emissiveness,
             shading: this.shading,
@@ -207,6 +209,7 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
             normalScale: this.normalScale,
             opacity: this.opacity,
             side: this.side,
+            transparent: this.transparent,
             refractionIndex: this.refractionIndex,
             impurityMap: this.impurityMap,
             impurityScale: this.impurityScale,
@@ -234,6 +237,8 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
         this.bumpMap = source.bumpMap;
         this.bumpScale = source.bumpScale;
         this.color = source.color;
+        this.depthTest = source.depthTest;
+        this.depthWrite = source.depthWrite;
         this.emissiveMap = source.emissiveMap;
         this.emissiveness = source.emissiveness;
         this.materialOutput = source.materialOutput;
@@ -243,21 +248,22 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
         this.opacity = source.opacity;
         this.shading = source.shading;
         this.side = source.side;
+        this.transparent = source.transparent;
         
-        this.refractionIndex = this.refractionIndex;
-        this.impurityMap = this.impurityMap;
-        this.impurityScale = this.impurityScale;
-        this.colorTransferBegin = this.colorTransferBegin;
-        this.colorTransferEnd = this.colorTransferEnd;
-        this.center = this.center;
-        this.tracingDepth = this.tracingDepth;
-        this.radius = this.radius;
-        this.sphericalNormalMap = this.sphericalNormalMap;
-        this.gamma = this.gamma;
-        this.contrast = this.contrast;
-        this.brightness = this.brightness;
-        this.dispersion = this.dispersion;
-        this.tracingOpacity = this.tracingOpacity;
+        this.refractionIndex = source.refractionIndex;
+        this.impurityMap = source.impurityMap;
+        this.impurityScale = source.impurityScale;
+        this.colorTransferBegin = source.colorTransferBegin;
+        this.colorTransferEnd = source.colorTransferEnd;
+        this.center = source.center;
+        this.tracingDepth = source.tracingDepth;
+        this.radius = source.radius;
+        this.sphericalNormalMap = source.sphericalNormalMap;
+        this.gamma = source.gamma;
+        this.contrast = source.contrast;
+        this.brightness = source.brightness;
+        this.dispersion = source.dispersion;
+        this.tracingOpacity = source.tracingOpacity;
         this.envMap = source.envMap;
     }
 
@@ -270,6 +276,8 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
         this.bumpMap = undefined;
         this.bumpScale = 1.0;
         this.color = '#ffffff';
+        this.depthTest = undefined;
+        this.depthWrite = undefined;
         this.emissiveMap = undefined;
         this.emissiveness = '#000000';
         this.materialOutput = false;
@@ -279,6 +287,7 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
         this.opacity = 1.0;
         this.shading = MATERIAL_SHADING.SMOOTH;
         this.side = MATERIAL_SIDE.DOUBLE;
+        this.transparent = undefined;
 
         this.refractionIndex = 2.4;
         this.impurityMap = undefined;