last fixes and remove logs

Author: Sascha Braun

src/v2/components/AssetBundle.ts

@@ -26,15 +26,14 @@ export class AssetBundle extends Mixins(AppComponent) {
   private m_bundle!: BundleHandle;
 
   public mounted() {
-    console.log("mounted asset bundle", this.name);
     this.m_bundle = this.app().assets.bundles.create(this.name);
     this.m_bundle.onLoad.on(this.onLoad);
     this.m_bundle.onUnload.on(this.onUnload);
 
-    //TODO handle preload
+    this.m_bundle.preload = this.preload;
   }
 
-  public beforeDestroy() {
+  public destroyed() {
     this.app().assets.bundles.dispose(this.name);
   }
 
@@ -53,21 +52,11 @@ export class AssetBundle extends Mixins(AppComponent) {
 
     await Vue.nextTick();
     await deps;
-
-    console.log("registered bundle", this.name, this.m_bundle.countAssets());
   }
 
   private async onUnload(): Promise<void> {
     this.m_active = false;
     await Vue.nextTick();
-
-    const assets = this.app().assets;
-    console.log(
-      assets.textures.size(),
-      assets.materials.size(),
-      assets.geometries.size(),
-      assets.models.size()
-    );
   }
 
   private getBundles(pDependencies: string | string[]): BundleHandle[] {

src/v2/components/Axes.ts

@@ -22,7 +22,8 @@ export class Axes extends Mixins(ObjectComponent) {
   }
 
   public async created() {
-    if (!this.scene() && !this.object()) {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    if (!scene && !this.object()) {
       throw new Error(
         "Grid component can only be added as child to an object or mesh component"
       );
@@ -31,14 +32,15 @@ export class Axes extends Mixins(ObjectComponent) {
     this.m_axes = new AxesHelper(this.size);
     this.m_axes.name = this.name;
 
-    const parent = this.object ? this.object() : this.scene();
+    const parent = this.object ? this.object() : scene;
     parent!.add(this.m_axes);
 
     this.m_created = true;
   }
 
-  public beforeDestroy() {
-    const parent = this.object ? this.object() : this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
     parent!.remove(this.m_axes);
   }
 

src/v2/components/Camera.ts

@@ -31,23 +31,34 @@ export class Camera extends Mixins(ObjectComponent) {
 
   public async created() {
     const app = this.app();
+    const sceneHandle = this.scene();
+    const scene = sceneHandle ? this.scene()!.get() : undefined;
+    if (!scene) {
+      throw new Error(
+        "Camera component can only be added as child to an object or scene component"
+      );
+    }
 
     const camera = await this.factory(app);
     camera.name = this.name;
 
-    this.m_camera = app.cameras.create(this.name);
+    this.m_camera = sceneHandle!.cameras.create(this.name);
     this.m_camera.set(camera);
     this.m_camera.onActivate.on(this.onActivate);
     this.m_camera.onDeactivate.on(this.onDeactivate);
 
     this.m_active = true;
 
-    console.log("camera created", this.name);
+    const parent = this.object ? this.object() : scene;
+    parent!.add(this.m_camera.get()!);
   }
 
-  public beforeDestroy() {
-    this.app().cameras.dispose(this.name);
-    console.log("camera disposed", this.name);
+  public destroyed() {
+    const sceneHandle = this.scene();
+    const scene = sceneHandle ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
+    parent!.remove(this.m_camera.get()!);
+    sceneHandle!.cameras.dispose(this.name);
   }
 
   public render(h: any) {

src/v2/components/Fog.ts

@@ -28,12 +28,13 @@ export class Fog extends Mixins(SceneComponent) {
 
   @Watch("exp2")
   public watchExp() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
     if (this.exp2) {
       this.m_fog = new ThreeFogExp2(this.color, this.density);
     } else {
       this.m_fog = new ThreeFog(this.color, this.near, this.far);
     }
-    this.scene()!.fog = this.m_fog;
+    scene!.fog = this.m_fog;
   }
   @Watch("near")
   public watchNear() {
@@ -58,7 +59,7 @@ export class Fog extends Mixins(SceneComponent) {
   private m_fog!: IFog;
 
   public created() {
-    const scene = this.scene();
+    const scene = this.scene() ? this.scene()!.get() : undefined;
     if (!scene) {
       throw new Error(
         "Fog component can only be added as a child to a scene component"
@@ -76,8 +77,8 @@ export class Fog extends Mixins(SceneComponent) {
     scene.fog = this.m_fog;
   }
 
-  public beforeDestroy() {
-    const scene = this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
     scene!.fog = null;
   }
 

src/v2/components/Geometry.ts

@@ -19,7 +19,7 @@ export class Geometry extends Mixins(AssetComponent) {
     this.app().assets.geometries.set(this.name, geometry);
   }
 
-  public async beforeDestroy() {
+  public async destroyed() {
     if (this.bundle()) {
       this.bundle()!.unregisterAsset(this.name);
     }

src/v2/components/Grid.ts

@@ -25,7 +25,8 @@ export class Grid extends Mixins(ObjectComponent) {
   }
 
   public async created() {
-    if (!this.scene() && !this.object()) {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    if (!scene && !this.object()) {
       throw new Error(
         "Grid component can only be added as child to an object or mesh component"
       );
@@ -34,14 +35,15 @@ export class Grid extends Mixins(ObjectComponent) {
     this.m_grid = new THREE.GridHelper(this.size, this.divisions);
     this.m_grid.name = this.name;
 
-    const parent = this.object ? this.object() : this.scene();
+    const parent = this.object ? this.object() : scene;
     parent!.add(this.m_grid);
 
     this.m_created = true;
   }
 
-  public beforeDestroy() {
-    const parent = this.object ? this.object() : this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
     parent!.remove(this.m_grid);
   }
 

src/v2/components/Group.ts

@@ -19,22 +19,24 @@ export class Group extends Mixins(ObjectComponent) {
   }
 
   public async created() {
-    if (!this.scene() && !this.object()) {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    if (!scene && !this.object()) {
       throw new Error(
         "Group component can only be added as child to an object or scene component"
       );
     }
 
     this.m_group = new THREE.Group();
     this.m_group.name = this.name;
-    const parent = this.object ? this.object() : this.scene();
+    const parent = this.object ? this.object() : scene;
     parent!.add(this.m_group);
 
     this.m_created = true;
   }
 
-  public beforeDestroy() {
-    const parent = this.object ? this.object() : this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
     parent!.remove(this.m_group);
   }
 

src/v2/components/Light.ts

@@ -23,22 +23,24 @@ export class Light extends Mixins(ObjectComponent) {
   }
 
   public async created() {
-    if (!this.scene() && !this.object()) {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    if (!scene && !this.object()) {
       throw new Error(
         "Light component can only be added as child to an object or scene component"
       );
     }
 
     this.m_light = await this.factory(this.app());
     this.m_light.name = this.name;
-    const parent = this.object ? this.object() : this.scene();
+    const parent = this.object ? this.object() : scene;
     parent!.add(this.m_light);
 
     this.m_created = true;
   }
 
-  public beforeDestroy() {
-    const parent = this.object ? this.object() : this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
     parent!.remove(this.m_light);
   }
 

src/v2/components/Material.ts

@@ -17,15 +17,13 @@ export class Material extends Mixins(AssetComponent) {
       this.bundle()!.registerAsset(this.name, material);
     }
     this.app().assets.materials.set(this.name, material);
-    console.log("material created", this.name);
   }
 
-  public async beforeDestroy() {
+  public async destroyed() {
     if (this.bundle()) {
       this.bundle()!.unregisterAsset(this.name);
     }
     this.app().assets.materials.dispose(this.name);
-    console.log("material disposed", this.name);
   }
 
   public render(h: any) {

src/v2/components/Mesh.ts

@@ -29,7 +29,8 @@ export class Mesh extends Mixins(ObjectComponent) {
   }
 
   public async created() {
-    if (!this.scene() && !this.object()) {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    if (!scene && !this.object()) {
       throw new Error(
         "Mesh component could not be created: can only be added as child to an object or mesh component"
       );
@@ -50,14 +51,15 @@ export class Mesh extends Mixins(ObjectComponent) {
 
     this.m_mesh.name = this.name;
 
-    const parent = this.object ? this.object() : this.scene();
+    const parent = this.object ? this.object() : scene;
     parent!.add(this.m_mesh);
 
     this.m_created = true;
   }
 
-  public beforeDestroy() {
-    const parent = this.object ? this.object() : this.scene();
+  public destroyed() {
+    const scene = this.scene() ? this.scene()!.get() : undefined;
+    const parent = this.object ? this.object() : scene;
     parent!.remove(this.m_mesh);
   }