Changeset 3525

Timestamp:

2012-07-04 10:50:43 (10 years ago)

Author:

dezhidki

Message:

Added basic camera logic.
Added basic templates for Doors

Location:

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame

Files:

• Player.cs (modified) (4 diffs)
• Room.cs (modified) (6 diffs)
• TestRoom.cs (modified) (1 diff)
• TheDungeonGame.cs (modified) (3 diffs)

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Player.cs

@@ -17 +17 @@
         public bool isMoving = false;
         private Keyboard keyboard;
-        private double speed = 200;
+        public double speed = 200;
 
         public Player(Game game, Vector pos)
@@ -24 +24 @@
             keyboard = game.Keyboard;
             CanRotate = false;
+           // MakeStatic();
             setupKeys();
         }
@@ -40 +41 @@
         }
 
-        public void tick()
+        public override void Update(Time time)
         {
-            if (isMoving)
+            if (!isMoving)
             {
                 movementVector = Vector.Zero;
@@ -48 +49 @@
             }
 
-            isMoving = false;  
+            isMoving = false;
+
+            base.Update(time);
         }
 

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/Room.cs

@@ -10 +10 @@
     abstract class Room
     {
-        
-       public Vector Position;
+
+        public Vector Position;
         public double width, height, thickness;
         protected List<IPhysicsObject> roomObjects = new List<IPhysicsObject>();
@@ -22 +22 @@
         public Game Game { get; set; }
         public Vector PosOnGrid { get; set; }
+        public PhysicsObject wall;
 
         public Room(Game game, Vector pos, Vector size, double thickness)
@@ -31 +32 @@
             this.thickness = thickness;
 
-            insidePos = VecMath.add(pos, new Vector(thickness, -thickness));
+            insidePos = VecMath.add(Position, new Vector(thickness, -thickness));
             insideWidth = width - thickness;
             insideHeight = height - thickness;
@@ -81 +82 @@
         public void addBlock(IPhysicsObject obj, int bx, int by)
         {
-            if (bx > bWidth || bx < 0 || by > bHeight || by < 0 || insideObjects[bx, by] != null) throw new Exception("Can't put block to " + bx + " , " + by);
+            if (bx >= bWidth || bx < 0 || by >= bHeight || by < 0 || insideObjects[bx, by] != null) throw new Exception("Can't put block to " + bx + " , " + by);
             obj.Left = insidePos.X + (bx * blockWidth);
-            obj.Top = insidePos.Y + (by * blockHeight);
+            obj.Top = insidePos.Y - (by * blockHeight);
             insideObjects[bx, by] = obj;
+        }
+
+        public void addBlockAt(IPhysicsObject obj, double x, double y)
+        {
+            obj.Left = Position.X + x;
+            obj.Top = Position.Y + y;
+            roomObjects.Add(obj);
+        }
+
+
+        // En vitsinyt käyttää enempää aikaa tämän parantamiseksi. Helppo ja toimiva
+        public void addDoors(int[] directions)
+        {
+            if(directions.Length > 4) throw new ArgumentException("Argument's length must be 4!");
+
+            for (int i = 0; i < directions.Length; i++)
+            {
+                if(directions[i] == -1) continue;
+
+                if (directions[i] == RoomDirection.North)
+                {
+                    PhysicsObject doorTop = PhysicsObject.CreateStaticObject(thickness, thickness);
+                    doorTop.Position = Position + new Vector((width + thickness) / 2, -thickness / 2);
+                    doorTop.Tag = "Top Door";
+                    roomObjects.Add(doorTop);
+                }else
+                    if (directions[i] == RoomDirection.East)
+                    {
+                        PhysicsObject doorRight = PhysicsObject.CreateStaticObject(thickness, thickness);
+                        doorRight.Position = Position + new Vector(width + thickness / 2, -(height + thickness) / 2);
+                        doorRight.Tag = "Right Door";
+                        roomObjects.Add(doorRight);
+                    }
+                    else
+                        if (directions[i] == RoomDirection.South)
+                        {
+                            PhysicsObject doorBottom = PhysicsObject.CreateStaticObject(thickness, thickness);
+                            doorBottom.Position = Position + new Vector((thickness + width) / 2, -height - thickness / 2);
+                            doorBottom.Tag = "Bottom Door";
+                            roomObjects.Add(doorBottom);
+                        }
+                        else
+                            if (directions[i] == RoomDirection.West)
+                            {
+                                PhysicsObject doorLeft = PhysicsObject.CreateStaticObject(thickness, thickness);
+                                doorLeft.Position = Position + new Vector(thickness / 2, -height / 2 - thickness / 2);
+                                doorLeft.Tag = "Left Door";
+                                roomObjects.Add(doorLeft);
+                            }
+            }    
         }
 
@@ -96 +147 @@
             wallDown.Color = Color.Black;
             PhysicsObject wallRight = createWall(VecMath.add(Position, new Vector(width, -thickness)), thickness, height - thickness);
+            wallRight.Color = Color.Orange;
             roomObjects.Add(wallTop);
             roomObjects.Add(wallLeft);
@@ -104 +156 @@
         public PhysicsObject createWall(Vector pos, double width, double height)
         {
-            PhysicsObject wall = PhysicsObject.CreateStaticObject(width, height);
+            wall = PhysicsObject.CreateStaticObject(width, height);
             wall.Left = pos.X;
             wall.Top = pos.Y;

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TestRoom.cs

@@ -19 +19 @@
         public override void initRoom()
         {
+            int[] doorLocations = { RoomDirection.North, RoomDirection.South, RoomDirection.West, RoomDirection.East };
             createBorders();
             roomObjects.Add(createBackground());
+            addDoors(doorLocations);
+        //    PhysicsObject testblock = PhysicsObject.CreateStaticObject(blockWidth, blockHeight);
+          //  addBlock(testblock, 0, 1);
           //  addBlock(new PhysicsObject(blockWidth, blockHeight), 0, 0);
         }

2012/27/DenisZ/TheDungeonGame/TheDungeonGame/TheDungeonGame/TheDungeonGame.cs

@@ -12 +12 @@
 public class TheDungeonGame : PhysicsGame
 {
-    public const double ROOMWIDTH = 850;
-    public const double ROOMHEIGHT = 500;
-    public const double ROOMTHICKNESS = 70;
+    public const double ROOMTHICKNESS = 60;
+    public const double ROOMWIDTH = 800 - ROOMTHICKNESS;
+    public const double ROOMHEIGHT = 450;
+    
     public static Vector roomSize = new Vector(ROOMWIDTH, ROOMHEIGHT);
     private Player player;
@@ -25 +26 @@
         Level.Width = ROOMWIDTH * 20;
         Level.Height = ROOMHEIGHT * 20;
-        //   Level.CreateBorders();
-        Camera.ZoomToLevel();
 
         generator = new LevelGenerator(this, Level.Size, new Vector(20, 20));
-        generator.generateRandomLevel(10, 15);
+        generator.generateRandomLevel(5, 10);
         generator.buildDungeon();
+        Room centerRoom = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y));
+        Camera.Position = centerRoom.Position + new Vector(ROOMWIDTH/2 + ROOMTHICKNESS/2, -ROOMHEIGHT/2 + ROOMTHICKNESS/4);
 
         player = new Player(this, Vector.Zero);
-        Add(player, 1);
-      //  Camera.Follow(player);
+        setupPlayer();
 
         Keyboard.Listen(Key.Escape, ButtonState.Pressed, Exit, "Lopeta peli");
         Keyboard.Listen(Key.R, ButtonState.Pressed, regenerateLevel, null);
+    }
+
+    private void setupPlayer()
+    {
+        player.Position = generator.getRoomAt((int)(generator.CenterRoom.X), (int)(generator.CenterRoom.Y)).Position + new Vector(ROOMWIDTH / 2, -ROOMHEIGHT / 2);
+        Add(player, 1);
     }
 
@@ -66 +72 @@
         }
 
-        player.tick();
+        player.Update(time);
     }
 }