Changeset 6843

Timestamp:

2015-07-21 11:57:35 (8 years ago)

Author:

mivasata

Message:

 

Location:

2015/30/ValtteriT/Pong/Pong/Pong

Files:

• Pong.cs (modified) (3 diffs)
• bin/x86/Debug/Pong.exe (modified) (previous)
• bin/x86/Debug/Pong.pdb (modified) (previous)
• obj/x86/Debug/Pong.exe (modified) (previous)
• obj/x86/Debug/Pong.pdb (modified) (previous)

2015/30/ValtteriT/Pong/Pong/Pong/Pong.cs

@@ -13 +13 @@
 
     PhysicsObject pallo;
-
     PhysicsObject maila1;
     PhysicsObject maila2;
+
+    IntMeter pelaajan1Pisteet;
+    IntMeter pelaajan2Pisteet;
 
     public override void Begin()
@@ -21 +23 @@
         LuoKentta();
         AsetaOhjaimet();
+        LisaaLaskurit();
         AloitaPeli();
        
@@ -68 +71 @@
     void AsetaOhjaimet()
     {
-        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.Down,     AsetaNopeus,   "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
-        Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus,   null,                             maila1, Vector.Zero);
+        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.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"
+        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.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
+        Keyboard.Listen(Key.F1,     ButtonState.Pressed,   ShowControlHelp, "Näytä ohjeet");
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed,   ConfirmExit,     "Lopeta peli");
     }
 
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
-        maila.Velocity = 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 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 = 10;
+
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = x;
+        naytto.Y = y;
+        naytto.TextColor = Color.BrightGreen;
+        naytto.BorderColor = Level.Background.Color;
+        naytto.Color = Level.Background.Color;
+        Add(naytto);
+
+        return laskuri;
+    }
 }