[075] Buddeln und weitere Fixes

OctoAwesome · Feb 24, 2015 · 17655ad · 17655ad
1 parent 064ad88
commit 17655ad
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/OctoAwesome/OctoAwesome.Model/Player.cs b/OctoAwesome/OctoAwesome.Model/Player.cs
@@ -19,6 +19,8 @@ public sealed class Player : Item, IHaveInventory
 
         public float Angle { get; private set; }
 
+        public float Height { get; private set; }
+
         public bool OnGround { get; set; }
 
         public float Tilt { get; private set; }
@@ -36,6 +38,7 @@ public Player(IInputSet input)
             Velocity = new Vector3(0, 0, 0);
             Radius = 0.75f;
             Angle = 0f;
+            Height = 3.5f;
             Mass = 100;
             InventoryItems = new List<InventoryItem>();
             InventoryItems.Add(new InventoryItem() { Name = "Apfel" });

diff --git a/OctoAwesome/OctoAwesome.Model/World.cs b/OctoAwesome/OctoAwesome.Model/World.cs
@@ -14,28 +14,39 @@ public sealed class World
     {
         private readonly Vector3[] CollisionOrder = new[] 
         {
-            // new Vector3(0, -2, 0),
+            new Vector3(0, -5, 0),
+            new Vector3(0, -4, 0),
+            new Vector3(0, -3, 0),
+            new Vector3(0, -2, 0),
 
             // Block direkt unter dem Player
             new Vector3(0, -1, 0),
 
             // Blocks am Boden um den Player
+            new Vector3(-1, -1, -1),new Vector3(1, -1, -1),new Vector3(-1, -1, 1),new Vector3(1, -1, 1),
             new Vector3(-1, -1, 0),new Vector3(1, -1, 0),new Vector3(0, -1, -1),new Vector3(0, -1, 1),
 
             // Kollision mit der Decke
             new Vector3(0, 6, 0),
+            new Vector3(-1, 6, -1),new Vector3(1, 6, -1),new Vector3(-1, 6, 1),new Vector3(1, 6, 1),
             new Vector3(-1, 6, 0),new Vector3(1, 6, 0),new Vector3(0, 6, -1),new Vector3(0, 6, 1),
             new Vector3(0, 5, 0),                
+            new Vector3(-1, 5, -1),new Vector3(1, 5, -1),new Vector3(-1, 5, 1),new Vector3(1, 5, 1),
             new Vector3(-1, 5, 0),new Vector3(1, 5, 0),new Vector3(0, 5, -1),new Vector3(0, 5, 1),
             new Vector3(0, 4, 0),                
+            new Vector3(-1, -1, -1),new Vector3(1, -1, -1),new Vector3(-1, -1, 1),new Vector3(1, -1, 1),
             new Vector3(-1, 4, 0),new Vector3(1, 4, 0),new Vector3(0, 4, -1),new Vector3(0, 4, 1),
             new Vector3(0, 3, 0),                
+            new Vector3(-1, 3, -1),new Vector3(1, 3, -1),new Vector3(-1, 3, 1),new Vector3(1, 3, 1),
             new Vector3(-1, 3, 0),new Vector3(1, 3, 0),new Vector3(0, 3, -1),new Vector3(0, 3, 1),
             new Vector3(0, 2, 0),                
+            new Vector3(-1, 2, -1),new Vector3(1, 2, -1),new Vector3(-1, 2, 1),new Vector3(1, 2, 1),
             new Vector3(-1, 2, 0),new Vector3(1, 2, 0),new Vector3(0, 2, -1),new Vector3(0, 2, 1),
             new Vector3(0, 1, 0),                
+            new Vector3(-1, 1, -1),new Vector3(1, 1, -1),new Vector3(-1, 1, 1),new Vector3(1, 1, 1),
             new Vector3(-1, 1, 0),new Vector3(1, 1, 0),new Vector3(0, 1, -1),new Vector3(0, 1, 1),
             new Vector3(0, 0, 0),                
+            new Vector3(-1, 0, -1),new Vector3(1, 0, -1),new Vector3(-1, 0, 1),new Vector3(1, 0, 1),
             new Vector3(-1, 0, 0),new Vector3(1, 0, 0),new Vector3(0, 0, -1),new Vector3(0, 0, 1),
         };
 

diff --git a/OctoAwesome/OctoAwesomeDX/Components/EgoCameraComponent.cs b/OctoAwesome/OctoAwesomeDX/Components/EgoCameraComponent.cs
@@ -21,12 +21,12 @@ public override void Initialize()
             base.Initialize();
 
             Projection = Matrix.CreatePerspectiveFieldOfView(
-                MathHelper.PiOver4, GraphicsDevice.Viewport.AspectRatio, 1f, 10000f);
+                MathHelper.PiOver4, GraphicsDevice.Viewport.AspectRatio, 0.1f, 10000f);
         }
 
         public override void Update(GameTime gameTime)
         {
-            CameraPosition = new Vector3(world.World.Player.Position.X, world.World.Player.Position.Y + 4f, world.World.Player.Position.Z);
+            CameraPosition = new Vector3(world.World.Player.Position.X, world.World.Player.Position.Y + 3.2f, world.World.Player.Position.Z);
             CameraUpVector = Vector3.Up;
 
             float height = (float)Math.Sin(world.World.Player.Tilt);
@@ -42,7 +42,7 @@ public override void Update(GameTime gameTime)
 
             View = Matrix.CreateLookAt(
                 CameraPosition,
-                new Vector3(world.World.Player.Position.X + lookX, world.World.Player.Position.Y + 4f + height, world.World.Player.Position.Z + lookY),
+                new Vector3(world.World.Player.Position.X + lookX, world.World.Player.Position.Y + 3.2f + height, world.World.Player.Position.Z + lookY),
                 CameraUpVector);
 
             float centerX = GraphicsDevice.Viewport.Width / 2;

diff --git a/OctoAwesome/OctoAwesomeDX/Components/WorldComponent.cs b/OctoAwesome/OctoAwesomeDX/Components/WorldComponent.cs
@@ -33,7 +33,7 @@ public override void Update(GameTime gameTime)
             {
                 World.DeleteBlock(
                     (int)SelectedBox.Value.X, 
-                    (int)SelectedBox.Value.Z, 
+                    (int)SelectedBox.Value.Y, 
                     (int)SelectedBox.Value.Z);
                 Dirty = true;
             }