@needle-tools/engine 2.33.0-pre → 2.35.0-pre

package/src/engine-components/Camera.ts

@@ -1,11 +1,12 @@
 import { Behaviour, GameObject } from "./Component";
 import * as THREE from "three";
-import { OrbitControls } from "./OrbitControls";
+// import { OrbitControls } from "./OrbitControls";
 import { getParam } from "../engine/engine_utils";
 import { serializeable } from "../engine/engine_serialization_decorator";
 import { RGBAColor } from "./js-extensions/RGBAColor";
 import { PerspectiveCamera } from "three";
 import { XRSessionMode } from "../engine/engine_setup";
+import { ICamera } from "../engine/engine_types"
 
 export enum ClearFlags {
     Skybox = 1,
@@ -15,7 +16,8 @@ export enum ClearFlags {
 
 const debug = getParam("debugcam");
 
-export class Camera extends Behaviour {
+export class Camera extends Behaviour implements ICamera {
+
 
     get aspect(): number {
         if (this._cam instanceof PerspectiveCamera) return this._cam.aspect;
@@ -104,6 +106,12 @@ export class Camera extends Behaviour {
         return this._cam!;
     }
 
+
+    // constructor(){
+    //     super();
+    //     console.log(this);
+    // }
+
     awake() {
         if (!this.sourceId) {
             console.warn("Camera has no source - the camera should be exported inside a gltf", this.name);
@@ -239,15 +247,4 @@ class CameraSkybox {
         }
     }
 
-}
-
-export function createCameraWithOrbitControl(scene: THREE.Scene): Camera {
-    const srcId = "created/implictly";
-    const go = new THREE.Object3D();
-    scene.add(go);
-    const cam = GameObject.addNewComponent(go, Camera, false);
-    cam.sourceId = srcId;
-    const orbit = GameObject.addNewComponent(go, OrbitControls, false);
-    orbit.sourceId = srcId;
-    return cam;
 }

package/src/engine-components/CameraUtils.ts

@@ -0,0 +1,15 @@
+import { OrbitControls } from "./OrbitControls";
+import { Camera } from "./Camera";
+import { addNewComponentInstance } from "../engine/engine_components";
+import { Object3D, Scene } from "three";
+
+export function createCameraWithOrbitControl(scene: Scene): Camera {
+    const srcId = "created/implictly";
+    const go = new Object3D();
+    scene.add(go);
+    const cam = addNewComponentInstance(go, new Camera(), false);
+    cam.sourceId = srcId;
+    const orbit = addNewComponentInstance(go, new OrbitControls(), false);
+    orbit.sourceId = srcId;
+    return cam as Camera;
+}

package/src/engine-components/Collider.ts

@@ -17,6 +17,11 @@ export class Collider extends Behaviour {
         this._shape = null;
     }
 
+    start(){
+        if (!this.attachedRigidbody)
+            this.attachedRigidbody = this.gameObject.getComponentInParent(Rigidbody);
+    }
+
     onEnable() {
         // a rigidbody is not assigned if we export an asset
         if (!this.attachedRigidbody)