Skip to content

Update scene loading to use Game.ChangeScene #9

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.

Sign up for GitHub

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
Nolankicks wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update scene loading to use Game.ChangeScene #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/GameSystem/GameSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ protected override void OnFixedUpdate()
{
Log.Info( $"Map {selectedMap.ResourceName} won the vote" );

Scene.Load( selectedMap.Scene );
var sceneLoadingOptions = new SceneLoadingOptions();
sceneLoadingOptions.SetScene( selectedMap.Scene );
Game.ChangeScene( sceneLoadingOptions );
}
}
}
Expand Down
17 changes: 10 additions & 7 deletions code/MapSystem/MapGameObjectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,21 +140,24 @@ public static void StartGame()

GameSystem.SavedGameMode = CurrentGamemode;

Game.ActiveScene.Load( CurrentMap.Scene );
var sceneLoadingOptions = new SceneLoadingOptions();
sceneLoadingOptions.SetScene( CurrentMap.Scene );
Game.ChangeScene( sceneLoadingOptions );
}

public void LoadAdditiveScene( SceneFile mainScene, SceneFile additiveScene )
{
if ( Scene.IsEditor )
return;

Scene.Load( mainScene );
var mainSceneOptions = new SceneLoadingOptions();
mainSceneOptions.SetScene( mainScene );
Game.ChangeScene( mainSceneOptions );

var slo = new SceneLoadOptions();
slo.IsAdditive = true;
slo.SetScene( additiveScene );

Scene.Load( slo );
var additiveSceneOptions = new SceneLoadingOptions();
additiveSceneOptions.IsAdditive = true;
additiveSceneOptions.SetScene( additiveScene );
Game.ChangeScene( additiveSceneOptions );
}
}

Expand Down