Changeset 6520 for 2015

Timestamp:

2015-06-29 14:47:42 (8 years ago)

Author:

misakana

Message:

 

Location:

2015/27/SamuliS/Pong

Files:

• Pong/Pong/Pong.cs (modified) (5 diffs)
• _UpgradeReport_Files (added)
• _UpgradeReport_Files/UpgradeReport.css (added)
• _UpgradeReport_Files/UpgradeReport.xslt (added)
• _UpgradeReport_Files/UpgradeReport_Error.png (added)
• _UpgradeReport_Files/UpgradeReport_Information.png (added)
• _UpgradeReport_Files/UpgradeReport_Success.png (added)
• _UpgradeReport_Files/UpgradeReport_Warning.png (added)

2015/27/SamuliS/Pong/Pong/Pong/Pong.cs

@@ -17 +17 @@
     PhysicsObject maila2;
 
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
+
+    IntMeter pelaajan1Pisteet;
+    IntMeter pelaajan2Pisteet;
+
     public override void Begin()
     {
@@ -22 +28 @@
         AsetaOhjaimet();
         AloitaPeli();
-        
-        
-       
+        LisaaLaskurit();
+
+
+
     }
 
@@ -36 +43 @@
         pallo.Restitution = 1.0;
 
+        AddCollisionHandler(pallo, KasittelePallonTormays);
+
         maila1 = LuoMaila(Level.Left + 20.0, 0.0);
         maila2 = LuoMaila(Level.Right - 20.0, 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 alaReuna = Level.CreateBottomBorder();
+        alaReuna.Restitution = 1.0;
+        alaReuna.IsVisible = false;
+
+        PhysicsObject yläReuna = Level.CreateTopBorder();
+        yläReuna.Restitution = 1.0;
+        yläReuna.IsVisible = false;
+
+
         Level.Background.Color = Color.Black;
 
@@ -66 +91 @@
         Keyboard.Listen(Key.A, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylös", maila1, nopeusYlos);
         Keyboard.Listen(Key.A, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
-        Keyboard.Listen(Key.Z, ButtonState
+        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.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: liikuta mailaa ylös", maila2, nopeusYlos);
+        Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+        Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa alas", maila2, nopeusAlas);
+        Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+
+        Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
     }
@@ -72 +105 @@
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
+        if ((nopeus.Y > 0) && (maila.Top > Level.Top))
+        {
+            maila.Velocity = Vector.Zero;
+            return;
+        }
+        if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
+        {
+            maila.Velocity = Vector.Zero;
+            return;
+        }
+
         maila.Velocity = nopeus;
     }
 
+    void LisaaLaskurit()
+    {
+        pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
+        pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
+    }
+
+    IntMeter LuoPisteLaskuri(double x, double y)
+    {
+        IntMeter laskuri = new IntMeter(0);
+        laskuri.MaxValue = 20;
+
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = x;
+        naytto.Y = y;
+        naytto.TextColor = Color.Green;
+        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;
+        }
+    }
 }