@needle-tools/engine 3.2.3-alpha → 3.2.4-alpha.1

package/src/engine-components/api.ts

@@ -1 +1,4 @@
+export { Behaviour, Component, GameObject } from "./Component"
+export * from "./codegen/components";
+export * from "./js-extensions/Object3D";
 export * from "./ui/PointerEvents"

package/src/engine-components/ui/Utils.ts

@@ -1,10 +1,10 @@
 
-import { FrontSide, DoubleSide, BackSide, TetrahedronGeometry } from "three"
+import { FrontSide, DoubleSide, Object3D } from "three"
 import { FrameEvent } from "../../engine/engine_setup";
 import { Behaviour } from "../Component";
 import { $shadowDomOwner, BaseUIComponent } from "./BaseUIComponent";
 
-export function tryGetUIComponent(obj: THREE.Object3D): BaseUIComponent | null {
+export function tryGetUIComponent(obj: Object3D): BaseUIComponent | null {
     const owner = obj[$shadowDomOwner];
     if (owner) {
         return owner;
@@ -15,7 +15,7 @@ export function tryGetUIComponent(obj: THREE.Object3D): BaseUIComponent | null {
     return null;
 }
 
-export function isUIObject(obj: THREE.Object3D) {
+export function isUIObject(obj: Object3D) {
     return obj["isUI"] === true || typeof obj[$shadowDomOwner] === "object";
 }
 
@@ -27,7 +27,7 @@ export type RenderSettings = {
     receiveShadows?: boolean;
 }
 
-export function updateRenderSettings(shadowComponent: THREE.Object3D, settings: RenderSettings) {
+export function updateRenderSettings(shadowComponent: Object3D, settings: RenderSettings) {
     if (!shadowComponent) return;
     // const owner = shadowComponent[$shadowDomOwner];
     // if (!owner)

package/src/engine-components-experimental/api.ts

@@ -0,0 +1 @@
+export * from "./networking/PlayerSync";

package/src/engine-components-experimental/networking/PlayerSync.ts

@@ -3,11 +3,12 @@ import { AssetReference } from "../../engine/engine_addressables";
 import { serializable } from "../../engine/engine_serialization_decorator";
 import { syncField } from "../../engine/engine_networking_auto"
 import { RoomEvents } from "../../engine/engine_networking";
-import { Object3D } from "three";
 import { syncDestroy } from "../../engine/engine_networking_instantiate";
-import { Vector3 } from "three";
+import { getParam } from "../../engine/engine_utils";
 
+import { Object3D } from "three";
 
+const debug = getParam("debugplayersync");
 
 export class PlayerSync extends Behaviour {
     @serializable(AssetReference)
@@ -28,12 +29,20 @@ export class PlayerSync extends Behaviour {
     }
 
     private async onUserJoined(_model) {
+        if (debug) console.log("PlayerSync.onUserJoined", _model);
         const instance = await this.asset?.instantiateSynced({ parent: this.gameObject }, true);
         if (instance) {
-            let pl = GameObject.getComponent(instance as Object3D, PlayerState);
+            let pl = GameObject.getComponent(instance, PlayerState);
             if (pl) {
                 pl.owner = this.context.connection.connectionId!;
             }
+            else {
+                console.error("<strong>Failed finding PlayerState on " + this.asset?.uri + "</strong>: please make sure the asset has a PlayerState component!");
+                GameObject.destroySynced(instance);
+            }
+        }
+        else{
+            console.warn("PlayerSync: failed instantiating asset!")
         }
 
         // TODO: previously created instances are not re-created when re-joining room
@@ -87,7 +96,7 @@ export class PlayerState extends Behaviour {
     }
 
     //** use to check if a component or gameobject is part of a instance owned by the local player */
-    static isLocalPlayer(obj: THREE.Object3D | Component): boolean {
+    static isLocalPlayer(obj: Object3D | Component): boolean {
         if (obj instanceof Object3D) {
             const state = GameObject.getComponentInParent(obj, PlayerState);
             return state?.isLocalPlayer ?? false;
@@ -129,6 +138,8 @@ export class PlayerState extends Behaviour {
     }
 
     private onOwnerChange(newOwner: string, oldOwner: string) {
+        if (debug) console.log("PlayerSync.onOwnerChange", this, "newOwner", newOwner, "oldOwner", oldOwner);
+
         // Remove from local owner array if it was local before
         const index = PlayerState._local.indexOf(this);
         if (index >= 0) PlayerState._local.splice(index, 1);
@@ -154,6 +165,7 @@ export class PlayerState extends Behaviour {
 
     awake(): void {
         PlayerState.all.push(this);
+        if(debug) console.log("Registered new PlayerState", this, PlayerState.all.length-1, PlayerState.all)
 
         this.context.connection.beginListen(RoomEvents.UserLeftRoom, (model: { userId: string }) => {
             // console.log("USER LEFT", model.userId)
@@ -177,6 +189,7 @@ export class PlayerState extends Behaviour {
 
     /** this tells the server that this client has been destroyed and the networking message for the instantiate will be removed */
     doDestroy() {
+        if (debug) console.log("PlayerSync.doDestroy → syncDestroy", this);
         syncDestroy(this.gameObject, this.context.connection);
     }
 

package/src/needle-engine.ts

@@ -3,22 +3,18 @@ makeErrorsVisibleForDevelopment();
 
 import "./engine/engine_element";
 import "./engine/engine_setup";
-
 import "./engine-components/CameraUtils"
 
-
-export { GameObject, Behaviour } from "./engine-components/Component";
-export { serializable, serializeable } from "./engine/engine_serialization_decorator";
-export { Collision } from "./engine/engine_types";
 export * from "./engine/api";
 export * from "./engine-components/api";
-export * from "./engine-components/codegen/components";
-export * from "./engine-components/js-extensions/Object3D";
-
+export * from "./engine-components-experimental/api";
 
 // make accessible for external javascript
 import { Context } from "./engine/engine_setup";
 const Needle = { Context: Context };
+if (globalThis["Needle"] !== undefined) {
+    console.warn("Needle Engine is already imported");
+}
 globalThis["Needle"] = Needle;
 function registerGlobal(obj: object) {
     for (const key in obj) {
@@ -47,7 +43,7 @@ for (const method of Object.getOwnPropertyNames(GameObject)) {
 
 // make three accessible
 import * as THREE from "three";
-if(!globalThis["THREE"]) {
+if (!globalThis["THREE"]) {
     globalThis["THREE"] = THREE;
 }
 else console.warn("Threejs is already imported");