Changeset 2791

Timestamp:

2012-06-05 11:11:16 (8 years ago)

Author:

anjuroys

Message:

 

Location:

2012/23/AnttiR/Pong

Files:

• Pong.suo (modified) (previous)
• Pong/Pong (modified) (1 prop)
• Pong/Pong/Peli.cs (modified) (8 diffs)
• Pong/Pong/bin (deleted)
• Pong/Pong/obj (deleted)
• Pong/PongContent (modified) (1 prop)
• Pong/PongContent/bin (deleted)
• Pong/PongContent/obj (deleted)

2012/23/AnttiR/Pong/Pong/Pong/Peli.cs

@@ -21 +21 @@
     PhysicsObject maila2;
     PhysicsObject maila1;
+    PhysicsObject este;
+    PhysicsObject este2;
+    PhysicsObject este3;
+    PhysicsObject este4;
+    PhysicsObject este5;
     public override void Begin()
     {
@@ -48 +53 @@
         naytto.X = x;
         naytto.Y = y;
-        naytto.TextColor = Color.Black;
-        naytto.BorderColor = Level.BackgroundColor;
-        naytto.Color = Level.BackgroundColor;
+        naytto.TextColor = Color.White;
+        naytto.BorderColor = Color.Black;
+        naytto.Color = Color.Black;
         Add(naytto);
 
@@ -59 +64 @@
     {
 
-        pallo = new PhysicsObject(10, 10);
+        pallo = new PhysicsObject(15, 15);
         pallo.Shape = Shape.Circle;
         pallo.Color = Color.Black;
@@ -66 +71 @@
         pallo.Y = 0;
         pallo.Restitution = 1.0;
-        pallo.KineticFriction = 0.3;
+        pallo.KineticFriction = 0.1;
         Add(pallo);
         AddCollisionHandler(pallo, KasittelePallonTormays);
@@ -72 +77 @@
         maila2 = PhysicsObject.CreateStaticObject(10.0, 150.0);
         maila2.Shape = Shape.Rectangle;
-        maila2.X = Level.Left + 20.0;
+        maila2.X = Level.Left + 10.0;
         maila2.Y = 0.0;
         maila2.Restitution = 1.0;
-        maila2.Color = Color.Black;
+        maila2.Color = Color.LightBlue;
         Add(maila2);
 
         maila1 = PhysicsObject.CreateStaticObject(10.0, 150.0);
         maila1.Shape = Shape.Rectangle;
-        maila1.X = Level.Right - 20.0;
+        maila1.X = Level.Right - 10.0;
         maila1.Y = 0;
         maila1.Restitution = 1.0;
-        maila1.Color = Color.Black;
+        maila1.Color = Color.DarkRed;
         Add(maila1);
 
+        este = PhysicsObject.CreateStaticObject(200.0, 200.0);
+        este.Restitution = 1.0;
+        este.AngularVelocity = 10.0;
+        este.Color = Color.Black;
+        este.Shape = Shape.Hexagon;
+        este.X = -50;
+        este.Y = 300;
+        Add(este);
+
+
+        este2 = PhysicsObject.CreateStaticObject(100.0, 100.0);
+        este2.Restitution = 1.0;
+        este2.AngularVelocity = -10.0;
+        este2.Color = Color.Black;
+        este2.Shape = Shape.Octagon;
+        este2.X = 200;
+        este2.Y = -150;
+        Add(este2);
+
+        este3 = PhysicsObject.CreateStaticObject(150.0, 200.0);
+        este3.Restitution = 1.0;
+        este3.AngularVelocity = -5.0;
+        este3.Color = Color.Black;
+        este3.Shape = Shape.Pentagon;
+        este3.X = 150;
+        este3.Y = 200;
+        Add(este3);
+
+        este4 = PhysicsObject.CreateStaticObject(150.0, 150.0);
+        este4.Restitution = 1.0;
+        este4.AngularVelocity = 5.0;
+        este4.Color = Color.Black;
+        este4.Shape = Shape.Triangle;
+        este4.X = -300;
+        este4.Y = 10;
+        Add(este4);
+
+        este5 = PhysicsObject.CreateStaticObject(50.0, 50.0);
+        este5.Restitution = 1.0;
+        este5.AngularVelocity = 5.0;
+        este5.Color = Color.Black;
+        este5.Shape = Shape.Pentagon;
+        este5.X = -150;
+        este5.Y = -100;
+        Add(este5);
 
         PhysicsObject www = Level.CreateBottomBorder();
@@ -117 +167 @@
         Keyboard.Listen(Key.A, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
 
+
         Keyboard.Listen(Key.Z, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila2, nopeusAlas);
         Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
@@ -122 +173 @@
         Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila1, nopeusYlos);
         Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+
         Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa alas", maila1, nopeusAlas);
         Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
 
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
+
+        Keyboard.Listen(Key.Space, ButtonState.Pressed, delegate { pallo.Velocity = new Vector(pallo.Velocity.Y, pallo.Velocity.X); }, "Käännä pallon pystynopeus vaakanopeudeksi");
+        Keyboard.Listen(Key.Enter, ButtonState.Pressed, delegate { pallo.Velocity = new Vector(pallo.Velocity.X*2,pallo.Velocity.Y*2);},"Kiihdytä palloa");
+         // Keyboard.Listen(Key.Delete,ButtonState.Pressed, delegate { pallo.Velocity = new Vector(pallo.Velocity.X:2,pallo.Velocity.Y:2);},"Hidasta palloa palloa");
+
     }
 
@@ -153 +210 @@
 
     void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
-    {
+    {    
         if (maila1.IsDestroyed || maila2.IsDestroyed) return;
         if (kohde == oikeaReuna) pelaajan1Pisteet.Value += 1;
         if (kohde == vasenReuna) pelaajan2Pisteet.Value += 1;
+        if (pelaajan1Pisteet > pelaajan2Pisteet)
+        Level.BackgroundColor = Color.Blue;
+        if (pelaajan2Pisteet > pelaajan1Pisteet)
+        Level.BackgroundColor = Color.Red;
+        if (pelaajan1Pisteet == pelaajan2Pisteet)
+            Level.BackgroundColor = Color.White;
     }
 }