Changeset 2781

Timestamp:

2012-06-04 21:54:25 (9 years ago)

Author:

ramipasa

Message:

 

Location:

2012/23/RamiP/YAG2DSSBase/YAG2DSS

Files:

• YAG2DSS/ALTKHandler.cs (modified) (2 diffs)
• YAG2DSS/GUI/AMessageDisplay.cs (modified) (4 diffs)
• YAG2DSS/GUI/AUIButton.cs (modified) (1 diff)
• YAG2DSS/GUI/Dialogs/ExitWindow.cs (modified) (6 diffs)
• YAG2DSS/GUI/aMainFont.xml (deleted)
• YAG2DSS/YAG2DSS.cs (modified) (4 diffs)
• YAG2DSSContent/Fonts/aMainFont.xml (modified) (1 diff)

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/ALTKHandler.cs

@@ -28 +28 @@
         public static StaticAnimHandler StaticAnimHandler;
         public static GUI.Dialogs.ExitWindow ExitWindow;
+        public static GUI.AMessageDisplay MessageDisplay;
 
         /// <summary>
@@ -55 +56 @@
             ExitWindow.Enabled = false;
             Game.Components.Add(ExitWindow);
+
+            MessageDisplay = new GUI.AMessageDisplay(Game);
+            MessageDisplay.backgroundTextureColor = new Color(0, 192, 0, 128);
+            MessageDisplay.TextColor = Color.Blue;
+            MessageDisplay.FontPath = "aMainFont";
+            MessageDisplay.UpdateFont("");
+            MessageDisplay.Initialize();
+            MessageDisplay.CreateBackgroundTexture(ALTKConstants.WindowWidth);
+            Game.Components.Add(MessageDisplay);
+
         }
 

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/AMessageDisplay.cs

@@ -44 +44 @@
         public string FontPath = "aMessageFont";
 
-        public Texture2D Texture;
         public Texture2D CommonItemTexture;
 
@@ -54 +53 @@
 
         public Color TextColor = Color.Red;
-        public Color TextColorPressed = Color.Green;
-        public Color TextColorCurrent = Color.Red;
         public Color BackgroundColor = new Color(new Vector4(255, 180, 180, 75));
 
@@ -64 +61 @@
 
         public int StartFromItem = 0;
-
-        public SoundEffect soundEffect;
-        public SoundEffectInstance soundInstance;
 
         public float TargetElapsedTime = 1.0f;
@@ -192 +186 @@
         public void UpdateFont(string Modpath)
         {
-            spriteFont = content.Load<SpriteFont>(Environment.CurrentDirectory + "\\" + Modpath + "\\Content\\" + FontPath);
+            spriteFont = ALTKHandler.Loader.loadFont("aMainFont");
         }
 

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/AUIButton.cs

@@ -105 +105 @@
                 if (textSize.X < Width)
                 {
-                    TextXAdd = Convert.ToInt32((Width - textSize.X) / 2);
+                    TextXAdd = Convert.ToInt32(((Width - textSize.X) / 2) - (textSize.X / 4));
                     //TextXAdd = Convert.ToInt32((textSize.X - Width) / -2);
                 }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/GUI/Dialogs/ExitWindow.cs

@@ -35 +35 @@
         AUIButton BExit;
         AUIButton BCancel;
+        AUIButton LCaption;
 
         /// <summary>
@@ -58 +59 @@
             BExit = new AUIButton(Game);
             BExit.FontPath = "aMainFont";
+            BExit.AlphaRate = BExit.AlphaRate / 2.0f;
             BExit.UpdateFont("");
             BExit.AdaptiveSize = true;
@@ -68 +70 @@
             BExit.Height = 30;
             BExit.IdleTexture = CreateTexture(200, 30,
-                new Color(0, 102, 255, 196),
+                new Color(0, 51, 128, 128),
                 new Color(102, 0, 153, 255),
                 new Color(0, 0, 255, 168));
@@ -77 +79 @@
             BExit.Initialize();
 
