Changeset 6202 for 2015/26

Timestamp:

2015-06-23 19:26:59 (4 years ago)

Author:

empaheik

Message:

 

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (7 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (1 diff)
• HillbillyRunContent/viljaa.png (added)

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRun.cs

@@ -30 +30 @@
 
     private double cameraTargetX; // Sijainti jossa kameran pitäisi olla.
-    private double cameraOffset = 400; // Tämän voisi ehkä laskea jostain (esim. ikkunan leveydestä kolmasosa tai jotain).
+    private Vector cameraTarget;
+
+    private double cameraOffset = 400; // TODO: Tämän voisi ehkä laskea jostain (esim. ikkunan leveydestä kolmasosa tai jotain).
     private double cameraSpeed = 2.0; // Kameran liikkumisnopeus.
 
@@ -37 +39 @@
     private Image[] groundTopImages = LoadImages("ground_top");
     private Image[] supportStructureImages = LoadImages("");
+    private Image[] foreGroundDecorations = LoadImages("viljaa");
 
     private Image[] houseImages = LoadImages("house", "houseburned");
@@ -138 +141 @@
         Window.Height = 900;
 
-        //Camera.X = cameraTargetX = players[0].X;
-        Camera.ZoomToLevel();
+        Camera.X = cameraTargetX = players[0].X;
+        Camera.Y = cameraTargetY = players[0].Y;
+        //Camera.ZoomToLevel();
 
         Timer cameraTimer = new Timer();
@@ -155 +159 @@
         level.SetTileMethod(Color.Black, CreateGroundTop);
         level.SetTileMethod(Color.Brown, CreateGround);
+
         level.SetTileMethod(Color.Cyan, CreateHouse);
         level.SetTileMethod(Color.PaintDotNetBlue, CreateBurnedHouse);
+
         level.SetTileMethod(Color.Gold, CreatePlayer);
         level.SetTileMethod(Color.Rose, CreateDummy, Color.Rose);   //TODO: CreateFlame
         level.SetTileMethod(Color.Harlequin, CreateCart);
-        level.SetTileMethod(Color.White, CreateDummy, Color.White); //TODO: CreateSmoke
+        level.SetTileMethod(Color.White, CreateDummy, Color.White); //TODO: CreateSmoke (optional)
         //level.SetTileMethod(Color.PaintDotNetBlue, CreateDummy, Color.PaintDotNetBlue); 
-        level.SetTileMethod(Color.DarkGray, CreateDummy, Color.DarkGray);   //TODO: CreateTombStone
+        level.SetTileMethod(Color.DarkGray, CreateDummy, Color.DarkGray);   //TODO: CreateTombStone (optional)
         level.SetTileMethod(Color.Gray, CreateCrawly);  
         level.SetTileMethod(Color.Red, CreateDummy, Color.Red);    //TODO: CreateWitch
@@ -272 +278 @@
         visibleGround.TextureWrapSize = new Vector(width / TILE_SIZE, height / TILE_SIZE);
         Add(visibleGround, -1);
+
+        int probability = RandomGen.NextInt(100);
+        bool wheat = probability < 20;
+
+        if(wheat)
+        {
+            GameObject wheatBlock = new GameObject(width * 1.5, height * 3);
+            wheatBlock.Image = foreGroundDecorations[0];
+            wheatBlock.Position = visibleGround.Position;
+            Add(wheatBlock, 2);
+        }
     }
 
@@ -300 +317 @@
     void UpdateCamera()
     {
+
+        double minY = players.Min(p => p.Y);
+        double maxY = players.Max(p => p.Y);
         double minX = players.Min(p => p.X) + cameraOffset;
+
+        Vector minPosition = new Vector(Math.Max(minX, cameraTargetX), minY);
+        Vector maxPosition = new Vector(minX, maxY);
+
+        cameraTarget = (minPosition + maxPosition) * 0.5;
+        cameraTarget.X = Math.Max(cameraTargetX, minX);     //Lellllll.
+
         cameraTargetX = Math.Max(cameraTargetX, minX);
+
 
         double windowMax = Camera.ScreenToWorld(new Vector(Window.Width / 2.0, 0)).X;
@@ -310 +338 @@
             player.Right = Math.Min(player.Right, windowMax);
         }
+
+        //double windowMax = Camera.ScreenToWorld(new Vector(Window.Width / 2.0, 0)).X;
+        //double windowMin = Camera.ScreenToWorld(new Vector(-Window.Width / 2.0, 0)).X;
+        //foreach (var player in players)
+        //{
+        //    player.Left = Math.Max(player.Left, windowMin);
+        //    player.Right = Math.Min(player.Right, windowMax);
+        //}
     }
 
     protected override void Update(Time time)
     {
-        Camera.X += (cameraTargetX - Camera.X) * time.SinceLastUpdate.TotalSeconds * cameraSpeed;
+        Camera.Position += (cameraTarget - Camera.Position) * time.SinceLastUpdate.TotalSeconds * cameraSpeed;
+        //Camera.X += (cameraTargetX - Camera.X) * time.SinceLastUpdate.TotalSeconds * cameraSpeed;
+
 
         base.Update(time);

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun/HillbillyRunContent/HillbillyRunContent.contentproj

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