architwin 1.3.0 → 1.3.2

package/lib/atwinui/components/toolbar/modelControlsPane.d.ts

@@ -7,3 +7,4 @@ export declare function setTransformType(type: string): void;
 export declare function getCoordinateValues(): Object3DPosition;
 export declare function clearCoordinateInputs(): void;
 export declare function showCurrentCoordinateValue(): void;
+export declare function handleModelControlInputs(): void;

package/lib/atwinui/components/toolbar/modelControlsPane.js

@@ -1,6 +1,7 @@
 import { useCapitalizeFirstLetter } from "../../../utils";
 import { getSelectedObject } from "../../../architwin";
 import { Notyf } from 'notyf';
+import log from 'loglevel';
 let notyf = new Notyf({ position: { x: 'left', y: 'bottom' }, duration: 4500 });
 export let activeModelControlPane = false;
 export let modelControlPane;
@@ -8,6 +9,7 @@ let transformType = 'translate';
 let inputX;
 let inputY;
 let inputZ;
+let isInputEventListenerSet = false;
 export function renderModelControlPane(type = 'Translate') {
     const element = document.createElement('div');
     element.classList.add('at_container');
@@ -24,17 +26,17 @@ export function renderModelControlPane(type = 'Translate') {
                 <div class="at_number_field">
                     <span class="at_bolder">X</span>
                     <input type="number" id="at-input-x" class="at_rounded_input"/>
-                    <span class="at_bolder">m</span>
+                    <span class="at_bolder at_model_unit">m</span>
                 </div>
                 <div class="at_number_field">
                     <span class="at_bolder">Y</span>
                     <input type="number" id="at-input-y" class="at_rounded_input"/>
-                    <span class="at_bolder">m</span>
+                    <span class="at_bolder at_model_unit">m</span>
                 </div>
                 <div class="at_number_field">
                     <span class="at_bolder">Z</span>
                     <input type="number" id="at-input-z" class="at_rounded_input"/>
-                    <span class="at_bolder">m</span>
+                    <span class="at_bolder at_model_unit">m</span>
                 </div>
                 <button class="at_button at_primary_azusa" id="at-confirm-transform">Confirm</button>
             </div>
@@ -67,6 +69,7 @@ export function setTransformType(type) {
                 transformType = type.toLowerCase();
                 return;
             }
+            setModelInputUnit(type);
             console.error("transformTypeTitle is undefined");
             return;
         }
@@ -154,3 +157,58 @@ export function showCurrentCoordinateValue() {
         inputZ.value = currentScale.z.toFixed(3).toString();
     }
 }
+function setModelInputUnit(type) {
+    log.info("setModelInputUnit()");
+    if (!type) {
+        console.error("Type is undefined");
+        return;
+    }
+    const elements = document.querySelectorAll(`at_model_unit`);
+    if (elements && elements.length > 0) {
+        elements.forEach((element) => {
+            if (type === 'translate') {
+                element.textContent = 'm';
+            }
+            else if (type === 'rotate') {
+                element.textContent = '°';
+            }
+            else if (type === 'scale') {
+                element.textContent = '%';
+            }
+        });
+    }
+}
+function onModelControlInput(event) {
+    //@ts-expect-error
+    const value = event.target.value;
+    if (!value) {
+        return;
+    }
+    const decimalIndex = value.indexOf('.');
+    if (decimalIndex !== -1) {
+        const decimalPlaces = value.substring(decimalIndex + 1).length;
+        if (decimalPlaces >= 4) {
+            // Prevent additional input if there are already 3 or more decimal places
+            //@ts-expect-error
+            event.target.value = value.slice(0, -1);
+        }
+    }
+}
+export function handleModelControlInputs() {
+    log.info("handleModelControlInputs()");
+    if (!inputX) {
+        inputX = document.getElementById('at-input-x');
+    }
+    if (!inputY) {
+        inputY = document.getElementById('at-input-y');
+    }
+    if (!inputZ) {
+        inputZ = document.getElementById('at-input-z');
+    }
+    if (isInputEventListenerSet) {
+        return;
+    }
+    inputX.addEventListener('input', onModelControlInput);
+    inputY.addEventListener('input', onModelControlInput);
+    inputZ.addEventListener('input', onModelControlInput);
+}

