architwin 1.8.0 → 1.8.1

package/lib/architwin.d.ts

@@ -358,6 +358,7 @@ declare function updateObject(id: number, payload: FileUpload): Promise<I3DObjec
 /**
  * Delete an object from from the s3 bucket
  * @param id - The object id of the target object to be deleted
+ * @deprecated - use disposeModel instead
  * @returns
  */
 declare function deleteObject(id: number): Promise<void>;
@@ -365,6 +366,7 @@ declare function deleteObject(id: number): Promise<void>;
  * Deletes an object added to a showcase space. Not to be confused with delete object which totally deletes an
  * object from the s3 storage
  * @param id - The showcase id of the object
+ * @deprecated - use disposeModel instead
  * @returns
  */
 declare function deleteShowcaseObject(id: number): Promise<void>;

package/lib/atwinui/components/toolbar/menu-bar.d.ts

@@ -0,0 +1,4 @@
+import { LitElement } from 'lit';
+export declare class Menubar extends LitElement {
+    render(): import("lit-html").TemplateResult<1>;
+}

package/lib/atwinui/components/toolbar/menu-bar.js

@@ -0,0 +1,35 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { html, LitElement } from 'lit';
+import { customElement } from 'lit/decorators.js';
+let Menubar = class Menubar extends LitElement {
+    render() {
+        return html `
+    <div class="at_toolbar_container" id="at-menu-bar">
+        <div class="at_sidebar_button_icon">
+            <span class="mdi mdi-bullseye" id="at-expand-btn"></span>
+        </div>
+        <div class="at_sidebar_button_icon">      
+            <span class="mdi mdi-cube-outline" id="at-object-list-btn"></span>
+        </div>
+        <div class="at_sidebar_button_icon">
+            <span class="mdi mdi-map"  id="at-minimap-btn" target-pane="at-map"></span>
+        </div>
+        <div class="at_sidebar_button_icon">
+            <span class="mdi mdi-message-video" id="at-videocall-btn"></span>
+        </div>
+        <div class="at_sidebar_button_icon">
+            <span class="mdi mdi-monitor-screenshot" id="at-screenshot-btn"></span>
+        </div>
+    </div>
+    `;
+    }
+};
+Menubar = __decorate([
+    customElement('at-menubar')
+], Menubar);
+export { Menubar };

package/lib/atwinui/components/toolbar/sidebar-container.d.ts

@@ -0,0 +1,5 @@
+import { LitElement } from 'lit';
+export declare class SidebarContainer extends LitElement {
+    checked: boolean;
+    render(): import("lit-html").TemplateResult<1>;
+}

package/lib/atwinui/components/toolbar/sidebar-container.js

@@ -0,0 +1,27 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { html, LitElement } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
+let SidebarContainer = class SidebarContainer extends LitElement {
+    constructor() {
+        super(...arguments);
+        this.checked = false;
+    }
+    render() {
+        return html `
+      <div class="at_sidebar_container at_topRight" id="at-sidebar-container">
+      </div>
+    `;
+    }
+};
+__decorate([
+    property()
+], SidebarContainer.prototype, "checked", void 0);
+SidebarContainer = __decorate([
+    customElement('at-sidebar-container')
+], SidebarContainer);
+export { SidebarContainer };

package/lib/convert.d.ts

@@ -1,6 +1,11 @@
+export declare let generatedIds: Array<number>;
 export declare function meterToMillimeter(meter: number, decimal?: number): number;
 export declare function generateRandomUniqueNumber(currentIds: Array<number>): number;
