Changeset 2977

Timestamp:

2012-06-13 10:51:46 (9 years ago)

Author:

sijoseha

Message:

Talletus.

Location:

2012/24/AnttoniS/Ufot/Ufot

Files:

• Ufot/Ufot.cs (modified) (4 diffs)
• Ufot/Ufot.csproj.Debug.cachefile (added)
• Ufot/bin/x86/Debug/Content/ukko.xnb (added)
• Ufot/bin/x86/Debug/Ufot.exe (modified) (previous)
• Ufot/bin/x86/Debug/Ufot.pdb (modified) (previous)
• Ufot/obj/x86/Debug/ContentPipeline-{79138FA0-960A-4FD2-BC0E-B4BD422F72DE}.xml (modified) (2 diffs)
• Ufot/obj/x86/Debug/Ufot.csproj.FileListAbsolute.txt (modified) (1 diff)
• Ufot/obj/x86/Debug/Ufot.exe (modified) (previous)
• Ufot/obj/x86/Debug/Ufot.pdb (modified) (previous)
• Ufot/obj/x86/Debug/cachefile-{79138FA0-960A-4FD2-BC0E-B4BD422F72DE}-targetpath.txt (added)
• UfotContent/UfotContent.contentproj (modified) (1 diff)
• UfotContent/ukko.png (added)

2012/24/AnttoniS/Ufot/Ufot/Ufot/Ufot.cs

@@ -9 +9 @@
 public class Ufot : PhysicsGame
 {
-    PhysicsObject ukko;
+    PhysicsObject vartalo;
     PhysicsObject pää;
+    Image ukko = LoadImage("ukko");
+    
     public override void Begin()
     {
@@ -21 +23 @@
         Wind = new Vector(80, 10);
 
-        ukko = new PhysicsObject(75, 150);
-        PlasmaCannon ase = new PlasmaCannon(80, 50);
-        ukko.Add(ase);
+
+        vartalo = new PhysicsObject(75, 150);
+        vartalo.Mass = (10000);
+        PlasmaCannon ase = new PlasmaCannon(30, 20);
+        vartalo.Add(ase);
+        ase.X = 20;
         Keyboard.Listen(Key.Space, ButtonState.Down, AmmuAseella, "Ammu", ase);
         Mouse.IsCursorVisible = true;
         Mouse.ListenMovement(0.1, KuunteleLiiketta, null);
-        ukko.X = -0.0;
-        ukko.Y = -380;
-        ukko.Color = Color.Beige;
-        ukko.Shape = Shape.Ellipse;
+        vartalo.X = -0.0;
+        vartalo.Y = -380;
+        vartalo.Color = Color.Beige;
+        vartalo.Shape = Shape.Ellipse;
         Gravity = new Vector(0.0, -0.0);
-        ukko.Restitution = 1.0;
-        Add(ukko);
-
-
-        pää = new PhysicsObject(70, 70);
-        pää.Color = Color.Beige;
-        pää.X = -0.0;
-        pää.Y = -300;
-        pää.Shape = Shape.Circle;
-        Add(pää);
-
-
+        vartalo.Restitution = 1.0;
+        Add(vartalo);
+        vartalo.Image = ukko;
 
 
@@ -52 +48 @@
     void KuunteleLiiketta(AnalogState hiirenTila)
     {
-        ukko.X = Mouse.PositionOnWorld.X;
-        pää.X = Mouse.PositionOnWorld.X;
+        vartalo.X = Mouse.PositionOnWorld.X;
     }
 
@@ -62 +57 @@
         if (ammus != null)
         {
-            ammus.Size *= 3;
+            ammus.Size *= 1;
         }
+
+        
     }
 

2012/24/AnttoniS/Ufot/Ufot/Ufot/obj/x86/Debug/ContentPipeline-{79138FA0-960A-4FD2-BC0E-B4BD422F72DE}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>ukko.png</Source>
+      <Name>ukko</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\AnttoniS\Ufot\Ufot\Ufot\bin\x86\Debug\Content\ukko.xnb</Output>
+      <Time>2012-06-13T10:17:10.358499+03:00</Time>
+    </Item>
     <BuildSuccessful>true</BuildSuccessful>
     <Settings>
@@ -16 +25 @@
     <Assemblies>
       <Assembly>
+        <Key>C:\Program Files (x86)\Jypeli\lib\ContentExtensions\TextFileContentExtension.dll</Key>
+        <Value>2012-04-23T14:23:36+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.XImporter.dll</Key>
+        <Value>2011-09-01T17: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-01T17: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-01T17: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-01T17: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-01T17: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-01T17:22:30+03: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>2012-03-16T14:30:47.6570912+02:00</Value>

2012/24/AnttoniS/Ufot/Ufot/Ufot/obj/x86/Debug/Ufot.csproj.FileListAbsolute.txt

@@ -7 +7 @@
 C:\MyTemp\AnttoniS\Ufot\Ufot\Ufot\obj\x86\Debug\Ufot.exe
 C:\MyTemp\AnttoniS\Ufot\Ufot\Ufot\obj\x86\Debug\Ufot.pdb
+C:\MyTemp\AnttoniS\Ufot\Ufot\Ufot\bin\x86\Debug\Content\ukko.xnb

2012/24/AnttoniS/Ufot/Ufot/UfotContent/UfotContent.contentproj

@@ -44 +44 @@
     <Reference Include="TextFileContentExtension" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ukko.png">
+      <Name>ukko</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.