-
Notifications
You must be signed in to change notification settings - Fork 14
chore: Multi-scene world - Realm dependant skybox time #7244
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
dalkia
wants to merge
5
commits into
dev
Choose a base branch
from
fix/multi-scene-world-skybox
base: dev
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.
+116
−9
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
67f3c60
realm dependant time
dalkia 73da1bf
Merge branch 'dev' into fix/multi-scene-world-skybox
dalkia e24121f
Update Explorer/Assets/DCL/SkyBox/RealmSkyboxState.cs
dalkia a7b25e7
Comment clarification
dalkia a36e01b
Missing import
dalkia 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
There are no files selected for viewing
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
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
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,73 @@ | ||
| using DCL.Ipfs; | ||
| using DCL.SceneRestrictionBusController.SceneRestriction; | ||
| using DCL.SceneRestrictionBusController.SceneRestrictionBus; | ||
| using ECS; | ||
| using UnityEngine; | ||
|
|
||
| namespace DCL.SkyBox | ||
| { | ||
| /// <summary> | ||
| /// Applies the realm-level fixed skybox hour from the server about response (configurations.skybox.fixedHour). | ||
| /// Takes priority over UIOverride and GlobalTime, but yields to SDK components and scene metadata. | ||
| /// </summary> | ||
| public class RealmSkyboxState : ISkyboxState | ||
| { | ||
| private readonly IRealmData realmData; | ||
| private readonly SkyboxSettingsAsset settings; | ||
| private readonly ISceneRestrictionBusController sceneRestrictionController; | ||
| private readonly InterpolateTimeOfDayState transition; | ||
|
|
||
| public RealmSkyboxState( | ||
| IRealmData realmData, | ||
| SkyboxSettingsAsset settings, | ||
| ISceneRestrictionBusController sceneRestrictionController, | ||
| InterpolateTimeOfDayState transition) | ||
| { | ||
| this.realmData = realmData; | ||
| this.settings = settings; | ||
| this.sceneRestrictionController = sceneRestrictionController; | ||
| this.transition = transition; | ||
| } | ||
|
|
||
| public bool Applies() => | ||
| realmData.Configured && realmData.SkyboxFixedHour.HasValue; | ||
|
|
||
| public void Enter() | ||
| { | ||
| sceneRestrictionController.PushSceneRestriction( | ||
| SceneRestriction.CreateSkyboxTimeUILocked(SceneRestrictionsAction.APPLIED)); | ||
|
|
||
| settings.IsDayCycleEnabled = false; | ||
| settings.TransitionMode = SceneMetadata.TransitionMode.FORWARD; | ||
| ApplyFixedHour(); | ||
| transition.Enter(); | ||
| } | ||
|
|
||
| public void Update(float dt) | ||
| { | ||
| ApplyFixedHour(); | ||
| transition.Update(dt); | ||
| } | ||
|
|
||
| public void Exit() | ||
| { | ||
| sceneRestrictionController.PushSceneRestriction( | ||
| SceneRestriction.CreateSkyboxTimeUILocked(SceneRestrictionsAction.REMOVED)); | ||
|
|
||
| transition.Exit(); | ||
| } | ||
|
|
||
| private void ApplyFixedHour() | ||
| { | ||
| if (!realmData.SkyboxFixedHour.HasValue) | ||
| return; | ||
|
|
||
| float normalizedTime = SkyboxSettingsAsset.NormalizeTime(realmData.SkyboxFixedHour.Value); | ||
dalkia marked this conversation as resolved.
Show resolved
Hide resolved
dalkia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (Mathf.Approximately(settings.TargetTimeOfDayNormalized, normalizedTime)) | ||
| return; | ||
|
|
||
| settings.TargetTimeOfDayNormalized = normalizedTime; | ||
| } | ||
| } | ||
| } | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.