Changeset 1570

Timestamp:

2010-08-03 14:56:35 (12 years ago)

Author:

paaaanro

Message:

Viimeistelin pelin

Location:

2010/31/arsajukk/Pong

Files:

• Content/Content.contentproj (modified) (2 diffs)
• Content/head.png (added)
• Peli.cs (modified) (7 diffs)

2010/31/arsajukk/Pong/Content/Content.contentproj

@@ -1 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectGuid>8ad7a651-3f1c-4a35-8e22-f226cc4eee7c</ProjectGuid>
@@ -34 +34 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="head.png">
+      <Name>head</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
 </Project>

2010/31/arsajukk/Pong/Peli.cs

@@ -12 +12 @@
     PhysicsObject maila1;
     PhysicsObject maila2;
+      PhysicsObject vasenReuna;
+         PhysicsObject oikeaReuna;
+    IntMeter pelaajan1Pisteet;
+    IntMeter pelaajan2Pisteet;
+
+    Image pallonKuva = LoadImage("head");
 
 
@@ -18 +24 @@
         LuoKentta();
         AsetaOhjaimet();
+        LisaaLaskurit();
+        AloitaPeli();
 
-        AloitaPeli();
 
     }
@@ -25 +32 @@
     void LuoKentta()
     {
-        pallo = new PhysicsObject(40.0, 40.0);
+        pallo = new PhysicsObject(80.0, 80.0);
         pallo.Shape = Shapes.Circle;
         pallo.X = -200.0;
         pallo.Y = 0.0;
         pallo.Restitution = 1.0;
+        pallo.Image = pallonKuva;
+
         Add(pallo);
+
+        AddCollisionHandler(pallo, KasittelePallonTormays);
 
         maila1 = LuoMaila(Level.Left + 20.0, 0.0);
         maila2 = LuoMaila(Level.Right - 20.0, 0.0);
+        maila1.Color = Color.Blue;
+        maila2.Color = Color.Red;
+       vasenReuna = Level.CreateLeftBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+        
+        oikeaReuna = Level.CreateRightBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+        
+        PhysicsObject yläReuna = Level.CreateTopBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+        
+        PhysicsObject alaReuna = Level.CreateBottomBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
 
-
-        Level.CreateBorders(1.0, false);
-        Level.BackgroundColor = Color.Black;
+        Level.BackgroundColor = Color.LightGreen;
 
         Camera.ZoomToLevel();
@@ -54 +80 @@
         maila.X = x;
         maila.Y = y;
-        maila.Restitution = 1.0;
+        maila.Restitution = 2.0;
+        
         Add(maila);
         return maila;
@@ -76 +103 @@
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Poistu");
 
+        ControllerOne.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila1, nopeusYlos);
+        ControllerOne.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+        ControllerOne.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila1, nopeusAlas);
+        ControllerOne.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+
+        ControllerTwo.Listen(Button.DPadUp, ButtonState.Down, AsetaNopeus, "Liikuta mailaa ylös", maila2, nopeusYlos);
+        ControllerTwo.Listen(Button.DPadUp, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+        ControllerTwo.Listen(Button.DPadDown, ButtonState.Down, AsetaNopeus, "Liikuta mailaa alas", maila2, nopeusAlas);
+        ControllerTwo.Listen(Button.DPadDown, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+
+        ControllerOne.Listen(Button.Back, ButtonState.Pressed, Exit, "Poistu");
+        ControllerTwo.Listen(Button.Back, ButtonState.Pressed, Exit, "Poistu");
 
     }
@@ -81 +120 @@
     void AsetaNopeus(PhysicsObject maila, Vector nopeus)
     {
+        if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
+        {
+            maila.Velocity = Vector.Zero;
+            return;
+        }
         if ((nopeus.Y > 0) && (maila.Top > Level.Top))
         {
@@ -89 +133 @@
         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);
+
+    }
+
+
+
+    IntMeter LuoPisteLaskuri(double x, double y)
+    {
+        IntMeter laskuri = new IntMeter(0);
+        laskuri.MaxValue = 10;
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = x;
+        naytto.Y = y;
+        naytto.TextColor = Color.Orange;
+        Add(naytto);
+        return laskuri;
+    }
+
+   void KasittelePallonTormays( PhysicsObject pallo, PhysicsObject kohde )
+{
+    if ( kohde == oikeaReuna )
+    {
+        pelaajan1Pisteet.Value += 1;
+    }
+    else if ( kohde == vasenReuna )
+    {
+        pelaajan2Pisteet.Value += 1;
+    }
+
+
 }
 
+}