matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce unnecessary #include dependency chains

Browse Source 
for example, elements no longer include Client.h or Graphics.h, and interface stuff won't include Window.h or Graphics.h unless requested
This commit is contained in:
jacob1 2017-07-13 23:24:35 -04:00
parent 781a90a970
commit 5ee10d14e4
71 changed files with 307 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Activity.h
View File

@ -26,17 +26,11 @@ public:
} }
virtual void Show() virtual void Show()
{ {
if(ui::Engine::Ref().GetWindow() != this) MakeActiveWindow();
{
ui::Engine::Ref().ShowWindow(this);
}
} }
virtual void Hide() virtual void Hide()
{ {
if(ui::Engine::Ref().GetWindow() == this) CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
} }
virtual ~WindowActivity() {} virtual ~WindowActivity() {}
}; };

3
src/debug/DebugLines.cpp
View File

@ -1,5 +1,4 @@
#include "DebugLines.h" #include "DebugLines.h"
#include "gui/interface/Engine.h"
#include "gui/game/GameView.h" #include "gui/game/GameView.h"
#include "gui/game/GameController.h" #include "gui/game/GameController.h"
@ -13,7 +12,7 @@ DebugLines::DebugLines(unsigned int id, GameView * view, GameController * contro
void DebugLines::Draw() void DebugLines::Draw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = view->GetGraphics();
if (view->GetDrawingLine()) if (view->GetDrawingLine())
{ {

3
src/debug/DebugParts.cpp
View File

@ -1,7 +1,8 @@
#include <iomanip>
#include <sstream>
#include "DebugParts.h" #include "DebugParts.h"
#include "gui/interface/Engine.h" #include "gui/interface/Engine.h"
#include "simulation/Simulation.h" #include "simulation/Simulation.h"
#include <iomanip>
DebugParts::DebugParts(unsigned int id, Simulation * sim): DebugParts::DebugParts(unsigned int id, Simulation * sim):
DebugInfo(id), DebugInfo(id),

94
src/graphics/Graphics.h
View File

@ -9,98 +9,8 @@
#include "OpenGLHeaders.h" #include "OpenGLHeaders.h"
#endif #endif
#include "Config.h" #include "Config.h"
//#include "powder.h" #include "Pixel.h"
#include "Icons.h"
#define PIXELCHANNELS 3
#ifdef PIX16
#define PIXELSIZE 2
#define PIXPACK(x) ((((x)>>8)&0xF800)|(((x)>>5)&0x07E0)|(((x)>>3)&0x001F)) //16bit RGB in 16bit int: ????
#define PIXRGB(r,g,b) ((((r)<<8)&0xF800)|(((g)<<3)&0x07E0)|(((b)>>3)&0x001F))
#define PIXR(x) (((x)>>8)&0xF8)
#define PIXG(x) (((x)>>3)&0xFC)
#define PIXB(x) (((x)<<3)&0xF8)
#else
#define PIXELSIZE 4
#ifdef PIX32BGRA
#define PIXPACK(x) ((((x)>>16)&0x0000FF)|((x)&0x00FF00)|(((x)<<16)&0xFF0000)) //24bit BGR in 32bit int: 00BBGGRR
#define PIXRGB(r,g,b) (((b)<<16)|((g)<<8)|((r)))// (((b)<<16)|((g)<<8)|(r))
#define PIXR(x) ((x)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)>>16)
#else
#ifdef PIX32BGRA
#define PIXPACK(x) ((((x)>>8)&0x0000FF00)|(((x)<<8)&0x00FF0000)|(((x)<<24)&0xFF000000)) //32bit BGRA in 32bit int: BBGGRRAA
#define PIXRGB(r,g,b) (((b)<<24)|((g)<<16)|((r)<<8))
#define PIXR(x) (((x)>>8)&0xFF)
#define PIXG(x) (((x)>>16)&0xFF)
#define PIXB(x) (((x)>>24)&0xFF)
#elif defined(PIX32OGL)
#undef PIXELCHANNELS
#define PIXELCHANNELS 4
#define PIXPACK(x) (0xFF000000|((x)&0xFFFFFF)) //32bit ARGB in 32bit int: AARRGGBB
#define PIXRGB(r,g,b) (0xFF000000|((r)<<16)|((g)<<8)|((b)))
#define PIXRGBA(r,g,b,a) (((a)<<24)|((r)<<16)|((g)<<8)|((b)))
#define PIXA(x) (((x)>>24)&0xFF)
#define PIXR(x) (((x)>>16)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)&0xFF)
#else
#define PIXPACK(x) (x) //24bit RGB in 32bit int: 00RRGGBB.
#define PIXRGB(r,g,b) (((r)<<16)|((g)<<8)|(b))
#define PIXR(x) (((x)>>16)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)&0xFF)
#endif
#endif
#endif
#ifdef PIX16
typedef unsigned short pixel;
#else
typedef unsigned int pixel;
#endif
//Icon names, see Graphics::draw_icon
enum Icon
{
NoIcon = 0,
IconOpen,
IconReload,
IconSave,
IconVoteUp,
IconVoteDown,
IconTag,
IconNew,
IconLogin,
IconRenderSettings,
IconSimulationSettings,
IconPause,
IconVoteSort,
IconDateSort,
IconMyOwn,
IconFavourite,
IconSearch,
IconDelete,
IconAdd,
IconReport,
IconUsername,
IconPassword,
IconClose,
IconEffect,
IconFire,
IconGlow,
IconBlur,
IconBlob,
IconBasic,
IconAltAir,
IconPressure,
IconVelocity,
IconWarp,
IconPersistant,
IconHeat,
IconLife,
IconGradient
};
//"Graphics lite" - slightly lower performance due to variable size, //"Graphics lite" - slightly lower performance due to variable size,
class VideoBuffer class VideoBuffer

46
src/graphics/Icons.h Normal file
View File

@ -0,0 +1,46 @@
#ifndef ICONS_H
#define ICONS_H
//Icon names, see Graphics::draw_icon
enum Icon
{
NoIcon = 0,
IconOpen,
IconReload,
IconSave,
IconVoteUp,
IconVoteDown,
IconTag,
IconNew,
IconLogin,
IconRenderSettings,
IconSimulationSettings,
IconPause,
IconVoteSort,
IconDateSort,
IconMyOwn,
IconFavourite,
IconSearch,
IconDelete,
IconAdd,
IconReport,
IconUsername,
IconPassword,
IconClose,
IconEffect,
IconFire,
IconGlow,
IconBlur,
IconBlob,
IconBasic,
IconAltAir,
IconPressure,
IconVelocity,
IconWarp,
IconPersistant,
IconHeat,
IconLife,
IconGradient
};
#endif // ICONS_H

53
src/graphics/Pixel.h Normal file
View File

@ -0,0 +1,53 @@
#ifndef PIXEL_H
#define PIXEL_H
#define PIXELCHANNELS 3
#ifdef PIX16
#define PIXELSIZE 2
#define PIXPACK(x) ((((x)>>8)&0xF800)|(((x)>>5)&0x07E0)|(((x)>>3)&0x001F)) //16bit RGB in 16bit int: ????
#define PIXRGB(r,g,b) ((((r)<<8)&0xF800)|(((g)<<3)&0x07E0)|(((b)>>3)&0x001F))
#define PIXR(x) (((x)>>8)&0xF8)
#define PIXG(x) (((x)>>3)&0xFC)
#define PIXB(x) (((x)<<3)&0xF8)
#else
#define PIXELSIZE 4
#ifdef PIX32BGRA
#define PIXPACK(x) ((((x)>>16)&0x0000FF)|((x)&0x00FF00)|(((x)<<16)&0xFF0000)) //24bit BGR in 32bit int: 00BBGGRR
#define PIXRGB(r,g,b) (((b)<<16)|((g)<<8)|((r)))// (((b)<<16)|((g)<<8)|(r))
#define PIXR(x) ((x)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)>>16)
#else
#ifdef PIX32BGRA
#define PIXPACK(x) ((((x)>>8)&0x0000FF00)|(((x)<<8)&0x00FF0000)|(((x)<<24)&0xFF000000)) //32bit BGRA in 32bit int: BBGGRRAA
#define PIXRGB(r,g,b) (((b)<<24)|((g)<<16)|((r)<<8))
#define PIXR(x) (((x)>>8)&0xFF)
#define PIXG(x) (((x)>>16)&0xFF)
#define PIXB(x) (((x)>>24)&0xFF)
#elif defined(PIX32OGL)
#undef PIXELCHANNELS
#define PIXELCHANNELS 4
#define PIXPACK(x) (0xFF000000|((x)&0xFFFFFF)) //32bit ARGB in 32bit int: AARRGGBB
#define PIXRGB(r,g,b) (0xFF000000|((r)<<16)|((g)<<8)|((b)))
#define PIXRGBA(r,g,b,a) (((a)<<24)|((r)<<16)|((g)<<8)|((b)))
#define PIXA(x) (((x)>>24)&0xFF)
#define PIXR(x) (((x)>>16)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)&0xFF)
#else
#define PIXPACK(x) (x) //24bit RGB in 32bit int: 00RRGGBB.
#define PIXRGB(r,g,b) (((r)<<16)|((g)<<8)|(b))
#define PIXR(x) (((x)>>16)&0xFF)
#define PIXG(x) (((x)>>8)&0xFF)
#define PIXB(x) ((x)&0xFF)
#endif
#endif
#endif
#ifdef PIX16
typedef unsigned short pixel;
#else
typedef unsigned int pixel;
#endif
#endif // PIXEL_H

2
src/graphics/Renderer.cpp
View File

@ -4,8 +4,10 @@
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include "Config.h" #include "Config.h"
#include "Misc.h"
#include "Renderer.h" #include "Renderer.h"
#include "Graphics.h" #include "Graphics.h"
#include "gui/game/RenderPreset.h"
#include "simulation/Elements.h" #include "simulation/Elements.h"
#include "simulation/ElementGraphics.h" #include "simulation/ElementGraphics.h"
#include "simulation/Air.h" #include "simulation/Air.h"

4
src/graphics/Renderer.h
View File

@ -7,13 +7,11 @@
#endif #endif
#include "Config.h" #include "Config.h"
#include "client/Client.h"
#include "Graphics.h" #include "Graphics.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include "gui/game/RenderPreset.h"
class RenderPreset;
class Simulation; class Simulation;
class Graphics; class Graphics;
struct gcache_item struct gcache_item

2
src/gui/colourpicker/ColourPickerActivity.cpp
View File

@ -258,7 +258,7 @@ void ColourPickerActivity::OnKeyPress(int key, Uint16 character, bool shift, boo
void ColourPickerActivity::OnDraw() void ColourPickerActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
//g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); //g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->fillrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3, 0, 0, 0, currentAlpha); g->fillrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3, 0, 0, 0, currentAlpha);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);

14
src/gui/console/ConsoleController.cpp
View File

@ -28,8 +28,7 @@ void ConsoleController::EvaluateCommand(std::string command)
void ConsoleController::CloseConsole() void ConsoleController::CloseConsole()
{ {
if(ui::Engine::Ref().GetWindow() == consoleView) consoleView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
} }
std::string ConsoleController::FormatCommand(std::string command) std::string ConsoleController::FormatCommand(std::string command)
@ -53,9 +52,8 @@ void ConsoleController::PreviousCommand()
void ConsoleController::Exit() void ConsoleController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == consoleView) consoleView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow(); if (callback)
if(callback)
callback->ControllerExit(); callback->ControllerExit();
HasDone = true; HasDone = true;
} }
@ -65,9 +63,9 @@ ConsoleView * ConsoleController::GetView()
return consoleView; return consoleView;
} }
ConsoleController::~ConsoleController() { ConsoleController::~ConsoleController()
if(ui::Engine::Ref().GetWindow() == consoleView) {
ui::Engine::Ref().CloseWindow(); consoleView->CloseActiveWindow();
delete callback; delete callback;
delete consoleModel; delete consoleModel;
delete consoleView; delete consoleView;

2
src/gui/console/ConsoleView.cpp
View File

@ -91,7 +91,7 @@ void ConsoleView::NotifyCurrentCommandChanged(ConsoleModel * sender)
void ConsoleView::OnDraw() void ConsoleView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->fillrect(Position.X, Position.Y, Size.X, Size.Y, 0, 0, 0, 110); g->fillrect(Position.X, Position.Y, Size.X, Size.Y, 0, 0, 0, 110);
g->draw_line(Position.X, Position.Y+Size.Y-16, Position.X+Size.X, Position.Y+Size.Y-16, 255, 255, 255, 160); g->draw_line(Position.X, Position.Y+Size.Y-16, Position.X+Size.X, Position.Y+Size.Y-16, 255, 255, 255, 160);
g->draw_line(Position.X, Position.Y+Size.Y, Position.X+Size.X, Position.Y+Size.Y, 255, 255, 255, 200); g->draw_line(Position.X, Position.Y+Size.Y, Position.X+Size.X, Position.Y+Size.Y, 255, 255, 255, 200);

13
src/gui/dialogues/ConfirmPrompt.cpp
View File

@ -1,7 +1,8 @@
#include "ConfirmPrompt.h" #include "ConfirmPrompt.h"
#include "gui/Style.h" #include "gui/Style.h"
#include "gui/interface/Label.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Label.h"
#include "gui/interface/ScrollPanel.h" #include "gui/interface/ScrollPanel.h"
#include "PowderToy.h" #include "PowderToy.h"
@ -40,7 +41,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
CloseAction(ConfirmPrompt * prompt_, DialogueResult result_) { prompt = prompt_; result = result_; } CloseAction(ConfirmPrompt * prompt_, DialogueResult result_) { prompt = prompt_; result = result_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->callback) if(prompt->callback)
prompt->callback->ConfirmCallback(result); prompt->callback->ConfirmCallback(result);
prompt->SelfDestruct(); prompt->SelfDestruct();
@ -64,7 +65,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial
AddComponent(okayButton); AddComponent(okayButton);
SetOkayButton(okayButton); SetOkayButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, std::string buttonText, ConfirmDialogueCallback * callback_): ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, std::string buttonText, ConfirmDialogueCallback * callback_):
@ -102,7 +103,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, std::string
CloseAction(ConfirmPrompt * prompt_, DialogueResult result_) { prompt = prompt_; result = result_; } CloseAction(ConfirmPrompt * prompt_, DialogueResult result_) { prompt = prompt_; result = result_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->callback) if(prompt->callback)
prompt->callback->ConfirmCallback(result); prompt->callback->ConfirmCallback(result);
prompt->SelfDestruct(); prompt->SelfDestruct();
@ -126,7 +127,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, std::string
AddComponent(okayButton); AddComponent(okayButton);
SetOkayButton(okayButton); SetOkayButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
bool ConfirmPrompt::Blocking(std::string title, std::string message, std::string buttonText) bool ConfirmPrompt::Blocking(std::string title, std::string message, std::string buttonText)
@ -152,7 +153,7 @@ bool ConfirmPrompt::Blocking(std::string title, std::string message, std::string
void ConfirmPrompt::OnDraw() void ConfirmPrompt::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

1
src/gui/dialogues/ConfirmPrompt.h
View File

@ -1,6 +1,7 @@
#ifndef CONFIRMPROMPT_H_ #ifndef CONFIRMPROMPT_H_
#define CONFIRMPROMPT_H_ #define CONFIRMPROMPT_H_
#include <string>
#include "gui/interface/Window.h" #include "gui/interface/Window.h"
class ConfirmDialogueCallback; class ConfirmDialogueCallback;

7
src/gui/dialogues/ErrorMessage.cpp
View File

@ -1,6 +1,7 @@
#include "gui/Style.h" #include "gui/Style.h"
#include "ErrorMessage.h" #include "ErrorMessage.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "PowderToy.h" #include "PowderToy.h"
@ -30,7 +31,7 @@ ErrorMessage::ErrorMessage(std::string title, std::string message, ErrorMessage
DismissAction(ErrorMessage * message_) { message = message_; } DismissAction(ErrorMessage * message_) { message = message_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); message->CloseActiveWindow();
if(message->callback) if(message->callback)
message->callback->DismissCallback(); message->callback->DismissCallback();
message->SelfDestruct(); message->SelfDestruct();
@ -46,7 +47,7 @@ ErrorMessage::ErrorMessage(std::string title, std::string message, ErrorMessage
SetOkayButton(okayButton); SetOkayButton(okayButton);
SetCancelButton(okayButton); SetCancelButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void ErrorMessage::Blocking(std::string title, std::string message) void ErrorMessage::Blocking(std::string title, std::string message)
@ -65,7 +66,7 @@ void ErrorMessage::Blocking(std::string title, std::string message)
void ErrorMessage::OnDraw() void ErrorMessage::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

7
src/gui/dialogues/InformationMessage.cpp
View File

@ -1,6 +1,7 @@
#include "gui/Style.h" #include "gui/Style.h"
#include "InformationMessage.h" #include "InformationMessage.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/ScrollPanel.h" #include "gui/interface/ScrollPanel.h"
@ -58,7 +59,7 @@ InformationMessage::InformationMessage(std::string title, std::string message, b
DismissAction(InformationMessage * message_) { message = message_; } DismissAction(InformationMessage * message_) { message = message_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); message->CloseActiveWindow();
message->SelfDestruct(); //TODO: Fix component disposal message->SelfDestruct(); //TODO: Fix component disposal
} }
}; };
@ -72,12 +73,12 @@ InformationMessage::InformationMessage(std::string title, std::string message, b
SetOkayButton(okayButton); SetOkayButton(okayButton);
SetCancelButton(okayButton); SetCancelButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void InformationMessage::OnDraw() void InformationMessage::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

9
src/gui/dialogues/SaveIDMessage.cpp
View File

@ -1,5 +1,6 @@
#include "gui/Style.h" #include "gui/Style.h"
#include "SaveIDMessage.h" #include "SaveIDMessage.h"
#include "graphics/Graphics.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/CopyTextButton.h" #include "gui/interface/CopyTextButton.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
@ -38,7 +39,7 @@ SaveIDMessage::SaveIDMessage(int id):
DismissAction(SaveIDMessage * message_) { message = message_; } DismissAction(SaveIDMessage * message_) { message = message_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); message->CloseActiveWindow();
message->SelfDestruct(); message->SelfDestruct();
} }
}; };
@ -50,12 +51,12 @@ SaveIDMessage::SaveIDMessage(int id):
AddComponent(okayButton); AddComponent(okayButton);
SetCancelButton(okayButton); SetCancelButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void SaveIDMessage::OnDraw() void SaveIDMessage::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);
@ -63,7 +64,7 @@ void SaveIDMessage::OnDraw()
void SaveIDMessage::OnTryExit(ExitMethod method) void SaveIDMessage::OnTryExit(ExitMethod method)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
SelfDestruct(); SelfDestruct();
} }

