diff --git a/RhythmBullet/Content/Content.mgcb b/RhythmBullet/Content/Content.mgcb index e653332..6d80f2c 100644 --- a/RhythmBullet/Content/Content.mgcb +++ b/RhythmBullet/Content/Content.mgcb @@ -631,18 +631,6 @@ /processorParam:Quality=Best /build:sfx/pop_open.ogg -#begin defaultCover.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:defaultCover.png - #begin 1920x1080/fonts/darktech_ldr.spritefont /importer:FontDescriptionImporter /processor:FontDescriptionProcessor @@ -676,3 +664,27 @@ /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 + diff --git a/RhythmBullet/Content/RhythmBullet.png b/RhythmBullet/Content/RhythmBullet.png new file mode 100644 index 0000000..0655c08 Binary files /dev/null and b/RhythmBullet/Content/RhythmBullet.png differ diff --git a/RhythmBullet/Content/defaultCover.png b/RhythmBullet/Content/default_cover.png similarity index 100% rename from RhythmBullet/Content/defaultCover.png rename to RhythmBullet/Content/default_cover.png diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs index fed9f6d..a67a182 100644 --- a/RhythmBullet/RhythmBulletGame.cs +++ b/RhythmBullet/RhythmBulletGame.cs @@ -91,7 +91,7 @@ namespace RhythmBullet { // Create a new SpriteBatch, which can be used to draw textures. spriteBatch = new SpriteBatch(GraphicsDevice); - Screen = new LoadingScreen(Content.Load("recrown")); + Screen = new LoadingScreen(Content.Load("RhythmBullet"), new Rectangle(0,0, Graphics.PreferredBackBufferWidth, Graphics.PreferredBackBufferHeight)); // TODO: use this.Content to load your game content here } @@ -126,7 +126,7 @@ namespace RhythmBullet /// Provides a snapshot of timing values. protected override void Draw(GameTime gameTime) { - GraphicsDevice.Clear(Color.White); + GraphicsDevice.Clear(Color.Transparent); spriteBatch.Begin(); Screen.Draw(spriteBatch); spriteBatch.End(); @@ -155,7 +155,7 @@ namespace RhythmBullet Assets.Queue("cybercircle3B"); Assets.Queue("title"); Assets.Queue("cybercircle1"); - Assets.Queue("defaultCover"); + Assets.Queue("default_cover"); Assets.Queue("laser"); Assets.Queue("pellet"); Assets.Queue("shard"); diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs index df1c485..d6c50a9 100644 --- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs +++ b/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs @@ -73,14 +73,11 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem /// public void Update() { - if (queue.Count > 0) + if (queue.Count > 0 && (thread == null || !thread.IsAlive)) { - if (thread == null || !thread.IsAlive) - { - ThreadStart threadStart = new ThreadStart(LoadBatch); - thread = new Thread(threadStart); - thread.Start(); - } + ThreadStart threadStart = new ThreadStart(LoadBatch); + thread = new Thread(threadStart); + thread.Start(); } } diff --git a/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs b/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs index 7a3d5b8..58a2b95 100644 --- a/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs +++ b/RhythmBullet/Zer01HD/Utilities/UI/LoadingScreen.cs @@ -14,14 +14,16 @@ namespace RhythmBullet.Zer01HD.Game class LoadingScreen : Screen { Texture2D recrown; - public LoadingScreen(Texture2D recrown) + Rectangle rectangleBounds; + public LoadingScreen(Texture2D recrown, Rectangle bounds) { this.recrown = recrown; + this.rectangleBounds = bounds; } public override void Draw(SpriteBatch spriteBatch) { - spriteBatch.Draw(recrown, recrown.Bounds, Color.White); + spriteBatch.Draw(recrown, rectangleBounds, Color.White); base.Draw(spriteBatch); } }