|
@@ -1,4 +1,5 @@
|
|
|
#include "client/gui/BaseGUI.h"
|
|
|
+#include "client/Game.h"
|
|
|
#include "client/rendering/Engine.h"
|
|
|
|
|
|
static const Color4 INPUT_BACKGROUND(0x00, 0x00, 0x00, 0xA0);
|
|
@@ -8,12 +9,9 @@ const Vector2 BaseGUI::FIXED_SIZE(400.0f, 300.0f);
|
|
|
BaseGUI::Base::Base() : hovered(false), pressed(false) {
|
|
|
}
|
|
|
|
|
|
-BaseGUI::BaseGUI(const Controller& controller) : controller(controller) {
|
|
|
-}
|
|
|
-
|
|
|
void BaseGUI::tickBase(Base& b) {
|
|
|
- b.hovered = isIn(b.pos, b.size, controller.getMouse() / scale);
|
|
|
- b.pressed = b.hovered && controller.leftClick.wasReleased();
|
|
|
+ b.hovered = isIn(b.pos, b.size, Game::controller.getMouse() / scale);
|
|
|
+ b.pressed = b.hovered && Game::controller.leftClick.wasReleased();
|
|
|
}
|
|
|
|
|
|
void BaseGUI::tick() {
|
|
@@ -31,53 +29,53 @@ void BaseGUI::tick() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::updateScale(ShaderMatrix& sm) {
|
|
|
+void BaseGUI::updateScale() {
|
|
|
const Size& size = Engine::getSize();
|
|
|
scale = static_cast<int>(
|
|
|
std::min(size.width / FIXED_SIZE[0], size.height / FIXED_SIZE[1]));
|
|
|
scale = scale < 1.0f ? 1.0f : scale;
|
|
|
scaledSize = Vector2(size.width / scale, size.height / scale);
|
|
|
- sm.scale(scale).update();
|
|
|
+ Engine::matrix.scale(scale).update();
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::renderBase(Renderer& r, const Base& base) {
|
|
|
- r.renderRectangle(base.pos, base.size,
|
|
|
- base.hovered ? INPUT_BACKGROUND_2 : INPUT_BACKGROUND);
|
|
|
+void BaseGUI::renderBase(const Base& base) {
|
|
|
+ Engine::renderer.renderRectangle(base.pos, base.size,
|
|
|
+ base.hovered ? INPUT_BACKGROUND_2
|
|
|
+ : INPUT_BACKGROUND);
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::renderLabels(Renderer& r) {
|
|
|
+void BaseGUI::renderLabels() {
|
|
|
for(const Label& label : labels) {
|
|
|
- renderCenteredString(r, label.base, label.text);
|
|
|
+ renderCenteredString(label.base, label.text);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::renderInputs(Renderer& r) {
|
|
|
- for(Input& input : inputs) {
|
|
|
- input.text.setLimit(r.charsInSpace(input.base.size[0] - 20.0f));
|
|
|
- renderBase(r, input.base);
|
|
|
- StringBuffer<256> text(input.text);
|
|
|
- Vector2 pos = renderCenteredString(r, input.base, text);
|
|
|
- if(Engine::isActiveTextInput(&input.text)) {
|
|
|
- Vector2 cursor = r.getStringSize(text, input.text.getCursor());
|
|
|
- renderString(r, Vector2(pos[0] + cursor[0], pos[1] + 2.0f),
|
|
|
- "&292_");
|
|
|
- renderString(r, Vector2(pos[0] + cursor[0], pos[1] + 3.0f),
|
|
|
- "&292_");
|
|
|
+void BaseGUI::renderInputs() {
|
|
|
+ for(Input& i : inputs) {
|
|
|
+ i.text.setLimit(Engine::renderer.charsInSpace(i.base.size[0] - 20.0f));
|
|
|
+ renderBase(i.base);
|
|
|
+ StringBuffer<256> text(i.text);
|
|
|
+ Vector2 pos = renderCenteredString(i.base, text);
|
|
|
+ if(Engine::isActiveTextInput(&i.text)) {
|
|
|
+ Vector2 c =
|
|
|
+ Engine::renderer.getStringSize(text, i.text.getCursor());
|
|
|
+ renderString(Vector2(pos[0] + c[0], pos[1] + 2.0f), "&292_");
|
|
|
+ renderString(Vector2(pos[0] + c[0], pos[1] + 3.0f), "&292_");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::renderButtons(Renderer& r) {
|
|
|
+void BaseGUI::renderButtons() {
|
|
|
for(const Button& button : buttons) {
|
|
|
- renderBase(r, button.base);
|
|
|
- renderCenteredString(r, button.base, button.text);
|
|
|
+ renderBase(button.base);
|
|
|
+ renderCenteredString(button.base, button.text);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::render(float, ShaderMatrix&, Renderer& r) {
|
|
|
- renderLabels(r);
|
|
|
- renderInputs(r);
|
|
|
- renderButtons(r);
|
|
|
+void BaseGUI::render() {
|
|
|
+ renderLabels();
|
|
|
+ renderInputs();
|
|
|
+ renderButtons();
|
|
|
}
|
|
|
|
|
|
Vector2 BaseGUI::round(const Vector2& v) const {
|
|
@@ -85,8 +83,8 @@ Vector2 BaseGUI::round(const Vector2& v) const {
|
|
|
static_cast<int>(v[1] * scale) / scale);
|
|
|
}
|
|
|
|
|
|
-void BaseGUI::renderString(Renderer& r, const Vector2& pos, const char* s) {
|
|
|
- r.renderString(round(pos), s);
|
|
|
+void BaseGUI::renderString(const Vector2& pos, const char* s) {
|
|
|
+ Engine::renderer.renderString(round(pos), s);
|
|
|
}
|
|
|
|
|
|
BaseGUI::Label& BaseGUI::addLabel(const char* text) {
|
|
@@ -104,10 +102,10 @@ BaseGUI::Button& BaseGUI::addButton(const char* text) {
|
|
|
return buttons[buttons.getLength() - 1];
|
|
|
}
|
|
|
|
|
|
-Vector2 BaseGUI::renderCenteredString(Renderer& r, const Base& b,
|
|
|
- const char* text) {
|
|
|
- Vector2 pos = b.pos + (b.size - r.getStringSize(text)) * 0.5f;
|
|
|
- renderString(r, pos, text);
|
|
|
+Vector2 BaseGUI::renderCenteredString(const Base& b, const char* text) {
|
|
|
+ Vector2 pos =
|
|
|
+ b.pos + (b.size - Engine::renderer.getStringSize(text)) * 0.5f;
|
|
|
+ renderString(pos, text);
|
|
|
return pos;
|
|
|
}
|
|
|
|