Changeset 2262 for 2011/26

Timestamp:

2011-06-29 11:01:35 (12 years ago)

Author:

jumakall

Message:

 

Location:

2011/26/JuhoK/SFN

Files:

• SFN.suo (modified) (previous)
• SFN/SFN/Peli.cs (modified) (5 diffs)
• SFN/SFN/bin/x86/Debug/SFN.exe (modified) (previous)
• SFN/SFN/bin/x86/Debug/SFN.pdb (modified) (previous)
• SFN/SFN/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• SFN/SFN/obj/x86/Debug/SFN.exe (modified) (previous)
• SFN/SFN/obj/x86/Debug/SFN.pdb (modified) (previous)
• SFN/SFNContent/obj/x86/Debug/ContentPipeline.xml (modified) (3 diffs)
• SFN/SFNContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

2011/26/JuhoK/SFN/SFN/SFN/Peli.cs

@@ -70 +70 @@
         {
             ClearAll();
+
+            Label ylapalkki = new Label(Screen.Width, Screen.Height / 15);
+            ylapalkki.Color = Color.White;
+            ylapalkki.X = 0;
+            ylapalkki.Y = Screen.Top - (ylapalkki.Height / 2);
+            Add(ylapalkki);
+
+            Label alapalkki = new Label(Screen.Width, Screen.Height / 4);
+            alapalkki.Color = Color.White;
+            alapalkki.Position = new Vector(0, Screen.Bottom + (alapalkki.Height / 2));
+            Add(alapalkki);
+
+            Label oikeareuna = new Label(Screen.Width / 6, Screen.Height);
+            oikeareuna.Color = Color.White;
+            oikeareuna.Position = new Vector(Screen.Right - oikeareuna.Width / 2, 0);
+            Add(oikeareuna);
+
             Keyboard.Listen(Key.Escape, ButtonState.Released, Exit, null);
             Camera.ZoomToLevel();
             Level.BackgroundColor = Color.LightGray;
 
-            GameObject alapalkki = new GameObject(Level.Width, Level.Height / 4);
+            /*GameObject alapalkki = new GameObject(Level.Width, Level.Height / 4);
             alapalkki.X = 0;
             alapalkki.Y = Level.Bottom + alapalkki.Height / 2;
-            Add(alapalkki);
-
+            Add(alapalkki);*/
+            /*
             GameObject ylapalkki = new GameObject(Level.Width, Level.Height / 10);
             ylapalkki.X = 0;
             ylapalkki.Y = Level.Top - ylapalkki.Height / 2;
             Add(ylapalkki);
-
-            GameObject oikeareuna = new GameObject(Level.Width / 6, Level.Height);
+            */
+            /*GameObject oikeareuna = new GameObject(Level.Width / 6, Level.Height);
             oikeareuna.Position = new Vector(Level.Right - oikeareuna.Width / 2, 0);
-            Add(oikeareuna);
+            Add(oikeareuna);*/
 
             //Next
             PushButton nextid = new PushButton("-->");
-            nextid.Position = new Vector(Level.Right * 1.15, Level.Top * 1.2); //Level.Right + 80, Level.Top + 60
+            nextid.Position = new Vector(Screen.Right * 0.9, ylapalkki.Y); //Level.Right + 80, Level.Top + 60
             nextid.Clicked += new Action(nextid_Clicked);
             Add(nextid);
@@ -96 +113 @@
             //Previous
             PushButton previousid = new PushButton("<--");
-            previousid.Position = new Vector(Level.Right * 0.85, Level.Top * 1.2); //Level.Right - 80, Level.Top + 60
+            previousid.Position = new Vector(Screen.Right * 0.65, ylapalkki.Y); //Level.Right - 80, Level.Top + 60
             previousid.Clicked += new Action(previousid_Clicked);
             Add(previousid);
@@ -112 +129 @@
             //Number
             number = new Label((ID+1).ToString()+"/"+autot.Count.ToString());
-            number.Position = new Vector(Level.Right, Level.Top * 1.2); //Level.Right, Level.Top + 60
+            number.Position = new Vector(Screen.Right * 0.78, ylapalkki.Y); //Level.Right, Level.Top + 60
             Add(number);
 
             malli = new Label(autot[ID].korinnimi.ToString());
-            malli.Position = new Vector(Level.Left, Level.Top * 1.2); //Level.Left, Level.Top + 60
+            malli.Position = new Vector(Level.Left, ylapalkki.Y); //Level.Left, Level.Top + 60
             Add(malli);
 
             moottori = new Label("Moottori: " + autot[ID].moottori.ToString());
-            moottori.Position = new Vector(Level.Left + 250, Level.Top * 1.2); //Level.Left + 250, Level.Top * 1.2
+            moottori.Position = new Vector(Level.Left + 250, ylapalkki.Y); //Level.Left + 250, Level.Top * 1.2
             Add(moottori);
 
+
             renkaat = new Label("Renkaat: "+autot[ID].renkaat.ToString());
-            renkaat.Position = new Vector(Level.Left + 500, Level.Top * 1.2); //Level.Left + 500, Level.Top + 60
+            renkaat.Position = new Vector(0, ylapalkki.Y);
+            //renkaat.Y = ylapalkki.Y;
+            //ylapalkki.Y = 200 - ylapalkki.Height/2;
+            //renkaat.Position = //new Vector(ylapalkki.X, ylapalkki.Y); //Level.Left + 500, Level.Top + 60
             Add(renkaat);
 
@@ -134 +155 @@
             renkaiden_hinta.Position = new Vector(Level.Right + 65, Level.Top - 180);
             Add(renkaiden_hinta);
+            
         }
 
@@ -152 +174 @@
         void previousid_Clicked()
         {
-            //ID = --ID % autot.Count;
-            MessageDisplay.Add("You can't use this button, because it's are broken.");
+            ID = (--ID + autot.Count) % autot.Count;
             UpdateHUD();
         }

2011/26/JuhoK/SFN/SFN/SFNContent/obj/x86/Debug/ContentPipeline.xml

@@ -8 +8 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb</Output>
-      <Time>2011-06-27T19:39:36+03:00</Time>
+      <Output>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround2.xnb</Output>
+      <Time>2011-06-28T10:09:57.8381342+03:00</Time>
     </Item>
     <Item>
@@ -17 +17 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround.xnb</Output>
-      <Time>2011-06-28T17:01:04+03:00</Time>
+      <Output>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\MenuBackround.xnb</Output>
+      <Time>2011-06-28T10:27:54.1975092+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -26 +26 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFNContent\</RootDirectory>
-      <LoggerRootDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\</LoggerRootDirectory>
-      <IntermediateDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>J:\Visual Studio\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFNContent\</RootDirectory>
+      <LoggerRootDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFN\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFNContent\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\MyTemp\JuhoK\SFN\SFN\SFN\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
-        <Value>2010-08-23T12:41:18+03:00</Value>
+        <Key>C:\Program Files\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
+        <Value>2010-08-23T13:41:18+03:00</Value>
       </Assembly>
       <Assembly>
-        <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
-        <Value>2011-06-27T18:29:19.4335733+03:00</Value>
+        <Key>C:\WINNT\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
+        <Value>2010-12-30T13:08:47.7865068+02:00</Value>
       </Assembly>
     </Assemblies>