Changeset 3460 for 2012

Timestamp:

2012-07-03 10:38:47 (9 years ago)

Author:

henmatma

Message:

Talletus.

Location:

2012/27/HenriM

Files:

• Pong/Pong/Pong/Pong.cs (modified) (4 diffs)
• kalja.png (added)
• kaljaadventures (added)
• kaljaadventures/kaljaadventures (added)
• kaljaadventures/kaljaadventures.sln (added)
• kaljaadventures/kaljaadventures/kaljaadventures (added)
• kaljaadventures/kaljaadventures/kaljaadventures/Game.ico (added)
• kaljaadventures/kaljaadventures/kaljaadventures/GameThumbnail.png (added)
• kaljaadventures/kaljaadventures/kaljaadventures/Ohjelma.cs (added)
• kaljaadventures/kaljaadventures/kaljaadventures/Properties (added)
• kaljaadventures/kaljaadventures/kaljaadventures/Properties/AssemblyInfo.cs (added)
• kaljaadventures/kaljaadventures/kaljaadventures/kaljaadventures.cs (added)
• kaljaadventures/kaljaadventures/kaljaadventures/kaljaadventures.csproj (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent/kaljaadventuresContent.contentproj (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent/kentta1.txt (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent/maali.wav (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent/norsu.png (added)
• kaljaadventures/kaljaadventures/kaljaadventuresContent/tahti.png (added)

2012/27/HenriM/Pong/Pong/Pong/Pong.cs

@@ -10 +10 @@
 {
 
-    Vector nopeusYlos = new Vector(0, 200);
-    Vector nopeusAlas = new Vector(0, -200);
+    Vector nopeusYlos = new Vector(0, 400);
+    Vector nopeusAlas = new Vector(0, -400);
 
     PhysicsObject pallo;
     PhysicsObject maila1;
     PhysicsObject maila2;
+
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
 
     IntMeter pelaajan1Pisteet;
@@ -35 +38 @@
     pallo.Y = 0.0;
     pallo.Restitution = 1.0;
+    pallo.KineticFriction = 0.0;
 
     Add(pallo);
@@ -41 +45 @@
     maila2 = LuoMaila(Level.Right - 20.0, 0.0);
 
-    PhysicsObject vasenReuna = Level.CreateLeftBorder();
+    vasenReuna = Level.CreateLeftBorder();
     vasenReuna.Restitution = 1.0;
     vasenReuna.IsVisible = false;
+    vasenReuna.KineticFriction = 0.0;
 
-    PhysicsObject oikeaReuna = Level.CreateRightBorder();
+    oikeaReuna = Level.CreateRightBorder();
     oikeaReuna.Restitution = 1.0;
     oikeaReuna.IsVisible = false;
+    oikeaReuna.KineticFriction = 0.0;
+
+    PhysicsObject alaReuna = Level.CreateBottomBorder();
+    alaReuna.Restitution = 1.0;
+    alaReuna.IsVisible = false;
+    alaReuna.KineticFriction = 0.0;
+
+    PhysicsObject ylaReuna = Level.CreateTopBorder();
+    ylaReuna.Restitution = 1.0;
+    ylaReuna.IsVisible = false;
+    ylaReuna.KineticFriction = 0.0;
 
     Level.BackgroundColor = Color.Black;
@@ -130 +146 @@
     void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
     {
+        if (kohde == oikeaReuna)
+        {
+            pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            pelaajan2Pisteet.Value += 1;
+        }
 
     }