code adapting to refactors of RA and minor cleanup

This commit is contained in:
Harrison Deng 2019-01-13 23:17:27 -06:00
parent bfc72917f0
commit 104a759e9f
4 changed files with 5 additions and 4 deletions

View File

@ -55,7 +55,7 @@
<Compile Include="Audio\MusicList.cs" />
<Compile Include="Audio\SupportedFormats.cs" />
<Compile Include="Audio\TransparentSampleProvider.cs" />
<Compile Include="Audio\Visualizer\HorizontalVisualizer.cs" />
<Compile Include="Audio\Visualizer\ReflectedHorizontalVisualizer.cs" />
<Compile Include="Screens\MainMenu\MainPage.cs" />
<Compile Include="Screens\Transitions\FadeAwayTransition.cs" />
<Compile Include="Screens\MainMenu\MainScreen.cs" />

View File

@ -86,7 +86,7 @@ namespace RecrownedAthenaeum
spriteBatch = new SpriteBatch(GraphicsDevice);
Camera = new Camera2D(graphics.GraphicsDevice);
screenManager = new ScreenManager(graphics, Camera);
screenManager.RequireNextScreenEvent += RequireNextScreen;
screenManager.ShowFirstScreenEvent += ShowFirstScreen;
QueueContent();
screenManager.Screen = new LoadingScreen(this, Content.Load<Texture2D>("RhythmBullet"), 0.7f);
}
@ -153,7 +153,7 @@ namespace RecrownedAthenaeum
resizing = true;
assets.UnloadAll();
QueueContent();
screenManager.Resize(new LoadingScreen(this, Content.Load<Texture2D>("loading_ring"), 0.4f));
screenManager.Resize(new LoadingScreen(this, Content.Load<Texture2D>("loading_ring"), 0.4f, true));
SetUpCursor();
}
@ -189,7 +189,7 @@ namespace RecrownedAthenaeum
Mouse.SetCursor(MouseCursor.FromTexture2D(currentCursorTexture, currentCursorTexture.Width / 2, currentCursorTexture.Height / 2));
}
private void RequireNextScreen(Screen Screen)
private void ShowFirstScreen(Screen Screen)
{
Screen.NextScreen = mainScreen;
}

View File

@ -17,6 +17,7 @@ namespace RecrownedAthenaeum.Screens.MainMenu
{
title = new Image(assets.Get<Texture2D>("title"));
AddModule(title);
}
public override void ApplySize(int width, int height)