Changeset 7309

Timestamp:

2016-06-14 15:03:01 (7 years ago)

Author:

jetopont

Message:

Tein laser peliä ja bongia

Location:

2016/24/JereP/Bong

Files:

• .vs/Bong/v14/.suo (modified) (previous)
• Bong/Bong/Bong.cs (modified) (4 diffs)
• Bong/Bong/bin/x86/Debug/Bong.exe (modified) (previous)
• Bong/Bong/bin/x86/Debug/Bong.pdb (modified) (previous)
• Bong/Bong/obj/x86/Debug/Bong.csproj.FileListAbsolute.txt (modified) (1 diff)
• Bong/Bong/obj/x86/Debug/Bong.exe (modified) (previous)
• Bong/Bong/obj/x86/Debug/Bong.pdb (modified) (previous)
• Bong/Bong/obj/x86/Debug/ContentPipeline-{D693B282-540A-4A65-8EE0-577FDC978B51}.xml (modified) (1 diff)
• Bong/Bong/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Bong/BongContent/obj/x86/Debug/BongContent.contentproj.FileListAbsolute.txt (modified) (1 diff)
• Bong/BongContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

2016/24/JereP/Bong/Bong/Bong/Bong.cs

@@ -9 +9 @@
 public class Bong : PhysicsGame
 {
-    Vector nopeusYlos = new Vector(0, 200);
-    Vector nopeusAlas = new Vector(0, -200);
+    Vector nopeusYlos = new Vector(0,300);
+    Vector nopeusAlas = new Vector(0,-300);
 
     PhysicsObject pallo;
     PhysicsObject maila1;
     PhysicsObject maila2;
+
+    PhysicsObject vasenReuna;
+    PhysicsObject oikeaReuna;
+
+    IntMeter Pelaajan1Pisteet;
+    IntMeter Pelaajan2Pisteet;
     public override void Begin()
     {
@@ -29 +35 @@
         pallo.X = -500.0;
         pallo.Y = 100.0;
-        Level.CreateBorders(1.0, true);
+
+        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;
+
         pallo.Restitution = 1.0;
-        Level.Background.Color = Color.Pink;
+        pallo.KineticFriction = 1.0;
+
+        Level.Background.Color = Color.Black;
+        Camera.ZoomToLevel();
 
         Add(pallo);
 
-        maila1 = LuoMaila(Level.Left + 20.0, 0.0);
-        maila2 = LuoMaila(Level.Right - 20.0, 0.0);
+        AddCollisionHandler(pallo, KasittelePallonTormays);
 
-    
+        maila1 = LuoMaila(Level.Left + 40.0, 0.0);
+        maila2 = LuoMaila(Level.Right - 40.0, 0.0);
+  
 
 
@@ -62 +85 @@
     void AsetaOhjaimet()
     {
-        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);
+        Keyboard.Listen(Key.W, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa ylös", maila1, nopeusYlos);
+        Keyboard.Listen(Key.W, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
 
-        Keyboard.Listen(Key.Z, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
-        Keyboard.Listen(Key.Z, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
+        Keyboard.Listen(Key.S, ButtonState.Down, AsetaNopeus, "Pelaaja 1: Liikuta mailaa alas", maila1, nopeusAlas);
+        Keyboard.Listen(Key.S, ButtonState.Released, AsetaNopeus, null, maila1, Vector.Zero);
 
         Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila2, nopeusYlos);
@@ -101 +124 @@
             return;
         }
-
+        
         maila.Velocity = nopeus;
     }
     void LisaaLaskurit()
     {
-        /// laskuri
+        Pelaajan1Pisteet = LuoPisteLaskuri(Screen.Left + 100.0, Screen.Top - 100.0);
+        Pelaajan2Pisteet = LuoPisteLaskuri(Screen.Right - 100.0, Screen.Top - 100.0);
     }
-    IntMeter LuoPisteLaskuri()
+    IntMeter LuoPisteLaskuri(double x, double y)
     {
+   
         IntMeter laskuri = new IntMeter(0);
-        laskuri.MaxValue = 10;
-
+        laskuri.MaxValue = 300000000;
         Label naytto = new Label();
         naytto.BindTo(laskuri);
         naytto.X = x;
         naytto.Y = y;
-        naytto.TextColor = Color.Black;
+        naytto.TextColor = Color.White;
         naytto.BorderColor = Level.Background.Color;
         naytto.Color = Level.Background.Color;
         Add(naytto);
 
+        
+
         return laskuri;
     }
+    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    {
+        if (kohde == oikeaReuna)
+        {
+            Pelaajan1Pisteet.Value += 1;
+        }
+        else if (kohde == vasenReuna)
+        {
+            Pelaajan2Pisteet.Value += 1;
+        }
+    }
+    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);
+    }
+    
 }

