Changeset 6197 for 2015/26

Timestamp:

2015-06-23 18:18:31 (6 years ago)

Author:

empaheik

Message:

ColorTileMap?-versio

Location:

2015/26/ohjaajat/HillbillyRun/HillbillyRun/HillbillyRun

Files:

• HillbillyRun/HillbillyRun.cs (modified) (3 diffs)
• HillbillyRunContent/HillbillyRunContent.contentproj (modified) (2 diffs)
• HillbillyRunContent/level0.png (added)
• HillbillyRunContent/level1.txt (deleted)
• HillbillyRunContent/nope.txt (added)

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

@@ -47 +47 @@
     {
         //IntroSequence();
-        MainMenu();
+        //MainMenu();
+        StartGame();
     }
 
@@ -113 +114 @@
 
         // Testailen tässä kärryn luomista.
+        //double size = 0.7;
+        //PhysicsObject cart = new PhysicsObject(400 * size, 80 * size);
+        //cart.X = -1600;
+        //cart.Y = 200;
+        //cart.Image = cartImage;
+        //cart.CollisionIgnoreGroup = 2;
+        //Add(cart);
+        //PhysicsObject cartWheel = new PhysicsObject(160 * size, 160 * size, Shape.Circle);
+        //cartWheel.Image = cartWheelImage;
+        //cartWheel.Position = cart.Position + new Vector(-110, -30) * size;
+        //cartWheel.CollisionIgnoreGroup = 2;
+        //Add(cartWheel);
+        //AxleJoint joint = new AxleJoint(cart, cartWheel);
+        //Add(joint);
+    }
+
+    void ScreenSettings()
+    {
+        Window.Width = 1800;
+        Window.Height = 900;
+
+        Camera.X = cameraTargetX = players[0].X;
+        //Camera.ZoomToLevel();
+
+        Timer cameraTimer = new Timer();
+        cameraTimer.Interval = 1 / 30.0;
+        cameraTimer.Timeout += UpdateCamera;
+        cameraTimer.Start();
+    }
+
+    void CreateLevel()
+    {
+        Gravity = new Vector(0, -1000);
+
+        ColorTileMap level = ColorTileMap.FromLevelAsset("level" + levelNumber);
+        level.SetTileMethod(Color.Black, CreateGroundTop);
+        level.SetTileMethod(Color.Brown, CreateGround);
+        level.SetTileMethod(Color.Cyan, CreateDummy, Color.Cyan);   //TODO: CreatePlatform
+        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.PaintDotNetBlue, CreateDummy, Color.PaintDotNetBlue); //TODO: CreateImprovement
+        level.SetTileMethod(Color.DarkGray, CreateDummy, Color.DarkGray);   //TODO: CreateTombStone
+        level.SetTileMethod(Color.Gray, CreateDummy, Color.Gray);  //TODO: CreateCrawly
+        level.SetTileMethod(Color.Red, CreateDummy, Color.Red);    //TODO: CreateWitch
+        level.Execute(TILE_SIZE, TILE_SIZE);
+
+
+        //TileMap level = TileMap.FromLevelAsset("level" + levelNumber);
+        //level.SetTileMethod('P', CreatePlayer);
+        //level.SetTileMethod('#', CreateGroundTop);
+        //level.SetTileMethod('%', CreateGround);
+        //level.Optimize('#', '%');
+        //level.Execute(TILE_SIZE, TILE_SIZE);
+        //Level.CreateBorders(true);
+
+        SetControls();
+    }
+
+    private void CreateCart(Vector position, double width, double height)
+    {
         double size = 0.7;
         PhysicsObject cart = new PhysicsObject(400 * size, 80 * size);
-        cart.X = -1600;
-        cart.Y = 200;
+        cart.Position = position;
         cart.Image = cartImage;
         cart.CollisionIgnoreGroup = 2;
@@ -129 +191 @@
     }
 
-    void ScreenSettings()
-    {
-        Window.Width = 1800;
-        Window.Height = 900;
-
-        Camera.X = cameraTargetX = players[0].X;
-
-        Timer cameraTimer = new Timer();
-        cameraTimer.Interval = 1 / 30.0;
-        cameraTimer.Timeout += UpdateCamera;
-        cameraTimer.Start();
-    }
-
-    void CreateLevel()
-    {
-        Gravity = new Vector(0, -1000);
-
-        TileMap level = TileMap.FromLevelAsset("level" + levelNumber);
-        level.SetTileMethod('P', CreatePlayer);
-        level.SetTileMethod('#', CreateGroundTop);
-        level.SetTileMethod('%', CreateGround);
-        level.Optimize('#', '%');
-        level.Execute(TILE_SIZE, TILE_SIZE);
-        //Level.CreateBorders(true);
-
-        SetControls();
+
+    private void CreateDummy(Vector position, double width, double height, Color color)
+    {
+        PhysicsObject dummy = PhysicsObject.CreateStaticObject(width, height);
+        dummy.Position = position;
+        dummy.Color = color;
+        //dummy.TextureWrapSize = new Vector(width / TILE_SIZE, height / TILE_SIZE);
+        Add(dummy);
     }
 

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

@@ -47 +47 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="level1.txt">
-      <Name>level1</Name>
+    <Compile Include="nope.txt">
+      <Name>nope</Name>
       <Importer>TextFileImporter</Importer>
       <Processor>TextFileContentProcessor</Processor>
@@ -79 +79 @@
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="level0.png">
+      <Name>level0</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.