Changeset 7307

Timestamp:

2016-06-14 15:01:23 (7 years ago)

Author:

latukova

Message:

 

Location:

2016/24/LasseK

Files:

• Ammus1.png (added)
• Ammus2.png (added)
• PinPong/.vs/PinPong/v14/.suo (modified) (previous)
• PinPong/PinPong/PinPong/PinPong.cs (modified) (5 diffs)
• PinPong/PinPong/PinPong/bin/x86/Debug/PinPong.exe (modified) (previous)
• PinPong/PinPong/PinPong/bin/x86/Debug/PinPong.pdb (modified) (previous)
• PinPong/PinPong/PinPong/obj/x86/Debug/ContentPipeline-{6DAC37A3-7F96-4641-8C99-0BC4C668F854}.xml (modified) (1 diff)
• PinPong/PinPong/PinPong/obj/x86/Debug/PinPong.exe (modified) (previous)
• PinPong/PinPong/PinPong/obj/x86/Debug/PinPong.pdb (modified) (previous)
• PinPong/UpgradeLog.htm (added)
• Suunnitelma.png (added)
• Tiger.png (added)
• TigerPalatIlmanValkoistaTaustaa.png (added)
• Tykki.png (added)
• Tykkitorni.png (added)
• VaununRunko.png (added)

2016/24/LasseK/PinPong/PinPong/PinPong/PinPong.cs

@@ -15 +15 @@
     PhysicsObject pallo;
     PhysicsObject maila1;
-    IPhysicsObject maila2;
+    PhysicsObject maila2;
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
+    IntMeter pelaajan1Pisteet;
+    IntMeter pelaajan2Pisteet;
+    
     public override void Begin()
     {
-     
-         LuoKentta();
+        LisaaLaskurit();
+        LuoKentta();
         AloitaPeli();
         AsetaOhjaimet();
@@ -39 +44 @@
         Add(pallo);
 
-        PhysicsObject maila = PhysicsObject.CreateStaticObject(20.0, 100.0);
-        maila.Shape = Shape.Rectangle;
-        maila.X = Level.Left + 20.0;
-        maila.Y = 0.0;
-        maila.Restitution = 1.0;
-        Add(maila);
-
         maila1 = LuoMaila(Level.Left + 20.0, 0.0);
         maila2 = LuoMaila(Level.Right - 20.0, 0.0);
-
+        AddCollisionHandler(pallo, KasittelePallonTormays);
 
         pallo.X = -200.0;
 
         pallo.Y = 0.0;
-        Level.CreateBorders(1.0, false);
+        vasenReuna = Level.CreateLeftBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+        oikeaReuna = Level.CreateRightBorder();
+        oikeaReuna.Restitution = 1.0;
+        oikeaReuna.IsVisible = false;
+       PhysicsObject YlaReuna = Level.CreateTopBorder();
+        YlaReuna.Restitution = 1.0;
+        YlaReuna.IsVisible = false;
+       PhysicsObject AlaReuna = Level.CreateBottomBorder();
+        AlaReuna.Restitution = 1.0;
+        AlaReuna.IsVisible = false;
+
         pallo.Restitution = 1.0;
-        Level.Background.Color = Color.Pink;
+        Level.Background.Color = Color.HotPink;
         Camera.ZoomToLevel();
     }
@@ -70 +80 @@
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
+
+        if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
+        {
+            maila.Velocity = Vector.Zero;
+            return;
+        }
+        if ((nopeus.Y > 0) && (maila.Top > Level.Top))
+
+        {
+            maila.Velocity = Vector.Zero;
+                return;
+        }
+            
         maila.Velocity = nopeus;
+
     }
     void AsetaOhjaimet()
     {
         Keyboard.Listen(Key.A, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylos", maila1, nopeusYlos);
-        Keyboard.Listen(Key.A, ButtonState.Released, null, maila1, Vector.Zero);
+        Keyboard.Listen(Key.A, ButtonState.Released,AsetaNopeus, null, maila1, Vector.Zero);
         Keyboard.Listen(Key.Z, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
         Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
@@ -89 +113 @@
     }
 
+    IntMeter LuoPisteLaskuri(double x, double y)
+    {
+        IntMeter laskuri = new IntMeter(0);
+        laskuri.MaxValue = 10;
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = x;
+        naytto.Y = y;
+        naytto.TextColor = Color.HotPink;
+        naytto.BorderColor = Level.Background.Color;
+        naytto.Color = Level.Background.Color;
+        Add(naytto);
+
+
+        return laskuri;
+    }
+    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    {
+
+        if (kohde == oikeaReuna)
+        {
+            pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            pelaajan2Pisteet.Value += 1;
+        }
+    }
+    void LisaaLaskurit()
+    {
+        pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
+        pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
+
+
+
+    }
+
+
+
 
 
@@ -94 +157 @@
 
 
-   

2016/24/LasseK/PinPong/PinPong/PinPong/obj/x86/Debug/ContentPipeline-{6DAC37A3-7F96-4641-8C99-0BC4C668F854}.xml

@@ -17 +17 @@
       <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-09-16T13:46:35.8102287+03:00</Value>
+        <Value>2015-09-16T13:41:58.0471254+03:00</Value>
       </Assembly>
     </Assemblies>