2016/24/JereP/Bong/Bong/Bong/obj/x86/Debug/Bong.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\MyTemp\JerePöntynen\Bong\Bong\Bong\obj\x86\Debug\Bong.exe
 C:\MyTemp\JerePöntynen\Bong\Bong\Bong\obj\x86\Debug\Bong.pdb
+C:\MyTemp\Jere2\Bong\Bong\Bong\bin\x86\Debug\Bong.exe
+C:\MyTemp\Jere2\Bong\Bong\Bong\bin\x86\Debug\Bong.pdb
+C:\MyTemp\Jere2\Bong\Bong\Bong\bin\x86\Debug\Jypeli.dll
+C:\MyTemp\Jere2\Bong\Bong\Bong\bin\x86\Debug\Jypeli.xml
+C:\MyTemp\Jere2\Bong\Bong\Bong\obj\x86\Debug\Bong.csprojResolveAssemblyReference.cache
+C:\MyTemp\Jere2\Bong\Bong\Bong\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
+C:\MyTemp\Jere2\Bong\Bong\Bong\obj\x86\Debug\Bong.exe
+C:\MyTemp\Jere2\Bong\Bong\Bong\obj\x86\Debug\Bong.pdb

2016/24/JereP/Bong/Bong/Bong/obj/x86/Debug/ContentPipeline-{D693B282-540A-4A65-8EE0-577FDC978B51}.xml

@@ -9 +9 @@
       <BuildConfiguration>Debug</BuildConfiguration>
       <CompressContent>false</CompressContent>
-      <RootDirectory>C:\MyTemp\JerePöntynen\Bong\Bong\BongContent\</RootDirectory>
-      <LoggerRootDirectory>C:\MyTemp\JerePöntynen\Bong\Bong\Bong\</LoggerRootDirectory>
-      <IntermediateDirectory>C:\MyTemp\JerePöntynen\Bong\Bong\Bong\obj\x86\Debug\</IntermediateDirectory>
-      <OutputDirectory>C:\MyTemp\JerePöntynen\Bong\Bong\Bong\bin\x86\Debug\Content\</OutputDirectory>
+      <RootDirectory>C:\MyTemp\Jere2\Bong\Bong\BongContent\</RootDirectory>
+      <LoggerRootDirectory>C:\MyTemp\Jere2\Bong\Bong\Bong\</LoggerRootDirectory>
+      <IntermediateDirectory>C:\MyTemp\Jere2\Bong\Bong\Bong\obj\x86\Debug\</IntermediateDirectory>
+      <OutputDirectory>C:\MyTemp\Jere2\Bong\Bong\Bong\bin\x86\Debug\Content\</OutputDirectory>
     </Settings>
     <Assemblies>

2016/24/JereP/Bong/Bong/BongContent/obj/x86/Debug/BongContent.contentproj.FileListAbsolute.txt

@@ -1 +1 @@
 C:\MyTemp\JerePöntynen\Bong\Bong\BongContent\obj\x86\Debug\BongContent.contentprojResolveAssemblyReference.cache
+C:\MyTemp\Jere2\Bong\Bong\BongContent\obj\x86\Debug\BongContent.contentprojResolveAssemblyReference.cache