PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

GfxContext renamed to DrawContext

Browse Source
This commit is contained in:
MihailRis
2024-04-30 00:31:13 +03:00
parent 4af0a8acf7
commit bcf2f5029d
37 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/AssetsLoader.h
+1 -1
View File
@@ -48,7 +48,7 @@ struct SoundCfg : AssetCfg {
}; };
using aloader_func = std::function<assetload::postfunc( using aloader_func = std::function<assetload::postfunc(
AssetsLoader*, AssetsLoader*, // redundant?
const ResPaths*, const ResPaths*,
const std::string&, const std::string&,
const std::string&, const std::string&,
src/engine.cpp
+2 -2
View File
@@ -17,7 +17,7 @@
#include "frontend/screens/Screen.hpp" #include "frontend/screens/Screen.hpp"
#include "frontend/screens/MenuScreen.hpp" #include "frontend/screens/MenuScreen.hpp"
#include "graphics/core/Batch2D.hpp" #include "graphics/core/Batch2D.hpp"
#include "graphics/core/GfxContext.hpp" #include "graphics/core/DrawContext.hpp"
#include "graphics/core/ImageData.hpp" #include "graphics/core/ImageData.hpp"
#include "graphics/core/Shader.hpp" #include "graphics/core/Shader.hpp"
#include "graphics/ui/GUI.hpp" #include "graphics/ui/GUI.hpp"
@@ -150,7 +150,7 @@ void Engine::renderFrame(Batch2D& batch) {
screen->draw(delta); screen->draw(delta);
Viewport viewport(Window::width, Window::height); Viewport viewport(Window::width, Window::height);
GfxContext ctx(nullptr, viewport, &batch); DrawContext ctx(nullptr, viewport, &batch);
gui->draw(&ctx, assets.get()); gui->draw(&ctx, assets.get());
} }
src/frontend/hud.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "../graphics/core/Batch2D.hpp" #include "../graphics/core/Batch2D.hpp"
#include "../graphics/core/Batch3D.hpp" #include "../graphics/core/Batch3D.hpp"
#include "../graphics/core/Font.hpp" #include "../graphics/core/Font.hpp"
#include "../graphics/core/GfxContext.hpp" #include "../graphics/core/DrawContext.hpp"
#include "../graphics/core/Mesh.hpp" #include "../graphics/core/Mesh.hpp"
#include "../graphics/core/Shader.hpp" #include "../graphics/core/Shader.hpp"
#include "../graphics/core/Texture.hpp" #include "../graphics/core/Texture.hpp"
@@ -422,7 +422,7 @@ void Hud::remove(std::shared_ptr<UINode> node) {
cleanup(); cleanup();
} }
void Hud::draw(const GfxContext& ctx){ void Hud::draw(const DrawContext& ctx){
const Viewport& viewport = ctx.getViewport(); const Viewport& viewport = ctx.getViewport();
const uint width = viewport.getWidth(); const uint width = viewport.getWidth();
const uint height = viewport.getHeight(); const uint height = viewport.getHeight();
@@ -440,7 +440,7 @@ void Hud::draw(const GfxContext& ctx){
// Crosshair // Crosshair
if (!pause && !inventoryOpen && !player->debug) { if (!pause && !inventoryOpen && !player->debug) {
GfxContext chctx = ctx.sub(); DrawContext chctx = ctx.sub();
chctx.setBlendMode(BlendMode::inversion); chctx.setBlendMode(BlendMode::inversion);
auto texture = assets->getTexture("gui/crosshair"); auto texture = assets->getTexture("gui/crosshair");
batch->texture(texture); batch->texture(texture);
src/frontend/hud.h
+2 -2
View File
@@ -16,7 +16,7 @@ class Engine;
class Inventory; class Inventory;
class LevelFrontend; class LevelFrontend;
class UiDocument; class UiDocument;
class GfxContext; class DrawContext;
class Viewport; class Viewport;
namespace gui { namespace gui {
@@ -116,7 +116,7 @@ public:
~Hud(); ~Hud();
void update(bool hudVisible); void update(bool hudVisible);
void draw(const GfxContext& context); void draw(const DrawContext& context);
/// @brief Check if inventory mode on /// @brief Check if inventory mode on
bool isInventoryOpen() const; bool isInventoryOpen() const;
src/frontend/screens/LevelScreen.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include "../../audio/audio.h" #include "../../audio/audio.h"
#include "../../coders/imageio.hpp" #include "../../coders/imageio.hpp"
#include "../../graphics/core/PostProcessing.h" #include "../../graphics/core/PostProcessing.h"
#include "../../graphics/core/GfxContext.hpp" #include "../../graphics/core/DrawContext.hpp"
#include "../../graphics/core/Viewport.hpp" #include "../../graphics/core/Viewport.hpp"
#include "../../graphics/core/ImageData.hpp" #include "../../graphics/core/ImageData.hpp"
#include "../../graphics/ui/GUI.hpp" #include "../../graphics/ui/GUI.hpp"
@@ -79,7 +79,7 @@ void LevelScreen::saveWorldPreview() {
Camera camera = *player->camera; Camera camera = *player->camera;
camera.setFov(glm::radians(70.0f)); camera.setFov(glm::radians(70.0f));
Viewport viewport(previewSize * 1.5, previewSize); Viewport viewport(previewSize * 1.5, previewSize);
GfxContext ctx(nullptr, viewport, batch.get()); DrawContext ctx(nullptr, viewport, batch.get());
worldRenderer->draw(ctx, &camera, false, postProcessing.get()); worldRenderer->draw(ctx, &camera, false, postProcessing.get());
auto image = postProcessing->toImage(); auto image = postProcessing->toImage();
@@ -141,7 +141,7 @@ void LevelScreen::draw(float delta) {
auto camera = controller->getPlayer()->currentCamera; auto camera = controller->getPlayer()->currentCamera;
Viewport viewport(Window::width, Window::height); Viewport viewport(Window::width, Window::height);
GfxContext ctx(nullptr, viewport, batch.get()); DrawContext ctx(nullptr, viewport, batch.get());
worldRenderer->draw(ctx, camera.get(), hudVisible, postProcessing.get()); worldRenderer->draw(ctx, camera.get(), hudVisible, postProcessing.get());
src/graphics/core/GfxContext.cpp → src/graphics/core/DrawContext.cpp
+15 -15
View File
@@ -1,4 +1,4 @@
#include "GfxContext.hpp" #include "DrawContext.hpp"
#include <GL/glew.h> #include <GL/glew.h>
@@ -20,8 +20,8 @@ static void set_blend_mode(BlendMode mode) {
} }
GfxContext::GfxContext( DrawContext::DrawContext(
const GfxContext* parent, const DrawContext* parent,
const Viewport& viewport, const Viewport& viewport,
Batch2D* g2d Batch2D* g2d
) : parent(parent), ) : parent(parent),
@@ -29,7 +29,7 @@ GfxContext::GfxContext(
g2d(g2d) g2d(g2d)
{} {}
GfxContext::~GfxContext() { DrawContext::~DrawContext() {
if (g2d) { if (g2d) {
g2d->flush(); g2d->flush();
} }
@@ -72,22 +72,22 @@ GfxContext::~GfxContext() {
} }
} }
const Viewport& GfxContext::getViewport() const { const Viewport& DrawContext::getViewport() const {
return viewport; return viewport;
} }
Batch2D* GfxContext::getBatch2D() const { Batch2D* DrawContext::getBatch2D() const {
return g2d; return g2d;
} }
GfxContext GfxContext::sub() const { DrawContext DrawContext::sub() const {
auto ctx = GfxContext(this, viewport, g2d); auto ctx = DrawContext(this, viewport, g2d);
ctx.depthTest = depthTest; ctx.depthTest = depthTest;
ctx.cullFace = cullFace; ctx.cullFace = cullFace;
return ctx; return ctx;
} }
void GfxContext::setViewport(const Viewport& viewport) { void DrawContext::setViewport(const Viewport& viewport) {
this->viewport = viewport; this->viewport = viewport;
Window::viewport( Window::viewport(
0, 0, 0, 0,
@@ -96,7 +96,7 @@ void GfxContext::setViewport(const Viewport& viewport) {
); );
} }
void GfxContext::setFramebuffer(Framebuffer* fbo) { void DrawContext::setFramebuffer(Framebuffer* fbo) {
if (this->fbo == fbo) if (this->fbo == fbo)
return; return;
this->fbo = fbo; this->fbo = fbo;
@@ -105,14 +105,14 @@ void GfxContext::setFramebuffer(Framebuffer* fbo) {
} }
} }
void GfxContext::setDepthMask(bool flag) { void DrawContext::setDepthMask(bool flag) {
if (depthMask == flag) if (depthMask == flag)
return; return;
depthMask = flag; depthMask = flag;
glDepthMask(GL_FALSE + flag); glDepthMask(GL_FALSE + flag);
} }
void GfxContext::setDepthTest(bool flag) { void DrawContext::setDepthTest(bool flag) {
if (depthTest == flag) if (depthTest == flag)
return; return;
depthTest = flag; depthTest = flag;
@@ -123,7 +123,7 @@ void GfxContext::setDepthTest(bool flag) {
} }
} }
void GfxContext::setCullFace(bool flag) { void DrawContext::setCullFace(bool flag) {
if (cullFace == flag) if (cullFace == flag)
return; return;
cullFace = flag; cullFace = flag;
@@ -134,14 +134,14 @@ void GfxContext::setCullFace(bool flag) {
} }
} }
void GfxContext::setBlendMode(BlendMode mode) { void DrawContext::setBlendMode(BlendMode mode) {
if (blendMode == mode) if (blendMode == mode)
return; return;
blendMode = mode; blendMode = mode;
set_blend_mode(mode); set_blend_mode(mode);
} }
void GfxContext::setScissors(glm::vec4 area) { void DrawContext::setScissors(glm::vec4 area) {
Window::pushScissor(area); Window::pushScissor(area);
scissorsCount++; scissorsCount++;
} }
src/graphics/core/GfxContext.hpp → src/graphics/core/DrawContext.hpp
+5 -5
View File
@@ -9,8 +9,8 @@
class Batch2D; class Batch2D;
class Framebuffer; class Framebuffer;
class GfxContext { class DrawContext {
const GfxContext* parent; const DrawContext* parent;
Viewport viewport; Viewport viewport;
Batch2D* const g2d; Batch2D* const g2d;
Framebuffer* fbo = nullptr; Framebuffer* fbo = nullptr;
@@ -20,12 +20,12 @@ class GfxContext {
BlendMode blendMode = BlendMode::normal; BlendMode blendMode = BlendMode::normal;
int scissorsCount = 0; int scissorsCount = 0;
public: public:
GfxContext(const GfxContext* parent, const Viewport& viewport, Batch2D* g2d); DrawContext(const DrawContext* parent, const Viewport& viewport, Batch2D* g2d);
~GfxContext(); ~DrawContext();
Batch2D* getBatch2D() const; Batch2D* getBatch2D() const;
const Viewport& getViewport() const; const Viewport& getViewport() const;
GfxContext sub() const; DrawContext sub() const;
void setViewport(const Viewport& viewport); void setViewport(const Viewport& viewport);
void setFramebuffer(Framebuffer* fbo); void setFramebuffer(Framebuffer* fbo);
src/graphics/core/PostProcessing.cpp
+2 -2
View File
@@ -19,7 +19,7 @@ PostProcessing::PostProcessing() {
PostProcessing::~PostProcessing() { PostProcessing::~PostProcessing() {
} }
void PostProcessing::use(GfxContext& context) { void PostProcessing::use(DrawContext& context) {
const auto& vp = context.getViewport(); const auto& vp = context.getViewport();
if (fbo) { if (fbo) {
fbo->resize(vp.getWidth(), vp.getHeight()); fbo->resize(vp.getWidth(), vp.getHeight());
@@ -29,7 +29,7 @@ void PostProcessing::use(GfxContext& context) {
context.setFramebuffer(fbo.get()); context.setFramebuffer(fbo.get());
} }
void PostProcessing::render(const GfxContext& context, Shader* screenShader) { void PostProcessing::render(const DrawContext& context, Shader* screenShader) {
if (fbo == nullptr) { if (fbo == nullptr) {
throw std::runtime_error("'use(...)' was never called"); throw std::runtime_error("'use(...)' was never called");
} }
src/graphics/core/PostProcessing.h
+3 -3
View File
@@ -2,7 +2,7 @@
#define GRAPHICS_CORE_POST_PROCESSING_HPP_ #define GRAPHICS_CORE_POST_PROCESSING_HPP_
#include "Viewport.hpp" #include "Viewport.hpp"
#include "GfxContext.hpp" #include "DrawContext.hpp"
#include <memory> #include <memory>
@@ -24,14 +24,14 @@ public:
/// @brief Prepare and bind framebuffer /// @brief Prepare and bind framebuffer
/// @param context graphics context will be modified /// @param context graphics context will be modified
void use(GfxContext& context); void use(DrawContext& context);
/// @brief Render fullscreen quad using the passed shader /// @brief Render fullscreen quad using the passed shader
/// with framebuffer texture bound /// with framebuffer texture bound
/// @param context graphics context /// @param context graphics context
/// @param screenShader shader used for fullscreen quad /// @param screenShader shader used for fullscreen quad
/// @throws std::runtime_error if use(...) wasn't called before /// @throws std::runtime_error if use(...) wasn't called before
void render(const GfxContext& context, Shader* screenShader); void render(const DrawContext& context, Shader* screenShader);
/// @brief Make an image from the last rendered frame /// @brief Make an image from the last rendered frame
std::unique_ptr<ImageData> toImage(); std::unique_ptr<ImageData> toImage();
src/graphics/render/BlocksPreview.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include "../core/Atlas.hpp" #include "../core/Atlas.hpp"
#include "../core/Batch3D.hpp" #include "../core/Batch3D.hpp"
#include "../core/Framebuffer.hpp" #include "../core/Framebuffer.hpp"
#include "../core/GfxContext.hpp" #include "../core/DrawContext.hpp"
#include "../core/Shader.hpp" #include "../core/Shader.hpp"
#include "../core/Texture.hpp" #include "../core/Texture.hpp"
#include "../core/Viewport.hpp" #include "../core/Viewport.hpp"
@@ -124,8 +124,8 @@ std::unique_ptr<Atlas> BlocksPreview::build(
Atlas* atlas = assets->getAtlas("blocks"); Atlas* atlas = assets->getAtlas("blocks");
Viewport viewport(iconSize, iconSize); Viewport viewport(iconSize, iconSize);
GfxContext pctx(nullptr, viewport, nullptr); DrawContext pctx(nullptr, viewport, nullptr);
GfxContext ctx = pctx.sub(); DrawContext ctx = pctx.sub();
ctx.setCullFace(true); ctx.setCullFace(true);
ctx.setDepthTest(true); ctx.setDepthTest(true);
src/graphics/render/Skybox.cpp
+5 -5
View File
@@ -6,7 +6,7 @@
#include "../../graphics/core/Texture.hpp" #include "../../graphics/core/Texture.hpp"
#include "../../graphics/core/Cubemap.hpp" #include "../../graphics/core/Cubemap.hpp"
#include "../../graphics/core/Framebuffer.hpp" #include "../../graphics/core/Framebuffer.hpp"
#include "../../graphics/core/GfxContext.hpp" #include "../../graphics/core/DrawContext.hpp"
#include "../../window/Window.h" #include "../../window/Window.h"
#include "../../window/Camera.h" #include "../../window/Camera.h"
@@ -91,7 +91,7 @@ void Skybox::drawStars(float angle, float opacity) {
} }
void Skybox::draw( void Skybox::draw(
const GfxContext& pctx, const DrawContext& pctx,
Camera* camera, Camera* camera,
Assets* assets, Assets* assets,
float daytime, float daytime,
@@ -103,7 +103,7 @@ void Skybox::draw(
drawBackground(camera, assets, width, height); drawBackground(camera, assets, width, height);
GfxContext ctx = pctx.sub(); DrawContext ctx = pctx.sub();
ctx.setBlendMode(BlendMode::addition); ctx.setBlendMode(BlendMode::addition);
Shader* shader = assets->getShader("ui3d"); Shader* shader = assets->getShader("ui3d");
@@ -134,8 +134,8 @@ void Skybox::draw(
drawStars(angle, opacity); drawStars(angle, opacity);
} }
void Skybox::refresh(const GfxContext& pctx, float t, float mie, uint quality) { void Skybox::refresh(const DrawContext& pctx, float t, float mie, uint quality) {
GfxContext ctx = pctx.sub(); DrawContext ctx = pctx.sub();
ctx.setDepthMask(false); ctx.setDepthMask(false);
ctx.setDepthTest(false); ctx.setDepthTest(false);
ctx.setFramebuffer(fbo.get()); ctx.setFramebuffer(fbo.get());
src/graphics/render/Skybox.hpp
+3 -3
View File
@@ -13,7 +13,7 @@ class Assets;
class Camera; class Camera;
class Batch3D; class Batch3D;
class Framebuffer; class Framebuffer;
class GfxContext; class DrawContext;
struct skysprite { struct skysprite {
std::string texture; std::string texture;
@@ -40,14 +40,14 @@ public:
~Skybox(); ~Skybox();
void draw( void draw(
const GfxContext& pctx, const DrawContext& pctx,
Camera* camera, Camera* camera,
Assets* assets, Assets* assets,
float daytime, float daytime,
float fog float fog
); );
void refresh(const GfxContext& pctx, float t, float mie, uint quality); void refresh(const DrawContext& pctx, float t, float mie, uint quality);
void bind() const; void bind() const;
void unbind() const; void unbind() const;
bool isReady() const { bool isReady() const {
src/graphics/render/WorldRenderer.cpp
+7 -7
View File
@@ -23,7 +23,7 @@
#include "../../world/World.h" #include "../../world/World.h"
#include "../core/Atlas.hpp" #include "../core/Atlas.hpp"
#include "../core/Batch3D.hpp" #include "../core/Batch3D.hpp"
#include "../core/GfxContext.hpp" #include "../core/DrawContext.hpp"
#include "../core/LineBatch.hpp" #include "../core/LineBatch.hpp"
#include "../core/Mesh.hpp" #include "../core/Mesh.hpp"
#include "../core/PostProcessing.h" #include "../core/PostProcessing.h"
@@ -140,7 +140,7 @@ void WorldRenderer::drawChunks(Chunks* chunks, Camera* camera, Shader* shader) {
} }
void WorldRenderer::renderLevel( void WorldRenderer::renderLevel(
const GfxContext& ctx, const DrawContext& ctx,
Camera* camera, Camera* camera,
const EngineSettings& settings const EngineSettings& settings
) { ) {
@@ -213,12 +213,12 @@ void WorldRenderer::renderBlockSelection(Camera* camera, Shader* linesShader) {
} }
void WorldRenderer::renderDebugLines( void WorldRenderer::renderDebugLines(
const GfxContext& pctx, const DrawContext& pctx,
Camera* camera, Camera* camera,
Shader* linesShader, Shader* linesShader,
const EngineSettings& settings const EngineSettings& settings
) { ) {
GfxContext ctx = pctx.sub(); DrawContext ctx = pctx.sub();
const auto& viewport = ctx.getViewport(); const auto& viewport = ctx.getViewport();
uint displayWidth = viewport.getWidth(); uint displayWidth = viewport.getWidth();
uint displayHeight = viewport.getHeight(); uint displayHeight = viewport.getHeight();
@@ -266,7 +266,7 @@ void WorldRenderer::renderDebugLines(
} }
void WorldRenderer::draw( void WorldRenderer::draw(
const GfxContext& pctx, const DrawContext& pctx,
Camera* camera, Camera* camera,
bool hudVisible, bool hudVisible,
PostProcessing* postProcessing PostProcessing* postProcessing
@@ -282,7 +282,7 @@ void WorldRenderer::draw(
// World render scope with diegetic HUD included // World render scope with diegetic HUD included
{ {
GfxContext wctx = pctx.sub(); DrawContext wctx = pctx.sub();
postProcessing->use(wctx); postProcessing->use(wctx);
Window::clearDepth(); Window::clearDepth();
@@ -292,7 +292,7 @@ void WorldRenderer::draw(
// Actually world render with depth buffer on // Actually world render with depth buffer on
{ {
GfxContext ctx = wctx.sub(); DrawContext ctx = wctx.sub();
ctx.setDepthTest(true); ctx.setDepthTest(true);
ctx.setCullFace(true); ctx.setCullFace(true);
renderLevel(ctx, camera, settings); renderLevel(ctx, camera, settings);
src/graphics/render/WorldRenderer.hpp
+4 -4
View File
@@ -24,7 +24,7 @@ class Chunks;
class LevelFrontend; class LevelFrontend;
class Skybox; class Skybox;
class PostProcessing; class PostProcessing;
class GfxContext; class DrawContext;
struct EngineSettings; struct EngineSettings;
class WorldRenderer { class WorldRenderer {
@@ -50,7 +50,7 @@ class WorldRenderer {
/// @param linesShader shader used /// @param linesShader shader used
/// @param settings engine settings /// @param settings engine settings
void renderDebugLines( void renderDebugLines(
const GfxContext& context, const DrawContext& context,
Camera* camera, Camera* camera,
Shader* linesShader, Shader* linesShader,
const EngineSettings& settings const EngineSettings& settings
@@ -62,7 +62,7 @@ public:
~WorldRenderer(); ~WorldRenderer();
void draw( void draw(
const GfxContext& context, const DrawContext& context,
Camera* camera, Camera* camera,
bool hudVisible, bool hudVisible,
PostProcessing* postProcessing PostProcessing* postProcessing
@@ -74,7 +74,7 @@ public:
/// @param camera active camera /// @param camera active camera
/// @param settings engine settings /// @param settings engine settings
void renderLevel( void renderLevel(
const GfxContext& context, const DrawContext& context,
Camera* camera, Camera* camera,
const EngineSettings& settings const EngineSettings& settings
); );
src/graphics/ui/GUI.cpp
+2 -2
View File
@@ -9,7 +9,7 @@
#include "../../frontend/UiDocument.h" #include "../../frontend/UiDocument.h"
#include "../../graphics/core/Batch2D.hpp" #include "../../graphics/core/Batch2D.hpp"
#include "../../graphics/core/Shader.hpp" #include "../../graphics/core/Shader.hpp"
#include "../../graphics/core/GfxContext.hpp" #include "../../graphics/core/DrawContext.hpp"
#include "../../window/Events.h" #include "../../window/Events.h"
#include "../../window/input.h" #include "../../window/input.h"
#include "../../window/Camera.h" #include "../../window/Camera.h"
@@ -136,7 +136,7 @@ void GUI::act(float delta, const Viewport& vp) {
} }
} }
void GUI::draw(const GfxContext* pctx, Assets* assets) { void GUI::draw(const DrawContext* pctx, Assets* assets) {
auto& viewport = pctx->getViewport(); auto& viewport = pctx->getViewport();
glm::vec2 wsize = viewport.size(); glm::vec2 wsize = viewport.size();
src/graphics/ui/GUI.hpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include <unordered_map> #include <unordered_map>
class Viewport; class Viewport;
class GfxContext; class DrawContext;
class Assets; class Assets;
class Camera; class Camera;
@@ -86,7 +86,7 @@ namespace gui {
/// @brief Draw all visible elements on main container /// @brief Draw all visible elements on main container
/// @param pctx parent graphics context /// @param pctx parent graphics context
/// @param assets active assets storage /// @param assets active assets storage
void draw(const GfxContext* pctx, Assets* assets); void draw(const DrawContext* pctx, Assets* assets);
/// @brief Add element to the main container /// @brief Add element to the main container
/// @param node UI element /// @param node UI element
src/graphics/ui/elements/Button.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "Button.hpp" #include "Button.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
using namespace gui; using namespace gui;
@@ -75,7 +75,7 @@ void Button::refresh() {
} }
} }
void Button::drawBackground(const GfxContext* pctx, Assets* assets) { void Button::drawBackground(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
batch->texture(nullptr); batch->texture(nullptr);
src/graphics/ui/elements/Button.hpp
+1 -1
View File
@@ -18,7 +18,7 @@ namespace gui {
onaction action, onaction action,
glm::vec2 size=glm::vec2(-1)); glm::vec2 size=glm::vec2(-1));
virtual void drawBackground(const GfxContext* pctx, Assets* assets) override; virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
virtual Align getTextAlign() const; virtual Align getTextAlign() const;
virtual void setTextAlign(Align align); virtual void setTextAlign(Align align);
src/graphics/ui/elements/CheckBox.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "CheckBox.hpp" #include "CheckBox.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "Label.hpp" #include "Label.hpp"
@@ -10,7 +10,7 @@ CheckBox::CheckBox(bool checked) : UINode(glm::vec2(32.0f)), checked(checked) {
setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f)); setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
} }
void CheckBox::draw(const GfxContext* pctx, Assets* assets) { void CheckBox::draw(const DrawContext* pctx, Assets* assets) {
if (supplier) { if (supplier) {
checked = supplier(); checked = supplier();
} }
src/graphics/ui/elements/CheckBox.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ namespace gui {
public: public:
CheckBox(bool checked=false); CheckBox(bool checked=false);
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual void mouseRelease(GUI*, int x, int y) override; virtual void mouseRelease(GUI*, int x, int y) override;
src/graphics/ui/elements/Container.cpp
+4 -4
View File
@@ -1,6 +1,6 @@
#include "Container.hpp" #include "Container.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
using namespace gui; using namespace gui;
@@ -73,7 +73,7 @@ void Container::setScrollable(bool flag) {
scrollable = flag; scrollable = flag;
} }
void Container::draw(const GfxContext* pctx, Assets* assets) { void Container::draw(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
glm::vec2 size = getSize(); glm::vec2 size = getSize();
drawBackground(pctx, assets); drawBackground(pctx, assets);
@@ -82,7 +82,7 @@ void Container::draw(const GfxContext* pctx, Assets* assets) {
batch->texture(nullptr); batch->texture(nullptr);
batch->flush(); batch->flush();
{ {
GfxContext ctx = pctx->sub(); DrawContext ctx = pctx->sub();
ctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y)); ctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
for (auto node : nodes) { for (auto node : nodes) {
if (node->isVisible()) if (node->isVisible())
@@ -91,7 +91,7 @@ void Container::draw(const GfxContext* pctx, Assets* assets) {
} }
} }
void Container::drawBackground(const GfxContext* pctx, Assets* assets) { void Container::drawBackground(const DrawContext* pctx, Assets* assets) {
glm::vec4 color = isPressed() ? pressedColor : (hover ? hoverColor : this->color); glm::vec4 color = isPressed() ? pressedColor : (hover ? hoverColor : this->color);
if (color.a <= 0.001f) if (color.a <= 0.001f)
return; return;
src/graphics/ui/elements/Container.hpp
+2 -2
View File
@@ -19,8 +19,8 @@ namespace gui {
Container(glm::vec2 size); Container(glm::vec2 size);
virtual void act(float delta) override; virtual void act(float delta) override;
virtual void drawBackground(const GfxContext* pctx, Assets* assets); virtual void drawBackground(const DrawContext* pctx, Assets* assets);
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override; virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
virtual void add(std::shared_ptr<UINode> node); virtual void add(std::shared_ptr<UINode> node);
virtual void add(std::shared_ptr<UINode> node, glm::vec2 pos); virtual void add(std::shared_ptr<UINode> node, glm::vec2 pos);
src/graphics/ui/elements/Image.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "Image.hpp" #include "Image.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Texture.hpp" #include "../../core/Texture.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
@@ -12,7 +12,7 @@ Image::Image(std::string texture, glm::vec2 size) : UINode(size), texture(textur
setInteractive(false); setInteractive(false);
} }
void Image::draw(const GfxContext* pctx, Assets* assets) { void Image::draw(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
glm::vec4 color = getColor(); glm::vec4 color = getColor();
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
src/graphics/ui/elements/Image.hpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace gui {
public: public:
Image(std::string texture, glm::vec2 size=glm::vec2(32,32)); Image(std::string texture, glm::vec2 size=glm::vec2(32,32));
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual void setAutoResize(bool flag); virtual void setAutoResize(bool flag);
virtual bool isAutoResize() const; virtual bool isAutoResize() const;
src/graphics/ui/elements/InputBindBox.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "InputBindBox.hpp" #include "InputBindBox.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"
@@ -15,7 +15,7 @@ InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding)
setScrollable(false); setScrollable(false);
} }
void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) { void InputBindBox::drawBackground(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
batch->texture(nullptr); batch->texture(nullptr);
src/graphics/ui/elements/InputBindBox.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ namespace gui {
Binding& binding; Binding& binding;
public: public:
InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f)); InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f));
virtual void drawBackground(const GfxContext* pctx, Assets* assets) override; virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
virtual void clicked(GUI*, mousecode button) override; virtual void clicked(GUI*, mousecode button) override;
virtual void keyPressed(keycode key) override; virtual void keyPressed(keycode key) override;
src/graphics/ui/elements/InventoryView.cpp
+2 -2
View File
@@ -17,7 +17,7 @@
#include "../../core/Atlas.hpp" #include "../../core/Atlas.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp" #include "../../core/Font.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Shader.hpp" #include "../../core/Shader.hpp"
#include "../../render/BlocksPreview.hpp" #include "../../render/BlocksPreview.hpp"
#include "../GUI.hpp" #include "../GUI.hpp"
@@ -110,7 +110,7 @@ SlotView::SlotView(
setColor(glm::vec4(0, 0, 0, 0.2f)); setColor(glm::vec4(0, 0, 0, 0.2f));
} }
void SlotView::draw(const GfxContext* pctx, Assets* assets) { void SlotView::draw(const DrawContext* pctx, Assets* assets) {
if (bound == nullptr) if (bound == nullptr)
return; return;
src/graphics/ui/elements/InventoryView.hpp
+2 -2
View File
@@ -11,7 +11,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
class Assets; class Assets;
class GfxContext; class DrawContext;
class Content; class Content;
class ItemStack; class ItemStack;
class ContentIndices; class ContentIndices;
@@ -56,7 +56,7 @@ namespace gui {
public: public:
SlotView(SlotLayout layout); SlotView(SlotLayout layout);
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
void setHighlighted(bool flag); void setHighlighted(bool flag);
bool isHighlighted() const; bool isHighlighted() const;
src/graphics/ui/elements/Label.cpp
+2 -2
View File
@@ -1,5 +1,5 @@
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp" #include "../../core/Font.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
@@ -137,7 +137,7 @@ uint Label::getLinesNumber() const {
return cache.lines.size(); return cache.lines.size();
} }
void Label::draw(const GfxContext* pctx, Assets* assets) { void Label::draw(const DrawContext* pctx, Assets* assets) {
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
auto font = assets->getFont(fontName); auto font = assets->getFont(fontName);
cache.prepare(font, static_cast<size_t>(glm::abs(getSize().x))); cache.prepare(font, static_cast<size_t>(glm::abs(getSize().x)));
src/graphics/ui/elements/Label.hpp
+1 -1
View File
@@ -91,7 +91,7 @@ namespace gui {
virtual uint getLinesNumber() const; virtual uint getLinesNumber() const;
virtual bool isFakeLine(size_t line) const; virtual bool isFakeLine(size_t line) const;
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual void textSupplier(wstringsupplier supplier); virtual void textSupplier(wstringsupplier supplier);
src/graphics/ui/elements/Plotter.cpp
+2 -2
View File
@@ -2,7 +2,7 @@
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp" #include "../../core/Font.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
#include "../../../util/stringutil.h" #include "../../../util/stringutil.h"
@@ -14,7 +14,7 @@ void Plotter::act(float delta) {
points[index % dmwidth] = std::min(value, dmheight); points[index % dmwidth] = std::min(value, dmheight);
} }
void Plotter::draw(const GfxContext* pctx, Assets* assets) { void Plotter::draw(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
batch->texture(nullptr); batch->texture(nullptr);
src/graphics/ui/elements/Plotter.hpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
class Assets; class Assets;
class GfxContext; class DrawContext;
namespace gui { namespace gui {
class Plotter : public gui::UINode { class Plotter : public gui::UINode {
@@ -30,7 +30,7 @@ namespace gui {
} }
void act(float delta) override; void act(float delta) override;
void draw(const GfxContext* pctx, Assets* assets) override; void draw(const DrawContext* pctx, Assets* assets) override;
}; };
} }
src/graphics/ui/elements/TextBox.cpp
+3 -3
View File
@@ -1,7 +1,7 @@
#include "TextBox.hpp" #include "TextBox.hpp"
#include "Label.hpp" #include "Label.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp" #include "../../core/Font.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
@@ -22,7 +22,7 @@ TextBox::TextBox(std::wstring placeholder, glm::vec4 padding)
textInitX = label->getPos().x; textInitX = label->getPos().x;
} }
void TextBox::draw(const GfxContext* pctx, Assets* assets) { void TextBox::draw(const DrawContext* pctx, Assets* assets) {
Panel::draw(pctx, assets); Panel::draw(pctx, assets);
font = assets->getFont(label->getFontName()); font = assets->getFont(label->getFontName());
@@ -71,7 +71,7 @@ void TextBox::draw(const GfxContext* pctx, Assets* assets) {
} }
} }
void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) { void TextBox::drawBackground(const DrawContext* pctx, Assets* assets) {
glm::vec2 pos = calcPos(); glm::vec2 pos = calcPos();
auto batch = pctx->getBatch2D(); auto batch = pctx->getBatch2D();
src/graphics/ui/elements/TextBox.hpp
+2 -2
View File
@@ -144,8 +144,8 @@ namespace gui {
virtual void click(GUI*, int, int) override; virtual void click(GUI*, int, int) override;
virtual void mouseMove(GUI*, int x, int y) override; virtual void mouseMove(GUI*, int x, int y) override;
virtual bool isFocuskeeper() const override {return true;} virtual bool isFocuskeeper() const override {return true;}
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual void drawBackground(const GfxContext* pctx, Assets* assets) override; virtual void drawBackground(const DrawContext* pctx, Assets* assets) override;
virtual void typed(unsigned int codepoint) override; virtual void typed(unsigned int codepoint) override;
virtual void keyPressed(keycode key) override; virtual void keyPressed(keycode key) override;
virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override; virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
src/graphics/ui/elements/TrackBar.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "TrackBar.hpp" #include "TrackBar.hpp"
#include "../../core/GfxContext.hpp" #include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp" #include "../../core/Batch2D.hpp"
#include "../../../assets/Assets.h" #include "../../../assets/Assets.h"
@@ -23,7 +23,7 @@ TrackBar::TrackBar(
setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f)); setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f));
} }
void TrackBar::draw(const GfxContext* pctx, Assets* assets) { void TrackBar::draw(const DrawContext* pctx, Assets* assets) {
if (supplier) { if (supplier) {
value = supplier(); value = supplier();
} }
src/graphics/ui/elements/TrackBar.hpp
+1 -1
View File
@@ -20,7 +20,7 @@ namespace gui {
double value, double value,
double step=1.0, double step=1.0,
int trackWidth=12); int trackWidth=12);
virtual void draw(const GfxContext* pctx, Assets* assets) override; virtual void draw(const DrawContext* pctx, Assets* assets) override;
virtual void setSupplier(doublesupplier supplier); virtual void setSupplier(doublesupplier supplier);
virtual void setConsumer(doubleconsumer consumer); virtual void setConsumer(doubleconsumer consumer);
src/graphics/ui/elements/UINode.hpp
+2 -2
View File
@@ -10,7 +10,7 @@
#include "../../../delegates.h" #include "../../../delegates.h"
#include "../../../window/input.h" #include "../../../window/input.h"
class GfxContext; class DrawContext;
class Assets; class Assets;
namespace gui { namespace gui {
@@ -90,7 +90,7 @@ namespace gui {
/// @brief Called every frame for all visible elements /// @brief Called every frame for all visible elements
/// @param delta delta timУ /// @param delta delta timУ
virtual void act(float delta) {}; virtual void act(float delta) {};
virtual void draw(const GfxContext* pctx, Assets* assets) = 0; virtual void draw(const DrawContext* pctx, Assets* assets) = 0;
virtual void setVisible(bool flag); virtual void setVisible(bool flag);
bool isVisible() const; bool isVisible() const;