7
src/gui/dialogues/TextPrompt.cpp
View File

@ -2,6 +2,7 @@
#include "TextPrompt.h" #include "TextPrompt.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Engine.h"
#include "gui/Style.h" #include "gui/Style.h"
#include "PowderToy.h" #include "PowderToy.h"
@ -13,7 +14,7 @@ public:
CloseAction(TextPrompt * prompt_, TextPrompt::DialogueResult result_) { prompt = prompt_; result = result_; } CloseAction(TextPrompt * prompt_, TextPrompt::DialogueResult result_) { prompt = prompt_; result = result_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->callback) if(prompt->callback)
prompt->callback->TextCallback(result, prompt->textField->GetText()); prompt->callback->TextCallback(result, prompt->textField->GetText());
prompt->SelfDestruct(); //TODO: Fix component disposal prompt->SelfDestruct(); //TODO: Fix component disposal
@ -73,7 +74,7 @@ TextPrompt::TextPrompt(std::string title, std::string message, std::string text,
AddComponent(okayButton); AddComponent(okayButton);
SetOkayButton(okayButton); SetOkayButton(okayButton);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
std::string TextPrompt::Blocking(std::string title, std::string message, std::string text, std::string placeholder, bool multiline) std::string TextPrompt::Blocking(std::string title, std::string message, std::string text, std::string placeholder, bool multiline)
@ -101,7 +102,7 @@ std::string TextPrompt::Blocking(std::string title, std::string message, std::st
void TextPrompt::OnDraw() void TextPrompt::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

2
src/gui/elementsearch/ElementSearchActivity.cpp
View File

@ -188,7 +188,7 @@ void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool)
void ElementSearchActivity::OnDraw() void ElementSearchActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);

