cleanup

Author: Pamavoc

classes/Animations.ts

@@ -1,20 +1,14 @@
 import { getProject, types as t } from '@theatre/core'
 import { ObjectType } from '@/classes/interfaces/ObjectType';
-
-//import studio from '@theatre/studio';
 import gsap from 'gsap'
 
 
 export default class Animations {
 
-  webgl: any
   vector3D: any
 
-  constructor(webgl) {
-
-    this.webgl = webgl
-
-    
+  constructor() {
+  
     const nudgableNumber = (defaultValue) => t.number(defaultValue, { nudgeMultiplier: 0.01 });
 
     this.vector3D = {
@@ -26,7 +20,7 @@ export default class Animations {
     if(window.location.pathname === "/studio") {
 
       import('@theatre/studio').then(studio => {
-        studio.default.initialize() //.initialize()  
+        studio.default.initialize() 
       });
 
 
@@ -119,11 +113,11 @@ export default class Animations {
     return sheet;
   }
 
-  createIntroduction() {
+  createIntroduction(camera) {
     const project = this.createProject('Introduction')
     const sheet = this.createSheet(project, 'Camera Animation', '/sounds/initialisation.mp3')
 
-    this.createTheatreObject(sheet, "camera", this.webgl.camera.instance, {
+    this.createTheatreObject(sheet, "camera", camera.instance, {
 
         transforms: {
           position: this.vector3D,

classes/Audio.ts

@@ -1,7 +1,6 @@
 import { Howl, Howler } from 'howler';
 
 
-
 export default class Audio {
 	sounds: any
 

classes/Raycaster.ts

@@ -9,15 +9,14 @@ export default class Raycaster {
     raycaster: THREE.Raycaster
     mouse: THREE.Vector2
     objects: any
-    anims: Animations
     currentIntersect: any
 
     constructor(scene: THREE.Scene, camera: THREE.PerspectiveCamera, renderer: THREE.WebGLRenderer) {
 
         this.scene = scene
         this.renderer = renderer
         this.camera = camera
-        this.anims = new Animations()
+       
 
 
         this.mouse = new THREE.Vector2()

classes/Smoke.ts

@@ -8,9 +8,11 @@ import Scene from '@/classes/Scene';
 import Materials from '@/classes/Materials';
 import useAudio from '@/composables/useAudio';
 import useAnimations from '@/composables/useAnimations';
-import Animations from '@/classes/Animations';
+import CameraManager from '@/classes/managers/CameraManager'
+
 
 export default class WebGL {
+  cameraManager: CameraManager
   scene: THREE.Scene;
   camera: THREE.PerspectiveCamera;
   renderer: Renderer;
@@ -26,7 +28,6 @@ export default class WebGL {
   params: ObjectType;
 
 
-
   raycast: Raycaster;
   emitter: any;
 
@@ -52,7 +53,10 @@ export default class WebGL {
     this.renderer = new Renderer(this.width, this.height);
     this.scene = new Scene(this);
 
-    this.animations = new Animations(this)
+
+    // MANAGERS
+    this.cameraManager = new CameraManager({ webgl: this})
+    this.animations = useAnimations()
 
 
     this.raycast = new Raycaster(
@@ -76,7 +80,7 @@ export default class WebGL {
       // const cube = this.scene.instance.getObjectByProperty('name', 'cube-base');
       // console.log(cube)
 
-      this.animations.createIntroduction()
+      this.animations.createIntroduction(this.camera)
 
       // this.animations.start(this.camera.instance, target)
 

classes/WebGL.ts

@@ -1,8 +1,7 @@
 import * as THREE from 'three';
 import useDebug from "@/composables/useDebug";
-import { lerp } from "three/src/math/MathUtils";
 
-export default class Cameras {
+export default class CameraManager {
 	webgl:any
 	scene:any
 	cameras: any
@@ -15,15 +14,14 @@ export default class Cameras {
 
 	setCam(camera) {
 
-		if(this.currentCamera) this.scene.remove(this.currentCamera.instance)
+		if(this.currentCamera) this.scene.instance.remove(this.currentCamera.instance)
 
 		this.currentCamera = camera
-		this.scene.add(this.currentCamera.instance)
+		this.scene.instance.add(this.currentCamera.instance)
     }
 
 	resize() {
 		this.currentCamera.resize(this.currentCamera);
-		// this.mainCamera.resize();
 	}