-
Notifications
You must be signed in to change notification settings - Fork 706
Add music to main menu + moving backround on main menu #2301
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
icslucas
wants to merge
15
commits into
main
Choose a base branch
from
bettermusic
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
010688e
commit
icslucas d20bda6
Merge branch 'main' into bettermusic
icslucas f16b481
prettier
icslucas 7bb99cc
Update pre-commit hook to use npx for lint-stagedfix weird bug
icslucas 7228e6c
Update UserSettings.ts
icslucas e8f0324
add new tracks
icslucas 8d0fedd
Update pre-commit hook to use npx for lint-staged
icslucas 531f36d
Update SoundManager.ts
icslucas ee0ba43
Merge branch 'main' into bettermusic
icslucas 2f7a0b9
Merge branch 'main' into bettermusic
icslucas ea16997
Merge branch 'main' into bettermusic
evanpelle 65c58e7
Merge branch 'main' into bettermusic
ryanbarlow97 ec7be09
Merge branch 'main' into bettermusic
ryanbarlow97 d8bb2dc
Merge branch 'main' into bettermusic
ryanbarlow97 4d702f6
Merge branch 'main' into bettermusic
ryanbarlow97 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is unrelated to the background music, can you put it in another PR? Looks good though |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import { Howl } from "howler"; | ||
| import ironHorizon from "../../../proprietary/sounds/music/iron-horizon.mp3"; | ||
| import preludeToWar from "../../../proprietary/sounds/music/prelude-to-war.mp3"; | ||
| import worldDivided from "../../../proprietary/sounds/music/world-divided.mp3"; | ||
|
|
||
| class MenuSoundManager { | ||
| private backgroundMusic: Howl[] = []; | ||
| private currentTrack: number = 0; | ||
| private backgroundMusicVolume: number = 0; | ||
|
|
||
| constructor() { | ||
| this.backgroundMusic = [ | ||
| new Howl({ | ||
| src: [ironHorizon], | ||
| loop: false, | ||
| onend: this.playNext.bind(this), | ||
| volume: 0, | ||
| }), | ||
| new Howl({ | ||
| src: [worldDivided], | ||
| loop: false, | ||
| onend: this.playNext.bind(this), | ||
| volume: 0, | ||
| }), | ||
| new Howl({ | ||
| src: [preludeToWar], | ||
| loop: false, | ||
| onend: this.playNext.bind(this), | ||
| volume: 0, | ||
| }), | ||
| ]; | ||
| } | ||
|
|
||
| public playBackgroundMusic(): void { | ||
| if ( | ||
| this.backgroundMusic.length > 0 && | ||
| !this.backgroundMusic[this.currentTrack].playing() | ||
| ) { | ||
| this.backgroundMusic[this.currentTrack].play(); | ||
| } | ||
| } | ||
|
|
||
| public stopBackgroundMusic(): void { | ||
| if (this.backgroundMusic.length > 0) { | ||
| this.backgroundMusic[this.currentTrack].stop(); | ||
| } | ||
| } | ||
|
|
||
| public setBackgroundMusicVolume(volume: number): void { | ||
| this.backgroundMusicVolume = Math.max(0, Math.min(1, volume)); | ||
| this.backgroundMusic.forEach((track) => { | ||
| track.volume(this.backgroundMusicVolume); | ||
| }); | ||
| } | ||
|
|
||
| private playNext(): void { | ||
| this.currentTrack = (this.currentTrack + 1) % this.backgroundMusic.length; | ||
| this.playBackgroundMusic(); | ||
| } | ||
| } | ||
|
|
||
| export default new MenuSoundManager(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
don't we already have a music setting?