From 7735445888de515389884a58e34e6d08c4c725ec Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Sat, 15 Sep 2018 14:05:14 -0500
Subject: [PATCH] Loading screen base set up.

---
 .../1920x1080/fonts/darktech_ldr.spritefont   |   2 +-
 .../1920x1080/fonts/gasalt_regular.spritefont |   2 +-
 .../1920x1080/fonts/iron_maiden.spritefont    |   2 +-
 .../2560x1440/fonts/darktech_ldr.spritefont   |   2 +-
 .../2560x1440/fonts/gasalt_regular.spritefont |   2 +-
 .../2560x1440/fonts/iron_maiden.spritefont    |   2 +-
 .../3840x2160/fonts/darktech_ldr.spritefont   |   2 +-
 .../3840x2160/fonts/gasalt_regular.spritefont |   2 +-
 .../3840x2160/fonts/iron_maiden.spritefont    |   2 +-
 RhythmBullet/Content/Content.mgcb             |  24 ++++----
 .../{splash_texture.png => recrown.png}       | Bin
 RhythmBullet/RhythmBullet.csproj              |   6 +-
 RhythmBullet/RhythmBulletGame.cs              |  53 ++++++++----------
 RhythmBullet/Zer01HD/Game/LoadingScreen.cs    |  27 +++++++++
 .../Zer01HD/Game/MainScreen/MainScreen.cs     |  20 +++++++
 RhythmBullet/Zer01HD/UI/Book/Page.cs          |   8 +--
 16 files changed, 99 insertions(+), 57 deletions(-)
 rename RhythmBullet/Content/{splash_texture.png => recrown.png} (100%)
 create mode 100644 RhythmBullet/Zer01HD/Game/LoadingScreen.cs
 create mode 100644 RhythmBullet/Zer01HD/Game/MainScreen/MainScreen.cs

diff --git a/RhythmBullet/Content/1920x1080/fonts/darktech_ldr.spritefont b/RhythmBullet/Content/1920x1080/fonts/darktech_ldr.spritefont
index b76012f..94b07ed 100644
--- a/RhythmBullet/Content/1920x1080/fonts/darktech_ldr.spritefont
+++ b/RhythmBullet/Content/1920x1080/fonts/darktech_ldr.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/darktech_ldr.ttf</FontName>
+    <FontName>Darktech LDR</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/1920x1080/fonts/gasalt_regular.spritefont b/RhythmBullet/Content/1920x1080/fonts/gasalt_regular.spritefont
index 36bde11..7ff72d4 100644
--- a/RhythmBullet/Content/1920x1080/fonts/gasalt_regular.spritefont
+++ b/RhythmBullet/Content/1920x1080/fonts/gasalt_regular.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/gasalt_regular.ttf</FontName>
+    <FontName>Gasalt</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/1920x1080/fonts/iron_maiden.spritefont b/RhythmBullet/Content/1920x1080/fonts/iron_maiden.spritefont
index d008501..de47d32 100644
--- a/RhythmBullet/Content/1920x1080/fonts/iron_maiden.spritefont
+++ b/RhythmBullet/Content/1920x1080/fonts/iron_maiden.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/iron_maiden.ttf</FontName>
+    <FontName>Iron Maiden</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/2560x1440/fonts/darktech_ldr.spritefont b/RhythmBullet/Content/2560x1440/fonts/darktech_ldr.spritefont
index b024cc3..9605a6d 100644
--- a/RhythmBullet/Content/2560x1440/fonts/darktech_ldr.spritefont
+++ b/RhythmBullet/Content/2560x1440/fonts/darktech_ldr.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/darktech_ldr.ttf</FontName>
+    <FontName>Darktech LDR</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/2560x1440/fonts/gasalt_regular.spritefont b/RhythmBullet/Content/2560x1440/fonts/gasalt_regular.spritefont
index 15315bb..91fdfd5 100644
--- a/RhythmBullet/Content/2560x1440/fonts/gasalt_regular.spritefont
+++ b/RhythmBullet/Content/2560x1440/fonts/gasalt_regular.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/gasalt_regular.ttf</FontName>
+    <FontName>Gasalt</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/2560x1440/fonts/iron_maiden.spritefont b/RhythmBullet/Content/2560x1440/fonts/iron_maiden.spritefont
index 928a665..ca32a9b 100644
--- a/RhythmBullet/Content/2560x1440/fonts/iron_maiden.spritefont
+++ b/RhythmBullet/Content/2560x1440/fonts/iron_maiden.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/iron_maiden.ttf</FontName>
+    <FontName>Iron Maiden</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/3840x2160/fonts/darktech_ldr.spritefont b/RhythmBullet/Content/3840x2160/fonts/darktech_ldr.spritefont
index 66504b1..2455c85 100644
--- a/RhythmBullet/Content/3840x2160/fonts/darktech_ldr.spritefont
+++ b/RhythmBullet/Content/3840x2160/fonts/darktech_ldr.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/darktech_ldr.ttf</FontName>
+    <FontName>Darktech LDR</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/3840x2160/fonts/gasalt_regular.spritefont b/RhythmBullet/Content/3840x2160/fonts/gasalt_regular.spritefont
index d1704cf..abb738b 100644
--- a/RhythmBullet/Content/3840x2160/fonts/gasalt_regular.spritefont
+++ b/RhythmBullet/Content/3840x2160/fonts/gasalt_regular.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/gasalt_regular.ttf</FontName>
+    <FontName>Gasalt</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/3840x2160/fonts/iron_maiden.spritefont b/RhythmBullet/Content/3840x2160/fonts/iron_maiden.spritefont
index 4bdf926..233cb91 100644
--- a/RhythmBullet/Content/3840x2160/fonts/iron_maiden.spritefont
+++ b/RhythmBullet/Content/3840x2160/fonts/iron_maiden.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>fonts/iron_maiden.ttf</FontName>
+    <FontName>Iron Maiden</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/Content.mgcb b/RhythmBullet/Content/Content.mgcb
index 7dc7798..e653332 100644
--- a/RhythmBullet/Content/Content.mgcb
+++ b/RhythmBullet/Content/Content.mgcb
@@ -643,18 +643,6 @@
 /processorParam:TextureFormat=Color
 /build:defaultCover.png
 
