Changeset 2778

Timestamp:

2012-06-04 16:03:38 (9 years ago)

Author:

ramipasa

Message:

korjauksia

Location:

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS

Files:

• ALTKHandler.cs (modified) (2 diffs)
• GUI/AUIButton.cs (modified) (4 diffs)
• GUI/Dialogs/ExitWindow.cs (modified) (9 diffs)
• YAG2DSS.cs (modified) (2 diffs)
• YAG2DSS.csproj (modified) (3 diffs)

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

@@ -27 +27 @@
         public static Cursor Cursor;
         public static StaticAnimHandler StaticAnimHandler;
+        public static GUI.Dialogs.ExitWindow ExitWindow;
 
         /// <summary>
@@ -48 +49 @@
             Cursor.Initialize();
             Game.Components.Add(Cursor);
+
+            ExitWindow = new GUI.Dialogs.ExitWindow(Game);
+            ExitWindow.Initialize();
+            ExitWindow.Visible = false;
+            ExitWindow.Enabled = false;
+            Game.Components.Add(ExitWindow);
         }
 

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

@@ -106 +106 @@
                 {
                     TextXAdd = Convert.ToInt32((Width - textSize.X) / 2);
+                    //TextXAdd = Convert.ToInt32((textSize.X - Width) / -2);
                 }
                 else if (textSize.X > Width)
@@ -201 +202 @@
                 if (mpX > this.PositionX + baseX &&
                 mpX < this.PositionX + baseX + this.Width &&
-                mpY > this.PositionY + baseY &&
-                mpY < this.PositionY + baseY + this.Height &&
+                mpY > this.PositionY + baseY + this.Height / 2 &&
+                mpY < this.PositionY + baseY + this.Height * 1.5 &&
                 Locked == false)
                 {
@@ -344 +345 @@
                 if (IdleTexture != null)
                 {
+                    int xPos = Convert.ToInt32(PositionX + baseX) - 10;
+                    int yPos = Convert.ToInt32(PositionY + baseY);
+
+                    Console.WriteLine("xPos: " + xPos + "; yPos: " + yPos);
+
                     if (HoverTexture == null)
                     {
@@ -352 +358 @@
                         if (CursoronButton == true)
                         {
-                            spriteBatch.Draw(IdleTexture, new Rectangle(Convert.ToInt32(PositionX + baseX), Convert.ToInt32(PositionY + baseY), Width, Height), new Color(new Vector4(128, 128, 128, idleTextureAlpha)));
-                            spriteBatch.Draw(HoverTexture, new Rectangle(Convert.ToInt32(PositionX + baseX), Convert.ToInt32(PositionY + baseY), Width, Height), new Color(new Vector4(128, 128, 128, hoverTextureAlpha)));
+                            spriteBatch.Draw(IdleTexture, new Rectangle(xPos, yPos, Width, Height), new Color(new Vector4(128, 128, 128, idleTextureAlpha)));
+                            spriteBatch.Draw(HoverTexture, new Rectangle(xPos, yPos, Width, Height), new Color(new Vector4(128, 128, 128, hoverTextureAlpha)));
                         }
                         else
                         {
-                            spriteBatch.Draw(HoverTexture, new Rectangle(Convert.ToInt32(PositionX + baseX), Convert.ToInt32(PositionY + baseY), Width, Height), new Color(new Vector4(128, 128, 128, hoverTextureAlpha)));
-                            spriteBatch.Draw(IdleTexture, new Rectangle(Convert.ToInt32(PositionX + baseX), Convert.ToInt32(PositionY + baseY), Width, Height), new Color(new Vector4(128, 128, 128, idleTextureAlpha)));
+                            spriteBatch.Draw(HoverTexture, new Rectangle(xPos, yPos, Width, Height), new Color(new Vector4(128, 128, 128, hoverTextureAlpha)));
+                            spriteBatch.Draw(IdleTexture, new Rectangle(xPos, yPos, Width, Height), new Color(new Vector4(128, 128, 128, idleTextureAlpha)));
                         }
                     }

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

@@ -48 +48 @@
             base.Initialize();
 
-            backgroundTexture = CreateBackgroundTexture();
+            backgroundTexture = CreateTexture(sizePos.Width, sizePos.Height,
+                new Color(96, 96, 128, 128),
+                new Color(32, 32, 255, 255),
+                new Color(96, 96, 96, 255));
 
             spriteBatch = new SpriteBatch(GraphicsDevice);
@@ -59 +62 @@
             BExit.ButtonText = "Poistu";
             BExit.PositionY = 100.0f;
-            BExit.PositionX = 200.0f;
+            BExit.PositionX = 100.0f;
             BExit.TextColor = Color.Blue;
             BExit.TextColorPressed = Color.Teal;
             BExit.Width = 200;
             BExit.Height = 30;
+            BExit.IdleTexture = CreateTexture(200, 30,
+                new Color(0, 102, 255, 196),
+                new Color(102, 0, 153, 255),
+                new Color(0, 0, 255, 168));
+            BExit.HoverTexture = CreateTexture(200, 30,
+                new Color(0, 255, 153, 196),
+                new Color(0, 0, 255, 255),
+                new Color(102, 0, 153, 196));
+            BExit.Initialize();
+
+            //BExit.IdleTexture.SaveAsPng(System.IO.File.Create(Environment.CurrentDirectory + "\\texture.png"), 200, 30);
+            //Environment.Exit(0);
         }
 
@@ -71 +86 @@
         }
 
