Changeset 1093

Timestamp:

2010-07-06 14:53:06 (13 years ago)

Author:

paaaanro

Message:

hAXX

Location:

2010/27/juliuski/pong

Files:

• Content/Content.contentproj (modified) (2 diffs)
• Ohjelma.cs (modified) (1 diff)
• Peli.cs (modified) (9 diffs)
• pong.csproj (modified) (1 diff)
• pong.sln (modified) (1 diff)
• pong.suo (modified) (previous)

2010/27/juliuski/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>f9c780b3-7d12-46e1-a31f-6304b90aa913</ProjectGuid>
@@ -34 +34 @@
     <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Pong.PNG">
+      <Name>Pong</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
 </Project>

2010/27/juliuski/pong/Ohjelma.cs

@@ -8 +8 @@
         {
 #if !DEBUG
-            game.IsFullScreen = true;
+                  SetWindowSize( 600,600,false); 
+
+           
 #endif
             game.Run();
         }
+
     }
+    
+        
+    
 }
 

2010/27/juliuski/pong/Peli.cs

@@ -6 +6 @@
 public class Peli : PhysicsGame
 {
-    Vector nopeusYlos = new Vector(0, 200);
-    Vector nopeusAlas = new Vector(0, -200);
-
+    Vector nopeusYlos = new Vector(0, 700);
+    Vector nopeusAlas = new Vector(0, -700);
+    PhysicsObject pallo2;
     PhysicsObject pallo;
     PhysicsObject maila1;
@@ -25 +25 @@
     protected override void Begin()
     {
+        
         luokentta();
         AsetaOhjaimet();
         aloitapeli();
         LisaaLaskurit();
+       
 
 
@@ -37 +39 @@
     void luokentta()
     {
-        pallo = new PhysicsObject(40.0, 40.0);
+
+        pallo = new PhysicsObject(20.0, 20.0);
         Add(pallo);
-        pallo.Shape = Shapes.Triangle;
-        pallo.Color = Color.Pink;
+        pallo.Shape = Shapes.Rectangle;
+        pallo.Color = Color.White;
         pallo.X = -200.0;
         pallo.Y = 0.0;
-        pallo.Restitution = 1.1;
-        Level.BackgroundColor = Color.Green;
+        pallo.Restitution = 1;
+        pallo2 = new PhysicsObject(20.0, 20.0);
+        Add(pallo2);
+        pallo2.Shape = Shapes.Rectangle;
+        pallo2.Color = Color.White;
+        pallo2.X = -220.0;
+        pallo2.Y = 0.0;
+        pallo2.Restitution = 1;
+
+        Level.BackgroundColor = Color.Black;
         Camera.ZoomToLevel();
         vasenReuna = Level.CreateLeftBorder();
-        vasenReuna.Restitution = 1.0;
+        vasenReuna.Restitution = 1;
         vasenReuna.IsVisible = false;
         oikeaReuna = Level.CreateRightBorder();
-        oikeaReuna.Restitution = 1.0;
+        oikeaReuna.Restitution = 1;
         oikeaReuna.IsVisible = false;
         alaReuna = Level.CreateBottomBorder();
-        alaReuna.Restitution = 1.0;
+        alaReuna.Restitution = 1;
         alaReuna.IsVisible = false;
         ylaReuna = Level.CreateTopBorder();
-        ylaReuna.Restitution = 1.0;
+        ylaReuna.Restitution = 1;
         ylaReuna.IsVisible = false;
         maila1 = LuoMaila(Level.Left + 20.0, 0.0);
         maila2 = LuoMaila(Level.Right - 20.0, 0.0);
         AddCollisionHandler(pallo, KasittelePallonTormays);
-
+        AddCollisionHandler(pallo2, KasittelePallonTormays);
 
     }
@@ -69 +80 @@
         pallo.Hit(impulssi);
 
+        pallo2.Hit(impulssi);
 
 
@@ -75 +87 @@
     {
         PhysicsObject maila = PhysicsObject.CreateStaticObject(20.0, 100.0);
-        maila.Shape = Shapes.Circle;
+        maila.Shape = Shapes.Rectangle;
+
         maila.X = x;
         maila.Y = y;
-        maila.Restitution = 1.001;
+        maila.Restitution = 1.0;
         Add(maila);
 
@@ -95 +108 @@
         Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa alas", maila2, nopeusAlas);
         Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
-
+       
         Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Poistu");
@@ -132 +145 @@
     {
         IntMeter laskuri = new IntMeter(0);
-        laskuri.MaxValue = 10;
+        laskuri.MaxValue = 9;
         Label naytto = new Label();
         naytto.BindTo(laskuri);
@@ -144 +157 @@
 
 
-    void KasittelePallonTormays(PhysicsObject pallo, PhysicsObject kohde)
+    void KasittelePallonTormays(PhysicsObject erkki, PhysicsObject kohde)
     {
         if (kohde == oikeaReuna)
@@ -155 +168 @@
         }
     }
-
-
 }
-

2010/27/juliuski/pong/pong.csproj

@@ -89 +89 @@
     <Content Include="Game.ico" />
     <Content Include="GameThumbnail.png" />
+    <Content Include="Pong.ico" />
+    <Content Include="Pong.PNG" />
   </ItemGroup>
   <ItemGroup>

2010/27/juliuski/pong/pong.sln

@@ -6 +6 @@
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Mixed Platforms = Debug|Mixed Platforms
                 Debug|x86 = Debug|x86
+                Debug|Xbox 360 = Debug|Xbox 360
+                Release|Mixed Platforms = Release|Mixed Platforms
                 Release|x86 = Release|x86
+                Release|Xbox 360 = Release|Xbox 360
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Debug|Mixed Platforms.Build.0 = Debug|x86
                 {B4190151-FC24-49BF-9FDE-91A528B40C64}.Debug|x86.ActiveCfg = Debug|x86
                 {B4190151-FC24-49BF-9FDE-91A528B40C64}.Debug|x86.Build.0 = Debug|x86
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Debug|Xbox 360.ActiveCfg = Debug|x86
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Release|Mixed Platforms.ActiveCfg = Release|x86
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Release|Mixed Platforms.Build.0 = Release|x86
                 {B4190151-FC24-49BF-9FDE-91A528B40C64}.Release|x86.ActiveCfg = Release|x86
                 {B4190151-FC24-49BF-9FDE-91A528B40C64}.Release|x86.Build.0 = Release|x86
+                {B4190151-FC24-49BF-9FDE-91A528B40C64}.Release|Xbox 360.ActiveCfg = Release|x86
+                {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
                 {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Debug|x86.ActiveCfg = Debug|x86
+                {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Debug|Xbox 360.ActiveCfg = Debug|x86
+                {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Release|Mixed Platforms.ActiveCfg = Release|x86
                 {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Release|x86.ActiveCfg = Release|x86
+                {F9C780B3-7D12-46E1-A31F-6304B90AA913}.Release|Xbox 360.ActiveCfg = Release|x86
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution