Changeset 4521

Timestamp:

2013-07-22 14:57:49 (10 years ago)

Author:

dezhidki

Message:

Talletus.

Location:

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster

Files:

• CastleMaster.csproj (modified) (1 diff)
• Game.cs (modified) (6 diffs)
• Graphics/Camera.cs (modified) (3 diffs)
• World/Level.cs (modified) (3 diffs)
• World/LevelTest.cs (added)
• World/Tiles/TileFloor.cs (modified) (1 diff)

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/CastleMaster.csproj

@@ -84 +84 @@
     <Compile Include="Game.cs" />
     <Compile Include="World\Level.cs" />
+    <Compile Include="World\LevelTest.cs" />
     <Compile Include="World\Tiles\Tile.cs" />
     <Compile Include="World\Tiles\TileFloor.cs" />

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Game.cs

@@ -10 +10 @@
 using Microsoft.Xna.Framework.Media;
 using CastleMaster.Input;
-
 using Keys = System.Windows.Forms.Keys;
+using Viewport = CastleMaster.Graphics.Viewport;
 using System.Text;
 using CastleMaster.Graphics;
@@ -35 +35 @@
         private RenderHelper renderer;
         private Camera camera;
-        private Level level;
-        
+        private LevelTest level;
+        private int cameraSpeed = 10;
+
         #region Counter
         private readonly TimeSpan ONE_SECOND = TimeSpan.FromSeconds(1.0);
@@ -73 +74 @@
         {
             input.RegisterKeyboardKey(Keys.Escape);
+            input.RegisterKeyboardKey(Keys.W);
+            input.RegisterKeyboardKey(Keys.A);
+            input.RegisterKeyboardKey(Keys.S);
+            input.RegisterKeyboardKey(Keys.D);
+            input.RegisterKeyboardKey(Keys.Z);
+            input.RegisterKeyboardKey(Keys.X);
         }
 
@@ -101 +108 @@
 
             camera = new Camera();
-            level = new Level(128, 128);
+            level = new LevelTest(128, 128);
         }
 
@@ -116 +123 @@
             if (InputHandler.HasKeyBeenPressed(Keys.Escape))
                 this.Exit();
+            if (InputHandler.IsKeyDown(Keys.W))
+                camera.YTop -= cameraSpeed;
+            if (InputHandler.IsKeyDown(Keys.S))
+                camera.YTop += cameraSpeed;
+            if (InputHandler.IsKeyDown(Keys.A))
+                camera.XLeft -= cameraSpeed;
+            if (InputHandler.IsKeyDown(Keys.D))
+                camera.XLeft += cameraSpeed;
+            if (InputHandler.HasKeyBeenPressed(Keys.Z))
+                Viewport.ZOOM += Viewport.ZOOM_STEP;
+            if (InputHandler.HasKeyBeenPressed(Keys.X))
+                Viewport.ZOOM -= Viewport.ZOOM_STEP;
 
             updates++;
@@ -140 +159 @@
 
             level.RenderBackground(camera, renderer);
-            
+
             renderer.EndRender();
 

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Graphics/Camera.cs

@@ -4 +4 @@
 using System.Text;
 using Microsoft.Xna.Framework;
+using CastleMaster.Input;
 
 namespace CastleMaster.Graphics
@@ -30 +31 @@
         }
 
-        public int XRight 
+        public int XRight
         {
             get { return xOffs + Game.WIDTH; }
@@ -45 +46 @@
         public void Update()
         {
+            mouseWorldPos = Viewport.ScreenToWorld(InputHandler.MouseX + xOffs, InputHandler.MouseY + yOffs);
+        }
 
+        public void Zoom(float factor)
+        {
+            Viewport.ZOOM += factor;
+
+            xOffs = (int)((mouseWorldPos.X - mouseWorldPos.Y) * Viewport.X_SCALE_ZOOMED);
+            yOffs = (int)((mouseWorldPos.X + mouseWorldPos.Y) * Viewport.Y_SCALE_ZOOMED);
         }
     }

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/World/Level.cs

@@ -28 +28 @@
             new Tile(this);
             InitTiles();
+
+            InitLevel();
         }
+
+        public int Width { get { return width; } }
+
+        public int Height { get { return height; } }
 
         public List<Tile> RegisteredTiles { get { return registeredTiles; } }
@@ -34 +40 @@
         protected virtual void InitTiles() { }
 
+        protected virtual void InitLevel() { }
+
         public void RenderBackground(Camera camera, RenderHelper renderer)
         {
-            int w = (Game.WIDTH / Viewport.FLOOR_TILE_HEIGHT);
-            int h = (Game.HEIGHT / Viewport.Y_STEP);
+            float w = (Game.WIDTH / Viewport.FLOOR_TILE_WIDTH) / Viewport.ZOOM;
+            float h = (Game.HEIGHT / Viewport.Y_STEP) / Viewport.ZOOM;
 
-            int x0 = camera.XLeft / Viewport.FLOOR_TILE_HEIGHT;
-            int y0 = camera.YTop / Viewport.Y_STEP;
-            int x1 = x0 + w;
-            int y1 = y0 + h;
+            int x0 = (int)((camera.XLeft / Viewport.FLOOR_TILE_WIDTH) / Viewport.ZOOM) - 3;
+            int y0 = (int)((camera.YTop / Viewport.Y_STEP) / Viewport.ZOOM) - 5;
+            int x1 = (int)(x0 + w) + 5;
+            int y1 = (int)(y0 + h) + 7;
 
             renderer.SetOffset(camera);
-
-            for (int y = y0; y <= y1; y++)
-                for (int x = x0; x <= x1; x++)
+            int tp;
+            for (int y = y0; y < y1; y++)
+            {
+                for (int x = x0; x < x1; x++)
                 {
                     int xTile = x + (y >> 1) + (y & 1);
@@ -54 +63 @@
                     if (xTile >= 0 && zTile >= 0 && xTile < width && zTile < height)
                     {
-                        Tile t = registeredTiles[tiles[xTile + zTile * width]];
+                        tp = xTile + zTile * width;
+                        Tile t = registeredTiles[tiles[tp]];
                         if (t.ID != TILE_VOID)
-                            t.Render(renderer, new Vector2((x * Viewport.FLOOR_TILE_WIDTH + (y & 1) * Viewport.X_STEP) * Viewport.ZOOM, (y * Viewport.Y_STEP - Viewport.Y_STEP) * Viewport.ZOOM), xTile, zTile, data[xTile + zTile * width]);
+                            t.Render(renderer, new Vector2((x * Viewport.FLOOR_TILE_WIDTH + (y & 1) * Viewport.X_STEP) * Viewport.ZOOM, (y * Viewport.Y_STEP + Viewport.Y_STEP) * Viewport.ZOOM), xTile, zTile, data[tp]);
                     }
                 }
+            }
 
             renderer.SetOffset();

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/World/Tiles/TileFloor.cs

@@ -17 +17 @@
         public override void Render(RenderHelper renderer, Vector2 screenPos, int tileX, int tileZ, byte dataVal)
         {
+            renderer.Render(screenPos, 0, 0, Resources.SPRITESHEET_TILES, Viewport.ZOOM);
         }
     }