Changeset 7407 for 2016/24

Timestamp:

2016-06-17 10:24:10 (7 years ago)

Author:

eemjohla

Message:

 

Location:

2016/24/EemeliL/Pong

Files:

• .vs/Pong/v14/.suo (modified) (previous)
• Pong.cs (modified) (5 diffs)
• Pong/Pong/Pong.csproj.Debug.cachefile (added)
• Pong/Pong/bin/x86/Debug/Content/PallonKuva.xnb (added)
• Pong/Pong/bin/x86/Debug/Content/Taustakuva.xnb (added)
• Pong/Pong/bin/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/bin/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Debug/ContentPipeline-{DEDB9D28-5879-4871-A6B4-04925B47CDA3}.xml (modified) (2 diffs)
• Pong/Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt (modified) (1 diff)
• Pong/Pong/obj/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/obj/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Debug/cachefile-{DEDB9D28-5879-4871-A6B4-04925B47CDA3}-targetpath.txt (added)
• Pong/PongContent/PallonKuva.png (added)
• Pong/PongContent/PongContent.contentproj (modified) (1 diff)
• Pong/PongContent/Taustakuva.png (added)

2016/24/EemeliL/Pong/Pong.cs

@@ -38 +38 @@
     void LuoKentta()
     {
-        pallo = new PhysicsObject(40.0, 40.0);
+        pallo = new PhysicsObject(70.0, 70.0);
         pallo.Shape = Shape.Circle;
         pallo.Color = RandomGen.NextColor();
@@ -44 +44 @@
         pallo.Y = 0.0;
         pallo.Restitution = 2.0;
+        pallo.Image = LoadImage("PallonKuva");
 
         Add(pallo);
@@ -71 +72 @@
 
 
-        Level.Background.Color = Color.Blue;
+        Level.Background.Image = LoadImage("Taustakuva");
+        Level.Background.Color = RandomGen.NextColor();
 
         AddCollisionHandler(pallo, KasittelePallonTormays);
@@ -85 +87 @@
     PhysicsObject LuoMaila(double X, double Y)
     {
-        PhysicsObject maila = PhysicsObject.CreateStaticObject(20.0, 100.0);
-        maila.Shape = Shape.Hexagon;
+        PhysicsObject maila = PhysicsObject.CreateStaticObject(20.0, 130.0);
+        maila.Shape = Shape.Circle;
         maila.X = X;
         maila.Y = Y;
@@ -190 +192 @@
         pelaajan1Pisteet.Value = 0;
         pelaajan2Pisteet.Value = 0;
-     
-       }
+        ClearAll();
+        Begin();
+
+    }
 
 }

2016/24/EemeliL/Pong/Pong/Pong/obj/x86/Debug/ContentPipeline-{DEDB9D28-5879-4871-A6B4-04925B47CDA3}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>Taustakuva.png</Source>
+      <Name>Taustakuva</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EemeliL\Pong\Pong\Pong\bin\x86\Debug\Content\Taustakuva.xnb</Output>
+      <Time>2016-06-17T10:11:28.715129+03:00</Time>
+    </Item>
+    <Item>
+      <Source>PallonKuva.png</Source>
+      <Name>PallonKuva</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EemeliL\Pong\Pong\Pong\bin\x86\Debug\Content\PallonKuva.xnb</Output>
+      <Time>2016-06-17T10:19:44.8638933+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -16 +34 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2015-02-09T20:18:44+02:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.VideoImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.Content.Pipeline.AudioImporters.dll</Key>
+        <Value>2011-09-01T16:22:30+03:00</Value>
+      </Assembly>
+      <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\AnimationExtension.dll</Key>
+        <Value>2015-02-17T22:27:18+02:00</Value>
+      </Assembly>
+      <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
         <Value>2015-09-16T12:26:20.8291525+03:00</Value>

2016/24/EemeliL/Pong/Pong/Pong/obj/x86/Debug/Pong.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\MyTemp\EemeliL\Pong\Pong\Pong\obj\x86\Debug\Pong.exe
 C:\MyTemp\EemeliL\Pong\Pong\Pong\obj\x86\Debug\Pong.pdb
+C:\MyTemp\EemeliL\Pong\Pong\Pong\bin\x86\Debug\Content\Taustakuva.xnb
+C:\MyTemp\EemeliL\Pong\Pong\Pong\bin\x86\Debug\Content\PallonKuva.xnb

2016/24/EemeliL/Pong/Pong/PongContent/PongContent.contentproj

@@ -45 +45 @@
     <Reference Include="AnimationExtension" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Taustakuva.png">
+      <Name>Taustakuva</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PallonKuva.png">
+      <Name>PallonKuva</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!--  To modify your build process, add your task inside one of the targets below and uncomment it.