2
src/gui/filebrowser/FileBrowserActivity.cpp
View File

@ -327,7 +327,7 @@ void FileBrowserActivity::OnTick(float dt)
void FileBrowserActivity::OnDraw() void FileBrowserActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
//Window Background+Outline //Window Background+Outline
g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4);

13
src/gui/game/GameController.cpp
View File

@ -224,9 +224,8 @@ GameController::~GameController()
delete *iter; delete *iter;
} }
delete gameModel; delete gameModel;
if (ui::Engine::Ref().GetWindow() == gameView) if (gameView->CloseActiveWindow())
{ {
ui::Engine::Ref().CloseWindow();
delete gameView; delete gameView;
} }
} }
@ -835,8 +834,7 @@ void GameController::Tick()
void GameController::Exit() void GameController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == gameView) gameView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
HasDone = true; HasDone = true;
} }
@ -1365,7 +1363,7 @@ void GameController::OpenOptions()
void GameController::ShowConsole() void GameController::ShowConsole()
{ {
if(!console) if (!console)
console = new ConsoleController(NULL, commandInterface); console = new ConsoleController(NULL, commandInterface);
if (console->GetView() != ui::Engine::Ref().GetWindow()) if (console->GetView() != ui::Engine::Ref().GetWindow())
ui::Engine::Ref().ShowWindow(console->GetView()); ui::Engine::Ref().ShowWindow(console->GetView());
@ -1373,10 +1371,9 @@ void GameController::ShowConsole()
void GameController::HideConsole() void GameController::HideConsole()
{ {
if(!console) if (!console)
return; return;
if (console->GetView() == ui::Engine::Ref().GetWindow()) console->GetView()->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
} }
void GameController::OpenRenderOptions() void GameController::OpenRenderOptions()

1
src/gui/game/GameModel.h
View File

@ -20,6 +20,7 @@ using namespace std;
class GameView; class GameView;
class GameController; class GameController;
class SaveFile;
class Simulation; class Simulation;
class Renderer; class Renderer;

4
src/gui/game/GameView.cpp
View File

@ -138,7 +138,7 @@ public:
void Draw(const ui::Point& screenPos) void Draw(const ui::Point& screenPos)
{ {
ui::Button::Draw(screenPos); ui::Button::Draw(screenPos);
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
drawn = true; drawn = true;
if(showSplit) if(showSplit)
@ -2092,7 +2092,7 @@ void GameView::SetSaveButtonTooltips()
void GameView::OnDraw() void GameView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
if (ren) if (ren)
{ {
ren->clearScreen(1.0f); ren->clearScreen(1.0f);

13
src/gui/game/PropertyTool.cpp
View File

@ -1,9 +1,9 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "Tool.h"
#include "client/Client.h"
#include "gui/Style.h" #include "gui/Style.h"
#include "gui/game/Brush.h" #include "gui/game/Brush.h"
#include "simulation/Simulation.h"
#include "Tool.h"
#include "gui/interface/Window.h" #include "gui/interface/Window.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
@ -11,6 +11,7 @@
#include "gui/interface/DropDown.h" #include "gui/interface/DropDown.h"
#include "gui/interface/Keys.h" #include "gui/interface/Keys.h"
#include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ErrorMessage.h"
#include "simulation/Simulation.h"
class PropertyWindow: public ui::Window class PropertyWindow: public ui::Window
{ {
@ -33,7 +34,7 @@ public:
OkayAction(PropertyWindow * prompt_) { prompt = prompt_; } OkayAction(PropertyWindow * prompt_) { prompt = prompt_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->textField->GetText().length()) if(prompt->textField->GetText().length())
prompt->SetProperty(); prompt->SetProperty();
prompt->SelfDestruct(); prompt->SelfDestruct();
@ -89,7 +90,7 @@ sim(sim_)
AddComponent(textField); AddComponent(textField);
FocusComponent(textField); FocusComponent(textField);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void PropertyWindow::SetProperty() void PropertyWindow::SetProperty()
@ -217,13 +218,13 @@ void PropertyWindow::SetProperty()
void PropertyWindow::OnTryExit(ExitMethod method) void PropertyWindow::OnTryExit(ExitMethod method)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
SelfDestruct(); SelfDestruct();
} }
void PropertyWindow::OnDraw() void PropertyWindow::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

12
src/gui/game/SignTool.cpp
View File

@ -38,7 +38,7 @@ public:
OkayAction(SignWindow * prompt_) { prompt = prompt_; } OkayAction(SignWindow * prompt_) { prompt = prompt_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->signID==-1 && prompt->textField->GetText().length()) if(prompt->signID==-1 && prompt->textField->GetText().length())
{ {
prompt->sim->signs.push_back(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second)); prompt->sim->signs.push_back(sign(prompt->textField->GetText(), prompt->signPosition.X, prompt->signPosition.Y, (sign::Justification)prompt->justification->GetOption().second));
@ -57,7 +57,7 @@ public:
DeleteAction(SignWindow * prompt_) { prompt = prompt_; } DeleteAction(SignWindow * prompt_) { prompt = prompt_; }
void ActionCallback(ui::Button * sender) void ActionCallback(ui::Button * sender)
{ {
ui::Engine::Ref().CloseWindow(); prompt->CloseActiveWindow();
if(prompt->signID!=-1) if(prompt->signID!=-1)
{ {
prompt->sim->signs.erase(prompt->sim->signs.begin()+prompt->signID); prompt->sim->signs.erase(prompt->sim->signs.begin()+prompt->signID);
@ -166,12 +166,12 @@ SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Poi
AddComponent(deleteButton); AddComponent(deleteButton);
} }
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void SignWindow::OnTryExit(ui::Window::ExitMethod method) void SignWindow::OnTryExit(ui::Window::ExitMethod method)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
SelfDestruct(); SelfDestruct();
} }
@ -182,7 +182,7 @@ void SignWindow::DoDraw()
sign & currentSign = *iter; sign & currentSign = *iter;
int x, y, w, h, dx, dy; int x, y, w, h, dx, dy;
char type = 0; char type = 0;
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
std::string text = currentSign.getText(sim); std::string text = currentSign.getText(sim);
sign::splitsign(currentSign.text.c_str(), &type); sign::splitsign(currentSign.text.c_str(), &type);
currentSign.pos(text, x, y, w, h); currentSign.pos(text, x, y, w, h);
@ -251,7 +251,7 @@ void SignWindow::DoMouseDown(int x, int y, unsigned button)
void SignWindow::OnDraw() void SignWindow::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 200, 200, 200, 255);

3
src/gui/game/ToolButton.cpp
View File

@ -1,4 +1,5 @@
#include "ToolButton.h" #include "ToolButton.h"
#include "graphics/Graphics.h"
#include "gui/interface/Keys.h" #include "gui/interface/Keys.h"
#include "gui/interface/Mouse.h" #include "gui/interface/Mouse.h"
#include "Favorite.h" #include "Favorite.h"
@ -44,7 +45,7 @@ void ToolButton::OnMouseUp(int x, int y, unsigned int button)
void ToolButton::Draw(const ui::Point& screenPos) void ToolButton::Draw(const ui::Point& screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
int totalColour = Appearance.BackgroundInactive.Blue + (3*Appearance.BackgroundInactive.Green) + (2*Appearance.BackgroundInactive.Red); int totalColour = Appearance.BackgroundInactive.Blue + (3*Appearance.BackgroundInactive.Green) + (2*Appearance.BackgroundInactive.Red);
if (Appearance.GetTexture()) if (Appearance.GetTexture())

1
src/gui/interface/Appearance.cpp
View File

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include "Appearance.h" #include "Appearance.h"
#include "graphics/Graphics.h"
namespace ui namespace ui
{ {

3
src/gui/interface/Appearance.h
View File

@ -3,8 +3,9 @@
#include "Border.h" #include "Border.h"
#include "Colour.h" #include "Colour.h"
#include "graphics/Graphics.h" #include "graphics/Icons.h"
class VideoBuffer;
namespace ui namespace ui
{ {
class Appearance class Appearance

3
src/gui/interface/AvatarButton.cpp
View File

@ -3,7 +3,6 @@
#include "AvatarButton.h" #include "AvatarButton.h"
#include "Format.h" #include "Format.h"
#include "Engine.h"
#include "client/Client.h" #include "client/Client.h"
#include "client/requestbroker/RequestBroker.h" #include "client/requestbroker/RequestBroker.h"
#include "graphics/Graphics.h" #include "graphics/Graphics.h"
@ -51,7 +50,7 @@ void AvatarButton::OnResponseReady(void * imagePtr, int identifier)
void AvatarButton::Draw(const Point& screenPos) void AvatarButton::Draw(const Point& screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
if(avatar) if(avatar)
{ {

4
src/gui/interface/Button.cpp
View File

@ -1,7 +1,7 @@
#include <iostream> #include <iostream>
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Window.h"
#include "graphics/Graphics.h" #include "graphics/Graphics.h"
#include "Engine.h"
#include "Misc.h" #include "Misc.h"
namespace ui { namespace ui {
@ -75,7 +75,7 @@ void Button::Draw(const Point& screenPos)
TextPosition(ButtonText); TextPosition(ButtonText);
drawn = true; drawn = true;
} }
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
Point Position = screenPos; Point Position = screenPos;
ui::Colour bgColour(0, 0, 0); ui::Colour bgColour(0, 0, 0);

4
src/gui/interface/Checkbox.cpp
View File

@ -1,4 +1,6 @@
#include "Checkbox.h" #include "Checkbox.h"
#include "graphics/Graphics.h"
#include "gui/interface/Window.h"
using namespace ui; using namespace ui;
@ -70,7 +72,7 @@ void Checkbox::OnMouseLeave(int x, int y)
void Checkbox::Draw(const Point& screenPos) void Checkbox::Draw(const Point& screenPos)
{ {
Graphics * g = Engine::Ref().g; Graphics * g = GetGraphics();
if(checked) if(checked)
{ {
g->fillrect(screenPos.X+5, screenPos.Y+5, 6, 6, 255, 255, 255, 255); g->fillrect(screenPos.X+5, screenPos.Y+5, 6, 6, 255, 255, 255, 255);

6
src/gui/interface/Component.cpp
View File

@ -1,4 +1,5 @@
#include <iostream> #include <iostream>
#include "graphics/Graphics.h"
#include "gui/interface/Component.h" #include "gui/interface/Component.h"
#include "gui/interface/Engine.h" #include "gui/interface/Engine.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
@ -167,6 +168,11 @@ Point Component::GetScreenPos()
return newPos; return newPos;
} }
Graphics * Component::GetGraphics()
{
return parentstate_->GetGraphics();
}
// ***** OVERRIDEABLES ***** // ***** OVERRIDEABLES *****
// Kept empty. // Kept empty.

5
src/gui/interface/Component.h
View File

@ -1,9 +1,11 @@
#pragma once #pragma once
#include <string>
#include "Config.h"
#include "Appearance.h" #include "Appearance.h"
#include "Point.h" #include "Point.h"
#include "Window.h"
class Graphics;
namespace ui namespace ui
{ {
class ContextMenu; class ContextMenu;
@ -26,6 +28,7 @@ namespace ui
ui::Point textSize; ui::Point textSize;
ui::Point iconPosition; ui::Point iconPosition;
ui::ContextMenu * menu; ui::ContextMenu * menu;
Graphics * GetGraphics();
public: public:
Component(Window* parent_state); Component(Window* parent_state);
Component(Point position, Point size); Component(Point position, Point size);

12
src/gui/interface/ContextMenu.cpp
View File

@ -1,5 +1,6 @@
#include "ContextMenu.h" #include "ContextMenu.h"
#include "common/tpt-minmax.h" #include "common/tpt-minmax.h"
#include "graphics/Graphics.h"
using namespace ui; using namespace ui;
@ -52,20 +53,21 @@ void ContextMenu::Show(ui::Point position)
currentY += 15; currentY += 15;
} }
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
} }
void ContextMenu::ActionCallbackItem(ui::Button *sender, int item) void ContextMenu::ActionCallbackItem(ui::Button *sender, int item)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
Halt(); Halt();
source->OnContextMenuAction(item); source->OnContextMenuAction(item);
} }
void ContextMenu::OnMouseDown(int x, int y, unsigned button) void ContextMenu::OnMouseDown(int x, int y, unsigned button)
{ {
if(!(x > Position.X && y > Position.Y && y < Position.Y+Size.Y && x < Position.X+Size.X)) //Clicked outside window // Clicked outside window
ui::Engine::Ref().CloseWindow(); if (!(x > Position.X && y > Position.Y && y < Position.Y+Size.Y && x < Position.X+Size.X))
CloseActiveWindow();
} }
void ContextMenu::SetItem(int id, std::string text) void ContextMenu::SetItem(int id, std::string text)
@ -99,7 +101,7 @@ void ContextMenu::AddItem(ContextMenuItem item)
void ContextMenu::OnDraw() void ContextMenu::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->fillrect(Position.X, Position.Y, Size.X, Size.Y, 100, 100, 100, 255); g->fillrect(Position.X, Position.Y, Size.X, Size.Y, 100, 100, 100, 255);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, Appearance.BackgroundInactive.Alpha); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, Appearance.BackgroundInactive.Alpha);
} }

1
src/gui/interface/CopyTextButton.cpp
View File

@ -1,5 +1,6 @@
#include "CopyTextButton.h" #include "CopyTextButton.h"
#include "Colour.h" #include "Colour.h"
#include "PowderToy.h"
#include "gui/Style.h" #include "gui/Style.h"
namespace ui namespace ui

12
src/gui/interface/DropDown.cpp
View File

@ -1,7 +1,9 @@
#include <iostream> #include <iostream>
#include "graphics/Graphics.h"
#include "gui/Style.h" #include "gui/Style.h"
#include "Button.h" #include "Button.h"
#include "DropDown.h" #include "DropDown.h"
#include "gui/interface/Window.h"
namespace ui { namespace ui {
@ -21,7 +23,7 @@ public:
ItemSelectedAction(DropDownWindow * window, std::string option): window(window), option(option) { } ItemSelectedAction(DropDownWindow * window, std::string option): window(window), option(option) { }
virtual void ActionCallback(ui::Button *sender) virtual void ActionCallback(ui::Button *sender)
{ {
ui::Engine::Ref().CloseWindow(); window->CloseActiveWindow();
window->setOption(option); window->setOption(option);
window->SelfDestruct(); window->SelfDestruct();
} }
@ -45,7 +47,7 @@ public:
} }
virtual void OnDraw() virtual void OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X, Position.Y, Size.X, Size.Y); g->clearrect(Position.X, Position.Y, Size.X, Size.Y);
} }
void setOption(std::string option) void setOption(std::string option)
@ -64,7 +66,7 @@ public:
} }
virtual void OnTryExit(ExitMethod method) virtual void OnTryExit(ExitMethod method)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
SelfDestruct(); SelfDestruct();
} }
virtual ~DropDownWindow() {} virtual ~DropDownWindow() {}
@ -81,7 +83,7 @@ DropDown::DropDown(Point position, Point size):
void DropDown::OnMouseClick(int x, int y, unsigned int button) void DropDown::OnMouseClick(int x, int y, unsigned int button)
{ {
DropDownWindow * newWindow = new DropDownWindow(this); DropDownWindow * newWindow = new DropDownWindow(this);
ui::Engine::Ref().ShowWindow(newWindow); newWindow->MakeActiveWindow();
} }
void DropDown::Draw(const Point& screenPos) void DropDown::Draw(const Point& screenPos)
@ -92,7 +94,7 @@ void DropDown::Draw(const Point& screenPos)
TextPosition(options[optionIndex].first); TextPosition(options[optionIndex].first);
drawn = true; drawn = true;
} }
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
Point Position = screenPos; Point Position = screenPos;
ui::Colour textColour = Appearance.TextInactive; ui::Colour textColour = Appearance.TextInactive;