-
-
-        private Texture2D CreateBackgroundTexture()
-        {
-            //GraphicsDevice gd = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.Reach, new PresentationParameters());
-            Texture2D Texture = new Texture2D(GraphicsDevice, sizePos.Width, sizePos.Height, false, SurfaceFormat.Color);
-
-            Color[] color = new Color[sizePos.Width * sizePos.Height];
-
-            Color backColor = new Color(96, 128, 96, 128);
-            Color borderColor = new Color(32, 255, 32, 255);
-            Color outerBorderColor = new Color(96, 96, 96, 255);
-
-            //Stopwatch sw = new Stopwatch();
-
-            //sw.Start();
+        private Texture2D CreateTexture(int width, int height, Color MainColor, Color SecondaryColor, Color TertiaryColor)
+        {
+            Texture2D Texture = new Texture2D(GraphicsDevice, width, height, false, SurfaceFormat.Color);
+
+            Color[] color = new Color[width * height];
+
             // background color
             // ***
 
             for (int i = 0; i < color.Length; i++)
-                color[i] = backColor;
+                color[i] = MainColor;
 
             // main border
@@ -98 +103 @@
             // top
             for (int i = sizePos.Width; i < (sizePos.Width * 3); i++)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             // bottom
             for (int i = color.Length - (sizePos.Width * 3); i < color.Length - sizePos.Width; i++)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             // right
             for (int i = 1; i < color.Length - sizePos.Width - 2; i = i + sizePos.Width)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             for (int i = 2; i < color.Length - sizePos.Width - 2; i = i + sizePos.Width)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             // left
             for (int i = sizePos.Width - 3; i < color.Length; i = i + sizePos.Width)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             for (int i = sizePos.Width - 2; i < color.Length; i = i + sizePos.Width)
-                color[i] = borderColor;
+                color[i] = SecondaryColor;
 
             // outer border
@@ -123 +128 @@
             // top
             for (int i = 0; i < sizePos.Width; i++)
-                color[i] = outerBorderColor;
+                color[i] = TertiaryColor;
 
             // bottom
             for (int i = color.Length - sizePos.Width; i < color.Length; i++)
-                color[i] = outerBorderColor;
+                color[i] = TertiaryColor;
 
             // right
             for (int i = 0; i < color.Length - sizePos.Width; i = i + sizePos.Width)
-                color[i] = outerBorderColor;
+                color[i] = TertiaryColor;
 
             // left
             for (int i = sizePos.Width - 1; i < color.Length; i = i + sizePos.Width)
-                color[i] = outerBorderColor;
-
-            //sw.Stop();
-            //Console.WriteLine("ADialogWindow texture creation time (ms): " + sw.ElapsedMilliseconds);
+                color[i] = TertiaryColor;
 
             Texture.SetData(color);
@@ -152 +154 @@
             // TODO: Add your update code here
 
-            //YAG2DSS.Instance.MessageDisplay.Add("UPDATING");
-
             bool cursorOnChoice = false;
 
             YAG2DSS.Instance.MessageDisplay.Clear();
-            YAG2DSS.Instance.MessageDisplay.Add("Rectangle: " + sizePos.X + "; " + sizePos.Y + "; " + sizePos.Width + "; " + sizePos.Height);
-            YAG2DSS.Instance.MessageDisplay.Add(Convert.ToString(ALTK.Cursor.SecPosX + "; " + ALTK.Cursor.SecPosY));
-
-            //if (Cursor.SecPosX > sizePos.X && Cursor.SecPosY > sizePos.Y)
-            //{
-            //    YAG2DSS.Instance.MessageDisplay.Clear();
-            //    YAG2DSS.Instance.MessageDisplay.Add("ajajjajajaj xDDD");
-            //}
+            YAG2DSS.Instance.MessageDisplay.Add(Cursor.SecPosX + "; " + Cursor.SecPosY);
+            YAG2DSS.Instance.MessageDisplay.Add(Convert.ToString(BExit.PositionX + sizePos.X) + "; " + Convert.ToString(BExit.PositionY + sizePos.Y));
 
             if (Cursor.SecPosX > sizePos.X && Cursor.SecPosY > sizePos.Y &&
@@ -170 +164 @@
             {
                 Cursor.enableBasicInput = false;
-
-                //YAG2DSS.Instance.MessageDisplay.Clear();
-                YAG2DSS.Instance.MessageDisplay.Add("Cursor is on window");
-                //dialogMousePosX = ms.X - sizePos.X;
-                //dialogMousePosY = ms.Y - sizePos.Y;
 
                 prevMousePosX = mousePosX;
@@ -208 +197 @@
                 Cursor.enableBasicInput = true;
 
+            BExit.Update(gameTime, sizePos.X, sizePos.Y);
+
             base.Update(gameTime);
         }
@@ -218 +209 @@
 
             spriteBatch.End();
+
+            BExit.Draw(gameTime, sizePos.X, sizePos.Y);
 
             base.Draw(gameTime);

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

@@ -20 +20 @@
         // TODO: Kirjoita ohjelmakoodisi tähä
 
+        Kursori = new GameObject(32, 32);
+        Kursori.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "cursor.png"));
+        Kursori.IsVisible = false;
         AnalogHandler handler = new AnalogHandler(HandleCursor);
-        Kursori = new GameObject(32, 32);
         Mouse.ListenMovement(0.1, handler, "");
-        Kursori.Image = Image.FromStream(File.OpenRead(ALTKConstants.TexturePath + "cursor.png"));
         Add(Kursori);
 
@@ -150 +151 @@
     {
         //this.StopAll();
-        ExitWindow exitWindow = new ExitWindow(this);
-        exitWindow.Initialize();
-        this.Components.Add(exitWindow);
+        if (!ALTKHandler.ExitWindow.Enabled)
+        {
+            ALTKHandler.ExitWindow.Enabled = true;
+            ALTKHandler.ExitWindow.Visible = true;
+
+            Kursori.IsVisible = true;
+        }
     }
 }

2012/23/RamiP/YAG2DSSBase/YAG2DSS/YAG2DSS/YAG2DSS.csproj

@@ -6 +6 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YAG2DSS</RootNamespace>
@@ -60 +60 @@
     <PlatformTarget>x86</PlatformTarget>
     <XnaCompressContent>true</XnaCompressContent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
   </PropertyGroup>
   <ItemGroup>
@@ -132 +135 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="GUI\aMainFont.xml" />
     <Content Include="Game.ico" />
     <Content Include="GameThumbnail.png" />