began implementing changes in RA.

2019-01-28 11:41:36 -06:00
parent dbafc989a5
commit c7211323fd
8 changed files with 283 additions and 188 deletions
--- a/RhythmBullet/Content/Content.mgcb
+++ b/RhythmBullet/Content/Content.mgcb
@@ -74,6 +74,27 @@
 /processorParam:TextureFormat=Color
 /build:1920x1080/flake.png

+#begin 1920x1080/fonts/darktech_ldr.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:1920x1080/fonts/darktech_ldr.spritefont
+
+#begin 1920x1080/fonts/gasalt_regular.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:1920x1080/fonts/gasalt_regular.spritefont
+
+#begin 1920x1080/fonts/iron_maiden.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:1920x1080/fonts/iron_maiden.spritefont
+
 #begin 1920x1080/laser.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -266,6 +287,27 @@
 /processorParam:TextureFormat=Color
 /build:2560x1440/flake.png

+#begin 2560x1440/fonts/darktech_ldr.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:2560x1440/fonts/darktech_ldr.spritefont
+
+#begin 2560x1440/fonts/gasalt_regular.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:2560x1440/fonts/gasalt_regular.spritefont
+
+#begin 2560x1440/fonts/iron_maiden.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:2560x1440/fonts/iron_maiden.spritefont
+
 #begin 2560x1440/laser.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -470,6 +512,27 @@
 /processorParam:TextureFormat=Color
 /build:3840x2160/flake.png

+#begin 3840x2160/fonts/darktech_ldr.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:3840x2160/fonts/darktech_ldr.spritefont
+
+#begin 3840x2160/fonts/gasalt_regular.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:3840x2160/fonts/gasalt_regular.spritefont
+
+#begin 3840x2160/fonts/iron_maiden.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:3840x2160/fonts/iron_maiden.spritefont
+
 #begin 3840x2160/laser.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -602,6 +665,66 @@
 /processorParam:TextureFormat=Color
 /build:3840x2160/void_circle.png

+#begin cursor.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:cursor.png
+
+#begin default_cover.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:default_cover.png
+
+#begin loading_ring.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:loading_ring.png
+
+#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
+
+#begin RhythmBullet.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:RhythmBullet.png
+
 #begin sfx/disintegrate.ogg
 /importer:OggImporter
 /processor:SongProcessor
@@ -632,87 +755,6 @@
 /processorParam:Quality=Best
 /build:sfx/pop_open.ogg

-#begin 1920x1080/fonts/darktech_ldr.spritefont
-/importer:FontDescriptionImporter
-/processor:FontDescriptionProcessor
-/processorParam:PremultiplyAlpha=True
-/processorParam:TextureFormat=Compressed
-/build:1920x1080/fonts/darktech_ldr.spritefont
-
-#begin 1920x1080/fonts/gasalt_regular.spritefont
-/importer:FontDescriptionImporter
-/processor:FontDescriptionProcessor
-/processorParam:PremultiplyAlpha=True
-/processorParam:TextureFormat=Compressed
-/build:1920x1080/fonts/gasalt_regular.spritefont
-
-#begin 1920x1080/fonts/iron_maiden.spritefont
-/importer:FontDescriptionImporter
-/processor:FontDescriptionProcessor
-/processorParam:PremultiplyAlpha=True
-/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
-
-#begin default_cover.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:default_cover.png
-
-#begin RhythmBullet.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:RhythmBullet.png
-
-#begin loading_ring.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:loading_ring.png
-
-#begin cursor.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:cursor.png
-
 #begin UI.tatlas
 /importer:TextureAtlasImporter
 /processor:TextureAtlasProcessor
--- a/RhythmBullet/RhythmBullet.csproj
+++ b/RhythmBullet/RhythmBullet.csproj
@@ -72,17 +72,18 @@
    <Reference Include="BulletSharp, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\BulletSharp.0.11.1\lib\net40-client\BulletSharp.dll</HintPath>
    </Reference>
-    <Reference Include="MonoGame.Framework">
-      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath>
+    <Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\lib\net45\MonoGame.Framework.dll</HintPath>
    </Reference>
-    <Reference Include="NAudio, Version=1.8.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\NAudio.1.8.5\lib\net35\NAudio.dll</HintPath>
+    <Reference Include="NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.9.0-preview2\lib\net35\NAudio.dll</HintPath>
    </Reference>
    <Reference Include="RecrownedAthenaeum, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\References\RecrownedAthenaeum.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
@@ -146,7 +147,9 @@
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
    <Error Condition="!Exists('..\packages\BulletSharp.0.11.1\build\net40-client\BulletSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BulletSharp.0.11.1\build\net40-client\BulletSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets'))" />
  </Target>
+  <Import Project="..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets" Condition="Exists('..\packages\MonoGame.Framework.DesktopGL.3.7.1.189\build\MonoGame.Framework.DesktopGL.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -8,8 +8,8 @@ using RecrownedAthenaeum.Input;
 using RecrownedAthenaeum.Persistence;
 using RecrownedAthenaeum.ScreenSystem;
 using RecrownedAthenaeum.SpecialTypes;
-using RecrownedAthenaeum.UI.Skin;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 using RhythmBullet.Audio;
 using RhythmBullet.ContentResolvers;
 using RhythmBullet.Preferences;
@@ -50,7 +50,6 @@ namespace RhythmBullet
            graphics = new GraphicsDeviceManager(this);
            Content.RootDirectory = "Content";
            assets = new ContentManagerController(Content);