4
src/gui/interface/Label.cpp
View File

@ -5,7 +5,9 @@
#include "Label.h" #include "Label.h"
#include "Keys.h" #include "Keys.h"
#include "Mouse.h" #include "Mouse.h"
#include "PowderToy.h"
#include "ContextMenu.h" #include "ContextMenu.h"
#include "graphics/Graphics.h"
using namespace ui; using namespace ui;
@ -380,7 +382,7 @@ void Label::Draw(const Point& screenPos)
TextPosition(text); TextPosition(text);
drawn = true; drawn = true;
} }
Graphics * g = Engine::Ref().g; Graphics * g = GetGraphics();
std::string cDisplayText = displayText; std::string cDisplayText = displayText;

1
src/gui/interface/Label.h
View File

@ -4,7 +4,6 @@
#include <string> #include <string>
#include "Component.h" #include "Component.h"
#include "PowderToy.h"
#include "Colour.h" #include "Colour.h"
namespace ui namespace ui

2
src/gui/interface/Panel.cpp
View File

@ -1,7 +1,7 @@
#include <vector> #include <vector>
#include "gui/interface/Panel.h" #include "gui/interface/Panel.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include "gui/interface/Window.h" #include "gui/interface/Window.h"
#include "gui/interface/Component.h" #include "gui/interface/Component.h"