package/lib/atwinui/events.js

@@ -16,7 +16,7 @@ import { initFormData } from "./components/toolbar/tagFormPane";
 import { renderObjectList } from "./components/toolbar/objectListPane";
 import { renderLibraryList } from "./components/toolbar/libraryPane";
 import { renderObjectCard } from "./components/toolbar/card";
-import { toggleModelControl, getCoordinateValues, showCurrentCoordinateValue } from "./components/toolbar/modelControlsPane";
+import { toggleModelControl, getCoordinateValues, showCurrentCoordinateValue, handleModelControlInputs } from "./components/toolbar/modelControlsPane";
 import { attachTagMedia } from "../tag";
 import i18n from './components/toolbar/i18n';
 import { isValidUrl } from "../utils";
@@ -191,6 +191,7 @@ function setupIndividualEventListeners() {
     // handleToggleDropdown()
     handleCloseModelControls();
     handleConfirmTransform();
+    handleModelControlInputs();
 }
 //================ OBJECT EVENT HANDLERS ===============//
 function handleTranslateObject() {

package/lib/convert.d.ts

@@ -1,11 +1,6 @@
-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(config?: {
-    length?: number;
-    separator?: string;
-}): string;
-export declare function generateRandomUsername(): string;
+export declare function generateUUID(): string;
 export declare function useHexToRgb(hexcode: string): {
     r: number;
     g: number;
@@ -16,11 +11,3 @@ 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,6 +1,3 @@
-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));
@@ -16,7 +13,7 @@ export function generateRandomUniqueNumber(currentIds) {
     } while (currentIds.indexOf(randomNumber) !== -1);
     return randomNumber;
 }
-export function generateUUID(config) {
+export function generateUUID() {
     const cryptoObj = window.crypto;
     if (!cryptoObj) {
         console.error('crypto.getRandomValues() is not supported in this browser.');
@@ -32,42 +29,16 @@ export function generateUUID(config) {
         }
         hex.push(val);
     }
-    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;
+    // 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]}`;
 }
 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) / 255;
-    const g = parseInt(hexcode.substring(2, 4), 16) / 255;
-    const b = parseInt(hexcode.substring(4, 6), 16) / 255;
+    const r = parseInt(hexcode.substring(0, 2), 16);
+    const g = parseInt(hexcode.substring(2, 4), 16);
+    const b = parseInt(hexcode.substring(4, 6), 16);
     return { r, g, b };
 }
 export function useRgbToHex(color) {
@@ -81,31 +52,3 @@ 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/package.json

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

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

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

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

@@ -1,35 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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/pre_deploy.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-#    -o option
-#          This  option  is  supported if the system supports the User Portability Utilities op‐
-#          tion. It shall set various options, many of which shall be equivalent to  the  single
-#          option letters. The following values of option shall be supported:
-
-#          allexport Equivalent to -a.
-
-# === to support environment files ===
-
-# Load nvm
-export NVM_DIR="$HOME/.nvm"
-# This loads nvm
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-# This loads nvm bash_completion
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-
-set -a            
-. .env.local
-set +a
-
-export ROOT=`pwd`
-export HOME=/home/$USER
-
-# latest TAG
-export TAG_LATEST=$(git tag | tail -n1 | cut -f1)
-# use export TAG=<v#.#.#_rc###> to set TAG, otherwise use latest
-if [ -z "$TAG" ]; then
-    export TAG=$TAG_LATEST
-fi
-
-echo "\n=> TAG to publish...$TAG"
-# Pause the script
-# read -p "Press Enter to continue..."
-
-echo "\n=> Force PUSH TAGS to Origin..."
-git push -f --tags -v
-
-echo "\n=> Locally, checkout deployment TAG and build..."
-git checkout $TAG
-
-echo "\n=> Building..."
-npm run build
-
-# We must clear temp TAG!!!
-echo "\n Cleaning up environment..."
-export TAG=