Changeset 2215 for 2011/26

Timestamp:

2011-06-28 12:39:21 (12 years ago)

Author:

vilmarju

Message:

Talletus.

Location:

2011/26/VilleK/ponggi/ponggi/ponggi

Files:

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

2011/26/VilleK/ponggi/ponggi/ponggi/Peli.cs

@@ -8 +8 @@
 
 public class Peli : PhysicsGame
-{Vector nopeusYlos = new Vector( 0, 200 );
-    Vector nopeusAlas = new Vector( 0, -200 );
+{
+    Vector nopeusYlos = new Vector(0, 200);
+    Vector nopeusAlas = new Vector(0, -200);
 
     PhysicsObject pallo;
     PhysicsObject maila1;
     PhysicsObject maila2;
+    
 
 
@@ -29 +31 @@
         pallo = new PhysicsObject(70.0, 70.0);
         Add(pallo);
-        pallo.Shape = Shape.Circle;
+        pallo.Shape = Shape.Triangle;
         pallo.Color = Color.DarkViolet;
         pallo.X = -200.0;
@@ -42 +44 @@
     }
     void AsetaOhjaimet()
+    {
+        Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Poistu");
+        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.Escape, ButtonState.Pressed, Exit, "Poistu");
-             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", 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.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");
+    ControllerOne.Listen( Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila1, nopeusYlos );
+    ControllerOne.Listen( Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero );
+    ControllerOne.Listen( Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila1, nopeusAlas );
+    ControllerOne.Listen( Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero );
 
-    Keyboard.Listen( Key.F1,     ButtonState.Pressed,  ShowControlHelp, "Näytä ohjeet" );
+    ControllerTwo.Listen( Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila2, nopeusYlos );
+    ControllerTwo.Listen( Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero );
+    ControllerTwo.Listen( Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila2, nopeusAlas );
+    ControllerTwo.Listen( Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero );
 
-         }
-void AsetaNopeus( PhysicsObject maila, Vector nopeus )
-{
-   maila.Velocity = nopeus;
-}
+    ControllerOne.Listen( Button.Back, ButtonState.Pressed, Exit, "Poistu" );
+    ControllerTwo.Listen( Button.Back, ButtonState.Pressed, Exit, "Poistu" );
+
+    }
+       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;
+    }
+
 
     PhysicsObject LuoMaila(double x, double y)