-
-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
widgets: add Shape + minor image improve (#266)
* widgets: add Shape * image: minor improvment * glClear on FB alloc * add Nix HM * always create FB if not xray
- Loading branch information
Showing
7 changed files
with
290 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| #include "Shape.hpp" | ||
| #include "../Renderer.hpp" | ||
| #include <cmath> | ||
|
|
||
| CShape::CShape(const Vector2D& viewport_, const std::unordered_map<std::string, std::any>& props) : shadow(this, props, viewport_) { | ||
|
|
||
| size = std::any_cast<Hyprlang::VEC2>(props.at("size")); | ||
| rounding = std::any_cast<Hyprlang::INT>(props.at("rounding")); | ||
| border = std::any_cast<Hyprlang::INT>(props.at("border_size")); | ||
| color = std::any_cast<Hyprlang::INT>(props.at("color")); | ||
| borderColor = std::any_cast<Hyprlang::INT>(props.at("border_color")); | ||
| pos = std::any_cast<Hyprlang::VEC2>(props.at("position")); | ||
| halign = std::any_cast<Hyprlang::STRING>(props.at("halign")); | ||
| valign = std::any_cast<Hyprlang::STRING>(props.at("valign")); | ||
| angle = std::any_cast<Hyprlang::FLOAT>(props.at("rotate")); | ||
| xray = std::any_cast<Hyprlang::INT>(props.at("xray")); | ||
|
|
||
| viewport = viewport_; | ||
| angle = angle * M_PI / 180.0; | ||
|
|
||
| const Vector2D VBORDER = {border, border}; | ||
| const Vector2D REALSIZE = size + VBORDER * 2.0; | ||
| const Vector2D OFFSET = angle == 0 ? Vector2D{0.0, 0.0} : Vector2D{1.0, 1.0}; | ||
|
|
||
| pos = posFromHVAlign(viewport, xray ? size : REALSIZE + OFFSET * 2.0, pos, halign, valign, xray ? 0 : angle); | ||
|
|
||
| if (xray) { | ||
| shapeBox = {pos, size}; | ||
| borderBox = {pos - VBORDER, REALSIZE}; | ||
| } else { | ||
| shapeBox = {OFFSET + VBORDER, size}; | ||
| borderBox = {OFFSET, REALSIZE}; | ||
| } | ||
| } | ||
|
|
||
| bool CShape::draw(const SRenderData& data) { | ||
|
|
||
| if (firstRender) { | ||
| firstRender = false; | ||
| shadow.markShadowDirty(); | ||
| } | ||
|
|
||
| shadow.draw(data); | ||
|
|
||
| const auto MINHALFBORDER = std::min(borderBox.w, borderBox.h) / 2.0; | ||
|
|
||
| if (xray) { | ||
| if (border > 0) { | ||
| const int PIROUND = std::min(MINHALFBORDER, std::round(border * M_PI)); | ||
| CColor borderCol = borderColor; | ||
| borderCol.a *= data.opacity; | ||
| g_pRenderer->renderRect(borderBox, borderCol, rounding == -1 ? PIROUND : std::clamp(rounding, 0, PIROUND)); | ||
| } | ||
|
|
||
| glEnable(GL_SCISSOR_TEST); | ||
| glScissor(shapeBox.x, shapeBox.y, shapeBox.width, shapeBox.height); | ||
| glClearColor(0.0, 0.0, 0.0, 0.0); | ||
| glClear(GL_COLOR_BUFFER_BIT); | ||
| glDisable(GL_SCISSOR_TEST); | ||
|
|
||
| return data.opacity < 1.0; | ||
| } | ||
|
|
||
| if (!shapeFB.isAllocated()) { | ||
| const auto MINHALFSHAPE = std::min(shapeBox.w, shapeBox.h) / 2.0; | ||
| const bool ALLOWROUND = rounding > -1 && rounding < MINHALFSHAPE; | ||
|
|
||
| shapeFB.alloc(borderBox.width + borderBox.x * 2.0, borderBox.height + borderBox.y * 2.0, true); | ||
| g_pRenderer->pushFb(shapeFB.m_iFb); | ||
| glClearColor(0.0, 0.0, 0.0, 0.0); | ||
| glClear(GL_COLOR_BUFFER_BIT); | ||
|
|
||
| if (border > 0) | ||
| g_pRenderer->renderRect(borderBox, borderColor, ALLOWROUND ? (rounding == 0 ? 0 : rounding + std::round(border / M_PI)) : MINHALFBORDER); | ||
|
|
||
| g_pRenderer->renderRect(shapeBox, color, ALLOWROUND ? rounding : MINHALFSHAPE); | ||
| g_pRenderer->popFb(); | ||
| } | ||
|
|
||
| CTexture* tex = &shapeFB.m_cTex; | ||
| CBox texbox = {pos, tex->m_vSize}; | ||
|
|
||
| texbox.round(); | ||
| texbox.rot = angle; | ||
|
|
||
| g_pRenderer->renderTexture(texbox, *tex, data.opacity, 0, WL_OUTPUT_TRANSFORM_FLIPPED_180); | ||
|
|
||
| return data.opacity < 1.0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #pragma once | ||
|
|
||
| #include "IWidget.hpp" | ||
| #include "../../helpers/Vector2D.hpp" | ||
| #include "../../helpers/Color.hpp" | ||
| #include "../../helpers/Box.hpp" | ||
| #include "Shadowable.hpp" | ||
| #include <string> | ||
| #include <unordered_map> | ||
| #include <any> | ||
|
|
||
| class CShape : public IWidget { | ||
| public: | ||
| CShape(const Vector2D& viewport, const std::unordered_map<std::string, std::any>& props); | ||
|
|
||
| virtual bool draw(const SRenderData& data); | ||
|
|
||
| private: | ||
| CFramebuffer shapeFB; | ||
|
|
||
| int rounding; | ||
| double border; | ||
| double angle; | ||
| CColor color; | ||
| CColor borderColor; | ||
| Vector2D size; | ||
| Vector2D pos; | ||
| CBox shapeBox; | ||
| CBox borderBox; | ||
| bool xray; | ||
|
|
||
| std::string halign, valign; | ||
|
|
||
| bool firstRender = true; | ||
|
|
||
| Vector2D viewport; | ||
| CShadowable shadow; | ||
| }; |