Skip to content

Commit

Permalink
remove control room
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdaniculae committed Nov 6, 2024
1 parent 6324191 commit 3875110
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 102 deletions.
2 changes: 1 addition & 1 deletion src/Experience/Experience.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions src/Experience/Extras/Video.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 11 additions & 14 deletions src/Experience/World/World.js → src/Experience/World.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -46,7 +45,6 @@ export default class World {
this.setCategories()

// Setup
this.controlRoom = new ControlRoom()
this.audio = new Audio()
})

Expand Down Expand Up @@ -1113,7 +1111,6 @@ export default class World {
instance.program.video.defocus()
}

instance.controlRoom.irisTextureTransition()
instance.audio.stopAllTaskDescriptions()
instance.audio.changeBgMusic()

Expand Down
85 changes: 0 additions & 85 deletions src/Experience/World/ControlRoom.js

This file was deleted.

0 comments on commit 3875110

Please sign in to comment.