Changeset 6515

Timestamp:

2015-06-29 14:28:47 (8 years ago)

Author:

jivesuor

Message:

 

Location:

2015/27/JimiS/Pong

Files:

• Pong.sln (modified) (1 diff)
• Pong.suo (modified) (previous)
• Pong/Pong/Pong.cs (modified) (5 diffs)
• Pong/Pong/Pong.csproj.Release.cachefile (added)
• Pong/Pong/bin/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/bin/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/bin/x86/Release (added)
• Pong/Pong/bin/x86/Release/Content (added)
• Pong/Pong/bin/x86/Release/Content/jalkapallo.xnb (added)
• Pong/Pong/bin/x86/Release/Content/jalkapallokenttä.xnb (added)
• Pong/Pong/bin/x86/Release/Jypeli.dll (added)
• Pong/Pong/bin/x86/Release/Jypeli.xml (added)
• Pong/Pong/bin/x86/Release/Pong.exe (added)
• Pong/Pong/bin/x86/Release/Pong.pdb (added)
• Pong/Pong/obj/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/obj/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Release (added)
• Pong/Pong/obj/x86/Release/ContentPipeline-{43441B02-A17B-4AA5-9B96-F0812FDBF432}.xml (added)
• Pong/Pong/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache (added)
• Pong/Pong/obj/x86/Release/Microsoft.Xna.Framework.RuntimeProfile.txt (added)
• Pong/Pong/obj/x86/Release/Pong.csproj.FileListAbsolute.txt (added)
• Pong/Pong/obj/x86/Release/Pong.exe (added)
• Pong/Pong/obj/x86/Release/Pong.pdb (added)
• Pong/Pong/obj/x86/Release/TempPE (added)
• Pong/Pong/obj/x86/Release/cachefile-{43441B02-A17B-4AA5-9B96-F0812FDBF432}-targetpath.txt (added)
• Pong/PongContent/bin/x86/Release (added)
• Pong/PongContent/obj/x86/Release (added)
• Pong/PongContent/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache (added)
• Pong/PongContent/obj/x86/Release/PongContent.contentproj.FileListAbsolute.txt (added)
• Pong/PongContent/obj/x86/Release/PongContent.contentprojResolveAssemblyReference.cache (added)
• Pong/PongContent/obj/x86/Release/TempPE (added)

2015/27/JimiS/Pong/Pong.sln

@@ -4 +4 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pong", "Pong\Pong\Pong.csproj", "{DBDA1163-A49D-4875-B1F7-E504645581CB}"
 EndProject
-Project("{96E2B04D-8817-42C6-938A-82C39BA4D311}") = "PongContent", "Pong\PongContent\PongContent.contentproj", "{43441B02-A17B-4AA5-9B96-F0812FDBF432}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PongContent", "Pong\PongContent\PongContent.contentproj", "{43441B02-A17B-4AA5-9B96-F0812FDBF432}"
 EndProject
 Global

2015/27/JimiS/Pong/Pong/Pong/Pong.cs

@@ -39 +39 @@
         Add(pallo);
         pallo.Shape = Shape.Circle;
-        pallo.X = -200.0;
+        pallo.X = 200.0;
         pallo.Y = 0.0;
         pallo.Image = pallokuva;
@@ -60 +60 @@
         //reunat loppuu 
         pallo.Restitution = 1.0;
-        Level.Background.Color = Color.Green;
+        Level.Background.Color = Color.Yellow;
         pallo.Color = Color.Green;
         Camera.ZoomToLevel();
@@ -135 +135 @@
         naytto.X = x;
         naytto.Y = y;
-        naytto.TextColor = Color.White;
-        naytto.BorderColor = Level.Background.Color;
-        naytto.Color = Level.Background.Color;
+        naytto.TextColor = Color.Black;
+        naytto.BorderColor = Color.Red;
+        naytto.Color = Color.White;
         Add(naytto);
 
@@ -145 +145 @@
     {
         Label ohje = new Label("ohje painamalla F1");
-        ohje.X = Level.Left + 100.0;
+        ohje.X = Level.Left + 5.0;
         ohje.Y = Level.Top - 100.0;
-        ohje.TextColor = Color.Red;
+        ohje.TextColor = Color.Black;
         ohje.BorderColor = Level.Background.Color;
         ohje.Color = Level.Background.Color;
-        ohje.TextScale *= 2;
+        ohje.TextScale *= 1;
         Add(ohje);
     }
@@ -168 +168 @@
         maila.Velocity = nopeus;
     }
+    const double PALLON_MIN_NOPEUS = 300;
+
+    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);
+    }
 }