Changeset 7851

Timestamp:

2016-07-06 11:14:35 (4 years ago)

Author:

juleppaa

Message:

 

Location:

2016/24/JustusL/Object_Ball/Object_Ball

Files:

• Object_Ball/Object_Ball.cs (modified) (3 diffs)
• Object_Ball/bin/x86/Debug/Content/kentta1.xnb (modified) (previous)
• Object_Ball/bin/x86/Debug/Jypeli.dll (modified) (previous)
• Object_Ball/bin/x86/Debug/Object_Ball.exe (modified) (previous)
• Object_Ball/bin/x86/Debug/Object_Ball.pdb (modified) (previous)
• Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml (modified) (11 diffs)
• Object_Ball/obj/x86/Debug/Object_Ball.csprojResolveAssemblyReference.cache (modified) (previous)
• Object_Ball/obj/x86/Debug/Object_Ball.exe (modified) (previous)
• Object_Ball/obj/x86/Debug/Object_Ball.pdb (modified) (previous)
• Object_BallContent/kentta1.png (modified) (previous)
• Object_BallContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Object_BallContent/obj/x86/Debug/Object_BallContent.contentprojResolveAssemblyReference.cache (modified) (previous)

2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/Object_Ball.cs

@@ -42 +42 @@
         Gravity = new Vector(0, -70);
 
-        Level.Width = 10000;
-        Level.Height = 10000;
-        Level.CreateBorders();
+       
 
         //Level.Background.Image = tauste;
         //Level.Background.TileToLevel();
 
+       
+        //Camera.Follow(pallo);
+        Camera.StopFollowing();
+        
+        Ohjaimet();
+        LuoSlider();
+        LuoKauppa();
+        Grafiikat();
+
+
+        ColorTileMap ruudut = ColorTileMap.FromLevelAsset("kentta1");
+
+        //2. Kerrotaan mitä aliohjelmaa kutsutaan, kun tietyn värinen pikseli tulee vastaan kuvatiedostossa.
+        ruudut.SetTileMethod(Color.Red, LuoPallo);
+        //ruudut.SetTileMethod(, LuoTaso);
+        ruudut.SetTileMethod(new Color(255, 14, 255), LuoTahti);
+        ruudut.SetTileMethod(new Color(0, 255, 0), LuoMaali );
+
+        //3. Execute luo kentän
+        //   Parametreina leveys ja korkeus
+        ruudut.Execute(5, 5);
+
+        Level.Width = 1000;
+        Level.Height = 1000;
         GameObject tausta = new GameObject(Level.Width, Level.Height);
         tausta.Image = tauste;
         tausta.TextureWrapSize = new Vector(300, 300);
         Add(tausta, -3);
-        //Camera.Follow(pallo);
-        Camera.StopFollowing();
-        
-        Ohjaimet();
-        LuoSlider();
-        LuoKauppa();
-        Grafiikat();
-
-
-        ColorTileMap ruudut = ColorTileMap.FromLevelAsset("kentta1");
-
-        //2. Kerrotaan mitä aliohjelmaa kutsutaan, kun tietyn värinen pikseli tulee vastaan kuvatiedostossa.
-       /* ruudut.SetTileMethod(Color.Green, );
-        ruudut.SetTileMethod(Color.Black, LuoTaso);
-        ruudut.SetTileMethod(Color.Yellow, LuoTahti);
-
-        //3. Execute luo kentän
-        //   Parametreina leveys ja korkeus
-        ruudut.Execute(20, 20);*/
+        Level.CreateBorders();
+        
     }
 
@@ -215 +220 @@
         }
     }
-    void Palikka()
+    void LuoMaali(Vector paikka, double leveys, double korkeus)
     {
        
 
-        maali = PhysicsObject.CreateStaticObject(70, 70);
+        maali = PhysicsObject.CreateStaticObject(leveys*2, korkeus*2);
         maali.Tag = "maali";
         maali.Image = Maali;
-        maali.X = 700;
-        maali.Y = -400;
+        maali.Position = paikka;
 
         Add(maali);
-
-
-
-    }
-    void LuoPallo(Vector paikka double leveys, double korkeus)
+ }
+    void LuoPallo(Vector paikka, double leveys, double korkeus)
 {
-     pallo = new PhysicsObject(25.0, 25.0);
+     pallo = new PhysicsObject(leveys, korkeus);
         pallo.Shape = Shape.Circle;
         pallo.Color = Color.Red;
         pallo.IgnoresPhysicsLogics = true;
         Add(pallo);
+        pallo.Position = paikka;
         AddCollisionHandler(pallo, "maali", Voitto);
         AddCollisionHandler(pallo, "tahti", Kerays);
@@ -242 +244 @@
         Add(pallo);
 }
