Changeset 4254 for 2013

Timestamp:

2013-06-27 10:29:53 (10 years ago)

Author:

mitaivas

Message:

Talletus.

Location:

2013/26/MaxL/Keulaa2

Files:

• Keulaa.suo (modified) (previous)
• Keulaa/Keulaa/Keulaa.cs (modified) (6 diffs)
• Keulaa/Keulaa/Keulaa.csproj.Debug.cachefile (modified) (1 diff)
• Keulaa/Keulaa/bin/x86/Debug/Keulaa.exe (modified) (previous)
• Keulaa/Keulaa/bin/x86/Debug/Keulaa.pdb (modified) (previous)
• Keulaa/Keulaa/obj/x86/Debug/Keulaa.csproj.FileListAbsolute.txt (modified) (1 diff)
• Keulaa/Keulaa/obj/x86/Debug/Keulaa.exe (modified) (previous)
• Keulaa/Keulaa/obj/x86/Debug/Keulaa.pdb (modified) (previous)
• Keulaa/Keulaa/obj/x86/Debug/cachefile-{716DCBB6-30E1-436E-8D82-85A469FEA5A5}-targetpath.txt (modified) (1 diff)
• Keulaa/KeulaaContent/KeulaaContent.contentproj (modified) (1 diff)
• Keulaa/KeulaaContent/Kypara.png (modified) (previous)
• Keulaa/KeulaaContent/obj/x86/Debug/ContentPipeline.xml (modified) (10 diffs)
• Kypara - Copy.png (added)
• Kypara.png (modified) (previous)

2013/26/MaxL/Keulaa2/Keulaa/Keulaa/Keulaa.cs

@@ -17 +17 @@
     Image pilvenKuva = LoadImage("KeulaPilvet");
     Image taustaKuva = LoadImage("KeulaTausta");
+    Image kyparanKuva = LoadImage("Kypara");
 
     //PhysicsObject Vartalo;
-    PhysicsObject mopo;
+    PhysicsObject mopo = new PhysicsObject(250, 160);
     PhysicsObject Takarengas = new PhysicsObject(77, 77, Shape.Circle);
     PhysicsObject Eturengas = new PhysicsObject(80, 80, Shape.Circle);
     PhysicsObject Kasi = new PhysicsObject(10, 42);
     PhysicsObject Kasi2 = new PhysicsObject(44, 10);
-    PhysicsObject Vartalo = new PhysicsObject(30, 60);
-    PhysicsObject Kypara = new PhysicsObject(30, 30);
+    PhysicsObject Vartalo = new PhysicsObject(30, 80);
+    PhysicsObject Kypara = new PhysicsObject(50, 50);
+    PhysicsObject Palikka = new PhysicsObject(10, 10);
 
     Vector eteen = new Vector(4500, 0);
-    Vector taakse = new Vector(-4500, 0);
+    Vector taakse = new Vector(-5500, 0);
     double kaasu2 = -50;
     
@@ -80 +82 @@
     void LuoMopo(Vector paikka, double leveys, double korkeus)
     {
-        mopo = new PhysicsObject(250, 160);
+        
         mopo.Shape = Shape.FromImage(moponRunko);
         //mopo.MomentOfInertia = 500;
@@ -125 +127 @@
         Vartalo.CollisionIgnoreGroup = 1;
         Vartalo.Color = Color.Yellow;
-        Vartalo.Y = mopo.Top;
+        Vartalo.Y = mopo.Top-10;
         Vartalo.X = -30;
         AxleJoint VartaloLiitos = new AxleJoint(mopo, Vartalo, new Vector(-30, Vartalo.Bottom));
+        Vartalo.Mass = 2;
 
         Kasi.CollisionIgnoreGroup = 1;
@@ -133 +136 @@
         Kasi.Y = Vartalo.Top - 22;
         Kasi.X = Vartalo.Left + 15;
-        AxleJoint KasiLiitos = new AxleJoint(Vartalo, Kasi, new Vector(Vartalo.Left + 15, Kasi.Top));
+        AxleJoint KasiLiitos = new AxleJoint(Vartalo, Kasi, new Vector(Vartalo.Position.X, Kasi.Top));
 
         Kasi2.CollisionIgnoreGroup = 1;
@@ -143 +146 @@
 
         Kypara.CollisionIgnoreGroup = 1;
-        Kypara.Y = Vartalo.Top;
-        Kypara.X = Vartalo.Left + 15;
-        AxleJoint KyparaLiitos = new AxleJoint(Vartalo, Kypara, new Vector(Vartalo.Left + 15, Kypara.Bottom));
+        Kypara.Y = Vartalo.Top+10;
+        Kypara.X = Vartalo.Position.X;
+        AxleJoint KyparaLiitos = new AxleJoint(Vartalo, Kypara, new Vector(Vartalo.Position.X, Kypara.Bottom));
         Kypara.CanRotate = false;
-
-        Add(Kypara);
+        Kypara.Image = kyparanKuva;
+        Kypara.Shape = Shape.FromImage(kyparanKuva);
+
+        Palikka.Mass = 1;
+        Palikka.Y = Kasi2.Position.Y;
+        Palikka.X = Eturengas.Left;
+        AxleJoint PalikkaLiitos = new AxleJoint(mopo, Palikka);
+
+        Add(Palikka);
+        Add(PalikkaLiitos);
+        Add(Kypara, 2);
         Add(KyparaLiitos);
-        Add(Kasi2, 2);
+        Add(Kasi2, 3);
         Add(Kasi2Liitos);
         Add(Ohjaus);
-        Add(Kasi, 2);
+        Add(Kasi, 3);
         Add(KasiLiitos);
         Add(Vartalo, 1);
@@ -166 +178 @@
         Keyboard.Listen(Key.Right, ButtonState.Down, Nojaus, "Nojaa eteen", Vartalo, eteen);
         Keyboard.Listen(Key.Left, ButtonState.Down, Nojaus, "Nojaa taakse", Vartalo, taakse);
-        //Keyboard.Listen(Key.Down, ButtonState.Down, Nojaus, "Jarru!", Kypara, taakse);
+
+        Keyboard.Listen(Key.Down, ButtonState.Pressed, Jarru, "Jarru!", Eturengas, 0.2);
+        Keyboard.Listen(Key.Down, ButtonState.Released, JarruPois, "Jarru!", Eturengas);
+        Keyboard.Listen(Key.Down, ButtonState.Pressed, Jarru, "Jarru!", Takarengas, 0.6);
+        Keyboard.Listen(Key.Down, ButtonState.Released, JarruPois, "Jarru!", Eturengas);
+
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Lopeta");
     }
