From 3875110501b5218553c912aecee7326a2a94ab2e Mon Sep 17 00:00:00 2001 From: Bogdan Niculae <19570442+bogdaniculae@users.noreply.github.com> Date: Wed, 6 Nov 2024 12:21:17 +0200 Subject: [PATCH] remove control room --- src/Experience/Experience.js | 2 +- src/Experience/Extras/Video.js | 2 - src/Experience/{World => }/World.js | 25 ++++----- src/Experience/World/ControlRoom.js | 85 ----------------------------- 4 files changed, 12 insertions(+), 102 deletions(-) rename src/Experience/{World => }/World.js (98%) delete mode 100644 src/Experience/World/ControlRoom.js diff --git a/src/Experience/Experience.js b/src/Experience/Experience.js index 0b1e2bdc..73dfb48f 100644 --- a/src/Experience/Experience.js +++ b/src/Experience/Experience.js @@ -7,7 +7,7 @@ import Resources from './Utils/Resources.js' import MouseMove from './Utils/MouseMove.js' import sources from './Sources.js' import Menu from './Components/Menu.js' -import World from './World/World.js' +import World from './World.js' import FAQ from './Components/FAQ.js' import _gl from './Utils/Globals.js' import _lang from './Utils/Lang.js' diff --git a/src/Experience/Extras/Video.js b/src/Experience/Extras/Video.js index 8b2ecdaa..d2bb2348 100644 --- a/src/Experience/Extras/Video.js +++ b/src/Experience/Extras/Video.js @@ -15,8 +15,6 @@ export default class Video { instance.resources = instance.experience.resources instance.audio = instance.world.audio instance.scene = instance.experience.scene - instance.controlRoom = instance.world.controlRoom - instance.clickableObjects = instance.controlRoom.clickableObjects // Load all videos const chapterId = instance.world.selectedChapter.id diff --git a/src/Experience/World/World.js b/src/Experience/World.js similarity index 98% rename from src/Experience/World/World.js rename to src/Experience/World.js index 3c6fc503..bd9bce36 100644 --- a/src/Experience/World/World.js +++ b/src/Experience/World.js @@ -1,18 +1,17 @@ -import Offline from '../Utils/Offline.js' -import Experience from '../Experience.js' -import ControlRoom from './ControlRoom.js' -import Audio from '../Extras/Audio.js' -import Program from '../Progress/Program.js' -import ProgressBar from '../Components/ProgressBar.js' -import _s from '../Utils/Strings.js' -import _lang from '../Utils/Lang.js' -import _api from '../Utils/Api.js' -import _e from '../Utils/Events.js' -import _appInsights from '../Utils/AppInsights.js' +import Offline from './Utils/Offline.js' +import Experience from './Experience.js' +import Audio from './Extras/Audio.js' +import Program from './Progress/Program.js' +import ProgressBar from './Components/ProgressBar.js' +import _s from './Utils/Strings.js' +import _lang from './Utils/Lang.js' +import _api from './Utils/Api.js' +import _e from './Utils/Events.js' +import _appInsights from './Utils/AppInsights.js' import tippy from 'tippy.js' import 'tippy.js/dist/tippy.css' import 'tippy.js/animations/shift-away.css' -import _gl from '../Utils/Globals.js' +import _gl from './Utils/Globals.js' import isElectron from 'is-electron' let instance = null @@ -46,7 +45,6 @@ export default class World { this.setCategories() // Setup - this.controlRoom = new ControlRoom() this.audio = new Audio() }) @@ -1113,7 +1111,6 @@ export default class World { instance.program.video.defocus() } - instance.controlRoom.irisTextureTransition() instance.audio.stopAllTaskDescriptions() instance.audio.changeBgMusic() diff --git a/src/Experience/World/ControlRoom.js b/src/Experience/World/ControlRoom.js deleted file mode 100644 index c6cc597c..00000000 --- a/src/Experience/World/ControlRoom.js +++ /dev/null @@ -1,85 +0,0 @@ -import * as THREE from 'three'; -import { VideoTexture } from 'three'; -import Experience from '../Experience.js'; -import _e from '../Utils/Events.js'; - -let instance = null; - -export default class ControlRoom { - constructor() { - instance = this; - this.experience = new Experience(); - this.sizes = this.experience.sizes; - this.scene = this.experience.scene; - this.canvas = this.experience.canvas; - this.resources = this.experience.resources; - this.pointer = this.experience.pointer; - this.time = this.experience.time; - this.world = this.experience.world; - - this.clickableObjects = []; - this.screenObjects = []; - this.roomTexture = []; - - this.currentIntersect = null; - this.texture = null; - - // Setup - this.resourceItems = this.resources.items.controlRoom; - - // Events - this.setEventListeners(); - } - - setEventListeners() { - document.addEventListener( - _e.ACTIONS.STEP_TOGGLED, - this.irisTextureTransition, - ); - - window.addEventListener('click', () => { - if (!this.experience.world.program) return; - }); - } - - irisTextureTransition() { - instance.stopAllCustomIrisTextures(); - } - - // Set textures - setTexture(meshName, texture) { - if (!texture) return; - - this.texture = texture; - this.changeMeshTexture(meshName, this.texture); - this.playIfVideoTexture(); - } - - changeMeshTexture(name, texture) { - let mesh = this.screenObjects.filter((obj) => { - return obj.name == name; - }); - if (mesh) { - mesh[0].material.map = texture; - } - } - - updateTextureScreen4x4() {} - - playIfVideoTexture() { - if (this.texture instanceof VideoTexture) { - this.texture.image.play(); - } - } - - stopAllCustomIrisTextures() { - const customIrisTextures = Object.keys( - instance.resources.customTextureItems, - ); - customIrisTextures.forEach((textureName) => { - instance.resources.customTextureItems[ - textureName - ].item?.source.data.pause(); - }); - } -}