-    void LuoTahti(Vector paikka, double leveys, double ko)
-    {
-        PhysicsObject tahti = PhysicsObject.CreateStaticObject(25, 25);
+    void LuoTahti(Vector paikka, double leveys, double korkeus)
+    {
+        PhysicsObject tahti = PhysicsObject.CreateStaticObject(leveys, korkeus);
         tahti.Shape = Shape.Star;
         tahti.Color = Color.HotPink;
         tahti.Tag = "tahti";
-        tahti.X = 100;
+        tahti.Position = paikka;
 
         Add(tahti);

2016/24/JustusL/Object_Ball/Object_Ball/Object_Ball/obj/x86/Debug/ContentPipeline-{CD347656-A8F2-48EE-8097-A4F9AF1242F0}.xml

@@ -8 +8 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output>
-      <Time>2016-07-05T15:14:08.1334008+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaarikakka.xnb</Output>
+      <Time>2016-07-05T10:37:41.3098919+03:00</Time>
     </Item>
     <Item>
@@ -17 +17 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output>
-      <Time>2016-06-16T12:22:54.0854567+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kaariosa.xnb</Output>
+      <Time>2016-07-04T10:29:37.230784+03:00</Time>
     </Item>
     <Item>
@@ -26 +26 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output>
-      <Time>2016-06-16T12:22:55.824712+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kyna.xnb</Output>
+      <Time>2016-07-04T10:29:37.090384+03:00</Time>
     </Item>
     <Item>
@@ -35 +35 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output>
-      <Time>2016-06-16T11:35:20.5217772+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\maali_objectBall.xnb</Output>
+      <Time>2016-07-04T10:29:37.090384+03:00</Time>
     </Item>
     <Item>
@@ -44 +44 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output>
-      <Time>2016-06-16T11:35:20.5287781+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka kursori.xnb</Output>
+      <Time>2016-07-04T10:29:37.230784+03:00</Time>
     </Item>
     <Item>
@@ -53 +53 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output>
-      <Time>2016-06-16T12:22:56.4812302+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\palikka.xnb</Output>
+      <Time>2016-07-04T10:29:37.090384+03:00</Time>
     </Item>
     <Item>
@@ -62 +62 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output>
-      <Time>2016-07-04T20:43:40.1219171+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\ruutu.xnb</Output>
+      <Time>2016-07-04T13:04:34.8082709+03:00</Time>
     </Item>
     <Item>
@@ -71 +71 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output>
-      <Time>2016-07-04T20:43:40.1929412+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta1.xnb</Output>
+      <Time>2016-07-06T10:37:01.9231134+03:00</Time>
     </Item>
     <Item>
@@ -80 +80 @@
       <Processor>TextureProcessor</Processor>
       <Options>None</Options>
-      <Output>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output>
-      <Time>2016-07-04T20:43:40.2029413+03:00</Time>
+      <Output>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\kentta2.xnb</Output>
+      <Time>2016-07-04T14:53:50.6394709+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -90 +90 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory>
-      <LoggerRootDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>C:\Users\Justus\Documents\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_BallContent\</RootDirectory>
+      <LoggerRootDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\MyTemp\JustusL\Object_Ball\Object_Ball\Object_Ball\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>
       <Assembly>
-        <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
-        <Value>2015-04-01T18:41:16+03:00</Value>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2015-02-09T20:18:44+02:00</Value>
       </Assembly>
       <Assembly>
@@ -125 +125 @@
       </Assembly>
       <Assembly>
-        <Key>C:\Users\Justus\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
-        <Value>2015-04-01T18:41:16+03:00</Value>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
+        <Value>2015-02-17T22:27:18+02: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>2015-12-15T06:54:21.9346879+02:00</Value>
+        <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>2015-09-16T19:42:13.6500946+03:00</Value>
       </Assembly>
     </Assemblies>