Cleaned assets and code for new scaling system.

RhythmBullet/Content.tatlas

@@ -1,79 +0,0 @@
-{
-  "regions": [
-    {
-      "name": "rectangle-button-disabled",
-      "bounds": {
-        "X": 0,
-        "Y": 0,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button-down",
-      "bounds": {
-        "X": 0,
-        "Y": 16,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button-highlighted",
-      "bounds": {
-        "X": 0,
-        "Y": 32,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button",
-      "bounds": {
-        "X": 0,
-        "Y": 48,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "ScrollBar",
-      "bounds": {
-        "X": 16,
-        "Y": 0,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": null
-    }
-  ],
-  "textureName": "Content-texture.png"
-}

RhythmBullet/Content/1920x1080/fonts/darktech_ldr.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Darktech LDR</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>72</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/1920x1080/fonts/gasalt_regular.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Gasalt</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>36</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/1920x1080/fonts/iron_maiden.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Iron Maiden</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>72</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/2560x1440/fonts/darktech_ldr.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Darktech LDR</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>96</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/2560x1440/fonts/gasalt_regular.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Gasalt</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>48</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/2560x1440/fonts/iron_maiden.spritefont

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file contains an xml description of a font, and will be read by the XNA
-Framework Content Pipeline. Follow the comments to customize the appearance
-of the font in your game, and to change the characters which are available to draw
-with.
--->
-<XnaContent xmlns:Graphics="Microsoft.Xna.Framework.Content.Pipeline.Graphics">
-  <Asset Type="Graphics:FontDescription">
-
-    <!--
-    Modify this string to change the font that will be imported.
-    -->
-    <FontName>Iron Maiden</FontName>
-
-    <!--
-    Size is a float value, measured in points. Modify this value to change
-    the size of the font.
-    -->
-    <Size>96</Size>
-
-    <!--
-    Spacing is a float value, measured in pixels. Modify this value to change
-    the amount of spacing in between characters.
-    -->
-    <Spacing>0</Spacing>
-
-    <!--
-    UseKerning controls the layout of the font. If this value is true, kerning information
-    will be used when placing characters.
-    -->
-    <UseKerning>true</UseKerning>
-
-    <!--
-    Style controls the style of the font. Valid entries are "Regular", "Bold", "Italic",
-    and "Bold, Italic", and are case sensitive.
-    -->
-    <Style>Regular</Style>
-
-    <!--
-    If you uncomment this line, the default character will be substituted if you draw
-    or measure text that contains characters which were not included in the font.
-    -->
-    <!-- <DefaultCharacter>*</DefaultCharacter> -->
-
-    <!--
-    CharacterRegions control what letters are available in the font. Every
-    character from Start to End will be built and made available for drawing. The
-    default range is from 32, (ASCII space), to 126, ('~'), covering the basic Latin
-    character set. The characters are ordered according to the Unicode standard.
-    See the documentation for more information.
-    -->
-    <CharacterRegions>
-      <CharacterRegion>
-        <Start>&#32;</Start>
-        <End>&#126;</End>
-      </CharacterRegion>
-    </CharacterRegions>
-  </Asset>
-</XnaContent>

RhythmBullet/Content/Content.mgcb

@@ -10,661 +10,10 @@
 
 #-------------------------------- References --------------------------------#
 
-/reference:..\..\References\RecrownedAthenaeum.Pipeline.dll
+/reference:..\..\..\RecrownedAthenaeum\RecrownedAthenaeum.Pipeline\bin\Release\netstandard2.0\publish\RecrownedAthenaeum.Pipeline.dll
 
 #---------------------------------- Content ---------------------------------#
 
-#begin 1920x1080/backgrounds/mainBG.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:1920x1080/backgrounds/mainBG.png
-
-#begin 1920x1080/bar.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:1920x1080/bar.png
-
-#begin 1920x1080/cybercircle1.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:1920x1080/cybercircle1.png
-
-#begin 1920x1080/cybercircle3B.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:1920x1080/cybercircle3B.png
-
-#begin 1920x1080/flake.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: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
-/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:1920x1080/laser.png
-
-#begin 1920x1080/magic1.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:1920x1080/magic1.png
-
-#begin 1920x1080/pellet.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:1920x1080/pellet.png
-
-#begin 1920x1080/polyjet-standard.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:1920x1080/polyjet-standard.png
-
-#begin 1920x1080/shard.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:1920x1080/shard.png
-
-#begin 1920x1080/Shooter1.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:1920x1080/Shooter1.png
-
-#begin 1920x1080/square.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:1920x1080/square.png
-
-#begin 1920x1080/Tech-Circle1.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:1920x1080/Tech-Circle1.png
-
-#begin 1920x1080/title.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:1920x1080/title.png
-
-#begin 1920x1080/tpSelector.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:1920x1080/tpSelector.png
-
-#begin 1920x1080/void_circle.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:1920x1080/void_circle.png
-
-#begin 2560x1440/backgrounds/mainBG.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:2560x1440/backgrounds/mainBG.png
-
-#begin 2560x1440/bar.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:2560x1440/bar.png
-
-#begin 2560x1440/cybercircle1.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:2560x1440/cybercircle1.png
-
-#begin 2560x1440/cybercircle3B.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:2560x1440/cybercircle3B.png
-
-#begin 2560x1440/flake.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: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
-/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:2560x1440/laser.png
-
-#begin 2560x1440/magic1.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:2560x1440/magic1.png
-
-#begin 2560x1440/pellet.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:2560x1440/pellet.png
-
-#begin 2560x1440/polyjet-standard.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:2560x1440/polyjet-standard.png
-
-#begin 2560x1440/shard.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:2560x1440/shard.png
-
-#begin 2560x1440/Shooter1.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:2560x1440/Shooter1.png
-
-#begin 2560x1440/splashlogo.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:2560x1440/splashlogo.png
-
-#begin 2560x1440/square.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:2560x1440/square.png
-
-#begin 2560x1440/Tech-Circle1.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:2560x1440/Tech-Circle1.png
-
-#begin 2560x1440/title.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:2560x1440/title.png
-
-#begin 2560x1440/tpSelector.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:2560x1440/tpSelector.png
-
-#begin 2560x1440/void_circle.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:2560x1440/void_circle.png
-
-#begin 3840x2160/backgrounds/mainBG.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:3840x2160/backgrounds/mainBG.png
-
-#begin 3840x2160/bar.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:3840x2160/bar.png
-
-#begin 3840x2160/cybercircle1.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:3840x2160/cybercircle1.png
-
-#begin 3840x2160/cybercircle3B.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:3840x2160/cybercircle3B.png
-
-#begin 3840x2160/flake.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: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
-/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:3840x2160/laser.png
-
-#begin 3840x2160/magic1.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:3840x2160/magic1.png
-
-#begin 3840x2160/pellet.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:3840x2160/pellet.png
-
-#begin 3840x2160/polyjet-standard.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:3840x2160/polyjet-standard.png
-
-#begin 3840x2160/shard.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:3840x2160/shard.png
-
-#begin 3840x2160/Shooter1.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:3840x2160/Shooter1.png
-
-#begin 3840x2160/square.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:3840x2160/square.png
-
-#begin 3840x2160/Tech-Circle1.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:3840x2160/Tech-Circle1.png
-
-#begin 3840x2160/title.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:3840x2160/title.png
-
-#begin 3840x2160/tpSelector.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:3840x2160/tpSelector.png
-
-#begin 3840x2160/void_circle.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:3840x2160/void_circle.png
-
 #begin cursor.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -689,6 +38,27 @@
 /processorParam:TextureFormat=Color
 /build:default_cover.png
 
+#begin fonts/darktech_ldr.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:fonts/darktech_ldr.spritefont
+
+#begin fonts/gasalt_regular.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:fonts/gasalt_regular.spritefont
+
+#begin fonts/iron_maiden.spritefont
+/importer:FontDescriptionImporter
+/processor:FontDescriptionProcessor
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Compressed
+/build:fonts/iron_maiden.spritefont
+
 #begin loading_ring.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -725,35 +95,17 @@
 /processorParam:TextureFormat=Color
 /build:RhythmBullet.png
 
-#begin sfx/disintegrate.ogg
-/importer:OggImporter
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:sfx/disintegrate.ogg
-
-#begin sfx/explosion.ogg
-/importer:OggImporter
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:sfx/explosion.ogg
-
-#begin sfx/laser.ogg
-/importer:OggImporter
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:sfx/laser.ogg
-
-#begin sfx/pop_close.ogg
-/importer:OggImporter
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:sfx/pop_close.ogg
-
-#begin sfx/pop_open.ogg
-/importer:OggImporter
-/processor:SongProcessor
-/processorParam:Quality=Best
-/build:sfx/pop_open.ogg
+#begin title.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:title.png
 
 #begin UI.tatlas
 /importer:TextureAtlasImporter

RhythmBullet/Content/UI/.tatlas

@@ -1,69 +0,0 @@
-{
-  "regions": [
-    {
-      "name": "rectangle-button-disabled",
-      "bounds": {
-        "X": 0,
-        "Y": 0,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button-down",
-      "bounds": {
-        "X": 0,
-        "Y": 16,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button-highlighted",
-      "bounds": {
-        "X": 0,
-        "Y": 32,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    },
-    {
-      "name": "rectangle-button",
-      "bounds": {
-        "X": 0,
-        "Y": 48,
-        "Width": 16,
-        "Height": 16
-      },
-      "ninePatchData": {
-        "textureName": null,
-        "left": 4,
-        "right": 4,
-        "bottom": 4,
-        "top": 4
-      }
-    }
-  ],
-  "textureName": "-texture.png"
-}

RhythmBullet/Program.cs

@@ -2,21 +2,13 @@
 
 namespace RhythmBullet
 {
-    /// <summary>
-    /// The main class.
-    /// </summary>
     public static class Program
     {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {
             using (var game = new RhythmBulletGame())
-            {
                 game.Run();
-            }
         }
     }
 }

RhythmBullet/RhythmBulletGame.cs

@@ -5,7 +5,7 @@ using RecrownedAthenaeum.Render;
 using RecrownedAthenaeum.ContentSystem;
 using RecrownedAthenaeum.Input;
 using RecrownedAthenaeum.Persistence;
-using RecrownedAthenaeum.ScreenSystem;
+using RecrownedAthenaeum.UI.ScreenSystem;
 using RecrownedAthenaeum.SpecialTypes;
 using RecrownedAthenaeum.UI.SkinSystem;
 using RecrownedAthenaeum.UI.SkinSystem.Definitions;
@@ -31,15 +31,10 @@ namespace RhythmBullet
         GraphicsDeviceManager graphics;
         ConsistentSpriteBatch spriteBatch;
         public readonly ContentManagerController assets;
-        
-        readonly ResolutionContentResolver resolutionContentResolver;
         public PreferencesManager preferencesManager;
         private ScreenManager screenManager;
         public Camera2D Camera { get; private set; }
         public BasicEffect cameraEffect;
-
-        private bool resizing;
-        private bool initialLoadComplete;
         private MainScreen mainScreen;
         private Texture2D currentCursorTexture;
         internal readonly MusicController musicController;
@@ -52,10 +47,6 @@ namespace RhythmBullet
             Content.RootDirectory = "Content";
             assets = new ContentManagerController(Content);
             musicController = new MusicController();
-            resolutionContentResolver = new ResolutionContentResolver();
-            FontContentResolver fcr = new FontContentResolver(resolutionContentResolver);
-            assets.contentPathModifier.Add(typeof(Texture2D), resolutionContentResolver);
-            assets.contentPathModifier.Add(typeof(SpriteFont), fcr);
             preferencesManager = new PreferencesManager(
                 Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "/RhythmBullet",
                 new General(),
@@ -76,11 +67,9 @@ namespace RhythmBullet
         {
             General general = preferencesManager.GetPreferences<General>();
             Resolution resolution = general.Resolution;
-            resolutionContentResolver.Width = resolution.Width;
-            resolutionContentResolver.Height = resolution.Height;
             musicController.musicList.path = general.MusicDirectory;
             musicController.musicList.StartSearch();
-            if ((general.skinName ) != null)
+            if ((general.skinName) != null)
             {
                 skinManager.LoadSkin(Path.Combine(general.skinDirectory, general.skinName), graphics.GraphicsDevice);
             }
@@ -127,16 +116,13 @@ namespace RhythmBullet
         /// <param name="gameTime">Provides a snapshot of timing values.</param>
         protected override void Update(GameTime gameTime)
         {
-            if (assets.Done)
+            if (!assets.Done)
             {
-                if (resizing)
-                {
-                    assets.Update();
-                }
-                else if (!initialLoadComplete && CheckReadyForInitiate())
-                {
-                    PostLoad();
-                }
+                assets.Update();
+            }
+            else if (CheckReadyForInitiate())
+            {
+                PostLoad();
             }
             else
             {
@@ -162,11 +148,8 @@ namespace RhythmBullet
         public void Resize(int width, int height)
         {
             pixels_per_WU = height / WORLD_HEIGHT;
-            resolutionContentResolver.Width = width;
-            resolutionContentResolver.Height = height;
             graphics.PreferredBackBufferWidth = width;
             graphics.PreferredBackBufferHeight = height;
-            resizing = true;
             assets.UnloadAll();
             QueueContent();
             screenManager.Resize(new LoadingScreen(this, Content.Load<Texture2D>("loading_ring"), 0.4f, true));
@@ -183,8 +166,7 @@ namespace RhythmBullet
         private bool CheckReadyForInitiate()
         {
             bool ready = true;
-            if (!assets.Done ||
-                !musicController.musicList.Searched)
+            if (!assets.Done || !musicController.musicList.Searched)
             {
                 ready = false;
             }
@@ -220,7 +202,6 @@ namespace RhythmBullet
             UpdateCursor();
 
             mainScreen = new MainScreen(assets, Skin, Camera);
-            initialLoadComplete = true;
         }
 
         private void UpdateCursor()
@@ -250,7 +231,7 @@ namespace RhythmBullet
             TextButtonSkinDefinition textButtonSkinDefinition = new TextButtonSkinDefinition("rectangle-button-down", "rectangle-button");
             textButtonSkinDefinition.selectedRegion = "rectangle-button-highlighted";
             textButtonSkinDefinition.disabledRegion = "rectangle-button-disabled";
-            
+
             skin.AddDefinition(textButtonSkinDefinition);
 
             skin.Laminate();

RhythmBullet/Screens/MainMenu/MainPage.cs

@@ -21,15 +21,15 @@ namespace RhythmBullet.Screens.MainMenu
         protected override void Initialize(ContentManagerController assets, ISkin skin, BasicScissor scissorBox)
         {
             title = new Image(assets.Get<Texture2D>("title"));
-            AddModule(title);
+            AddModules(title);
 
             SpriteFont font = assets.Get<SpriteFont>("gasalt_regular");
 
             playButton = new TextButton("Play!", font, skin);
-            AddModule(playButton);
+            AddModules(playButton);
 
             quitButton = new TextButton("Quit", font, skin);
-            AddModule(quitButton);
+            AddModules(quitButton);
 
             base.Initialize(assets, skin, scissorBox);
         }
@@ -43,17 +43,17 @@ namespace RhythmBullet.Screens.MainMenu
             title.CenterVertically();
 
 
-            playButton.situation.Width = (int)(0.3f * title.Boundaries.Width);
-            playButton.situation.Height = (int)(0.05f * title.Boundaries.Width);
+            playButton.Width = (int)(0.3f * title.Boundaries.Width);
+            playButton.Height = (int)(0.05f * title.Boundaries.Width);
             playButton.CenterOrigin();
             playButton.CenterHorizontally();
-            playButton.situation.Y = (int)playButton.origin.Y + title.Boundaries.Y + title.Boundaries.Height + 60;
+            playButton.Y = (int)playButton.origin.Y + title.Boundaries.Y + title.Boundaries.Height + 60;
 
-            quitButton.situation.Width = (int)(0.3f * title.Boundaries.Width);
-            quitButton.situation.Height = (int)(0.05f * title.Boundaries.Width);
+            quitButton.Width = (int)(0.3f * title.Boundaries.Width);
+            quitButton.Height = (int)(0.05f * title.Boundaries.Width);
             quitButton.CenterOrigin();
             quitButton.CenterHorizontally();
-            quitButton.situation.Y = (int)quitButton.origin.Y + playButton.Boundaries.Y + playButton.Boundaries.Height + 15;
+            quitButton.Y = (int)quitButton.origin.Y + playButton.Boundaries.Y + playButton.Boundaries.Height + 15;
 
 
             base.ApplySize(width, height);

RhythmBullet/Screens/MainMenu/MainScreen.cs

@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.ContentSystem;
 using RecrownedAthenaeum.Input;
 using RecrownedAthenaeum.Render;
-using RecrownedAthenaeum.ScreenSystem;
+using RecrownedAthenaeum.UI.ScreenSystem;
 using RecrownedAthenaeum.UI.BookSystem;
 using RecrownedAthenaeum.UI.SkinSystem;
 using RhythmBullet.Screens.Transitions;

RhythmBullet/Screens/Transitions/FadeAwayTransition.cs

@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.Render;
-using RecrownedAthenaeum.ScreenSystem;
+using RecrownedAthenaeum.UI.ScreenSystem;
 using System;
 
 namespace RhythmBullet.Screens.Transitions

RhythmBullet/Specifications.cs

@@ -0,0 +1,8 @@
+namespace RhythmBullet
+{
+    public class Specifications
+    {
+        public const int PLAY_WIDTH = 16;
+        public const int PLAY_HEIGHT = 16;
+    }
+}