-    
+
+    void Jarru(PhysicsObject rengas, double jarru)
+    {
+        rengas.AngularDamping = jarru;
+    }
+    void JarruPois(PhysicsObject rengas)
+    {
+        rengas.AngularDamping = 1;
+    }
+
     void LuoTaso(Vector paikka, double leveys, double korkeus)
     {

2013/26/MaxL/Keulaa2/Keulaa/Keulaa/Keulaa.csproj.Debug.cachefile

@@ -8 +8 @@
 Content\KeulaTausta.xnb
 Content\Frame2.xnb
+Content\Kypara.xnb

2013/26/MaxL/Keulaa2/Keulaa/Keulaa/obj/x86/Debug/Keulaa.csproj.FileListAbsolute.txt

@@ -33 +33 @@
 C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\obj\x86\Debug\Keulaa.exe
 C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\obj\x86\Debug\Keulaa.pdb
+C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Kypara.xnb

2013/26/MaxL/Keulaa2/Keulaa/Keulaa/obj/x86/Debug/cachefile-{716DCBB6-30E1-436E-8D82-85A469FEA5A5}-targetpath.txt

@@ -8 +8 @@
 Content\KeulaTausta.xnb
 Content\Frame2.xnb
+Content\Kypara.xnb

2013/26/MaxL/Keulaa2/Keulaa/KeulaaContent/KeulaaContent.contentproj

@@ -106 +106 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Kypara.png">
+      <Name>Kypara</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. 

2013/26/MaxL/Keulaa2/Keulaa/KeulaaContent/obj/x86/Debug/ContentPipeline.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\RM125.xnb</Output>
-      <Time>2013-06-27T09:22:06.8742939+03:00</Time>
+      <Time>2013-06-27T09:40:28.4566222+03:00</Time>
     </Item>
     <Item>
@@ -18 +18 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Kentta.xnb</Output>
-      <Time>2013-06-27T09:22:06.8586938+03:00</Time>
+      <Time>2013-06-27T09:40:28.4410222+03:00</Time>
     </Item>
     <Item>
@@ -27 +27 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Hyppy.xnb</Output>
-      <Time>2013-06-27T09:22:06.9210942+03:00</Time>
+      <Time>2013-06-27T09:40:28.5190222+03:00</Time>
     </Item>
     <Item>
@@ -36 +36 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Frame.xnb</Output>
-      <Time>2013-06-27T09:22:06.9210942+03:00</Time>
+      <Time>2013-06-27T09:40:28.5190222+03:00</Time>
     </Item>
     <Item>
@@ -45 +45 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\trengas.xnb</Output>
-      <Time>2013-06-27T09:22:06.7806933+03:00</Time>
+      <Time>2013-06-27T09:40:28.3786222+03:00</Time>
     </Item>
     <Item>
@@ -54 +54 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\rengas.xnb</Output>
-      <Time>2013-06-27T09:22:06.7182929+03:00</Time>
+      <Time>2013-06-27T09:40:28.3318222+03:00</Time>
     </Item>
     <Item>
@@ -63 +63 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\KeulaPilvet.xnb</Output>
-      <Time>2013-06-27T09:22:06.7806933+03:00</Time>
+      <Time>2013-06-27T09:40:28.3786222+03:00</Time>
     </Item>
     <Item>
@@ -72 +72 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\KeulaTausta.xnb</Output>
-      <Time>2013-06-27T09:22:06.7806933+03:00</Time>
+      <Time>2013-06-27T09:40:28.3786222+03:00</Time>
     </Item>
     <Item>
@@ -81 +81 @@
       <Options>None</Options>
       <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Frame2.xnb</Output>
-      <Time>2013-06-27T09:22:06.7182929+03:00</Time>
+      <Time>2013-06-27T09:40:28.3318222+03:00</Time>
+    </Item>
+    <Item>
+      <Source>Kypara.png</Source>
+      <Name>Kypara</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+      <Options>None</Options>
+      <Output>C:\MyTemp\MaxL\Keulaa2\Keulaa\Keulaa\bin\x86\Debug\Content\Kypara.xnb</Output>
+      <Time>2013-06-27T09:59:53.3838222+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>
@@ -129 +138 @@
       <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>2013-06-11T09:51:51.0124292+03:00</Value>
+        <Value>2013-06-11T09:31:58.0206076+03:00</Value>
       </Assembly>
     </Assemblies>