@shapediver/viewer.shared.types 2.6.4 → 2.7.0

package/src/implementation/material/MapData.ts

@@ -1,12 +1,13 @@
 import { vec2 } from "gl-matrix";
 import { AbstractTreeNodeData } from "@shapediver/viewer.shared.node-tree";
 import { IMapData, TEXTURE_FILTERING, TEXTURE_WRAPPING } from "../../interfaces/data/material/IMapData";
+import { Color } from "../../types";
 
 export class MapData extends AbstractTreeNodeData implements IMapData {
     // #region Properties (11)
 
     readonly #center: vec2 = vec2.fromValues(0, 0);
-    readonly #color?: string;
+    readonly #color?: Color;
     readonly #flipY: boolean = true;
     readonly #image: HTMLImageElement;
     readonly #magFilter: TEXTURE_FILTERING = TEXTURE_FILTERING.NONE;
@@ -28,7 +29,7 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       minFilter: TEXTURE_FILTERING = TEXTURE_FILTERING.NONE,
       magFilter: TEXTURE_FILTERING = TEXTURE_FILTERING.NONE,
       center: vec2 = vec2.fromValues(0, 0),
-      color?: string,
+      color?: Color,
       offset: vec2 = vec2.fromValues(0, 0),
       repeat: vec2 = vec2.fromValues(1, 1),
       rotation: number = 0,
@@ -56,7 +57,7 @@ export class MapData extends AbstractTreeNodeData implements IMapData {
       return this.#center;
     }
 
-    public get color(): string | undefined {
+    public get color(): Color | undefined {
       return this.#color;
     }
 

package/src/implementation/material/MaterialGemData.ts

@@ -3,6 +3,7 @@ import { IMaterialGemData, IMaterialGemDataProperties } from '../../interfaces/d
 import { MATERIAL_ALPHA, MATERIAL_SHADING, MATERIAL_SIDE } from '../../interfaces/data/material/IMaterialAbstractData';
 import { IMapData } from '../../interfaces/data/material/IMapData';
 import { mat3, mat4, vec3 } from 'gl-matrix';
+import { Color } from '../../types';
 
 export class MaterialGemData extends AbstractMaterialData implements IMaterialGemData {
     // #region Properties (5)
@@ -11,8 +12,8 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
     #refractionIndex: number = 2.4;
     #impurityMap?: IMapData;
     #impurityScale: number = 1.0;
-    #colorTransferBegin: string = '#ffffff';
-    #colorTransferEnd: string = '#ffffff';
+    #colorTransferBegin: Color = '#ffffff';
+    #colorTransferEnd: Color = '#ffffff';
     #center: vec3 = vec3.create();
     #radius: number = 1;
     #sphericalNormalMap?: IMapData;
@@ -86,19 +87,19 @@ export class MaterialGemData extends AbstractMaterialData implements IMaterialGe
         this.#impurityScale = value;
     }
 
-    public get colorTransferBegin(): string {
+    public get colorTransferBegin(): Color {
         return this.#colorTransferBegin;
     }
 
-    public set colorTransferBegin(value: string) {
+    public set colorTransferBegin(value: Color) {
         this.#colorTransferBegin = value;
     }
 
-    public get colorTransferEnd(): string {
+    public get colorTransferEnd(): Color {
         return this.#colorTransferEnd;
     }
 
-    public set colorTransferEnd(value: string) {
+    public set colorTransferEnd(value: Color) {
         this.#colorTransferEnd = value;
     }
 

package/src/implementation/material/MaterialSpecularGlossinessData.ts

@@ -2,13 +2,14 @@ import { AbstractMaterialData } from './AbstractMaterialData';
 import { IMaterialSpecularGlossinessData, IMaterialSpecularGlossinessDataProperties } from '../../interfaces/data/material/IMaterialSpecularGlossinessDataProperties';
 import { MATERIAL_ALPHA, MATERIAL_SHADING, MATERIAL_SIDE } from '../../interfaces/data/material/IMaterialAbstractData';
 import { IMapData } from '../../interfaces/data/material/IMapData';
+import { Color } from '../../types';
 
 export class MaterialSpecularGlossinessData extends AbstractMaterialData implements IMaterialSpecularGlossinessData {
     // #region Properties (5)
 
     #glossiness: number = 1;
     #glossinessMap?: IMapData;
-    #specular: string = '#ffffff';
+    #specular: Color = '#ffffff';
     #specularGlossinessMap?: IMapData;
     #specularMap?: IMapData;
     #envMap?: string | string[];
@@ -66,11 +67,11 @@ export class MaterialSpecularGlossinessData extends AbstractMaterialData impleme
         this.#glossinessMap = value;
     }
 
-    public get specular(): string {
+    public get specular(): Color {
         return this.#specular;
     }
 
-    public set specular(value: string) {
+    public set specular(value: Color) {
         this.#specular = value;
     }
 

package/src/implementation/material/MaterialStandardData.ts

@@ -2,12 +2,13 @@ import { AbstractMaterialData } from './AbstractMaterialData';
 import { IMaterialStandardData, IMaterialStandardDataProperties } from '../../interfaces/data/material/IMaterialStandardData';
 import { IMapData } from '../../interfaces/data/material/IMapData';
 import { MATERIAL_ALPHA, MATERIAL_SHADING, MATERIAL_SIDE } from '../../interfaces/data/material/IMaterialAbstractData';
+import { Color } from '../../types';
 
 export class MaterialStandardData extends AbstractMaterialData implements IMaterialStandardData {
   // #region Properties (26)
 
-  #attenuationColor: string = '#ffffff';
-  #attenuationDistance = 0.0;
+  #attenuationColor: Color = '#ffffff';
+  #attenuationDistance = Infinity;
   #clearcoat: number = 0;
   #clearcoatMap?: IMapData;
   #clearcoatNormalMap?: IMapData;
@@ -24,11 +25,11 @@ export class MaterialStandardData extends AbstractMaterialData implements IMater
   #roughness = 1.0;
   #roughnessMap?: IMapData;
   #sheen = 0.0;
-  #sheenColor: string = '#ffffff';
+  #sheenColor: Color = '#ffffff';
   #sheenColorMap?: IMapData;
   #sheenRoughness = 1.0;
   #sheenRoughnessMap?: IMapData;
-  #specularColor: string = '#ffffff';
+  #specularColor: Color = '#ffffff';
   #specularColorMap?: IMapData;
   #specularIntensity = 1.0;
   #specularIntensityMap?: IMapData;
@@ -89,11 +90,11 @@ export class MaterialStandardData extends AbstractMaterialData implements IMater
 
   // #region Public Accessors (52)
 
-  public get attenuationColor(): string {
+  public get attenuationColor(): Color {
     return this.#attenuationColor;
   }
 
-  public set attenuationColor(value: string) {
+  public set attenuationColor(value: Color) {
     this.#attenuationColor = value;
   }
 
@@ -233,11 +234,11 @@ export class MaterialStandardData extends AbstractMaterialData implements IMater
     this.#sheen = value;
   }
 
-  public get sheenColor(): string {
+  public get sheenColor(): Color {
     return this.#sheenColor;
   }
 
-  public set sheenColor(value: string) {
+  public set sheenColor(value: Color) {
     this.#sheenColor = value;
   }
 
@@ -265,11 +266,11 @@ export class MaterialStandardData extends AbstractMaterialData implements IMater
     this.#sheenRoughnessMap = value;
   }
 
-  public get specularColor(): string {
+  public get specularColor(): Color {
     return this.#specularColor;
   }
 
-  public set specularColor(value: string) {
+  public set specularColor(value: Color) {
     this.#specularColor = value;
   }
 
@@ -353,7 +354,7 @@ export class MaterialStandardData extends AbstractMaterialData implements IMater
     this.side = MATERIAL_SIDE.DOUBLE;
     
     this.attenuationColor = '#ffffff';
-    this.attenuationDistance = 1;
+    this.attenuationDistance = Infinity;
     this.clearcoat = 0;
     this.clearcoatMap = undefined;
     this.clearcoatNormalMap = undefined;

package/src/index.ts

@@ -41,6 +41,7 @@ import { MaterialGemData } from './implementation/material/MaterialGemData'
 import { IMaterialGemData, IMaterialGemDataProperties } from './interfaces/data/material/IMaterialGemDataProperties'
 import { MaterialShadowData } from './implementation/material/MaterialShadowData'
 import { IMaterialShadowData, IMaterialShadowDataProperties } from './interfaces/data/material/IMaterialShadowData'
+import { Color } from './types'
 
 export {
   IMaterialStandardData, MaterialStandardData, IMaterialStandardDataProperties, 
@@ -71,4 +72,8 @@ export {
 export {
   ISDTFOverviewData, SDTFOverviewData, ISDTFOverview, SDTFAttributesData, ISDTFAttributesData, ISDTFAttributeData, SDTFAttributeData, SDTFItemData, ISDTFItemData, ISDTFAttributeVisualizationData,
   SdtfTypeHintName as SDTF_TYPEHINT, SdtfPrimitiveTypeGuard
+}
+
+export {
+  Color
 }

package/src/interfaces/data/IGeometryData.ts

@@ -61,6 +61,7 @@ export interface IPrimitiveData extends ITreeNodeData {
     // #region Public Methods (1)
 
     clone(): IPrimitiveData;
+    computeBoundingBox(matrix: mat4): IBox;
 
     // #endregion Public Methods (1)
 }
@@ -68,7 +69,6 @@ export interface IPrimitiveData extends ITreeNodeData {
 export interface IGeometryData extends ITreeNodeData {
     // #region Properties (7)
 
-    readonly matrix: mat4;
     readonly primitive: IPrimitiveData;
 
     boundingBox: IBox;

package/src/interfaces/data/IHTMLElementAnchorData.ts

@@ -1,6 +1,7 @@
 import { vec2, vec3 } from "gl-matrix";
 import { ITreeNodeData } from "@shapediver/viewer.shared.node-tree";
 import { IBox } from "@shapediver/viewer.shared.math";
+import { Color } from "../../types";
 
 export interface IAnchorDataImage {
     // #region Properties (6)
@@ -22,7 +23,7 @@ export interface IAnchorDataImage {
 export interface IAnchorDataText {
     // #region Properties (5)
 
-    color: string | number | vec3,
+    color: Color,
     hidden?: boolean,
     position?: {
         horizontal?: string,

package/src/interfaces/data/material/IMapData.ts

@@ -1,5 +1,6 @@
 import { ITreeNodeData } from "@shapediver/viewer.shared.node-tree";
 import { vec2 } from "gl-matrix";
+import { Color } from "../../../types";
 
 export enum TEXTURE_WRAPPING {
     REPEAT = 10497,
@@ -21,7 +22,7 @@ export interface IMapData extends ITreeNodeData {
     // #region Properties (11)
 
     readonly center: vec2;
-    readonly color?: string;
+    readonly color?: Color;
     readonly flipY: boolean;
     readonly image: HTMLImageElement;
     readonly magFilter: TEXTURE_FILTERING;

package/src/interfaces/data/material/IMaterialAbstractData.ts

@@ -1,4 +1,5 @@
 import { ITreeNodeData } from "@shapediver/viewer.shared.node-tree";
+import { Color } from "../../../types";
 import { IMapData } from "./IMapData";
 
 export enum MATERIAL_SIDE {
@@ -28,9 +29,9 @@ export interface IMaterialAbstractDataProperties {
     aoMapIntensity?: number,
     bumpMap?: IMapData,
     bumpScale?: number,
-    color?: string,
+    color?: Color,
     emissiveMap?: IMapData,
-    emissiveness?: string,
+    emissiveness?: Color,
     map?: IMapData,
     name?: string,
     normalMap?: IMapData,
@@ -52,9 +53,9 @@ export interface IMaterialAbstractData extends ITreeNodeData {
     aoMapIntensity: number,
     bumpMap?: IMapData,
     bumpScale: number,
-    color: string,
+    color: Color,
     emissiveMap?: IMapData,
-    emissiveness: string,
+    emissiveness: Color,
     map?: IMapData,
     materialOutput: boolean;
     name?: string,

package/src/interfaces/data/material/IMaterialGemDataProperties.ts

@@ -1,4 +1,5 @@
 import { mat3, mat4, vec3 } from "gl-matrix";
+import { Color } from "../../../types";
 import { IMapData } from "./IMapData";
 import { IMaterialAbstractData, IMaterialAbstractDataProperties } from "./IMaterialAbstractData";
 
@@ -7,8 +8,8 @@ export interface IMaterialGemDataProperties extends IMaterialAbstractDataPropert
 
     brightness?: number;
     center?: vec3;
-    colorTransferBegin?: string;
-    colorTransferEnd?: string;
+    colorTransferBegin?: Color;
+    colorTransferEnd?: Color;
     contrast?: number;
     dispersion?: number;
     envMap?: string | string[];
@@ -29,8 +30,8 @@ export interface IMaterialGemData extends IMaterialAbstractData {
 
     brightness?: number;
     center?: vec3;
-    colorTransferBegin?: string;
-    colorTransferEnd?: string;
+    colorTransferBegin?: Color;
+    colorTransferEnd?: Color;
     contrast?: number;
     dispersion?: number;
     envMap?: string | string[];

package/src/interfaces/data/material/IMaterialSpecularGlossinessDataProperties.ts

@@ -1,3 +1,4 @@
+import { Color } from "../../../types";
 import { IMapData } from "./IMapData";
 import { IMaterialAbstractData, IMaterialAbstractDataProperties } from "./IMaterialAbstractData";
 
@@ -7,7 +8,7 @@ export interface IMaterialSpecularGlossinessDataProperties extends IMaterialAbst
     envMap?: string | string[];
     glossiness?: number,
     glossinessMap?: IMapData,
-    specular?: string,
+    specular?: Color,
     specularGlossinessMap?: IMapData,
     specularMap?: IMapData,
 
@@ -20,7 +21,7 @@ export interface IMaterialSpecularGlossinessData extends IMaterialAbstractData {
     envMap?: string | string[];
     glossiness: number,
     glossinessMap?: IMapData,
-    specular: string,
+    specular: Color,
     specularGlossinessMap?: IMapData,
     specularMap?: IMapData,
 

package/src/interfaces/data/material/IMaterialStandardData.ts

@@ -1,10 +1,11 @@
+import { Color } from "../../../types";
 import { IMapData } from "./IMapData";
 import { IMaterialAbstractData, IMaterialAbstractDataProperties } from "./IMaterialAbstractData";
 
 export interface IMaterialStandardDataProperties extends IMaterialAbstractDataProperties {
     // #region Properties (30)
 
-    attenuationColor?: string,
+    attenuationColor?: Color,
     attenuationDistance?: number;
     clearcoat?: number;
     clearcoatMap?: IMapData;
@@ -22,11 +23,11 @@ export interface IMaterialStandardDataProperties extends IMaterialAbstractDataPr
     roughness?: number,
     roughnessMap?: IMapData,
     sheen?: number,
-    sheenColor?: string,
+    sheenColor?: Color,
     sheenColorMap?: IMapData,
     sheenRoughness?: number,
     sheenRoughnessMap?: IMapData,
-    specularColor?: string,
+    specularColor?: Color,
     specularColorMap?: IMapData,
     specularIntensity?: number,
     specularIntensityMap?: IMapData,
@@ -41,7 +42,7 @@ export interface IMaterialStandardDataProperties extends IMaterialAbstractDataPr
 export interface IMaterialStandardData extends IMaterialAbstractData {
     // #region Properties (30)
 
-    attenuationColor: string,
+    attenuationColor: Color,
     attenuationDistance: number;
     clearcoat: number;
     clearcoatMap?: IMapData;
@@ -59,11 +60,11 @@ export interface IMaterialStandardData extends IMaterialAbstractData {
     roughness: number,
     roughnessMap?: IMapData,
     sheen: number,
-    sheenColor: string,
+    sheenColor: Color,
     sheenColorMap?: IMapData,
     sheenRoughness: number,
     sheenRoughnessMap?: IMapData,
-    specularColor: string,
+    specularColor: Color,
     specularColorMap?: IMapData,
     specularIntensity: number,
     specularIntensityMap?: IMapData,

package/src/types.ts

@@ -0,0 +1,3 @@
+import { vec3, vec4 } from "gl-matrix";
+
+export type Color = string | number | number[] | vec3 | vec4;