Transition to .Net Core and VSCode in progress.

This commit is contained in:
2019-05-31 01:32:25 -05:00
parent f7aa272d76
commit 86a4db5973
25 changed files with 593 additions and 506 deletions

View File

@@ -1,13 +1,10 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.Render;
using RecrownedAthenaeum.UI.BookSystem;
using RecrownedAthenaeum.UI.Modular.Modules;
using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
using RecrownedAthenaeum.UI.SkinSystem;
using RecrownedAthenaeum.UI.SkinSystem.Definitions;
using System;
namespace RhythmBullet.Screens.MainMenu
{
@@ -21,7 +18,7 @@ namespace RhythmBullet.Screens.MainMenu
{
}
protected override void Initialize(ContentManagerController assets, ISkin skin)
protected override void Initialize(ContentManagerController assets, ISkin skin, BasicScissor scissorBox)
{
title = new Image(assets.Get<Texture2D>("title"));
AddModule(title);
@@ -33,6 +30,8 @@ namespace RhythmBullet.Screens.MainMenu
quitButton = new TextButton("Quit", font, skin);
AddModule(quitButton);
base.Initialize(assets, skin, scissorBox);
}
public override void ApplySize(int width, int height)
@@ -56,9 +55,11 @@ namespace RhythmBullet.Screens.MainMenu
quitButton.CenterHorizontally();
quitButton.situation.Y = (int)quitButton.origin.Y + playButton.Boundaries.Y + playButton.Boundaries.Height + 15;
base.ApplySize(width, height);
}
public override void Draw(SpriteBatch batch)
public override void Draw(ConsistentSpriteBatch batch)
{
base.Draw(batch);
}

View File

@@ -1,8 +1,8 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.Camera;
using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.Input;
using RecrownedAthenaeum.Render;
using RecrownedAthenaeum.ScreenSystem;
using RecrownedAthenaeum.UI.BookSystem;
using RecrownedAthenaeum.UI.SkinSystem;
@@ -17,22 +17,25 @@ namespace RhythmBullet.Screens.MainMenu
readonly Texture2D background;
readonly Book book;
readonly MainPage mainPage;
Rectangle screenSize;
public MainScreen(ContentManagerController assets, ISkin skin) : base(true)
public MainScreen(ContentManagerController assets, ISkin skin, Camera2D camera) : base(true)
{
this.assets = assets;
background = assets.Get<Texture2D>("backgrounds/mainBG");
fat = new FadeAwayTransition(1.5f);
book = new Book(assets, skin);
book = new Book(assets, skin, camera);
mainPage = new MainPage();
book.AddPages(mainPage);
InputUtilities.InputListeners.Add(book);
}
public override void Initiate(Rectangle screenSize, Camera2D camera)
public override void ApplySize(int width, int height)
{
book.Initiate(camera, screenSize);
base.Initiate(screenSize, camera);
screenSize.Width = width;
screenSize.Height = height;
book.ApplySize(width, height);
base.ApplySize(width, height);
}
public override void Show()
@@ -41,9 +44,9 @@ namespace RhythmBullet.Screens.MainMenu
base.Show();
}
public override void Draw(SpriteBatch spriteBatch)
public override void Draw(ConsistentSpriteBatch spriteBatch)
{
spriteBatch.Draw(background, ScreenSize, Color.White);
spriteBatch.Draw(background, screenSize, Color.White);
book.Draw(spriteBatch);
base.Draw(spriteBatch);
}

View File

@@ -1,5 +1,6 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.Render;
using RecrownedAthenaeum.ScreenSystem;
using System;
@@ -55,7 +56,7 @@ namespace RhythmBullet.Screens.Transitions
return true;
}
public void DrawTransition(SpriteBatch batch)
public void DrawTransition(ConsistentSpriteBatch batch)
{
if (curtain != null)
{