Changeset 7288 for 2016

Timestamp:

2016-06-14 14:25:13 (5 years ago)

Author:

koannak

Message:

 

Location:

2016/24/JamiP

Files:

• PONG/PONG.suo (added)
• PONG/PONG/PONG/PONG.cs (modified) (8 diffs)
• PONG/PONG/PONG/bin/x86/Debug/PONG.exe (modified) (previous)
• PONG/PONG/PONG/bin/x86/Debug/PONG.pdb (modified) (previous)
• PONG/PONG/PONG/obj/x86/Debug/PONG.exe (modified) (previous)
• PONG/PONG/PONG/obj/x86/Debug/PONG.pdb (modified) (previous)
• kuva.png (added)

2016/24/JamiP/PONG/PONG/PONG/PONG.cs

@@ -16 +16 @@
     PhysicsObject maila2;
 
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
+
     IntMeter pelaajan1Pisteet;
     IntMeter pelaajan2Pisteet;
@@ -25 +28 @@
         AsetaOhjaimet();
         LisaaLaskurit();
+        AddCollisionHandler(pallo, KasittelePallonTormays);
 
         PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
@@ -35 +39 @@
         pallo = new PhysicsObject(40.0, 40.0);
         Add(pallo);
-        pallo.Shape = Shape.Octagon;
+        pallo.Shape = Shape.Triangle;
         pallo.X = -200.0;
         pallo.Y = 0.0;
@@ -41 +45 @@
 
 
-       maila1 = LuoMaila(Level.Left + 20.0, 0.0);
-       maila2 = LuoMaila(Level.Right - 20.0, 0.0);
-       // LuoMaila(Level.Right - 20.0, 200.0);
+        maila1 = LuoMaila(Level.Left + 20.0, 0.0);
+        maila2 = LuoMaila(Level.Right - 20.0, 0.0);
+        // LuoMaila(Level.Right - 20.0, 200.0);
 
+        vasenReuna = Level.CreateLeftBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
 
-        Level.CreateBorders(1.0, 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;
+
         Level.Background.Color = Color.Black;
         Camera.ZoomToLevel();
@@ -74 +92 @@
         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);
-        Keyboard.Listen(Key.Space, ButtonState.Pressed, LyoPalloa, null,1000);
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, LyoPalloa, null, 1000);
 
 
@@ -102 +120 @@
 
     }
-    void LyoPalloa(int voima )
+    void LyoPalloa(int voima)
     {
         Vector impulssi = new Vector(voima, 10.0);
@@ -116 +134 @@
         IntMeter laskuri = new IntMeter(0);
         laskuri.MaxValue = 10;
-        
+
         Label naytto = new Label();
         naytto.BindTo(laskuri);
@@ -128 +146 @@
         return laskuri;
     }
-}
+    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    {
+        if (kohde == oikeaReuna)
+        {
+            pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            pelaajan2Pisteet.Value += 1;
 
-    
+        }
+    }
+}  
 
+
+