-
            musicController = new MusicController();
            resolutionContentResolver = new ResolutionContentResolver();
            FontContentResolver fcr = new FontContentResolver(resolutionContentResolver);
@@ -202,6 +201,9 @@ namespace RhythmBullet
            assets.Queue<Texture2D>("default_cover", false);
            assets.Queue<Texture2D>("backgrounds/mainBG");
            assets.Queue<TextureAtlas>("UI");
+            assets.Queue<SpriteFont>("gasalt_regular");
+            assets.Queue<SpriteFont>("darktech_ldr");
+            assets.Queue<SpriteFont>("iron_maiden");
        }

        private void PostLoad()
@@ -209,14 +211,15 @@ namespace RhythmBullet
            Debug.WriteLine("Initial setup and loading complete.");
            SetUpDefaultSkin();
            UpdateCursor();
-            mainScreen = new MainScreen(assets);
+
+            mainScreen = new MainScreen(assets, Skin);
            initialLoadComplete = true;
        }

        private void UpdateCursor()
        {
-            Texture2D texture = skinManager.Skin.CursorTexture;
-            int cursorSize = (int)(0.08f * graphics.PreferredBackBufferHeight);
+            Texture2D texture = Skin.CursorTexture;
+            int cursorSize = (int)(0.07f * graphics.PreferredBackBufferHeight);
            Debug.WriteLine("Cursor size length: " + cursorSize);
            RenderTarget2D renderTarget = new RenderTarget2D(GraphicsDevice, cursorSize, cursorSize);
            GraphicsDevice.SetRenderTarget(renderTarget);
@@ -238,6 +241,7 @@ namespace RhythmBullet

            TextButtonSkinDefinition textButtonSkinDefinition = new TextButtonSkinDefinition("Rounded9pButton-down", "Rounded9pButton");
            textButtonSkinDefinition.disabledRegion = "Rounded9pButton-disabled";
+            
            skin.AddDefinition("default", textButtonSkinDefinition);

            skin.Laminate();
--- a/RhythmBullet/Screens/MainMenu/MainPage.cs
+++ b/RhythmBullet/Screens/MainMenu/MainPage.cs
@@ -1,8 +1,11 @@
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.ContentSystem;
-using RecrownedAthenaeum.UI.Book;
+using RecrownedAthenaeum.UI.BookSystem;
 using RecrownedAthenaeum.UI.Modular.Modules;
 using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
+using RecrownedAthenaeum.UI.SkinSystem;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;

 namespace RhythmBullet.Screens.MainMenu
 {
@@ -12,18 +15,33 @@ namespace RhythmBullet.Screens.MainMenu
        TextButton playButton;
        TextButton quitButton;

-        internal MainPage(ContentManagerController assets) : base(0, 0)
+        internal MainPage() : base(0, 0)
+        {
+        }
+
+        protected override void Initialize(ContentManagerController assets, ISkin skin)
        {
            title = new Image(assets.Get<Texture2D>("title"));
            AddModule(title);

+            SpriteFont font = assets.Get<SpriteFont>("gasalt_regular");
+
+            var test = skin.ObtainDefinition<TextButtonSkinDefinition>(typeof(TextButton));
+
+            playButton = new TextButton("Play!", font, skin);
+            AddModule(playButton);
+
+            quitButton = new TextButton("Quit", font, skin);
+            AddModule(quitButton);
        }

        public override void ApplySize(int width, int height)
        {
            title.Scale = (width - 40) / title.Texture.Width;
-            title.bounds.X = (int)((width - title.bounds.Width) / 2f);
-            title.bounds.Y = (int)((height - title.bounds.Height) / 2f);
+            title.CenterOrigin();
+            title.bounds.X = width / 2;
+            title.bounds.Y = height / 2;
+
            base.ApplySize(width, height);
        }

--- a/RhythmBullet/Screens/MainMenu/MainScreen.cs
+++ b/RhythmBullet/Screens/MainMenu/MainScreen.cs
@@ -3,7 +3,8 @@ using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.Camera;
 using RecrownedAthenaeum.ContentSystem;
 using RecrownedAthenaeum.ScreenSystem;
-using RecrownedAthenaeum.UI.Book;
+using RecrownedAthenaeum.UI.BookSystem;
+using RecrownedAthenaeum.UI.SkinSystem;
 using RhythmBullet.Screens.Transitions;

 namespace RhythmBullet.Screens.MainMenu
@@ -16,13 +17,13 @@ namespace RhythmBullet.Screens.MainMenu
        readonly Book book;
        readonly MainPage mainPage;

-        public MainScreen(ContentManagerController assets) : base(true)
+        public MainScreen(ContentManagerController assets, ISkin skin) : base(true)
        {
            this.assets = assets;
            background = assets.Get<Texture2D>("backgrounds/mainBG");
            fat = new FadeAwayTransition(1.5f);
-            book = new Book();
-            mainPage = new MainPage(assets);
+            book = new Book(assets, skin);
+            mainPage = new MainPage();
            book.AddPages(mainPage);
        }

--- a/RhythmBullet/packages.config
+++ b/RhythmBullet/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="BulletSharp" version="0.11.1" targetFramework="net45" />
-  <package id="NAudio" version="1.8.5" targetFramework="net45" />
+  <package id="MonoGame.Framework.DesktopGL" version="3.7.1.189" targetFramework="net45" />
+  <package id="NAudio" version="1.9.0-preview2" targetFramework="net45" />
 </packages>