-export declare function generateUUID(): string;
+export declare function generateUUID(config?: {
+    length?: number;
+    separator?: string;
+}): string;
+export declare function generateRandomUsername(): string;
 export declare function useHexToRgb(hexcode: string): {
     r: number;
     g: number;
@@ -11,3 +16,11 @@ export declare function useRgbToHex(color: {
     g: number;
     b: number;
 }): string;
+export declare function convertToCssRgb(values: {
+    r: number;
+    g: number;
+    b: number;
+}): string;
+export declare function arrayBufferToBase64(buffer: any): string;
+export declare function isUrlValid(userInput: string): boolean;
+export declare function dateTimeFormat(d: any): string;

package/lib/convert.js

@@ -1,3 +1,6 @@
+import { format, toDate } from 'date-fns';
+import { ja } from 'date-fns/locale';
+export let generatedIds = [];
 export function meterToMillimeter(meter, decimal = 2) {
     const mm = meter * 1000;
     return parseFloat(mm.toFixed(decimal));
@@ -13,7 +16,7 @@ export function generateRandomUniqueNumber(currentIds) {
     } while (currentIds.indexOf(randomNumber) !== -1);
     return randomNumber;
 }
-export function generateUUID() {
+export function generateUUID(config) {
     const cryptoObj = window.crypto;
     if (!cryptoObj) {
         console.error('crypto.getRandomValues() is not supported in this browser.');
@@ -29,16 +32,42 @@ export function generateUUID() {
         }
         hex.push(val);
     }
-    // The UUID string format is "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-    return `${hex[0]}${hex[1]}-${hex[2]}-${hex[3]}-${hex[4]}-${hex[5]}${hex[6]}${hex[7]}`;
+    let randUUID = `${hex[0]}${hex[1]}-${hex[2]}-${hex[3]}-${hex[4]}-${hex[5]}${hex[6]}${hex[7]}`;
+    if (config && config.length) {
+        console.log('Length set');
+        randUUID = randUUID.slice(0, config.length);
+    }
+    if (config && config.separator) {
+        console.log('Separator set');
+        if (config.separator === 'none') {
+            randUUID = randUUID.replace(/-/g, config.separator);
+        }
+    }
+    return randUUID;
+}
+export function generateRandomUsername() {
+    // Helper function to generate a random word
+    function getRandomWord(length) {
+        let result = '';
+        const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+        const charactersLength = characters.length;
+        for (let i = 0; i < length; i++) {
+            result += characters.charAt(Math.floor(Math.random() * charactersLength));
+        }
+        return result;
+    }
+    const randomWord = getRandomWord(Math.floor(Math.random() * 5) + 4);
+    const randomNumber = Math.floor(Math.random() * 10000);
+    const username = `${randomWord}${randomNumber}`;
+    return username;
 }
 export function useHexToRgb(hexcode) {
     // Remove '#' symbol if it exists
     hexcode = hexcode.replace("#", "");
     // Parse hex values for red, green, and blue
-    const r = parseInt(hexcode.substring(0, 2), 16);
-    const g = parseInt(hexcode.substring(2, 4), 16);
-    const b = parseInt(hexcode.substring(4, 6), 16);
+    const r = parseInt(hexcode.substring(0, 2), 16) / 255;
+    const g = parseInt(hexcode.substring(2, 4), 16) / 255;
+    const b = parseInt(hexcode.substring(4, 6), 16) / 255;
     return { r, g, b };
 }
 export function useRgbToHex(color) {
@@ -52,3 +81,31 @@ export function useRgbToHex(color) {
     const hexB = color.b.toString(16).padStart(2, "0");
     return `${hexR}${hexG}${hexB}`;
 }
+export function convertToCssRgb(values) {
+    // console.log('convertToCssRgb()', values)
+    if (!values) {
+        console.log('values is undefined');
+        return;
+    }
+    let r = Math.round(values.r * 255);
+    let g = Math.round(values.g * 255);
+    let b = Math.round(values.b * 255);
+    return `rgb(${r},${g},${b})`;
+}
+export function arrayBufferToBase64(buffer) {
+    let binary = '';
+    const bytes = new Uint8Array(buffer);
+    const len = bytes.byteLength;
+    for (let i = 0; i < len; i++) {
+        binary += String.fromCharCode(bytes[i]);
+    }
+    return btoa(binary);
+}
+export function isUrlValid(userInput) {
+    const urlPattern = /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/;
+    return urlPattern.test(userInput);
+}
+export function dateTimeFormat(d) {
+    const local = format(toDate(d), 'yyyy年M月d日 HH:mm:ss', { locale: ja });
+    return local;
+}

package/lib/loaders/viewpointLoader.d.ts

@@ -21,6 +21,7 @@ declare class ViewpointLoader {
         textColor: string;
         maxLineLength: any;
         customPointerTexture: any;
+        pointerTextureOpacity: number;
     };
     outputs: Record<string, unknown> & MpSdk.Scene.PredefinedOutputs;
     context: MpSdk.Scene.IComponentContext;

package/lib/loaders/viewpointLoader.js

@@ -22,7 +22,8 @@ class ViewpointLoader {
             bevelSegments: 3,
             textColor: '#FFFFFF',
             maxLineLength: null,
-            customPointerTexture: null
+            customPointerTexture: null,
+            pointerTextureOpacity: 0.6
         };
         this.events = {
             'INTERACTION.CLICK': true,
@@ -69,6 +70,7 @@ class ViewpointLoader {
                 this.planeMaterial = new THREE.MeshBasicMaterial({
                     map: texture,
                     transparent: true,
+                    opacity: this.pointerTextureOpacity,
                     side: THREE.DoubleSide
                 });
                 this.planeMesh = new THREE.Mesh(this.planeGeometry, this.planeMaterial);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "architwin",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "ArchiTwin Library for Matterport",
   "main": "./lib/architwin.js",
   "types": "./lib/architwin.d.ts",