@needle-tools/engine 2.35.3-pre → 2.35.5-pre

package/src/engine-components/WebXRController.ts

@@ -13,7 +13,7 @@ import * as utils from "../engine/engine_three_utils"
 import { Interactable, UsageMarker } from "./Interactable";
 import { InstancingUtil } from "../engine/engine_instancing";
 import { Rigidbody } from "./RigidBody";
-import { delay, getParam } from "../engine/engine_utils";
+import { delay, getParam, getPath } from "../engine/engine_utils";
 import { UIRaycastUtils } from "./ui/RaycastUtils";
 import { RaycastResult } from "cannon-es";
 
@@ -79,7 +79,9 @@ export class WebXRController extends Behaviour {
         ctrl.controllerGrip.add(ctrl.controllerModel);
 
         ctrl.hand = context.renderer.xr.getHand(index);
-        ctrl.hand.add(new OculusHandModel(ctrl.hand));
+        const hand = new OculusHandModel(ctrl.hand);
+        hand["path"] = "/" + getPath(owner.sourceId, "/assets/");
+        ctrl.hand.add(hand);
         ctrl.hand.traverse(x => x.layers.set(2));
 
         ctrl.handPointerModel = new OculusHandPointerModel(ctrl.hand, ctrl.controller);
@@ -800,6 +802,8 @@ export class AttachedObject {
                 console.warn("Prevented taking object that is not interactable", candidate);
             return null;
         }
+        else candidate = interactable.gameObject;
+        
 
         let objectToAttach = candidate;
         const sync = GameObject.getComponentInParent(candidate, SyncedTransform);

package/src/engine-components/js-extensions/ExtensionUtils.ts

@@ -20,7 +20,7 @@ export function applyPrototypeExtensions<T>(obj: any, prototype : Constructor<T>
 }
 
 export function registerPrototypeExtensions<T>(type: Constructor<T>) {
-    console.log("Register", type.prototype.constructor.name);
+    // console.log("Register", type.prototype.constructor.name);
     const handler = createPrototypeExtensionHandler(type.prototype);
     handlers.set(type, handler);
 }

package/lib/engine/debug/error_overlay.d.ts

@@ -1 +0,0 @@
-export declare function makeErrorsVisibleForDevelopment(): void;

package/lib/engine/debug/error_overlay.js

@@ -1,114 +0,0 @@
-import { getParam } from "../engine_utils";
-import { isLocalNetwork } from "../engine_networking_utils";
-import { Context } from "../engine_setup";
-import { arContainerClassName } from "../engine_element_overlay";
-const debug = getParam("debugdebug");
-const hide = getParam("noerrors");
-const errorContainer = new Map();
-const locationRegex = new RegExp("    at .+\/(.+?\.ts)", "g");
-var LogType;
-(function (LogType) {
-    LogType[LogType["Log"] = 0] = "Log";
-    LogType[LogType["Warn"] = 1] = "Warn";
-    LogType[LogType["Error"] = 2] = "Error";
-})(LogType || (LogType = {}));
-export function makeErrorsVisibleForDevelopment() {
-    if (hide)
-        return;
-    if (isLocalNetwork()) {
-        if (debug)
-            console.log(window.location.hostname);
-        const error = console.error;
-        console.error = (...args) => {
-            error.apply(console, args);
-            handleLog(LogType.Error, args, null, null);
-        };
-        window.addEventListener("error", (event) => {
-            if (!event)
-                return;
-            handleLog(LogType.Error, event.error, event.filename, event.lineno);
-        });
-    }
-}
-function handleLog(type, message, _file, _line) {
-    const context = Context.Current;
-    if (type === LogType.Error) {
-        const domElement = context?.domElement ?? document.querySelector("needle-engine");
-        if (!domElement)
-            return;
-        if (Array.isArray(message)) {
-            message = message.join(" ");
-        }
-        appendErrorMessageToDomElement(domElement, message);
-    }
-}
-function getLocation(err) {
-    const location = err.stack;
-    console.log(location);
-    if (location) {
-        locationRegex.exec(location);
-        const match = locationRegex.exec(location);
-        return match ? match[1] : "";
-    }
-    return "";
-}
-function getErrorContainer(domElement) {
-    if (errorContainer.has(domElement)) {
-        return errorContainer.get(domElement);
-    }
-    else {
-        const container = document.createElement("div");
-        container.classList.add(arContainerClassName);
-        container.classList.add("desktop");
-        container.style.position = "absolute";
-        container.style.top = "0";
-        container.style.left = "0";
-        container.style.margin = "5px";
-        container.style.width = "calc(100% - 10px)";
-        container.style.zIndex = "1000";
-        container.style.pointerEvents = "none";
-        container.style.display = "flex";
-        container.style.alignItems = "end";
-        container.style.flexDirection = "column";
-        container.style.color = "white";
-        container.style.overflow = "auto";
-        domElement.appendChild(container);
-        errorContainer.set(domElement, container);
-        return container;
-    }
-}
-function appendErrorMessageToDomElement(element, msg, location) {
-    const container = getErrorContainer(element);
-    if (container.childElementCount >= 5) {
-        return;
-    }
-    const errorElement = document.createElement("div");
-    container.appendChild(errorElement);
-    errorElement.style.display = "flex";
-    errorElement.style.alignItems = "start";
-    errorElement.style.flexDirection = "row";
-    // errorElement.style.justifyContent = "space-between";
-    // errorElement.style.width = "100%";
-    errorElement.style.padding = ".2em";
-    errorElement.style.backgroundColor = "rgba(0,0,0,1)";
-    errorElement.style.marginBottom = "2px";
-    errorElement.style.borderRadius = "8px";
-    errorElement.style.color = "#ff5555";
-    errorElement.style.fontWeight = "bold";
-    errorElement.title = "Open developer console to debug";
-    errorElement.style.pointerEvents = "all";
-    errorElement.style.userSelect = "text";
-    const messageElement = document.createElement("div");
-    const locationElement = document.createElement("div");
-    errorElement.appendChild(messageElement);
-    errorElement.appendChild(locationElement);
-    if (msg.length > 200) {
-        msg = msg.substring(0, 200) + "...";
-    }
-    messageElement.innerText = msg; // "Javascript error: please open the browser developer console to debug";// + msg;
-    locationElement.innerText = location || "";
-    setTimeout(() => {
-        container.removeChild(errorElement);
-    }, 10000);
-}
-//# sourceMappingURL=error_overlay.js.map

package/lib/engine/debug/error_overlay.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error_overlay.js","sourceRoot":"","sources":["../../../../engine/debug/error_overlay.ts"],"names":[],"mappings":"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"}

package/src/engine/debug/error_overlay.ts

@@ -1,126 +0,0 @@
-import { getParam } from "../engine_utils";
-import { isLocalNetwork } from "../engine_networking_utils";
-import { Context } from "../engine_setup";
-import { arContainerClassName } from "../engine_element_overlay";
-
-const debug = getParam("debugdebug");
-const hide = getParam("noerrors");
-
-const errorContainer: Map<HTMLElement, HTMLElement> = new Map();
-const locationRegex = new RegExp("    at .+\/(.+?\.ts)", "g");
-
-enum LogType {
-    Log,
-    Warn,
-    Error
-}
-
-export function makeErrorsVisibleForDevelopment() {
-    if (hide) return;
-    if (isLocalNetwork()) {
-        if (debug)
-            console.log(window.location.hostname);
-        const error = console.error;
-        console.error = (...args: any[]) => {
-            error.apply(console, args);
-            handleLog(LogType.Error, args, null, null);
-        };
-
-        window.addEventListener("error", (event) => {
-            if (!event) return;
-            handleLog(LogType.Error, event.error, event.filename, event.lineno);
-        });
-    }
-}
-
-
-
-function handleLog(type: LogType, message: string | any[], _file: string | null, _line: number | null) {
-
-    const context = Context.Current;
-    if (type === LogType.Error) {
-        const domElement = context?.domElement ?? document.querySelector("needle-engine");
-        if(!domElement) return;
-        if (Array.isArray(message)) {
-            message = message.join(" ");
-        }
-        appendErrorMessageToDomElement(domElement, message);
-    }
-}
-
-
-
-function getLocation(err: Error): string {
-    const location = err.stack;
-    console.log(location);
-    if (location) {
-        locationRegex.exec(location);
-        const match = locationRegex.exec(location);
-        return match ? match[1] : "";
-    }
-    return "";
-}
-
-
-
-function getErrorContainer(domElement: HTMLElement): HTMLElement {
-    if (errorContainer.has(domElement)) {
-        return errorContainer.get(domElement)!;
-    } else {
-        const container = document.createElement("div");
-        container.classList.add(arContainerClassName);
-        container.classList.add("desktop");
-        container.style.position = "absolute";
-        container.style.top = "0";
-        container.style.left = "0";
-        container.style.margin = "5px";
-        container.style.width = "calc(100% - 10px)";
-        container.style.zIndex = "1000";
-        container.style.pointerEvents = "none";
-        container.style.display = "flex";
-        container.style.alignItems = "end";
-        container.style.flexDirection = "column";
-        container.style.color = "white";
-        container.style.overflow = "auto";
-        domElement.appendChild(container);
-        errorContainer.set(domElement, container);
-        return container;
-    }
-}
-
-
-function appendErrorMessageToDomElement(element: HTMLElement, msg: string, location?: string) {
-    const container = getErrorContainer(element);
-    if (container.childElementCount >= 5) {
-        return;
-    }
-    const errorElement = document.createElement("div");
-    container.appendChild(errorElement);
-    errorElement.style.display = "flex";
-    errorElement.style.alignItems = "start";
-    errorElement.style.flexDirection = "row";
-    // errorElement.style.justifyContent = "space-between";
-    // errorElement.style.width = "100%";
-    errorElement.style.padding = ".2em";
-    errorElement.style.backgroundColor = "rgba(0,0,0,1)";
-    errorElement.style.marginBottom = "2px";
-    errorElement.style.borderRadius = "8px";
-    errorElement.style.color = "#ff5555";
-    errorElement.style.fontWeight = "bold";
-    errorElement.title = "Open developer console to debug";
-    errorElement.style.pointerEvents = "all";
-    errorElement.style.userSelect = "text";
-
-    const messageElement = document.createElement("div");
-    const locationElement = document.createElement("div");
-    errorElement.appendChild(messageElement);
-    errorElement.appendChild(locationElement);
-    if (msg.length > 200) {
-        msg = msg.substring(0, 200) + "...";
-    }
-    messageElement.innerText = msg;// "Javascript error: please open the browser developer console to debug";// + msg;
-    locationElement.innerText = location || "";
-    setTimeout(() => {
-        container.removeChild(errorElement);
-    }, 10000);
-}