gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-09-27 21:56:19 -04:00
Code Issues Releases Wiki Activity

Fixed line endings

Browse Source
This commit is contained in:
Tim Sarbin 2018-11-24 23:52:23 -05:00
parent 8c953c4db8
commit 7d0715e97f
1 changed files with 165 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

330
OpenDiablo2.Scenes/Game.cs
View File

@ -1,170 +1,170 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using OpenDiablo2.Common; using OpenDiablo2.Common;
using OpenDiablo2.Common.Attributes; using OpenDiablo2.Common.Attributes;
using OpenDiablo2.Common.Enums; using OpenDiablo2.Common.Enums;
using OpenDiablo2.Common.Interfaces; using OpenDiablo2.Common.Interfaces;
using OpenDiablo2.Core.GameState_; using OpenDiablo2.Core.GameState_;
using OpenDiablo2.Core.UI; using OpenDiablo2.Core.UI;
namespace OpenDiablo2.Scenes namespace OpenDiablo2.Scenes
{ {
[Scene("Game")] [Scene("Game")]
public sealed class Game : IScene public sealed class Game : IScene
{ {
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private readonly IRenderWindow renderWindow; private readonly IRenderWindow renderWindow;
private readonly IResourceManager resourceManager; private readonly IResourceManager resourceManager;
private readonly IMapEngine mapEngine; private readonly IMapEngine mapEngine;
private readonly IGameState gameState; private readonly IGameState gameState;
private readonly IKeyboardInfoProvider keyboardInfoProvider; private readonly IKeyboardInfoProvider keyboardInfoProvider;
//private ISprite[] testSprite; //private ISprite[] testSprite;
private ISprite panelSprite, healthManaSprite, gameGlobeOverlapSprite; private ISprite panelSprite, healthManaSprite, gameGlobeOverlapSprite;
private Button runButton, menuButton; private Button runButton, menuButton;
public Game( public Game(
IRenderWindow renderWindow, IRenderWindow renderWindow,
IResourceManager resourceManager, IResourceManager resourceManager,
IMapEngine mapEngine, IMapEngine mapEngine,
IGameState gameState, IGameState gameState,
IKeyboardInfoProvider keyboardInfoProvider, IKeyboardInfoProvider keyboardInfoProvider,
Func<eButtonType, Button> createButton Func<eButtonType, Button> createButton
) )
{ {
this.renderWindow = renderWindow; this.renderWindow = renderWindow;
this.resourceManager = resourceManager; this.resourceManager = resourceManager;
this.mapEngine = mapEngine; this.mapEngine = mapEngine;
this.gameState = gameState; this.gameState = gameState;
this.keyboardInfoProvider = keyboardInfoProvider; this.keyboardInfoProvider = keyboardInfoProvider;
panelSprite = renderWindow.LoadSprite(ResourcePaths.GamePanels, Palettes.Act1); panelSprite = renderWindow.LoadSprite(ResourcePaths.GamePanels, Palettes.Act1);
healthManaSprite = renderWindow.LoadSprite(ResourcePaths.HealthMana, Palettes.Act1); healthManaSprite = renderWindow.LoadSprite(ResourcePaths.HealthMana, Palettes.Act1);
gameGlobeOverlapSprite = renderWindow.LoadSprite(ResourcePaths.GameGlobeOverlap, Palettes.Act1); gameGlobeOverlapSprite = renderWindow.LoadSprite(ResourcePaths.GameGlobeOverlap, Palettes.Act1);
runButton = createButton(eButtonType.Run); runButton = createButton(eButtonType.Run);
runButton.Location = new Point(256, 570); runButton.Location = new Point(256, 570);
runButton.OnToggle = OnRunToggle; runButton.OnToggle = OnRunToggle;
menuButton = createButton(eButtonType.Menu); menuButton = createButton(eButtonType.Menu);
menuButton.Location = new Point(393, 561); menuButton.Location = new Point(393, 561);
menuButton.OnToggle = OnMenuToggle; menuButton.OnToggle = OnMenuToggle;
} }
private void OnMenuToggle(bool isToggled) private void OnMenuToggle(bool isToggled)
{ {
log.Debug("Menu Toggle: " + isToggled); log.Debug("Menu Toggle: " + isToggled);
} }
private void OnRunToggle(bool isToggled) private void OnRunToggle(bool isToggled)
{ {
log.Debug("Run Toggle: " + isToggled); log.Debug("Run Toggle: " + isToggled);
} }
public void Render() public void Render()
{ {
/* /*
if (gameState.MapDirty) if (gameState.MapDirty)
RedrawMap(); RedrawMap();
for (int i = 0; i < gameState.MapData.Width * gameState.MapData.Height; i++) for (int i = 0; i < gameState.MapData.Width * gameState.MapData.Height; i++)
renderWindow.Draw(testSprite[i]); renderWindow.Draw(testSprite[i]);
*/ */
mapEngine.Render(); mapEngine.Render();
DrawPanel(); DrawPanel();
} }
private void DrawPanel() private void DrawPanel()
{ {
// Render the background bottom bar // Render the background bottom bar
renderWindow.Draw(panelSprite, 0, new Point(0, 600)); renderWindow.Draw(panelSprite, 0, new Point(0, 600));
renderWindow.Draw(panelSprite, 1, new Point(166, 600)); renderWindow.Draw(panelSprite, 1, new Point(166, 600));
renderWindow.Draw(panelSprite, 2, new Point(294, 600)); renderWindow.Draw(panelSprite, 2, new Point(294, 600));
renderWindow.Draw(panelSprite, 3, new Point(422, 600)); renderWindow.Draw(panelSprite, 3, new Point(422, 600));
renderWindow.Draw(panelSprite, 4, new Point(550, 600)); renderWindow.Draw(panelSprite, 4, new Point(550, 600));
renderWindow.Draw(panelSprite, 5, new Point(685, 600)); renderWindow.Draw(panelSprite, 5, new Point(685, 600));
// Render the health bar // Render the health bar
renderWindow.Draw(healthManaSprite, 0, new Point(30, 587)); renderWindow.Draw(healthManaSprite, 0, new Point(30, 587));
renderWindow.Draw(gameGlobeOverlapSprite, 0, new Point(28, 595)); renderWindow.Draw(gameGlobeOverlapSprite, 0, new Point(28, 595));
// Render the mana bar // Render the mana bar
renderWindow.Draw(healthManaSprite, 1, new Point(692, 588)); renderWindow.Draw(healthManaSprite, 1, new Point(692, 588));
renderWindow.Draw(gameGlobeOverlapSprite, 1, new Point(693, 591)); renderWindow.Draw(gameGlobeOverlapSprite, 1, new Point(693, 591));
runButton.Render(); runButton.Render();
menuButton.Render(); menuButton.Render();
} }
public void Update(long ms) public void Update(long ms)
{ {
runButton.Update(); runButton.Update();
menuButton.Update(); menuButton.Update();
var seconds = (float)ms / 1000f; var seconds = (float)ms / 1000f;
var xMod = 0f; var xMod = 0f;
var yMod = 0f; var yMod = 0f;
if (keyboardInfoProvider.KeyIsPressed(80 /*left*/)) if (keyboardInfoProvider.KeyIsPressed(80 /*left*/))
{ {
xMod = -8f * seconds; xMod = -8f * seconds;
yMod = 8f * seconds; yMod = 8f * seconds;
} }
if (keyboardInfoProvider.KeyIsPressed(79 /*right*/)) if (keyboardInfoProvider.KeyIsPressed(79 /*right*/))
{ {
xMod = 8f * seconds; xMod = 8f * seconds;
yMod = -8f * seconds; yMod = -8f * seconds;
} }
if (keyboardInfoProvider.KeyIsPressed(81 /*down*/)) if (keyboardInfoProvider.KeyIsPressed(81 /*down*/))
{ {
yMod = 10f * seconds; yMod = 10f * seconds;
xMod = 10f * seconds; xMod = 10f * seconds;
} }
if (keyboardInfoProvider.KeyIsPressed(82 /*up*/)) if (keyboardInfoProvider.KeyIsPressed(82 /*up*/))
{ {
yMod = -10f * seconds; yMod = -10f * seconds;
xMod = -10f * seconds; xMod = -10f * seconds;
} }
if (xMod != 0f || yMod != 0f) if (xMod != 0f || yMod != 0f)
mapEngine.CameraLocation = new PointF(mapEngine.CameraLocation.X + xMod, mapEngine.CameraLocation.Y + yMod); mapEngine.CameraLocation = new PointF(mapEngine.CameraLocation.X + xMod, mapEngine.CameraLocation.Y + yMod);
mapEngine.Update(ms); mapEngine.Update(ms);
} }
public void Dispose() public void Dispose()
{ {
} }
/* /*
private void RedrawMap() private void RedrawMap()
{ {
gameState.MapDirty = false; gameState.MapDirty = false;
testSprite = new ISprite[gameState.MapData.Width * gameState.MapData.Height]; testSprite = new ISprite[gameState.MapData.Width * gameState.MapData.Height];
var idx = 0; var idx = 0;
for (int y = 0; y < gameState.MapData.Height; y++) for (int y = 0; y < gameState.MapData.Height; y++)
{ {
for (int x = 0; x < gameState.MapData.Width; x++) for (int x = 0; x < gameState.MapData.Width; x++)
{ {
testSprite[idx] = renderWindow.GenerateMapCell(gameState.MapData, x, y, eRenderCellType.Floor, gameState.CurrentPalette); testSprite[idx] = renderWindow.GenerateMapCell(gameState.MapData, x, y, eRenderCellType.Floor, gameState.CurrentPalette);
testSprite[idx].Location = new Point(((x - y) * 80) - 2900, ((x + y) * 40) - 1900); testSprite[idx].Location = new Point(((x - y) * 80) - 2900, ((x + y) * 40) - 1900);
idx++; idx++;
} }
} }
}*/ }*/
} }
} }