-#begin splash_texture.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:splash_texture.png
-
 #begin 1920x1080/fonts/darktech_ldr.spritefont
 /importer:FontDescriptionImporter
 /processor:FontDescriptionProcessor
@@ -676,3 +664,15 @@
 /processorParam:TextureFormat=Compressed
 /build:1920x1080/fonts/iron_maiden.spritefont
 
+#begin recrown.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:recrown.png
+
diff --git a/RhythmBullet/Content/splash_texture.png b/RhythmBullet/Content/recrown.png
similarity index 100%
rename from RhythmBullet/Content/splash_texture.png
rename to RhythmBullet/Content/recrown.png
diff --git a/RhythmBullet/RhythmBullet.csproj b/RhythmBullet/RhythmBullet.csproj
index 3526df4..9e1c598 100644
--- a/RhythmBullet/RhythmBullet.csproj
+++ b/RhythmBullet/RhythmBullet.csproj
@@ -42,6 +42,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Zer01HD\Game\LoadingScreen.cs" />
+    <Compile Include="Zer01HD\Game\MainScreen\MainScreen.cs" />
     <Compile Include="Zer01HD\UI\Modular\Module.cs" />
     <Compile Include="Zer01HD\UI\Modular\ModuleGroup.cs" />
     <Compile Include="RhythmBulletGame.cs" />
@@ -115,9 +117,7 @@
     </None>
     <None Include="app.manifest" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Zer01HD\Game\MainScreen\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs
index c7a74bc..9b9d6ac 100644
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -1,7 +1,9 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using RhythmBullet.Zer01HD.Game;
 using RhythmBullet.Zer01HD.UI;