+            BCancel = new AUIButton(Game);
+            BCancel.FontPath = "aMainFont";
+            BCancel.AlphaRate = BCancel.AlphaRate / 2.0f;
+            BCancel.UpdateFont("");
+            BCancel.AdaptiveSize = false;
+            BCancel.ButtonText = "Minä haluan jatkaa! =///";
+            BCancel.PositionY = 150.0f;
+            BCancel.PositionX = 100.0f;
+            BCancel.TextColor = Color.Blue;
+            BCancel.TextColorPressed = Color.Teal;
+            BCancel.Width = 200;
+            BCancel.Height = 30;
+            BCancel.IdleTexture = CreateTexture(200, 30,
+                new Color(0, 51, 128, 128),
+                new Color(102, 0, 153, 255),
+                new Color(0, 0, 255, 168));
+            BCancel.HoverTexture = CreateTexture(200, 30,
+                new Color(0, 255, 153, 196),
+                new Color(0, 0, 255, 255),
+                new Color(102, 0, 153, 196));
+            BCancel.Initialize();
+
+            // Caption (haluatko nyt siis IHAN varmasti poistua??? ='((((( )
+            LCaption = new AUIButton(Game);
+            LCaption.FontPath = "aMainFont";
+            LCaption.UpdateFont("");
+            LCaption.AdaptiveSize = false;
+            LCaption.ButtonText = "Haluatko nyt siis IHAN varmasti poistua?? ='((((";
+            LCaption.PositionX = 10.0f;
+            LCaption.PositionY = 20.0f;
+            //LCaption.TextColor = Color.Teal;
+            LCaption.TextColorCurrent = Color.Teal;
+            LCaption.Width = 390;
+            LCaption.Height = 40;
+            LCaption.Initialize();
             //BExit.IdleTexture.SaveAsPng(System.IO.File.Create(Environment.CurrentDirectory + "\\texture.png"), 200, 30);
             //Environment.Exit(0);
@@ -199 +236 @@
             BExit.Update(gameTime, sizePos.X, sizePos.Y);
 
+            if (BExit.NeedsUpdating)
+                Environment.Exit(0);
+
+            BCancel.Update(gameTime, sizePos.X, sizePos.Y);
+
+            if (BCancel.NeedsUpdating)
+            {
+                BCancel.NeedsUpdating = false;
+                Cursor.enableBasicInput = true;
+                Enabled = false;
+                Visible = false;
+            }
+
             base.Update(gameTime);
         }
@@ -211 +261 @@
 
             BExit.Draw(gameTime, sizePos.X, sizePos.Y);
+            BCancel.Draw(gameTime, sizePos.X, sizePos.Y);
+            LCaption.Draw(gameTime, sizePos.X, sizePos.Y);
 
             base.Draw(gameTime);

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/YAG2DSS.cs

@@ -18 +18 @@
     public override void Begin()
     {
-        // TODO: Kirjoita ohjelmakoodisi tähä
-
         Kursori = new GameObject(32, 32);
         Kursori.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "cursor.png"));
@@ -46 +44 @@
         //AddCollisionHandler(po, 
         po.Hit(new Vector(500.0, 0.0));
-
-
     }
 
@@ -91 +87 @@
     {
         base.Update(gameTime);
+
+        ALTKHandler.MessageDisplay.AddItem("Trololollolollololoo, lololololooo...");
+
+        if (Kursori.Position.X > ALTKConstants.WindowWidth / 2.0)
+            Kursori.MoveTo(new Vector(ALTKConstants.WindowWidth / 2.0, Kursori.Position.Y), 1000000.0);
+        else if (Kursori.Position.X < ALTKConstants.WindowWidth / -2.0)
+            Kursori.MoveTo(new Vector(ALTKConstants.WindowWidth / -2.0, Kursori.Position.Y), 1000000.0);
+
+        if (Kursori.Position.Y > ALTKConstants.WindowHeight / 2.0)
+            Kursori.MoveTo(new Vector(Kursori.Position.X, ALTKConstants.WindowHeight / 2.0), 1000000.0);
+        else if (Kursori.Position.Y < ALTKConstants.WindowHeight / -2.0)
+            Kursori.MoveTo(new Vector(Kursori.Position.X, ALTKConstants.WindowHeight / -2.0), 1000000.0);
 
         ALTK.Cursor.SecPosX = Convert.ToInt32((ALTKConstants.WindowWidth / 2) + Kursori.Position.X);
@@ -159 +167 @@
         }
     }
+
+    
 }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSSContent/Fonts/aMainFont.xml

@@ -3 +3 @@
   <Asset Type="Graphics:FontDescription">
     <FontName>Segoe UI</FontName>
-    <Size>12</Size>
-    <Spacing>2</Spacing>
+    <Size>13</Size>
+    <Spacing>1</Spacing>
     <Style>Regular</Style>
     <DefaultCharacter>?</DefaultCharacter>