Merge remote-tracking branch 'origin/master'

AlexanderReaper7 · Nov 13, 2019 · 57c57ad · 57c57ad
2 parents d79d325 + d8163ab
commit 57c57ad
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/PartiAppen/PartiAppen/Content/Content.mgcb b/PartiAppen/PartiAppen/Content/Content.mgcb
@@ -168,6 +168,18 @@
 /processorParam:TextureFormat=Color
 /build:Images/logo.png
 
+#begin Images/newcircle.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:Images/newcircle.png
+
 #begin Sounds/track1.wav
 /importer:WavImporter
 /processor:SongProcessor

diff --git a/PartiAppen/PartiAppen/Content/Images/newcircle.png b/PartiAppen/PartiAppen/Content/Images/newcircle.png
diff --git a/PartiAppen/PartiAppen/Menu.cs b/PartiAppen/PartiAppen/Menu.cs
@@ -244,7 +244,11 @@ public AdvancedImage(Texture2D texture, Rectangle destinationRectangle, Color ti
 
         public void Draw(SpriteBatch spriteBatch)
         {
+            spriteBatch.End();
+            spriteBatch.Begin();
             spriteBatch.Draw(texture, destinationRectangle, null, tint, rotation,origin,SpriteEffects.None, 1f);
+            spriteBatch.End();
+            spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, null, null, Game1.camera.GetViewMatrix());
         }
     }
 

diff --git a/PartiAppen/PartiAppen/MenuManager.cs b/PartiAppen/PartiAppen/MenuManager.cs
@@ -61,7 +61,7 @@ public void LoadMenu(ContentManager content)
             Rectangle logoRect = new Rectangle(720 / 2 - (480 / 2), 20, 480, 480);
             Vector2 padding = new Vector2(-20);
             Texture2D logo = content.Load<Texture2D>(@"Images/logo");
-            Texture2D circle = content.Load<Texture2D>(@"Images/loadingcircledone");
+            Texture2D circle = content.Load<Texture2D>(@"Images/newcircle");
             // BackButton is in all pages but menu
             #region BackButton
 
@@ -281,6 +281,7 @@ public void Update()
                 case Menues.Menu:
                     // reset camera
                     Game1.camera.Position = Vector2.Zero;
+                    // Rotate circle thing
                     menu.Pages[0].AdvancedImages[0].rotation += deltaTime * rotationMultiplier;
 
                     break;