+using RhythmBullet.Zer01HD.Utilities.ContentSystem;
 
 namespace RhythmBullet
 {
@@ -10,10 +12,11 @@ namespace RhythmBullet
     /// </summary>
     public class RhythmBulletGame : Game
     {
-        private GraphicsDeviceManager graphics;
+        public GraphicsDeviceManager Graphics;
         SpriteBatch spriteBatch;
-
-        Screen currentScreen
+        public readonly ContentSystem Assets;
+        private Screen currentScreen;
+        Screen CurrentScreen
         {
             get
             {
@@ -21,18 +24,23 @@ namespace RhythmBullet
             }
             set
             {
-                currentScreen.Hide();
+                if (currentScreen != null)
+                {
+                    CurrentScreen.Hide();
+                }
                 currentScreen = value;
-                currentScreen.Show();
+                CurrentScreen.Show();
             }
         }
 
         public RhythmBulletGame()
         {
-            graphics = new GraphicsDeviceManager(this);
+            Graphics = new GraphicsDeviceManager(this);
+            Graphics.PreferredBackBufferWidth = 320;
+            Graphics.PreferredBackBufferHeight = 320;
+            Window.IsBorderless = true;
             Content.RootDirectory = "Content";
-            graphics.PreferredBackBufferWidth = 1920;
-            graphics.PreferredBackBufferHeight = 1080;
+            Assets = new ContentSystem(Content);
         }
 
         /// <summary>
@@ -55,6 +63,7 @@ namespace RhythmBullet
         {
             // Create a new SpriteBatch, which can be used to draw textures.
             spriteBatch = new SpriteBatch(GraphicsDevice);
+            CurrentScreen = new LoadingScreen(Content.Load<Texture2D>("recrown"));
 
             // TODO: use this.Content to load your game content here
         }
@@ -75,10 +84,7 @@ namespace RhythmBullet
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         protected override void Update(GameTime gameTime)
         {
-            if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || Keyboard.GetState().IsKeyDown(Keys.Escape)) Exit();
-
-            currentScreen.Update(gameTime);
-
+            CurrentScreen.Update(gameTime);
             base.Update(gameTime);
         }
 
@@ -88,30 +94,19 @@ namespace RhythmBullet
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         protected override void Draw(GameTime gameTime)
         {
-            GraphicsDevice.Clear(Color.CornflowerBlue);
-
+            GraphicsDevice.Clear(Color.White);
             spriteBatch.Begin();
-            currentScreen.Draw(spriteBatch);
+            CurrentScreen.Draw(spriteBatch);
             spriteBatch.End();
             
             base.Draw(gameTime);
         }
 
-        public int getWidth()
+        public void Resize(int width, int height)
         {
-            return graphics.PreferredBackBufferWidth;
-        }
-
-        public int getHeight()
-        {
-            return graphics.PreferredBackBufferHeight;
-        }
-
-        public void resize(int width, int height)
-        {
-            graphics.PreferredBackBufferWidth = width;
-            graphics.PreferredBackBufferHeight = height;
-
+            Graphics.PreferredBackBufferWidth = width;
+            Graphics.PreferredBackBufferHeight = height;
+            
         }
     }
 }
diff --git a/RhythmBullet/Zer01HD/Game/LoadingScreen.cs b/RhythmBullet/Zer01HD/Game/LoadingScreen.cs
new file mode 100644
index 0000000..0d839da
--- /dev/null
+++ b/RhythmBullet/Zer01HD/Game/LoadingScreen.cs
@@ -0,0 +1,27 @@
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+using RhythmBullet.Zer01HD.UI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RhythmBullet.Zer01HD.Game
+{
+    class LoadingScreen : Screen
+    {
+        Texture2D recrown;
+        public LoadingScreen(Texture2D recrown)
+        {
+            this.recrown = recrown;
+        }
+
+        public override void Draw(SpriteBatch spriteBatch)
+        {
+            spriteBatch.Draw(recrown, recrown.Bounds, Color.White);
+            base.Draw(spriteBatch);
+        }
+    }
+}
diff --git a/RhythmBullet/Zer01HD/Game/MainScreen/MainScreen.cs b/RhythmBullet/Zer01HD/Game/MainScreen/MainScreen.cs
new file mode 100644
index 0000000..e26a591
--- /dev/null
+++ b/RhythmBullet/Zer01HD/Game/MainScreen/MainScreen.cs
@@ -0,0 +1,20 @@
+using Microsoft.Xna.Framework.Graphics;
+using RhythmBullet.Zer01HD.UI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RhythmBullet.Zer01HD.Game.MainScreen
+{
+    class MainScreen : Screen
+    {
+        Viewport viewport = new Viewport();
+
+        public MainScreen()
+        {
+            
+        }
+    }
+}
diff --git a/RhythmBullet/Zer01HD/UI/Book/Page.cs b/RhythmBullet/Zer01HD/UI/Book/Page.cs
index 958d229..ea67815 100644
--- a/RhythmBullet/Zer01HD/UI/Book/Page.cs
+++ b/RhythmBullet/Zer01HD/UI/Book/Page.cs
@@ -21,16 +21,16 @@ namespace RhythmBullet.Zer01HD.UI.Book
 
         public virtual void ApplySize(int width, int height)
         {
-            X = pageX * width;
-            Y = pageY * height;
+            Position.X = pageX * width;
+            Position.Y = pageY * height;
             this.Width = width;
             this.Height = height;
         }
 
         public void DisplayWithViewport(Viewport viewport)
         {
-            viewport.X = X;
-            viewport.Y = Y;
+            viewport.X = (int) Position.X;
+            viewport.Y = (int) Position.Y;
         }
     }
 }