Changeset 6558 for 2015

Timestamp:

2015-06-30 10:34:33 (8 years ago)

Author:

jasukuva

Message:

Pong peli on valmis

Location:

2015/27/JaakkoS/Pong/Pong

Files:

• Pong/Pong.cs (modified) (6 diffs)
• Pong/bin (added)
• Pong/bin/x86 (added)
• Pong/bin/x86/Debug (added)
• Pong/bin/x86/Debug/Content (added)
• Pong/bin/x86/Debug/Jypeli.dll (added)
• Pong/bin/x86/Debug/Jypeli.xml (added)
• Pong/bin/x86/Debug/Pong.exe (added)
• Pong/bin/x86/Debug/Pong.pdb (added)
• Pong/obj (added)
• Pong/obj/x86 (added)
• Pong/obj/x86/Debug (added)
• Pong/obj/x86/Debug/ContentPipeline-{A0B06D21-D73F-4FA7-B7DB-2F8A810D49C4}.xml (added)
• Pong/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (added)
• Pong/obj/x86/Debug/Microsoft.Xna.Framework.RuntimeProfile.txt (added)
• Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt (added)
• Pong/obj/x86/Debug/Pong.csprojResolveAssemblyReference.cache (added)
• Pong/obj/x86/Debug/Pong.exe (added)
• Pong/obj/x86/Debug/Pong.pdb (added)
• Pong/obj/x86/Debug/TempPE (added)
• PongContent/bin (added)
• PongContent/bin/x86 (added)
• PongContent/bin/x86/Debug (added)
• PongContent/obj (added)
• PongContent/obj/x86 (added)
• PongContent/obj/x86/Debug (added)
• PongContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (added)
• PongContent/obj/x86/Debug/PongContent.contentproj.FileListAbsolute.txt (added)
• PongContent/obj/x86/Debug/PongContent.contentprojResolveAssemblyReference.cache (added)
• PongContent/obj/x86/Debug/TempPE (added)

2015/27/JaakkoS/Pong/Pong/Pong/Pong.cs

@@ -13 +13 @@
 
     PhysicsObject pallo;
-
     PhysicsObject maila1;
     PhysicsObject maila2;
+
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
 
     IntMeter pelaajan1Pisteet;
@@ -42 +44 @@
        maila2 = LuoMaila(Level.Right - 20.0, 0.0);
 
-        Level.CreateBorders(1.0, false);
+       vasenReuna = Level.CreateLeftBorder();
+       vasenReuna.Restitution = 1.0;
+       vasenReuna.IsVisible = false;
+
+       oikeaReuna = Level.CreateRightBorder();
+       oikeaReuna.Restitution = 1.0;
+       oikeaReuna.IsVisible = false;
+
+        PhysicsObject alaReuna = Level.CreateBottomBorder();
+        alaReuna.Restitution = 1.0;
+        alaReuna.IsVisible = false;
+
+        PhysicsObject ylaReuna = Level.CreateTopBorder();
+        ylaReuna.Restitution = 1.0;
+        ylaReuna.IsVisible = false;
+
         Level.Background.Color = Color.Black;
         Camera.ZoomToLevel();
 
-        
+        AddCollisionHandler(pallo, KasittelePallonTormays);
     }
 
@@ -67 +84 @@
         return maila;
     }
+
     void AsetaOhjaimet()
     {
@@ -82 +100 @@
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
     }
+
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
-        if ((nopeus.Y > 0) && (maila.Top > Level.Top))
+        if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
         {
             maila.Velocity = Vector.Zero;
             return;
         }
-        if ((nopeus.Y > 0) && (maila.Bottom > Level.Bottom))
+
+        if ((nopeus.Y > 0) && (maila.Top > Level.Top))
         {
             maila.Velocity = Vector.Zero;
@@ -97 +117 @@
         maila.Velocity = nopeus;
     }
+    
     void LisaaLaskurit()
     {
         pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
-        pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right + 100.0, Screen.Top - 100.0);
+        pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
     }
-    IntMeter LisaaPisteLaskurit()
+
+    IntMeter LuoPisteLaskuri(double x, double y)
     {
         IntMeter laskuri = new IntMeter(0);
@@ -119 +141 @@
         return laskuri;
     }
+
+    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    {
+        if (kohde == oikeaReuna)
+        {
+            pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            pelaajan2Pisteet.Value += 1;
+        }
+    }
 }