Changeset 5529

Timestamp:

2014-07-22 10:52:30 (9 years ago)

Author:

sieerinn

Message:

Pongin muokkaamista

Location:

2014/30/LauriR/Pong

Files:

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

2014/30/LauriR/Pong/Pong/Pong/Pong.cs

@@ -9 +9 @@
 public class Pong : PhysicsGame
 {
-    Vector nopeusYlos = new Vector(0, 200);
-    Vector nopeusAlas = new Vector(0, -200);
-
-    PhysicsObject pallo;
+    Vector nopeusYlos = new Vector(0, 400);
+    Vector nopeusAlas = new Vector(0, -400);
+
     PhysicsObject maila1;
     PhysicsObject maila2;
@@ -27 +26 @@
         AsetaOhjaimet();
         LisaaLaskurit();
-        AloitaPeli();
-    }
-
-    void LuoKentta()
-    {
-        pallo = new PhysicsObject(40.0, 40.0);
-        pallo.Shape = Shape.Circle;
-        pallo.X = -350.0;
-        pallo.Y = 0.0;
+       
+    }
+
+    void LuoPallo()
+    {
+        PhysicsObject pallo = new PhysicsObject(40.0, 40.0);
+        pallo.Shape = Shape.Hexagon;
+        pallo.Color = RandomGen.NextColor();
+        pallo.X = RandomGen.NextDouble(-100,100);
+        pallo.Y = RandomGen.NextDouble(-100, 100);
         pallo.Restitution = 1.0;
         pallo.KineticFriction = 0.0;
@@ -42 +42 @@
         AddCollisionHandler(pallo, KasittelePallonTormays);
 
+        Vector impulssi = new Vector(500.0, 0.0);
+        pallo.Hit(impulssi);
+    }
+
+    void LuoKentta()
+    {
+        for (int i = 0; i < 10; i++)
+        {
+
+
+            LuoPallo();
+
+        }
+      
         maila1 = LuoMaila(Level.Left + 20.0, 0.0);
         maila2 = LuoMaila(Level.Right - 20.0, 0.0);
@@ -65 +79 @@
         alaReuna.KineticFriction = 0.0;
 
-        Level.BackgroundColor = Color.Black;
+        Level.Background.Color = Color.Green;
+        
+        maila1.Color = Color.Wheat;
+        maila2.Color = Color.Wheat;
 
         Camera.ZoomToLevel();
@@ -91 +108 @@
     {
         IntMeter laskuri = new IntMeter(0);
-        laskuri.MaxValue = 10;
+        laskuri.MaxValue = 1000;
 
         Label naytto = new Label();
@@ -98 +115 @@
         naytto.Y = y;
         naytto.TextColor = Color.White;
-        naytto.BorderColor = Level.BackgroundColor;
-        naytto.Color = Level.BackgroundColor;
+        naytto.BorderColor = Level.Background.Color;
+        naytto.Color = Level.Background.Color;
         Add(naytto);
 
@@ -117 +134 @@
     }
 
-    void AloitaPeli()
-    {
-        Vector impulssi = new Vector(500.0, 0.0);
-        pallo.Hit(impulssi);
-    }
-
     void AsetaOhjaimet()
     {
+        PhoneBackButton.Listen(ConfirmExit, "Lopeta peli");
+
         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);
@@ -167 +180 @@
         maila.Velocity = nopeus;
     }
+
+    const double PALLON_MIN_NOPEUS = 500;
+
+    protected override void Update(Time time)
+    {
+        /*
+        if (pallo != null && Math.Abs(pallo.Velocity.X) < PALLON_MIN_NOPEUS)
+        {
+            pallo.Velocity = new Vector(pallo.Velocity.X * 1.1, pallo.Velocity.Y);
+        }
+         */
+        base.Update(time);
+    }
 }