Changeset 3233

Timestamp:

2012-06-26 15:04:26 (9 years ago)

Author:

elalylon

Message:

Talletus.

Location:

2012/26/EliasY/test1

Files:

• test1.suo (modified) (previous)
• test1/test1/bin/x86/Debug/test1.exe (modified) (previous)
• test1/test1/bin/x86/Debug/test1.pdb (modified) (previous)
• test1/test1/obj/x86/Debug/ContentPipeline-{BFB255A8-81A7-4A34-AF08-16AEFBF6C543}.xml (modified) (2 diffs)
• test1/test1/obj/x86/Debug/test1.csproj.FileListAbsolute.txt (modified) (1 diff)
• test1/test1/obj/x86/Debug/test1.exe (modified) (previous)
• test1/test1/obj/x86/Debug/test1.pdb (modified) (previous)
• test1/test1/test1.cs (modified) (5 diffs)
• test1/test1/test1.csproj.Debug.cachefile (modified) (1 diff)
• test1/test1Content/pimeys.png (added)
• test1/test1Content/test1Content.contentproj (modified) (1 diff)

2012/26/EliasY/test1/test1/test1/obj/x86/Debug/ContentPipeline-{BFB255A8-81A7-4A34-AF08-16AEFBF6C543}.xml

@@ -2 +2 @@
 <XnaContent xmlns:Pipeline="Microsoft.Xna.Framework.Content.Pipeline">
   <Asset Type="Pipeline:BuildItemCollection">
+    <Item>
+      <Source>pimeys.png</Source>
+      <Name>pimeys</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\EliasY\test1\test1\test1\bin\x86\Debug\Content\pimeys.xnb</Output>
+      <Time>2012-06-26T14:52:20.9459765+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-06-25T09:04:16+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:35:21.2332043+02:00</Value>

2012/26/EliasY/test1/test1/test1/obj/x86/Debug/test1.csproj.FileListAbsolute.txt

@@ -8 +8 @@
 C:\MyTemp\EliasY\test1\test1\test1\obj\x86\Debug\test1.exe
 C:\MyTemp\EliasY\test1\test1\test1\obj\x86\Debug\test1.pdb
+C:\MyTemp\EliasY\test1\test1\test1\bin\x86\Debug\Content\pimeys.xnb

2012/26/EliasY/test1/test1/test1/test1.cs

@@ -12 +12 @@
     const int ruudunKorkeus = 50;
     PhysicsObject pelaaja;
+    AssaultRifle kivaari;
+    GameObject pimeys;
 
     public override void Begin()
@@ -20 +22 @@
         AsetaOhjaimet();
 
-        Camera.ZoomToLevel();
+        Camera.Follow(pelaaja);
+        Camera.ZoomFactor = 1.7;
         /*todo:
+         * PIMEYS!!!
          * aseet
          * vihut
-         * kameran zoomaus pelaajaan
          * pistecountteri
          * tekstuurit
@@ -34 +37 @@
     void AsetaOhjaimet()
     {
-        Keyboard.Listen(Key.W, ButtonState.Down, Liiku, null, 0.0, 20.0);
-        Keyboard.Listen(Key.A, ButtonState.Down, Liiku, null, -20.0, 0.0);
-        Keyboard.Listen(Key.S, ButtonState.Down, Liiku, null, 0.0, -20.0);
-        Keyboard.Listen(Key.D, ButtonState.Down, Liiku, null, 20.0, 0.0);
+        Keyboard.Listen(Key.W, ButtonState.Down, Liiku, null, 0.0, 30.0);
+        Keyboard.Listen(Key.A, ButtonState.Down, Liiku, null, -30.0, 0.0);
+        Keyboard.Listen(Key.S, ButtonState.Down, Liiku, null, 0.0, -30.0);
+        Keyboard.Listen(Key.D, ButtonState.Down, Liiku, null, 30.0, 0.0);
 
         Keyboard.Listen(Key.Left, ButtonState.Down, Kaanny, null, 2.0);
@@ -50 +53 @@
         Keyboard.Listen(Key.Right, ButtonState.Released, LopetaKaantyminen, null);
 
+        Keyboard.Listen(Key.Up, ButtonState.Down, Ammu, null);
+    }
+
+    void Ammu()
+    {
+        PhysicsObject ammus = kivaari.Shoot();
+
+        if (ammus != null)
+        {
+            ammus.Size /= 3;
+        }
+        //reload-animaatio tähän?
     }
 
@@ -80 +95 @@
         pelaaja.X = 550;
         pelaaja.Y = -550;
+        pelaaja.Mass = 10;
 
+        kivaari = new AssaultRifle(80, 20);
+        kivaari.TimeBetweenUse = TimeSpan.FromMilliseconds(700);
 
+        pelaaja.Add(kivaari);
+        Add(pelaaja);
 
-        Add(pelaaja);
+        Pimenna();
+    }
+
+    void Pimenna()
+    {
+        pimeys = new GameObject(new Animation(LoadImage("pimeys")));
+        // Viimeistele
     }
 

2012/26/EliasY/test1/test1/test1/test1.csproj.Debug.cachefile

@@ +1 @@
+Content\pimeys.xnb
 kentta.txt

2012/26/EliasY/test1/test1/test1Content/test1Content.contentproj

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