Changeset 532

Timestamp:

2010-06-08 11:25:51 (13 years ago)

Author:

paaaanro

Message:

 

File:

• 2010/23/johanh/Pong/Pong/Peli.cs (modified) (9 diffs)

2010/23/johanh/Pong/Pong/Peli.cs

@@ -7 +7 @@
     public class Peli : PhysicsGame
     {
-        Vector nopeusYlos = new Vector(0, 200);
-        Vector nopeusAlas = new Vector(0, -200);
+        Vector nopeusYlos = new Vector(0, 275);
+        Vector nopeusAlas = new Vector(0, -275);
 
         PhysicsObject pallo;
@@ -22 +22 @@
         protected override void Begin()
         {
+            ClearAll();
             LuoKentta();
             AsetaOhjaimet();
@@ -30 +31 @@
         void LuoKentta()
         {
-            pallo = new PhysicsObject(30.0, 30.0);
+            pallo = new PhysicsObject(32.0, 32.0);
             pallo.Shape = Shapes.Circle;
-            pallo.X = -200.0;
+            pallo.X = 0.0;
             pallo.Y = 0.0;
             pallo.Restitution = 1.0;
@@ -38 +39 @@
             AddCollisionHandler(pallo, KasittelePallonTormays);
 
-            maila1 = LuoMaila(Level.Left + 20.0, 0.0);
-            maila2 = LuoMaila(Level.Right - 20.0, 0.0);
+            maila1 = LuoMaila(Level.Left + 22.0, 0.0);
+            maila2 = LuoMaila(Level.Right - 22.0, 0.0);
 
             vasenReuna = Level.CreateLeftBorder();
@@ -57 +58 @@
 
             Camera.ZoomToLevel();
+           
         }
 
         PhysicsObject LuoMaila(double x, double y)
         {
-            PhysicsObject maila = PhysicsObject.CreateStaticObject(30.0, 175.0);
+            PhysicsObject maila = PhysicsObject.CreateStaticObject(1.0, 200.0);
             maila.Shape = Shapes.Rectangle;
             maila.X = x;
@@ -74 +76 @@
             pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
             pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
+
         }
 
@@ -79 +82 @@
         {
             IntMeter laskuri = new IntMeter(0);
-            laskuri.MaxValue = 10;
+            laskuri.MaxValue = 100;
             ValueDisplay naytto = new ValueDisplay();
             naytto.BindTo(laskuri);
@@ -103 +106 @@
         void AloitaPeli()
         {
-            Vector impulssi = new Vector(500.0, 350.0);
+            Vector impulssi = new Vector(-400.0, -250.0);
             pallo.Hit(impulssi);
         }
 
         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.Space, ButtonState. Pressed, Begin, "Aloita peli" );
+            Keyboard.Listen(Key.W, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylös", maila1, nopeusYlos);
+            Keyboard.Listen(Key.W, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+            Keyboard.Listen(Key.S, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
+            Keyboard.Listen(Key.S, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
            
             Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila2, nopeusYlos);
@@ -138 +141 @@
         void AsetaNopeus(PhysicsObject maila, Vector nopeus)
         {
-            if ((nopeus.Y < 0) && (maila.Y < Level.Bottom))
+            if ((nopeus.Y < 1) && (maila.Y < Level.Bottom))
             {
                 maila.Velocity = Vector.Zero;
                 return;
             }
-            if ((nopeus.Y > 0) && (maila.Y > Level.Top))
+            if ((nopeus.Y > 1) && (maila.Y > Level.Top))
             {
                 maila.Velocity = Vector.Zero;