1
src/gui/interface/Panel.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <vector> #include <vector>
#include "graphics/Pixel.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include "gui/interface/Window.h" #include "gui/interface/Window.h"
#include "gui/interface/Component.h" #include "gui/interface/Component.h"

3
src/gui/interface/ProgressBar.cpp
View File

@ -1,5 +1,6 @@
#include "ProgressBar.h" #include "ProgressBar.h"
#include "common/tpt-minmax.h" #include "common/tpt-minmax.h"
#include "graphics/Graphics.h"
#include "gui/Style.h" #include "gui/Style.h"
using namespace ui; using namespace ui;
@ -38,7 +39,7 @@ std::string ProgressBar::GetStatus()
void ProgressBar::Draw(const Point & screenPos) void ProgressBar::Draw(const Point & screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
ui::Colour progressBarColour = style::Colour::WarningTitle; ui::Colour progressBarColour = style::Colour::WarningTitle;

2
src/gui/interface/RichLabel.cpp
View File

@ -175,7 +175,7 @@ std::string RichLabel::GetText()
void RichLabel::Draw(const Point& screenPos) void RichLabel::Draw(const Point& screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
ui::Colour textColour = Appearance.TextInactive; ui::Colour textColour = Appearance.TextInactive;
g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, displayText, textColour.Red, textColour.Green, textColour.Blue, 255); g->drawtext(screenPos.X+textPosition.X, screenPos.Y+textPosition.Y, displayText, textColour.Red, textColour.Green, textColour.Blue, 255);
} }

