alysbrooks-public » games » isometric-park-fna

Commit r312:5669a925df44 public

parent | child
Description:
Ensure scroll areas adjust with resolution change.
Commit status:
[Not Reviewed]
References:
m4-beginning
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r312:5669a925df44 -

Show file before | Show file after | Show commentsHide comments
@@ -171,7 +171,7
171 - Trees sometimes
171 - Trees sometimes
172 - Sometimes framerate jumps to 180-200 fps. (Better than reverse, but kinda weird)
172 - Sometimes framerate jumps to 180-200 fps. (Better than reverse, but kinda weird)
173 - Graphics don't adjust for the resolution
173 - Graphics don't adjust for the resolution
174 - Scroll area
174 - Scroll area @done(2021-06-23)
175 - Ingame Menu @done(2021-06-22)
175 - Ingame Menu @done(2021-06-22)
176 - Main Menu
176 - Main Menu
177 Misc:
177 Misc:
Show file before | Show file after | Show commentsHide comments
@@ -31,23 +31,20
31 private MouseState mousePrev;
31 private MouseState mousePrev;
32
32
33 private GraphicsDevice graphicsDevice;
33 private GraphicsDevice graphicsDevice;
34 private GraphicsDeviceManager gdm;
34 private Camera camera;
35 private Camera camera;
35
36
36 //Area to ignore:
37 //Area to ignore:
37 private int menuBarHeight;
38 private int menuBarHeight;
38
39
39 private int viewWidth;
40 public InputEngine(int menuBarHeight, Camera camera,
40 private int viewHeight;
41 GraphicsDeviceManager gdm) {
41
42 public InputEngine(int menuBarHeight, int viewWidth, int viewHeight, Camera camera,
43 GraphicsDevice graphicsDevice) {
44 //initialize to blank for now
42 //initialize to blank for now
45 this.keyboardPrev = new KeyboardState();
43 this.keyboardPrev = new KeyboardState();
46 this.menuBarHeight = menuBarHeight;
44 this.menuBarHeight = menuBarHeight;
47 this.viewWidth = viewWidth;
48 this.viewHeight = viewHeight;
49 this.camera = camera;
45 this.camera = camera;
50 this.graphicsDevice = graphicsDevice;
46 this.gdm = gdm;
47 this.graphicsDevice = gdm.GraphicsDevice;
51 }
48 }
52
49
53 public override void Update(double dt) {
50 public override void Update(double dt) {
@@ -59,6 +56,9
59
56
60 bool isPlaying = false;
57 bool isPlaying = false;
61
58
59 var viewWidth = gdm.PreferredBackBufferWidth;
60 var viewHeight = gdm.PreferredBackBufferHeight;
61
62 foreach (var entity in ReadEntities<GameStateComponent>())
62 foreach (var entity in ReadEntities<GameStateComponent>())
63 {
63 {
64 var state = GetComponent<GameStateComponent>(entity).isPlaying;
64 var state = GetComponent<GameStateComponent>(entity).isPlaying;
@@ -205,7 +205,7
205 {
205 {
206 SendMessage(new MoveCameraMessage {Movement = new Vector2(0, -4)});
206 SendMessage(new MoveCameraMessage {Movement = new Vector2(0, -4)});
207 }
207 }
208 else if (MathUtils.BetweenExclusive(mouseCur.Y, (this.viewHeight - 50 -menuBarHeight), this.viewHeight-menuBarHeight))
208 else if (MathUtils.BetweenExclusive(mouseCur.Y, (viewHeight - 50 -menuBarHeight), viewHeight-menuBarHeight))
209 {
209 {
210 SendMessage(new MoveCameraMessage {Movement = new Vector2(0, 4)});
210 SendMessage(new MoveCameraMessage {Movement = new Vector2(0, 4)});
211 }
211 }
@@ -213,7 +213,7
213 {
213 {
214 SendMessage(new MoveCameraMessage {Movement = new Vector2(-4, 0)});
214 SendMessage(new MoveCameraMessage {Movement = new Vector2(-4, 0)});
215 }
215 }
216 else if (MathUtils.BetweenExclusive(mouseCur.X, (this.viewWidth - 50), this.viewWidth))
216 else if (MathUtils.BetweenExclusive(mouseCur.X, (viewWidth - 50), viewWidth))
217 {
217 {
218 SendMessage(new MoveCameraMessage {Movement = new Vector2(4, 0)});
218 SendMessage(new MoveCameraMessage {Movement = new Vector2(4, 0)});
219 }
219 }
Show file before | Show file after | Show commentsHide comments
@@ -225,7 +225,7
225 this.grammar = new TraceryNet.Grammar(json2);
225 this.grammar = new TraceryNet.Grammar(json2);
226
226
227
227
228 WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, FNAGame.width, FNAGame.height, this.camera, GraphicsDevice));
228 WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm));
229 WorldBuilder.AddEngine(new UIEngine());
229 WorldBuilder.AddEngine(new UIEngine());
230
230
231 WorldBuilder.AddEngine(new GameBridgeEngine(this));
231 WorldBuilder.AddEngine(new GameBridgeEngine(this));
Show file before | Show file after | Show commentsHide comments
@@ -31,8 +31,6
31 // ImGui.PushFont(smallFont);
31 // ImGui.PushFont(smallFont);
32 ImGui.Begin("##In-game Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar);
32 ImGui.Begin("##In-game Toolbar", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar);
33
33
34 ImGui.Text("In-game menu");
35
36 if (ImGui.Button("Options", button_size))
34 if (ImGui.Button("Options", button_size))
37 {
35 {
38 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Options});
36 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Options});
You need to be logged in to leave comments. Login now