epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Game.Zoom.

Browse Source
This commit is contained in:
Paul Chote
2013-10-16 17:57:00 +13:00
parent 96d37df4b3
commit 3ef6a8317a
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Game.cs
View File

@@ -32,14 +32,8 @@ namespace OpenRA
public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference(); public static MouseButtonPreference mouseButtonPreference = new MouseButtonPreference();
public static ModData modData; public static ModData modData;
static WorldRenderer worldRenderer;
public static float Zoom
{
get { return worldRenderer.Viewport.Zoom; }
set { worldRenderer.Viewport.Zoom = value; }
}
public static Settings Settings; public static Settings Settings;
static WorldRenderer worldRenderer;
internal static OrderManager orderManager; internal static OrderManager orderManager;
static Server.Server server; static Server.Server server;
@@ -141,7 +135,7 @@ namespace OpenRA
// worldRenderer is null during the initial install/download screen // worldRenderer is null during the initial install/download screen
if (worldRenderer != null) if (worldRenderer != null)
{ {
Game.Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), Zoom); Game.Renderer.BeginFrame(worldRenderer.Viewport.TopLeft.ToFloat2(), worldRenderer.Viewport.Zoom);
Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation)); Sound.SetListenerPosition(worldRenderer.Position(worldRenderer.Viewport.CenterLocation));
worldRenderer.Draw(); worldRenderer.Draw();
} }

5
OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
View File

@@ -15,6 +15,7 @@ using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.RA; using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Widgets; using OpenRA.Mods.RA.Widgets;
using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Mods.RA.Widgets.Logic;
@@ -32,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
World world; World world;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public CncSettingsLogic(Widget widget, World world, Action onExit) public CncSettingsLogic(Widget widget, World world, Action onExit, WorldRenderer worldRenderer)
{ {
this.world = world; this.world = world;
var panel = widget.Get("SETTINGS_PANEL"); var panel = widget.Get("SETTINGS_PANEL");
@@ -90,7 +91,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
pixelDoubleCheckbox.OnClick = () => pixelDoubleCheckbox.OnClick = () =>
{ {
graphicsSettings.PixelDouble ^= true; graphicsSettings.PixelDouble ^= true;
Game.Zoom = graphicsSettings.PixelDouble ? 2 : 1; worldRenderer.Viewport.Zoom = graphicsSettings.PixelDouble ? 2 : 1;
}; };
var showShellmapCheckbox = generalPane.Get<CheckboxWidget>("SHOW_SHELLMAP"); var showShellmapCheckbox = generalPane.Get<CheckboxWidget>("SHOW_SHELLMAP");

11
OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
View File

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using OpenRA.Graphics;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic namespace OpenRA.Mods.RA.Widgets.Logic
@@ -16,18 +17,24 @@ namespace OpenRA.Mods.RA.Widgets.Logic
class IngameMenuLogic class IngameMenuLogic
{ {
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public IngameMenuLogic(Widget widget, World world, Action onExit) public IngameMenuLogic(Widget widget, World world, Action onExit, WorldRenderer worldRenderer)
{ {
widget.Get<ButtonWidget>("DISCONNECT").OnClick = () => widget.Get<ButtonWidget>("DISCONNECT").OnClick = () =>
{ {
onExit(); onExit();
LeaveGame(world); LeaveGame(world);
}; };
widget.Get<ButtonWidget>("SETTINGS").OnClick = () => widget.Get<ButtonWidget>("SETTINGS").OnClick = () =>
{ {
widget.Visible = false; widget.Visible = false;
Ui.OpenWindow("SETTINGS_MENU", new WidgetArgs { { "onExit", () => { widget.Visible = true; } } }); Ui.OpenWindow("SETTINGS_MENU", new WidgetArgs()
{
{ "onExit", () => widget.Visible = true },
{ "worldRenderer", worldRenderer },
});
}; };
widget.Get<ButtonWidget>("MUSIC").OnClick = () => widget.Get<ButtonWidget>("MUSIC").OnClick = () =>
{ {
widget.Visible = false; widget.Visible = false;

2
OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
widget.Get<ButtonWidget>("MAINMENU_BUTTON_SETTINGS").OnClick = () => widget.Get<ButtonWidget>("MAINMENU_BUTTON_SETTINGS").OnClick = () =>
{ {
Menu = MenuType.None; Menu = MenuType.None;
Ui.OpenWindow("SETTINGS_MENU", new WidgetArgs() Game.OpenWindow("SETTINGS_MENU", new WidgetArgs()
{ {
{ "onExit", () => Menu = MenuType.Main } { "onExit", () => Menu = MenuType.Main }
}); });

5
OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
View File

@@ -14,6 +14,7 @@ using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics; using OpenRA.FileFormats.Graphics;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.RA.Widgets.Logic namespace OpenRA.Mods.RA.Widgets.Logic
@@ -24,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
SoundDevice soundDevice; SoundDevice soundDevice;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public SettingsMenuLogic(Action onExit) public SettingsMenuLogic(Action onExit, WorldRenderer worldRenderer)
{ {
bg = Ui.Root.Get<BackgroundWidget>("SETTINGS_MENU"); bg = Ui.Root.Get<BackgroundWidget>("SETTINGS_MENU");
var tabs = bg.Get<ContainerWidget>("TAB_CONTAINER"); var tabs = bg.Get<ContainerWidget>("TAB_CONTAINER");
@@ -133,7 +134,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
pixelDoubleCheckbox.OnClick = () => pixelDoubleCheckbox.OnClick = () =>
{ {
gs.PixelDouble ^= true; gs.PixelDouble ^= true;
Game.Zoom = gs.PixelDouble ? 2 : 1; worldRenderer.Viewport.Zoom = gs.PixelDouble ? 2 : 1;
}; };
var capFrameRateCheckbox = display.Get<CheckboxWidget>("CAPFRAMERATE_CHECKBOX"); var capFrameRateCheckbox = display.Get<CheckboxWidget>("CAPFRAMERATE_CHECKBOX");