3
src/gui/interface/SaveButton.cpp
View File

@ -4,7 +4,6 @@
#include "SaveButton.h" #include "SaveButton.h"
#include "client/SaveInfo.h" #include "client/SaveInfo.h"
#include "graphics/Graphics.h" #include "graphics/Graphics.h"
#include "Engine.h"
#include "client/requestbroker/RequestBroker.h" #include "client/requestbroker/RequestBroker.h"
#include "simulation/SaveRenderer.h" #include "simulation/SaveRenderer.h"
#include "Format.h" #include "Format.h"
@ -165,7 +164,7 @@ void SaveButton::Tick(float dt)
void SaveButton::Draw(const Point& screenPos) void SaveButton::Draw(const Point& screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
float scaleFactor; float scaleFactor;
ui::Point thumbBoxSize(0, 0); ui::Point thumbBoxSize(0, 0);

3
src/gui/interface/ScrollPanel.cpp
View File

@ -1,6 +1,7 @@
#include <iostream> #include <iostream>
#include "ScrollPanel.h" #include "ScrollPanel.h"
#include "common/tpt-minmax.h" #include "common/tpt-minmax.h"
#include "graphics/Graphics.h"
using namespace ui; using namespace ui;
@ -48,7 +49,7 @@ void ScrollPanel::Draw(const Point& screenPos)
{ {
Panel::Draw(screenPos); Panel::Draw(screenPos);
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
//Vertical scroll bar //Vertical scroll bar
if (maxOffset.Y>0 && InnerSize.Y>0) if (maxOffset.Y>0 && InnerSize.Y>0)

3
src/gui/interface/Slider.cpp
View File

@ -1,6 +1,7 @@
#include <iostream> #include <iostream>
#include "Slider.h" #include "Slider.h"
#include "Colour.h" #include "Colour.h"
#include "graphics/Graphics.h"
namespace ui { namespace ui {
@ -104,7 +105,7 @@ void Slider::SetSteps(int steps)
void Slider::Draw(const Point& screenPos) void Slider::Draw(const Point& screenPos)
{ {
Graphics * g = Engine::Ref().g; Graphics * g = GetGraphics();
//g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255); //g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255);
if(bgGradient) if(bgGradient)

3
src/gui/interface/Spinner.cpp
View File

@ -1,6 +1,7 @@
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include "Spinner.h" #include "Spinner.h"
#include "graphics/Graphics.h"
using namespace ui; using namespace ui;
@ -20,7 +21,7 @@ void Spinner::Tick(float dt)
} }
void Spinner::Draw(const Point& screenPos) void Spinner::Draw(const Point& screenPos)
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
int baseX = screenPos.X+(Size.X/2); int baseX = screenPos.X+(Size.X/2);
int baseY = screenPos.Y+(Size.Y/2); int baseY = screenPos.Y+(Size.Y/2);
int lineInner = (Size.X/2); int lineInner = (Size.X/2);

5
src/gui/interface/Textbox.cpp
View File

@ -4,6 +4,7 @@
#include "Config.h" #include "Config.h"
#include "Platform.h" #include "Platform.h"
#include "Format.h" #include "Format.h"
#include "graphics/Graphics.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include "gui/interface/Textbox.h" #include "gui/interface/Textbox.h"
#include "gui/interface/Keys.h" #include "gui/interface/Keys.h"
@ -532,7 +533,7 @@ void Textbox::Draw(const Point& screenPos)
{ {
Label::Draw(screenPos); Label::Draw(screenPos);
Graphics * g = Engine::Ref().g; Graphics * g = GetGraphics();
if(IsFocused()) if(IsFocused())
{ {
if(border) g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255); if(border) g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255);
@ -694,7 +695,7 @@ void Textbox::Draw(const Point& screenPos)
TextPosition(); TextPosition();
drawn = true; drawn = true;
} }
Graphics * g = Engine::Ref().g; Graphics * g = GetGraphics();
if(IsFocused()) if(IsFocused())
{ {
if(border) g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255); if(border) g->drawrect(screenPos.X, screenPos.Y, Size.X, Size.Y, 255, 255, 255, 255);

22
src/gui/interface/Window.cpp
View File

@ -1,5 +1,6 @@
#include <iostream> #include <iostream>
#include "Window.h" #include "Window.h"
#include "Engine.h"
#include "Keys.h" #include "Keys.h"
#include "Component.h" #include "Component.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
@ -118,6 +119,27 @@ void Window::FocusComponent(Component* c)
this->focusedComponent_ = c; this->focusedComponent_ = c;
} }
void Window::MakeActiveWindow()
{
if (Engine::Ref().GetWindow() != this)
Engine::Ref().ShowWindow(this);
}
bool Window::CloseActiveWindow()
{
if (Engine::Ref().GetWindow() == this)
{
Engine::Ref().CloseWindow();
return true;
}
return false;
}
Graphics * Window::GetGraphics()
{
return Engine::Ref().g;
}
void Window::DoExit() void Window::DoExit()
{ {
OnExit(); OnExit();

8
src/gui/interface/Window.h
View File

@ -1,10 +1,12 @@
#ifndef WINDOW_H #ifndef WINDOW_H
#define WINDOW_H #define WINDOW_H
#include <string>
#include <vector> #include <vector>
#include "Config.h"
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include "Engine.h"
class Graphics;
namespace ui namespace ui
{ {
@ -78,6 +80,10 @@ namespace ui
enum OkayMethod { Enter, OkayButton }; enum OkayMethod { Enter, OkayButton };
enum ExitMethod { MouseOutside, Escape, ExitButton }; enum ExitMethod { MouseOutside, Escape, ExitButton };
void MakeActiveWindow();
bool CloseActiveWindow();
Graphics * GetGraphics();
protected: protected:
ui::Button * okayButton; ui::Button * okayButton;
ui::Button * cancelButton; ui::Button * cancelButton;

9
src/gui/localbrowser/LocalBrowserController.cpp
View File

@ -166,16 +166,15 @@ void LocalBrowserController::SetMoveToFront(bool move)
void LocalBrowserController::Exit() void LocalBrowserController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == browserView) browserView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
HasDone = true; HasDone = true;
} }
LocalBrowserController::~LocalBrowserController() { LocalBrowserController::~LocalBrowserController()
if(ui::Engine::Ref().GetWindow() == browserView) {
ui::Engine::Ref().CloseWindow(); browserView->CloseActiveWindow();
delete callback; delete callback;
delete browserModel; delete browserModel;
delete browserView; delete browserView;

13
src/gui/login/LoginController.cpp
View File

@ -27,21 +27,16 @@ User LoginController::GetUser()
void LoginController::Exit() void LoginController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == loginView) loginView->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
Client::Ref().SetAuthUser(loginModel->GetUser()); Client::Ref().SetAuthUser(loginModel->GetUser());
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
HasExited = true; HasExited = true;
} }
LoginController::~LoginController() { LoginController::~LoginController()
if(ui::Engine::Ref().GetWindow() == loginView) {
{ loginView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
}
delete loginModel; delete loginModel;
delete loginView; delete loginView;
} }

5
src/gui/login/LoginView.cpp
View File

@ -1,5 +1,6 @@
#include "LoginView.h" #include "LoginView.h"
#include "graphics/Graphics.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/Textbox.h" #include "gui/interface/Textbox.h"
@ -87,7 +88,7 @@ void LoginView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, boo
void LoginView::OnTryExit(ExitMethod method) void LoginView::OnTryExit(ExitMethod method)
{ {
ui::Engine::Ref().CloseWindow(); CloseActiveWindow();
} }
void LoginView::NotifyStatusChanged(LoginModel * sender) void LoginView::NotifyStatusChanged(LoginModel * sender)
@ -134,7 +135,7 @@ void LoginView::OnTick(float dt)
void LoginView::OnDraw() void LoginView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
} }

14
src/gui/options/OptionsController.cpp
View File

@ -1,5 +1,6 @@
#include "OptionsController.h" #include "OptionsController.h"
#include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ErrorMessage.h"
#include "gui/interface/Engine.h"
OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_): OptionsController::OptionsController(GameModel * gModel_, ControllerCallback * callback_):
gModel(gModel_), gModel(gModel_),
@ -93,10 +94,7 @@ OptionsView * OptionsController::GetView()
void OptionsController::Exit() void OptionsController::Exit()
{ {
if (ui::Engine::Ref().GetWindow() == view) view->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
// only update on close, it would be hard to edit if the changes were live // only update on close, it would be hard to edit if the changes were live
ui::Engine::Ref().Set3dDepth(depth3d); ui::Engine::Ref().Set3dDepth(depth3d);
if (callback) if (callback)
@ -105,11 +103,9 @@ void OptionsController::Exit()
} }
OptionsController::~OptionsController() { OptionsController::~OptionsController()
if(ui::Engine::Ref().GetWindow() == view) {
{ view->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
}
delete model; delete model;
delete view; delete view;
delete callback; delete callback;

3
src/gui/options/OptionsView.cpp
View File

@ -13,6 +13,7 @@
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/DropDown.h" #include "gui/interface/DropDown.h"
#include "gui/interface/Engine.h"
#include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ErrorMessage.h"
OptionsView::OptionsView(): OptionsView::OptionsView():
@ -297,7 +298,7 @@ void OptionsView::AttachController(OptionsController * c_)
void OptionsView::OnDraw() void OptionsView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
g->draw_line(Position.X+1, Position.Y+scale->Position.Y-4, Position.X+Size.X-1, Position.Y+scale->Position.Y-4, 255, 255, 255, 180); g->draw_line(Position.X+1, Position.Y+scale->Position.Y-4, Position.X+Size.X-1, Position.Y+scale->Position.Y-4, 255, 255, 255, 180);

15
src/gui/preview/PreviewController.cpp
View File

@ -100,7 +100,7 @@ bool PreviewController::SubmitComment(std::string comment)
void PreviewController::ShowLogin() void PreviewController::ShowLogin()
{ {
loginWindow = new LoginController(); loginWindow = new LoginController();
ui::Engine::Ref().ShowWindow(loginWindow->GetView()); loginWindow->GetView()->MakeActiveWindow();
} }
void PreviewController::NotifyAuthUserChanged(Client * sender) void PreviewController::NotifyAuthUserChanged(Client * sender)
@ -181,20 +181,15 @@ bool PreviewController::PrevCommentPage()
void PreviewController::Exit() void PreviewController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == previewView) previewView->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
HasExited = true; HasExited = true;
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
} }
PreviewController::~PreviewController() { PreviewController::~PreviewController()
if(ui::Engine::Ref().GetWindow() == previewView) {
{ previewView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
}
Client::Ref().RemoveListener(this); Client::Ref().RemoveListener(this);
delete previewModel; delete previewModel;
delete previewView; delete previewView;

4
src/gui/preview/PreviewView.cpp
View File

@ -329,7 +329,7 @@ void PreviewView::CheckComment()
void PreviewView::DoDraw() void PreviewView::DoDraw()
{ {
Window::DoDraw(); Window::DoDraw();
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
for (size_t i = 0; i < commentTextComponents.size(); i++) for (size_t i = 0; i < commentTextComponents.size(); i++)
{ {
int linePos = commentTextComponents[i]->Position.Y+commentsPanel->ViewportPosition.Y+commentTextComponents[i]->Size.Y+4; int linePos = commentTextComponents[i]->Position.Y+commentsPanel->ViewportPosition.Y+commentTextComponents[i]->Size.Y+4;
@ -353,7 +353,7 @@ void PreviewView::DoDraw()
void PreviewView::OnDraw() void PreviewView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
//Window Background+Outline //Window Background+Outline
g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4); g->clearrect(Position.X-2, Position.Y-2, Size.X+4, Size.Y+4);

2
src/gui/profile/ProfileActivity.cpp
View File

@ -263,7 +263,7 @@ void ProfileActivity::OnTick(float dt)
void ProfileActivity::OnDraw() void ProfileActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
} }

13
src/gui/render/RenderController.cpp
View File

@ -45,20 +45,15 @@ void RenderController::LoadRenderPreset(int presetNum)
void RenderController::Exit() void RenderController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == renderView) renderView->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
HasExited = true; HasExited = true;
} }
RenderController::~RenderController() { RenderController::~RenderController()
if(ui::Engine::Ref().GetWindow() == renderView) {
{ renderView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
}
delete callback; delete callback;
delete renderModel; delete renderModel;
delete renderView; delete renderView;

1
src/gui/render/RenderModel.cpp
View File

@ -1,4 +1,5 @@
#include "RenderModel.h" #include "RenderModel.h"
#include "gui/game/RenderPreset.h"
RenderModel::RenderModel(): RenderModel::RenderModel():
renderer(NULL) renderer(NULL)

2
src/gui/render/RenderView.cpp
View File

@ -365,7 +365,7 @@ void RenderView::NotifyColourChanged(RenderModel * sender)
void RenderView::OnDraw() void RenderView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(-1, -1, WINDOWW+1, WINDOWH+1); g->clearrect(-1, -1, WINDOWW+1, WINDOWH+1);
if(ren) if(ren)
{ {

2
src/gui/save/LocalSaveActivity.cpp
View File

@ -132,7 +132,7 @@ void LocalSaveActivity::saveWrite(std::string finalFilename)
void LocalSaveActivity::OnDraw() void LocalSaveActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->draw_rgba_image(save_to_disk_image, 0, 0, 0.7f); g->draw_rgba_image(save_to_disk_image, 0, 0, 0.7f);
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);

3
src/gui/save/ServerSaveActivity.cpp
View File

@ -1,4 +1,5 @@
#include "ServerSaveActivity.h" #include "ServerSaveActivity.h"
#include "graphics/Graphics.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/Textbox.h" #include "gui/interface/Textbox.h"
#include "gui/interface/Button.h" #include "gui/interface/Button.h"
@ -358,7 +359,7 @@ void ServerSaveActivity::OnTick(float dt)
void ServerSaveActivity::OnDraw() void ServerSaveActivity::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->draw_rgba_image(save_to_server_image, -10, 0, 0.7f); g->draw_rgba_image(save_to_server_image, -10, 0, 0.7f);
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);

1
src/gui/save/ServerSaveActivity.h
View File

@ -14,6 +14,7 @@ namespace ui
class Task; class Task;
class Thumbnail; class Thumbnail;
class VideoBuffer;
class ServerSaveActivity: public WindowActivity, public RequestListener, public TaskListener class ServerSaveActivity: public WindowActivity, public RequestListener, public TaskListener
{ {
public: public:

18
src/gui/search/SearchController.cpp
View File

@ -89,10 +89,7 @@ void SearchController::Update()
void SearchController::Exit() void SearchController::Exit()
{ {
InstantOpen(false); InstantOpen(false);
if(ui::Engine::Ref().GetWindow() == searchView) searchView->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
//HasExited = true; //HasExited = true;
@ -101,10 +98,7 @@ void SearchController::Exit()
SearchController::~SearchController() SearchController::~SearchController()
{ {
delete activePreview; delete activePreview;
if(ui::Engine::Ref().GetWindow() == searchView) searchView->CloseActiveWindow();
{
ui::Engine::Ref().CloseWindow();
}
delete searchModel; delete searchModel;
delete searchView; delete searchView;
delete callback; delete callback;
@ -209,19 +203,19 @@ void SearchController::InstantOpen(bool instant)
void SearchController::OpenSave(int saveID) void SearchController::OpenSave(int saveID)
{ {
delete activePreview; delete activePreview;
Graphics * g = ui::Engine::Ref().g; Graphics * g = searchView->GetGraphics();
g->fillrect(XRES/3, WINDOWH-20, XRES/3, 20, 0, 0, 0, 150); //dim the "Page X of Y" a little to make the CopyTextButton more noticeable g->fillrect(XRES/3, WINDOWH-20, XRES/3, 20, 0, 0, 0, 150); //dim the "Page X of Y" a little to make the CopyTextButton more noticeable
activePreview = new PreviewController(saveID, instantOpen, new OpenCallback(this)); activePreview = new PreviewController(saveID, instantOpen, new OpenCallback(this));
ui::Engine::Ref().ShowWindow(activePreview->GetView()); activePreview->GetView()->MakeActiveWindow();
} }
void SearchController::OpenSave(int saveID, int saveDate) void SearchController::OpenSave(int saveID, int saveDate)
{ {
delete activePreview; delete activePreview;
Graphics * g = ui::Engine::Ref().g; Graphics * g = searchView->GetGraphics();
g->fillrect(XRES/3, WINDOWH-20, XRES/3, 20, 0, 0, 0, 150); //dim the "Page X of Y" a little to make the CopyTextButton more noticeable g->fillrect(XRES/3, WINDOWH-20, XRES/3, 20, 0, 0, 0, 150); //dim the "Page X of Y" a little to make the CopyTextButton more noticeable
activePreview = new PreviewController(saveID, saveDate, instantOpen, new OpenCallback(this)); activePreview = new PreviewController(saveID, saveDate, instantOpen, new OpenCallback(this));
ui::Engine::Ref().ShowWindow(activePreview->GetView()); activePreview->GetView()->MakeActiveWindow();
} }
void SearchController::ClearSelection() void SearchController::ClearSelection()

9
src/gui/tags/TagsController.cpp
View File

@ -35,16 +35,15 @@ void TagsController::AddTag(std::string tag)
void TagsController::Exit() void TagsController::Exit()
{ {
if(ui::Engine::Ref().GetWindow() == tagsView) tagsView->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
if(callback) if(callback)
callback->ControllerExit(); callback->ControllerExit();
HasDone = true; HasDone = true;
} }
TagsController::~TagsController() { TagsController::~TagsController()
if(ui::Engine::Ref().GetWindow() == tagsView) {
ui::Engine::Ref().CloseWindow(); tagsView->CloseActiveWindow();
delete tagsModel; delete tagsModel;
delete tagsView; delete tagsView;
delete callback; delete callback;

3
src/gui/tags/TagsView.cpp
View File

@ -1,6 +1,7 @@
#include "client/Client.h" #include "client/Client.h"
#include "TagsView.h" #include "TagsView.h"
#include "graphics/Graphics.h"
#include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ErrorMessage.h"
#include "TagsController.h" #include "TagsController.h"
#include "TagsModel.h" #include "TagsModel.h"
@ -68,7 +69,7 @@ TagsView::TagsView():
void TagsView::OnDraw() void TagsView::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
} }

4
src/lua/LuaScriptInterface.cpp
View File

@ -533,8 +533,8 @@ int LuaScriptInterface::interface_showWindow(lua_State * l)
int LuaScriptInterface::interface_closeWindow(lua_State * l) int LuaScriptInterface::interface_closeWindow(lua_State * l)
{ {
LuaWindow * window = Luna<LuaWindow>::check(l, 1); LuaWindow * window = Luna<LuaWindow>::check(l, 1);
if(window && ui::Engine::Ref().GetWindow()==window->GetWindow()) if (window)
ui::Engine::Ref().CloseWindow(); window->GetWindow()->CloseActiveWindow();
return 0; return 0;
} }

3
src/lua/LuaWindow.cpp
View File

@ -606,8 +606,7 @@ int LuaWindow::onKeyRelease(lua_State * l)
LuaWindow::~LuaWindow() LuaWindow::~LuaWindow()
{ {
if(ui::Engine::Ref().GetWindow() == window) window->CloseActiveWindow();
ui::Engine::Ref().CloseWindow();
delete window; delete window;
} }
#endif #endif

2
src/simulation/Gravity.cpp
View File

@ -3,7 +3,7 @@
#include "common/tpt-thread.h" #include "common/tpt-thread.h"
#include "Config.h" #include "Config.h"
#include "Gravity.h" #include "Gravity.h"
//#include "powder.h" #include "Misc.h"
void Gravity::bilinear_interpolation(float *src, float *dst, int sw, int sh, int rw, int rh) void Gravity::bilinear_interpolation(float *src, float *dst, int sw, int sh, int rw, int rh)
{ {

2
src/simulation/WallType.h
View File

@ -1,7 +1,7 @@
#ifndef WALLTYPE_H_ #ifndef WALLTYPE_H_
#define WALLTYPE_H_ #define WALLTYPE_H_
#include "graphics/Graphics.h" #include "graphics/Pixel.h"
class VideoBuffer; class VideoBuffer;
struct wall_type struct wall_type

3
src/simulation/elements/Element.h
View File

@ -1,13 +1,14 @@
#ifndef ELEMENTCLASS_H #ifndef ELEMENTCLASS_H
#define ELEMENTCLASS_H #define ELEMENTCLASS_H
#include "graphics/Pixel.h"
#include "simulation/Simulation.h" #include "simulation/Simulation.h"
#include "graphics/Renderer.h"
#include "simulation/Elements.h" #include "simulation/Elements.h"
#include "simulation/StructProperty.h" #include "simulation/StructProperty.h"
class Simulation; class Simulation;
class Renderer; class Renderer;
class VideoBuffer;
struct Particle; struct Particle;
class Element class Element
{ {

8
src/tasks/TaskWindow.cpp
View File

@ -1,6 +1,7 @@
#include <sstream> #include <sstream>
#include "common/tpt-minmax.h" #include "common/tpt-minmax.h"
#include "gui/interface/Label.h" #include "gui/interface/Label.h"
#include "gui/interface/Engine.h"
#include "TaskWindow.h" #include "TaskWindow.h"
#include "gui/dialogues/ErrorMessage.h" #include "gui/dialogues/ErrorMessage.h"
#include "gui/Style.h" #include "gui/Style.h"
@ -27,7 +28,7 @@ TaskWindow::TaskWindow(std::string title_, Task * task_, bool closeOnDone):
statusLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; statusLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
AddComponent(statusLabel); AddComponent(statusLabel);
ui::Engine::Ref().ShowWindow(this); MakeActiveWindow();
task->AddTaskListener(this); task->AddTaskListener(this);
task->Start(); task->Start();
@ -53,9 +54,8 @@ void TaskWindow::NotifyDone(Task * task)
void TaskWindow::Exit() void TaskWindow::Exit()
{ {
if(ui::Engine::Ref().GetWindow()==this) if (CloseActiveWindow())
{ {
ui::Engine::Ref().CloseWindow();
SelfDestruct(); SelfDestruct();
} }
} }
@ -87,7 +87,7 @@ void TaskWindow::OnTick(float dt)
void TaskWindow::OnDraw() void TaskWindow::OnDraw()
{ {
Graphics * g = ui::Engine::Ref().g; Graphics * g = GetGraphics();
g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3); g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255); g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);