diff --git a/.back/WidBack/CMakeLists.txt b/.back/WidBack/CMakeLists.txt new file mode 100644 index 0000000..dc1b591 --- /dev/null +++ b/.back/WidBack/CMakeLists.txt @@ -0,0 +1,21 @@ +project(Widgets) + +### ---------------------- Static Library --------------------- ### +file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") +file(GLOB HEADERS "./public/*.hpp") + +add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) +target_include_directories(${PROJECT_NAME} PUBLIC ./public/) +target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui) + +### -------------------------- Applications -------------------------- ### + +add_executable(SimpleGui examples/SimpleGUI.cpp) +target_link_libraries(SimpleGui ${PROJECT_NAME} ${GLEW_LIB}) +target_include_directories(SimpleGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) + +add_executable(ChatGui examples/ChatGUI.cpp) +target_link_libraries(ChatGui ${PROJECT_NAME} ${GLEW_LIB}) +target_include_directories(ChatGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) + +file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") \ No newline at end of file diff --git a/Widgets/examples/ChatGUI.cpp b/.back/WidBack/examples/ChatGUI.cpp similarity index 83% rename from Widgets/examples/ChatGUI.cpp rename to .back/WidBack/examples/ChatGUI.cpp index 52845e4..64558f5 100644 --- a/Widgets/examples/ChatGUI.cpp +++ b/.back/WidBack/examples/ChatGUI.cpp @@ -9,7 +9,7 @@ class ExampleGUI : public Application { public: ExampleGUI() = default; - void processFrame(EventHandler* eventHandler) override { + void processFrame(EventHandler* eventHandler, halnf delta) override { auto rec = RectF({ 0, 0 }, mWindow->getSize()); mGui.updateConfigWrapper(mWidgetManager); @@ -23,7 +23,7 @@ public: private: WidgetManager mWidgetManager; - ComplexWidget mGui; + ComplexWidget mGui; }; int main() { diff --git a/Widgets/examples/ChatGUI.hpp b/.back/WidBack/examples/ChatGUI.hpp similarity index 74% rename from Widgets/examples/ChatGUI.hpp rename to .back/WidBack/examples/ChatGUI.hpp index 4b765cf..9043e6c 100644 --- a/Widgets/examples/ChatGUI.hpp +++ b/.back/WidBack/examples/ChatGUI.hpp @@ -4,8 +4,7 @@ namespace tp { - template - class UserWidget : public Widget { + class UserWidget : public Widget { public: UserWidget() = default; @@ -39,8 +38,7 @@ namespace tp { halnf mRounding = 0; }; - template - class MessageWidget : public Widget { + class MessageWidget : public Widget { public: MessageWidget() = default; @@ -84,8 +82,7 @@ namespace tp { halnf mRounding = 0; }; - template - class LoginWidget : public Widget { + class LoginWidget : public Widget { public: explicit LoginWidget() { mPass.mId = "pass"; @@ -120,16 +117,15 @@ namespace tp { } public: - TextInputWidget mUser; - TextInputWidget mPass; - ButtonWidget mButton; + TextInputWidget mUser; + TextInputWidget mPass; + ButtonWidget mButton; bool mLogged = false; RGBA mBGColor; }; - template - class ActiveChatWidget : public Widget { + class ActiveChatWidget : public Widget { public: ActiveChatWidget() { mSend.mLabel.mLabel = "Send"; @@ -172,23 +168,22 @@ namespace tp { } public: - Buffer> mMessages; - ScrollableWindow mHistoryView; - TextInputWidget mMessage; - ButtonWidget mSend; + Buffer mMessages; + ScrollableWindow mHistoryView; + TextInputWidget mMessage; + ButtonWidget mSend; RGBA mBGColor; halnf mPadding = 0; }; - template - class ChattingWidget : public Widget { + class ChattingWidget : public DockWidget { public: ChattingWidget() { // todo : fetch code - mUsers.append(UserWidget()); - mUsers.append(UserWidget()); - mUsers.append(UserWidget()); + mUsers.append(UserWidget()); + mUsers.append(UserWidget()); + mUsers.append(UserWidget()); mUsers[0].mArea = { 0, 0, 100, 100 }; mUsers[1].mArea = { 0, 0, 100, 100 }; @@ -198,9 +193,9 @@ namespace tp { mSideView.addWidget(&message.data()); } - mActive.mMessages.append(MessageWidget()); - mActive.mMessages.append(MessageWidget()); - mActive.mMessages.append(MessageWidget()); + mActive.mMessages.append(MessageWidget()); + mActive.mMessages.append(MessageWidget()); + mActive.mMessages.append(MessageWidget()); mActive.mMessages[0].mArea = { 0, 0, 100, 50 }; mActive.mMessages[1].mArea = { 0, 0, 100, 50 }; @@ -210,35 +205,24 @@ namespace tp { mActive.mHistoryView.addWidget(&message.data()); } - this->mChildWidgets.pushBack(&mSideView); - this->mChildWidgets.pushBack(&mActive); - this->mChildWidgets.pushBack(&mSplitView); + addSideWidget(&mSideView, DockWidget::RIGHT); + setCenterWidget(&mActive); } - void eventProcess(const Events& events) override { - mSplitView.setArea(this->mArea); - mSideView.setArea(mSplitView.getSecond()); - mActive.setArea(mSplitView.getFirst()); - } - - void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, mBGColor); } - void eventUpdateConfiguration(WidgetManager& wm) override { wm.setActiveId("ChattingWidget"); mBGColor = wm.getColor("Back", "Background"); } public: - Buffer> mUsers; - ScrollableWindow mSideView; - ActiveChatWidget mActive; - SplitView mSplitView; + Buffer mUsers; + ScrollableWindow mSideView; + ActiveChatWidget mActive; RGBA mBGColor; }; - template - class ComplexWidget : public Widget { + class ComplexWidget : public Widget { public: ComplexWidget() { this->mChildWidgets.pushBack(&mLogin); @@ -264,8 +248,8 @@ namespace tp { private: bool mLogged = false; - LoginWidget mLogin; - ChattingWidget mChatting; + LoginWidget mLogin; + ChattingWidget mChatting; RGBA mBGColor; }; diff --git a/3DEditor/rsc/Font.ttf b/.back/WidBack/examples/Font.ttf similarity index 100% rename from 3DEditor/rsc/Font.ttf rename to .back/WidBack/examples/Font.ttf diff --git a/Widgets/examples/SimpleGUI.cpp b/.back/WidBack/examples/SimpleGUI.cpp similarity index 79% rename from Widgets/examples/SimpleGUI.cpp rename to .back/WidBack/examples/SimpleGUI.cpp index 2e6a49c..31f6b53 100644 --- a/Widgets/examples/SimpleGUI.cpp +++ b/.back/WidBack/examples/SimpleGUI.cpp @@ -9,10 +9,10 @@ using namespace tp; class SimpleGUI : public Application { public: SimpleGUI() { - + // mGui.mPreview = true; } - void processFrame(EventHandler* eventHandler) override { + void processFrame(EventHandler* eventHandler, halnf) override { const auto rec = RectF({ 0, 0 }, mWindow->getSize()); mGui.setArea(rec); @@ -28,7 +28,8 @@ public: private: WidgetManager mWidgetManager; - SimpleWidget2 mGui; + // DockSpaceWidget mGui; + SimpleWidget3 mGui; }; int main() { diff --git a/.back/WidBack/examples/SimpleGUI.hpp b/.back/WidBack/examples/SimpleGUI.hpp new file mode 100644 index 0000000..259f66a --- /dev/null +++ b/.back/WidBack/examples/SimpleGUI.hpp @@ -0,0 +1,69 @@ +#include "Widgets.hpp" + +namespace tp { + + class SimpleWidget : public CollapsableMenu { + public: + SimpleWidget() { + this->addWidgetToMenu(&mSlider); + + this->addWidgetToMenu(&mInMenuButton1); + this->addWidgetToMenu(&mInMenuButton2); + + this->addWidgetToMenu(&mLabel); + + mInMenuButton1.mLabel.mLabel = "Button1"; + + mInMenuButton1.mCallback = []() { + printf("asd\n"); + }; + + mInMenuButton2.mLabel.mLabel = "Button2"; + } + + private: + ButtonWidget mInMenuButton1; + ButtonWidget mInMenuButton2; + + LabelWidget mLabel; + NamedSliderWidget mSlider; + }; + + class SimpleWidget3 : public WorkspaceWidget { + public: + SimpleWidget3() { + + mDockSpace.addSideWidget(&mButtons[0], DockWidget::BOTTOM); + mDockSpace.addSideWidget(&mButtons[1], DockWidget::RIGHT); + + mDockSpace.removeSideWidget(DockWidget::BOTTOM); + + mDockSpace.addSideWidget(&mButtons[0], DockWidget::TOP); + mDockSpace.addSideWidget(&mButtons[2], DockWidget::LEFT); + + mDockSpace.removeSideWidget(DockWidget::TOP); + + mDockSpace.addSideWidget(&mButtons[0], DockWidget::BOTTOM); + + mDockSpace.addSideWidget(&mButtons[3], DockWidget::TOP); + mDockSpace.setCenterWidget(&mButtons[4]); + + /* + mButtons[4].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::BOTTOM); }; + mButtons[0].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::TOP); }; + mButtons[2].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::RIGHT); }; + mButtons[3].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::LEFT); }; + */ + + mButtons[0].addWidgetToMenu(&mWidget); + mButtons[1].addWidgetToMenu(&mWidget2); + } + + private: + FloatingWidget mButtons[5]; + + SimpleWidget mWidget; + SimpleWidget mWidget2; + SimpleWidget mWidget3; + }; +} \ No newline at end of file diff --git a/Widgets/private/Animations.cpp b/.back/WidBack/private/Animations.cpp similarity index 100% rename from Widgets/private/Animations.cpp rename to .back/WidBack/private/Animations.cpp diff --git a/.back/WidBack/private/ButtonWidget.cpp b/.back/WidBack/private/ButtonWidget.cpp new file mode 100644 index 0000000..cc71543 --- /dev/null +++ b/.back/WidBack/private/ButtonWidget.cpp @@ -0,0 +1,46 @@ + +#include "ButtonWidget.hpp" + +using namespace tp; + +ButtonWidget::ButtonWidget() { + this->setArea({ 0, 0, 100, 30 }); + this->mChildWidgets.pushBack(&mLabel); +} + +ButtonWidget::ButtonWidget(const std::string& label, const tp::RectF& aArea) { + this->setArea(aArea); + mLabel.mLabel = label; + this->mChildWidgets.pushBack(&mLabel); +} + +bool ButtonWidget::isFired() { return this->isReleased(); } + +void ButtonWidget::eventProcess(const Events&) { + mLabel.setArea(this->mArea); + + if (isFired()) { + mCallback(); + } +} + +void ButtonWidget::eventDraw(Canvas& canvas) { + if (this->isHolding()) { + canvas.rect(this->mArea, pressedColor, rounding); + } else if (this->isFocus()) { + canvas.rect(this->mArea, hoveredColor, rounding); + } else { + canvas.rect(this->mArea, accentColor, rounding); + } +} + +void ButtonWidget::setLabel(const std::string& string) { mLabel.mLabel = string; } + +void ButtonWidget::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("Button"); + + pressedColor = wm.getColor("Pressed", "Action"); + hoveredColor = wm.getColor("Hovered", "Interaction"); + accentColor = wm.getColor("Default", "Accent"); + rounding = wm.getNumber("Rounding", "Rounding"); +} diff --git a/.back/WidBack/private/CollapsableMenu.cpp b/.back/WidBack/private/CollapsableMenu.cpp new file mode 100644 index 0000000..ad0265d --- /dev/null +++ b/.back/WidBack/private/CollapsableMenu.cpp @@ -0,0 +1,96 @@ + +#include "CollapsableMenu.hpp" + +using namespace tp; + +CollapsableMenu::CollapsableMenu() { + this->mChildWidgets.pushBack(&mHeader); + this->mChildWidgets.pushBack(&mBody); +} + +void CollapsableMenu::eventProcess(const Events&) { + if (mHeader.isReleased()) { + toggleCollapsed(); + } + + updateGeometry(); +} + +void CollapsableMenu::eventDraw(Canvas& canvas) { + if (mBorders) { + canvas.rect(this->mArea, mBorderColor, rounding); + canvas.rect(this->mArea.shrink(mBorderSize), mMenuColor, rounding); + } else { + canvas.rect(this->mArea, mMenuColor, rounding); + } +} + +void CollapsableMenu::addWidgetToMenu(Widget* widget) { + mBody.addWidget(widget); + + EventHandler ev; + mBody.procWrapper(ev, this->mArea); + updateGeometry(); +} + +void CollapsableMenu::setLabel(const std::string& string) { mHeader.mLabel = string; } + +void CollapsableMenu::toggleCollapsed() { setCollapsed(!getCollapsed()); } + +void CollapsableMenu::setCollapsed(bool collapsed) { + if (mLocked) return; + if (collapsed && !mCollapsed) mPrevHeight = this->mArea.size.y; + if (!collapsed && mCollapsed) this->mArea.size.y = mPrevHeight; + mCollapsed = collapsed; +} + +bool CollapsableMenu::getCollapsed() const { return mCollapsed; } + +void CollapsableMenu::updateGeometry() { + mHeader.setArea(getHeaderRect()); + + mBody.mEnable = !mCollapsed; + + if (mCollapsed) { + this->mArea.size.y = headerHeight; + } else { + if (mAdjustHeight) { + this->mArea.size.y = headerHeight + getBodyRect().size.y + mPadding * 2; + } + + mBody.setArea(getBodyRect()); + } +} + +RectF CollapsableMenu::getHeaderRect() { + RectF out = { this->mArea.pos, { this->mArea.size.x, headerHeight } }; + if (mBorders) out = out.shrink(mPadding); + return out; +} + +RectF CollapsableMenu::getBodyRect() { + RectF out = { Vec2F{ this->mArea.pos.x, this->mArea.pos.y + headerHeight }, + Vec2F{ this->mArea.size.x, this->mArea.size.y - headerHeight - mPadding } }; + + out.size.y -= mBorderSize * 2; + + if (mAdjustHeight) out.size.y = mBody.getContentSize(); + + if (mBody.getContentSize() && mBorders) { + out = out.shrink(mPadding); + out.size.y += mPadding * 2 + 1; + } + + return out; +} + +void CollapsableMenu::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("CollapsableMenu"); + + headerHeight = wm.getNumber("HeaderHeight", 35); + mMenuColor = wm.getColor("MenuColor", RGBA(0, 0, 0, 1.f)); + rounding = wm.getNumber("Rounding", "Rounding"); + mBorderColor = wm.getColor("BorderColor", RGBA(0.16, 0.16, 0.16, 1.f)); + mBorderSize = wm.getNumber("BorderSize", 2.f); + mPadding = wm.getNumber("Padding", "Padding"); +} diff --git a/.back/WidBack/private/FloatSpaceWidget.cpp b/.back/WidBack/private/FloatSpaceWidget.cpp new file mode 100644 index 0000000..c3c857e --- /dev/null +++ b/.back/WidBack/private/FloatSpaceWidget.cpp @@ -0,0 +1,47 @@ +#include "FloatingLayoutWidget.hpp" + +using namespace tp; + +FloatingLayoutWidget::FloatingLayoutWidget() = default; + +void FloatingLayoutWidget::eventProcess(const tp::Events& events) { + updateActiveWindow(events); +} + +void FloatingLayoutWidget::updateActiveWindow(const tp::Events& events) { + mIsPassThrough = true; + for (auto childNode = this->mChildWidgets.firstNode(); childNode; childNode = childNode->next) { + auto child = childNode->data; + if (child->mArea.isInside(events.getPointer())) { + mIsPassThrough = false; + } + } + + if (events.isPressed(InputID::MOUSE1)) { + + Widget* activeChild = nullptr; + + for (auto childNode = this->mChildWidgets.firstNode(); childNode; childNode = childNode->next) { + auto child = childNode->data; + + if (child->mArea.isInside(events.getPointer())) { + + mChildWidgets.detach(childNode); + mChildWidgets.pushFront(childNode); + + child->mHandlesEvents = true; + activeChild = child; + break; + } + } + + if (activeChild) { + for (auto child : this->mChildWidgets) { + if (activeChild != child.data() && !child->mIsDocked) child->mHandlesEvents = false; + } + } + + } +} + +bool FloatingLayoutWidget::handlesEvent() const { return !mIsPassThrough; } diff --git a/.back/WidBack/private/FloatingWidget.cpp b/.back/WidBack/private/FloatingWidget.cpp new file mode 100644 index 0000000..9760eb4 --- /dev/null +++ b/.back/WidBack/private/FloatingWidget.cpp @@ -0,0 +1,89 @@ + +#include "FloatingWidget.hpp" + +using namespace tp; + +FloatingWidget::FloatingWidget() { + this->mArea = { 0, 0, 300, 300 }; + this->mAdjustHeight = false; +} + +void FloatingWidget::eventProcess(const Events& events) { + mActionStartRelativePos = events.getPointerPrev() - this->mArea.pos; + + checkFloating(events); + if (mResizable) checkResizing(events); + + CollapsableMenu::eventProcess(events); +} + +void FloatingWidget::eventDraw(Canvas& canvas) { + CollapsableMenu::eventDraw(canvas); + + if (!this->getCollapsed() && mResizable) { + auto rect = getResizeHandle(); + canvas.rect(rect, mResizeHandleColor, 0); + canvas.circle(rect.pos - this->mBorderSize, rect.w, this->mMenuColor); + } +} + +void FloatingWidget::eventUpdateConfiguration(WidgetManager& wm) { + CollapsableMenu::eventUpdateConfiguration(wm); + + wm.setActiveId("FloatingWidget"); + + mResizeHandleSize = wm.getNumber("ResizeHandleSize", 15); + mResizeHandleColor = wm.getColor("ResizeHandleColor", RGBA(0.16, 0.16, 0.16, 1.f)); +} + +void FloatingWidget::checkFloating(const Events& events) { + mDropped = false; + + if (this->mHeader.isHolding() && events.getPointerDelta().length2() > 4) { + mFloating = true; + } + + if (mFloating && this->mHeader.isReleased()) { + mFloating = false; + this->mHeader.clearEvents(); + mDropped = true; + } + + if (mFloating) { + auto relativePos = events.getPointer() - this->mArea.pos; + this->mArea.pos += relativePos - mActionStartRelativePos; + } +} + +void FloatingWidget::checkResizing(const Events& events) { + if (this->getCollapsed()) return; + + if (events.isPressed(InputID::MOUSE1) && getResizeHandle().isInside(events.getPointer())) { + mResizing = true; + } + + if (events.isReleased(InputID::MOUSE1)) { + mResizing = false; + } + + if (mResizing) { + auto relativePos = events.getPointer() - this->mArea.pos; + this->mArea.size += relativePos - mActionStartRelativePos; + } + + if (!this->mCollapsed) { + this->mArea.size.clamp(mMinSize, { FLT_MAX, FLT_MAX }); + } +} + +RectF FloatingWidget::getResizeHandle() { + auto size = Vec2F(mResizeHandleSize); + auto pos = this->mArea.pos + this->mArea.size - size; + return { pos, size }; +} + +bool FloatingWidget::isFloating() const { return mFloating; } + +void FloatingWidget::stopFloating() { + mFloating = false; +} diff --git a/.back/WidBack/private/GridLayoutWidget.cpp b/.back/WidBack/private/GridLayoutWidget.cpp new file mode 100644 index 0000000..de92497 --- /dev/null +++ b/.back/WidBack/private/GridLayoutWidget.cpp @@ -0,0 +1,328 @@ +#include "GridLayoutWidget.hpp" + +using namespace tp; + +DockWidget::DockWidget() { + mSideWidgets[0].side = LEFT; + mSideWidgets[1].side = TOP; + mSideWidgets[2].side = RIGHT; + mSideWidgets[3].side = BOTTOM; +} + +void DockWidget::addSideWidget(Widget* widget, Side side) { + if (sideExists(side)) return; + + auto& sideWidget = mSideWidgets[side]; + sideWidget.widget = widget; + for (auto& order : mSideWidgets) { + if (order.order == -1) { + order.order = side; + break; + } + } + + sideWidget.hidden = false; + + mChildWidgets.pushBack(widget); + widget->mIsDocked = true; +} + +void DockWidget::removeSideWidget(Side side) { + if (!sideExists(side)) return; + + bool removed = false; + for (ualni i = 0; i < 3; i++) { + if (mSideWidgets[i].order == side) { + removed = true; + } + if (removed) { + swapV(mSideWidgets[i].order, mSideWidgets[i + 1].order); + } + } + mSideWidgets[3].order = -1; + + auto widget = mSideWidgets[side].widget; + widget->mIsDocked = false; + mChildWidgets.removeNode(mChildWidgets.find(widget)); + + mSideWidgets[side].widget = nullptr; +} + +void DockWidget::setCenterWidget(Widget* widget) { + mChildWidgets.removeNode(mChildWidgets.find(mCenterWidget)); + mCenterWidget = widget; + mChildWidgets.pushBack(mCenterWidget); +} + +void DockWidget::toggleHiddenState(DockWidget::Side side) { + if (!sideExists(side)) return; + mSideWidgets[side].hidden = !mSideWidgets[side].hidden; +} + +void DockWidget::eventProcess(const tp::Events& events) { + calculateSideAreas(); + calculateResizeHandles(); + // calculateHeaderAreas(); + + handlePreview(events); + handleResizeEvents(events); + + updateChildSideWidgets(); +} + +void DockWidget::eventDraw(Canvas& canvas) { + canvas.rect(this->mArea, mBackgroundColor, 0); + + for (auto& sideWidget : mSideWidgets) { + if (!isSideVisible(sideWidget.side)) continue; + auto& handle = sideWidget.resizeHandle; + if (handle.active) { + canvas.rect(handle.area.shrink(mPadding / 1.5f), mResizeHandleColorActive, 0); + } else if (handle.hover) { + canvas.rect(handle.area.shrink(mPadding / 1.5f), mResizeHandleColorHovered, 0); + } + } + + for (auto& sideWidget : mSideWidgets) { + if (!isSideVisible(sideWidget.side)) continue; + canvas.rect(sideWidget.headerArea, mResizeHandleColorActive, 0); + } +} + +void DockWidget::eventDrawOver(Canvas& canvas) { + if (!mPreview) return; + + if (mPreviewSide != NONE) canvas.rect(mPreviewArea.shrink(mPadding * 2), mPreviewColor, mRounding); + + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget) continue; + canvas.rect(sideWidget.previewHandleArea, mPreviewColor, mRounding); + } +} + +void DockWidget::calculateSideAreas() { + auto startArea = this->mArea; + for (auto& sideWidget : mSideWidgets) { + const auto side = sideWidget.order; + + if (side == -1) break; + if (!isSideVisible(Side(side))) continue; + + bool vertical = side == TOP || side == BOTTOM; + bool opposite = side == BOTTOM || side == RIGHT; + + auto& sideSize = mSideWidgets[side].absoluteSize; + + auto factor = sideSize / startArea.size[vertical]; + if (opposite) factor = factor * -1 + 1; + auto& area = mSideWidgets[side].area; + + if (!vertical) { + const auto first = startArea.splitByFactorHL(factor); + const auto second = startArea.splitByFactorHR(factor); + area = side == LEFT ? first : second; + startArea = side == LEFT ? second : first; + } else { + const auto first = startArea.splitByFactorVT(factor); + const auto second = startArea.splitByFactorVB(factor); + area = side == TOP ? first : second; + startArea = side == TOP ? second : first; + } + + area = area.shrink(mPadding); + } + + mCenterArea = startArea.shrink(mPadding); +} + +void DockWidget::calculateResizeHandles() { + RectF rec; + + if (isSideVisible(LEFT)) { + auto& side = mSideWidgets[LEFT]; + rec = { side.area.p4(), { mPadding * 2, side.area.size.y } }; + side.resizeHandle = { rec, 0, mCenterArea.p3().x }; + } + if (isSideVisible(RIGHT)) { + auto& side = mSideWidgets[RIGHT]; + rec = { side.area.p1(), { mPadding * 2, side.area.size.y } }; + rec.x -= mPadding * 2; + side.resizeHandle = { rec, 0, (this->mArea.p3() - mCenterArea.p1()).x }; + } + if (isSideVisible(TOP)) { + auto& side = mSideWidgets[TOP]; + rec = { side.area.p2(), { side.area.size.x, mPadding * 2 } }; + side.resizeHandle = { rec, 0, mCenterArea.p2().y }; + } + if (isSideVisible(BOTTOM)) { + auto& side = mSideWidgets[BOTTOM]; + rec = { side.area.p1(), { side.area.size.x, mPadding * 2 } }; + rec.y -= mPadding * 2; + side.resizeHandle = { rec, 0, (this->mArea.p3() - mCenterArea.p1()).y }; + } +} + +void DockWidget::handleResizeEvents(const Events& events) { + for (auto& sideWidget : mSideWidgets) { + auto& sideSize = sideWidget.absoluteSize; + auto& resizeHandle = sideWidget.resizeHandle; + if (resizeHandle.end < mSideSizePadding * 2) { + sideSize = resizeHandle.end / 2.f; + } else { + sideSize = clamp(sideSize, resizeHandle.start + mSideSizePadding, resizeHandle.end - mSideSizePadding); + } + } + + for (auto& sideWidget : mSideWidgets) { + sideWidget.resizeHandle.hover = false; + if (sideWidget.resizeHandle.area.isInside(events.getPointerPrev())) { + sideWidget.resizeHandle.hover = true; + } + } + + for (auto& sideWidget : mSideWidgets) { + sideWidget.resizeHandle.active = false; + } + + if (mPreview) return; + + auto resizeSideWidget = [&events](SideWidgetData& sideWidget, Vec2F deltaVec) { + halnf delta = deltaVec[(sideWidget.side == TOP || sideWidget.side == BOTTOM)]; + if (sideWidget.side == BOTTOM || sideWidget.side == RIGHT) delta *= -1; + sideWidget.absoluteSize += delta; + sideWidget.resizeHandle.active = true; + }; + + if (events.isDown(InputID::MOUSE1)) { + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.resizeHandle.area.isInside(events.getPointerPrev())) { + resizeSideWidget(sideWidget, events.getPointerDelta()); + } + } + } + + if (events.isDown(InputID::LEFT_ALT)) { + const auto pointer = events.getPointerPrev(); + if (!mCenterArea.isInside(pointer)) return; + + if (events.isPressed(InputID::MOUSE1)) { + for (auto i : { 0, 1 }) { + const auto step = mCenterArea.size[i] / 3.f; + const auto rec1 = mCenterArea.pos[i]; + const auto pos = pointer[i]; + if (pos > rec1 && pos < rec1 + step) resizeType[i] = 0; + if (pos > rec1 + step && pos < rec1 + step * 2) resizeType[i] = 1; + if (pos > rec1 + step * 2) resizeType[i] = 2; + } + } else if (events.isDown(InputID::MOUSE1)) { + const auto deltaVec = events.getPointerDelta(); + + if (resizeType[0] == 0) resizeSideWidget(mSideWidgets[LEFT], deltaVec); + if (resizeType[1] == 0) resizeSideWidget(mSideWidgets[TOP], deltaVec); + if (resizeType[0] == 2) resizeSideWidget(mSideWidgets[RIGHT], deltaVec); + if (resizeType[1] == 2) resizeSideWidget(mSideWidgets[BOTTOM], deltaVec); + } + } +} + +void DockWidget::updateChildSideWidgets() { + // Update Child Widgets + { + for (ualni i = 0; i < 4; i++) { + if (!sideExists(Side(i))) continue; + auto widget = mSideWidgets[i].widget; + + if (!isSideVisible(Side(i))) { + widget->mEnable = false; + } else { + widget->setArea(mSideWidgets[i].area); + widget->mEnable = true; + } + } + + if (mCenterWidget) mCenterWidget->setArea(mCenterArea); + } + + // update depth order + /* + if (mChildWidgets.size() > 1) { + for (auto sideChild : mSideWidgets) { + if (!sideChild) continue; + + for (auto childNode = mChildWidgets.firstNode(); childNode; childNode = childNode->next) { + if (childNode->data == sideChild) { + mChildWidgets.detach(childNode); + mChildWidgets.pushBack(childNode); + break; + } + } + } + } + */ +} + +void DockWidget::calculateHeaderAreas() { + for (ualni i = 0; i < 4; i++) { + if (!isSideVisible(Side(i))) continue; + auto& area = mSideWidgets[i].area; + const auto factor = mHeaderSize / area.size.y; + mSideWidgets[i].headerArea = area.splitByFactorVT(factor); + area = area.splitByFactorVB(factor); + + mSideWidgets[i].headerArea.size.y -= mPadding; + } +} + +bool DockWidget::isSideVisible(DockWidget::Side side) { + return sideExists(side) && !mSideWidgets[side].hidden; +} + +bool DockWidget::sideExists(DockWidget::Side side) { return mSideWidgets[side].widget; } + +ualni DockWidget::getVisibleSidesSize() { + ualni out = 0; + for (ualni i = 0; i < 4; i++) { + if (isSideVisible(Side(i))) out++; + } + return out; +} + +DockWidget::Side DockWidget::getPreviewSide() { return mPreviewSide; } + +void DockWidget::handlePreview(const Events& events) { + if (!mPreview) { + mPreviewSide = NONE; + return; + } + + const halnf factor = 0.3; + const halnf handleFactor = 0.1; + + const auto handleSize = min(mCenterArea.size.x, mCenterArea.size.y) * handleFactor; + + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget) continue; + + switch (sideWidget.side) { + case TOP: sideWidget.area = mCenterArea.splitByFactorVT(factor); break; + case BOTTOM: sideWidget.area = mCenterArea.splitByFactorVB(1 - factor); break; + case LEFT: sideWidget.area = mCenterArea.splitByFactorHL(factor); break; + case RIGHT: sideWidget.area = mCenterArea.splitByFactorHR(1 - factor); break; + default: break; + } + + sideWidget.area = sideWidget.area.shrink(mPadding * 2); + sideWidget.previewHandleArea = sideWidget.area.getSizedFromCenter({ handleSize, handleSize }); + } + + mPreviewArea = {}; + mPreviewSide = NONE; + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget) continue; + + if (sideWidget.previewHandleArea.isInside(events.getPointer())) { + mPreviewArea = sideWidget.area; + mPreviewSide = sideWidget.side; + } + } +} \ No newline at end of file diff --git a/.back/WidBack/private/LabelWidget.cpp b/.back/WidBack/private/LabelWidget.cpp new file mode 100644 index 0000000..dfefe0b --- /dev/null +++ b/.back/WidBack/private/LabelWidget.cpp @@ -0,0 +1,17 @@ +#include "LabelWidget.hpp" + +using namespace tp; + +LabelWidget::LabelWidget() { this->mArea = { 0, 0, 100, 30 }; } + +void LabelWidget::eventDraw(Canvas& canvas) { + canvas.text(mLabel.c_str(), this->mArea, fontSize, Canvas::LC, padding, fontColor); +} + +void LabelWidget::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("Label"); + + fontSize = wm.getNumber("Size", "FontSize"); + padding = wm.getNumber("Padding", "Padding"); + fontColor = wm.getColor("Default", "Front"); +} diff --git a/.back/WidBack/private/ScrollableWidget.cpp b/.back/WidBack/private/ScrollableWidget.cpp new file mode 100644 index 0000000..de74468 --- /dev/null +++ b/.back/WidBack/private/ScrollableWidget.cpp @@ -0,0 +1,179 @@ +#include "ScrollableWidget.hpp" +#include "../../WidgetsNew/public/widgets/ScrollableWidget.hpp" + +using namespace tp; + +ScrollBarWidget::ScrollBarWidget() = default; + +void ScrollBarWidget::eventProcess(const Events& events) { + auto area = getHandle(); + mHovered = getHandleHandle().isInside(events.getPointer()); + + if (mSizeFraction > 1.f) { + mPositionFraction = 0; + return; + } + + if (events.getScrollY() != 0 && mArea.isInside(events.getPointer())) { + auto offset = events.getScrollY() < 0 ? 1.0f : -1.0f; + mPositionFraction += mSizeFraction * offset * 0.3f; + mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction); + } + + if (events.isPressed(InputID::MOUSE1) && area.isInside(events.getPointer())) { + mIsScrolling = true; + } else if (events.isReleased(InputID::MOUSE1)) { + mIsScrolling = false; + } + + if (mIsScrolling) { + tp::halnf pos = events.getPointer().y; + pos = (pos - area.y - mSizeFraction * area.w / 2.f) / area.w; + mPositionFraction = tp::clamp(pos, 0.f, 1.f - mSizeFraction); + } + + mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction); +} + +void ScrollBarWidget::eventDraw(Canvas& canvas) { + auto area = getHandle(); + + if (mSizeFraction > 1.f) return; + // if (!areaParent.isOverlap(getHandle())) return; + + tp::RGBA col = mHandleColor; + + if (mIsScrolling) { + col = mScrollingColor; + } else if (mHovered) { + col = mHoveredColor; + } + + canvas.rect(area, mDefaultColor, mRounding); + canvas.rect(getHandleHandle(), col, mRounding); +} + +RectF ScrollBarWidget::getHandleHandle() const { + auto area = getHandle(); + auto sliderSize = tp::clamp(area.w * mSizeFraction, mMinSize * 2, area.w); + auto diffSize = sliderSize - area.w * mSizeFraction; + return { area.x, area.y + (area.w - diffSize) * mPositionFraction, area.z, sliderSize }; +} + +RectF ScrollBarWidget::getViewport() const { + if (mSizeFraction > 1.f) { + return this->mArea; + } + return { this->mArea.x, this->mArea.y, this->mArea.z - mHandleSize, this->mArea.w }; +} + +RectF ScrollBarWidget::getHandle() const { + return { this->mArea.x + this->mArea.z - mHandleSize + mPadding, + this->mArea.y + mPadding, + mHandleSize - mPadding * 2, + this->mArea.w - mPadding * 2 }; +} + +void ScrollBarWidget::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("Scrollbar"); + + mDefaultColor = wm.getColor("Default", "Base"); + mHandleColor = wm.getColor("Handle", "Accent"); + mHoveredColor = wm.getColor("Hovered", "Interaction"); + mScrollingColor = wm.getColor("Scrolling", "Action"); + mPadding = wm.getNumber("Padding", "Padding"); + mHandleSize = wm.getNumber("HandleSize", 20.f); + mMinSize = wm.getNumber("MinSize", 20.f); + mRounding = wm.getNumber("Rounding", "Rounding"); +} + +ScrollableWindow::ScrollableWindow() { + this->mChildWidgets.pushBack(&mScroller); + this->mChildWidgets.pushBack(&mContentWidget); +} + +ScrollableWindow::~ScrollableWindow() = default; + +void ScrollableWindow::eventProcess(const Events& events) { + List& content = mContentWidget.mChildWidgets; + + // to account all changed geometry of child widgets + for (auto widget : content) { + widget->procWrapper(events, mContentWidget.mVisibleArea); + } + + updateContents(content); + updateContentSize(content); + + const auto padding = mPadding; + + mScroller.mSizeFraction = mContentWidget.mArea.w / mContentSize; + mScroller.setArea(this->mArea); + mContentWidget.setArea(mScroller.getViewport()); + + if (mScroller.mSizeFraction > 1.f) { + setOffset(content, 0); + } else { + setOffset(content, (-mScroller.mPositionFraction) * mContentSize); + } + + for (auto widget : content) { + widget->setArea({ mContentWidget.mArea.x + padding, + mContentWidget.mArea.y + widget->mArea.y, + mScroller.getViewport().z - padding * 2, + widget->mArea.w }); + } +} + +void ScrollableWindow::addWidget(Widget* widget) { + mContentWidget.mChildWidgets.pushBack(widget); + + List& content = mContentWidget.mChildWidgets; + updateContents(content); + updateContentSize(content); +} + +void ScrollableWindow::clearContent() { mContentWidget.mChildWidgets.removeAll(); } +List& ScrollableWindow::getContent() { return mContentWidget.mChildWidgets; } + +void ScrollableWindow::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("ScrollableWidget"); + mPadding = wm.getNumber("Padding", "Padding"); +} + +[[nodiscard]] halnf ScrollableWindow::getContentSize() const { return mContentSize; } + +void ScrollableWindow::updateContents(List& contentWidgets) { + if (!contentWidgets.size()) { + return; + } + + const halnf offset = contentWidgets.first()->mArea.y + mPadding; + + halnf start = 0; + for (auto widget : contentWidgets) { + widget->mArea.y = start; + start += widget->mArea.w + mPadding; + } + + for (auto widget : contentWidgets) { + widget->mArea.y += offset; + } +} + +void ScrollableWindow::updateContentSize(List& contentWidgets) { + mContentSize = 0; + if (contentWidgets.size()) { + mContentSize = contentWidgets.last()->mArea.y - contentWidgets.first()->mArea.y; + mContentSize += contentWidgets.last()->mArea.w; + mContentSize += 2 * mPadding; + } +} + +void ScrollableWindow::setOffset(List& contentWidgets, const halnf offset) { + if (!contentWidgets.size()) return; + auto newOffset = offset - contentWidgets.first()->mArea.y + mPadding; + for (auto widget : contentWidgets) { + widget->mArea.y += newOffset; + } +} diff --git a/.back/WidBack/private/SliderWidget.cpp b/.back/WidBack/private/SliderWidget.cpp new file mode 100644 index 0000000..4b2b68e --- /dev/null +++ b/.back/WidBack/private/SliderWidget.cpp @@ -0,0 +1,62 @@ +#include "SliderWidget.hpp" + +using namespace tp; + +SliderWidget::SliderWidget() = default; + +void SliderWidget::eventProcess(const Events& events) { + if (this->isPressed()) { + mIsSliding = true; + } else if (events.isReleased(InputID::MOUSE1)) { + mIsSliding = false; + } + + if (mIsSliding) { + mFactor = (events.getPointer().x - this->mArea.x - handleSize / 2.f) / (this->mArea.z - handleSize); + } + + mFactor = tp::clamp(mFactor, 0.f, 1.f); +} + +void SliderWidget::eventDraw(Canvas& canvas) { + canvas.rect(this->mArea, handleColor, rounding); + canvas.rect(this->mArea.shrink(borderSize), defaultColor, rounding); + canvas.rect(getHandle(), handleColor, rounding); +} + +RectF SliderWidget::getHandle() const { + const auto left = this->mArea.x + (this->mArea.z - handleSize) * mFactor; + return { left, this->mArea.y, handleSize, this->mArea.w }; +} + +void SliderWidget::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("Slider"); + defaultColor = wm.getColor("Default", "Base"); + handleColor = wm.getColor("Handle", RGBA(0.3f, 0.3f, 0.3f, 1.f)); + borderSize = wm.getNumber("BorderSize", 2); + handleSize = wm.getNumber("HandleSize", 15.f); + rounding = wm.getNumber("Rounding", "Rounding"); +} + +NamedSliderWidget::NamedSliderWidget(const char* name) { + mLabel.mLabel = name; + this->mArea = { 0, 0, 100, 30 }; + + this->mChildWidgets.pushBack(&mSlider); + this->mChildWidgets.pushBack(&mLabel); +} + +void NamedSliderWidget::eventProcess(const Events& events) { + const auto widthFirst = this->mArea.z * mFactor; + const auto widthSecond = this->mArea.z * (1.f - mFactor); + + RectF rec = this->mArea; + rec.size.x = widthFirst; + + mLabel.setArea(rec); + + rec.pos.x += widthFirst; + rec.size.x = widthSecond; + + mSlider.setArea(rec); +} diff --git a/.back/WidBack/private/TextInputWidget.cpp b/.back/WidBack/private/TextInputWidget.cpp new file mode 100644 index 0000000..54925fa --- /dev/null +++ b/.back/WidBack/private/TextInputWidget.cpp @@ -0,0 +1,57 @@ +#include "TextInputWidget.hpp" + +#include "imgui.h" +#include "imgui_internal.h" + +using namespace tp; + +TextInputWidget::TextInputWidget() = default; + +void TextInputWidget::eventDraw(Canvas&) { + nChanged = false; + + const auto col = mAccentColor; + const auto colSel = mHoveredColor; + + ImGui::GetStyle().Colors[ImGuiCol_FrameBg] = { col.r, col.g, col.b, col.a }; + ImGui::GetStyle().Colors[ImGuiCol_TextSelectedBg] = { colSel.r, colSel.g, colSel.b, colSel.a }; + + ImGui::SetNextWindowPos({ this->mArea.x, this->mArea.y }); + ImGui::SetNextWindowSize({ this->mArea.z, this->mArea.w }); + ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 0, 0 }); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, mRounding * 1.5f); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { mPadding, mPadding }); + + // ImGui::PushID((int) alni(this)); + ImGui::Begin( + mId.c_str(), + 0, + ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground | + ImGuiWindowFlags_NoResize + ); + + if (mMultiline) { + if (ImGui::InputTextMultiline("input", mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w })) { + mValue = mBuff; + nChanged = true; + } + } else { + if (ImGui::InputTextEx("input", mId.c_str(), mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w }, 0)) { + mValue = mBuff; + nChanged = true; + } + } + + ImGui::End(); + ImGui::PopStyleVar(3); +} + +void TextInputWidget::eventUpdateConfiguration(WidgetManager& wm) { + wm.setActiveId("TextInput"); + + mAccentColor = wm.getColor("Accent", "Accent"); + mBaseColor = wm.getColor("Base", "Base"); + mRounding = wm.getNumber("Rounding", "Rounding"); + mHoveredColor = wm.getColor("Hovered", "Accent"); + mPadding = wm.getNumber("Padding", "Padding"); +} diff --git a/.back/WidBack/private/WidgetBase.cpp b/.back/WidBack/private/WidgetBase.cpp new file mode 100644 index 0000000..f838697 --- /dev/null +++ b/.back/WidBack/private/WidgetBase.cpp @@ -0,0 +1,140 @@ +#include "WidgetBase.hpp" + +using namespace tp; + +Widget::Widget() { mArea = { 0, 0, 100, 100 }; } + +Widget::~Widget() = default; + +void Widget::procWrapper(const Events& events, const RectF& parentArea) { + if (!mEnable) return; + + checkVisibility(events, parentArea); + + if (!mVisible) return; + + checkFocus(events); + + checkClicked(events); + + if (mHandlesEvents) { + + for (auto child : mChildWidgets) { + child->procWrapper(events, mVisibleArea); + } + + eventProcess(events); + } +} + +void Widget::drawWrapper(Canvas& canvas) { + if (!mEnable || !mVisible) return; + + eventDraw(canvas); + + // draw child widgets + canvas.pushClamp(this->mArea); + for (auto child = mChildWidgets.lastNode(); child; child = child->prev) { + child->data->drawWrapper(canvas); + } + canvas.popClamp(); + + eventDrawOver(canvas); +} + +void Widget::updateConfigWrapper(WidgetManager& wm) { + wm.setActiveId("Global"); + + eventUpdateConfiguration(wm); + + for (auto child : mChildWidgets) { + child->updateConfigWrapper(wm); + } +} + +void Widget::eventProcess(const Events& events) {} +void Widget::eventDraw(Canvas& canvas) {} +void Widget::eventDrawOver(Canvas& canvas) {} +void Widget::eventUpdateConfiguration(WidgetManager& wm) {} + +void Widget::eventVisible(const Events& events) {} +void Widget::eventNotVisible(const Events& events) {} + +void Widget::eventFocusEnter(const Events& events) {} +void Widget::eventFocusLeave(const Events& events) {} + +void Widget::eventPressed(const Events& events) {} +void Widget::eventReleased(const Events& events) {} + +void Widget::checkVisibility(const Events& events, const RectF& parentArea) { + const bool currentVisibility = parentArea.isOverlap(getArea()); + + parentArea.calcIntersection(mArea, mVisibleArea); + + if (currentVisibility != mVisible) { + if (currentVisibility) eventVisible(events); + else eventNotVisible(events); + } + + mVisible = currentVisibility; + + if (!mVisible) { + mHolding = false; + mPressed = false; + mReleased = false; + } +} + +void Widget::checkFocus(const Events& events) { + const bool currentFocus = mVisibleArea.isInside(events.getPointerPrev()); + + if (currentFocus != mInFocus) { + if (currentFocus) eventFocusEnter(events); + else eventFocusLeave(events); + } + + mInFocus = currentFocus; + + if (!mInFocus) { + mHolding = false; + mPressed = false; + mReleased = false; + } +} + +void Widget::checkClicked(const Events& events) { + mPressed = false; + mReleased = false; + + if (!mInFocus) return; + + if (mHolding) { + if (events.isReleased(InputID::MOUSE1)) { + eventReleased(events); + mReleased = true; + mHolding = false; + } + } else { + if (events.isPressed(InputID::MOUSE1) && mVisibleArea.isInside(events.getPointer())) { + eventPressed(events); + mHolding = true; + mPressed = true; + } + } +} + +void Widget::setEnable(bool enable) { mEnable = enable; } +void Widget::setVisible(bool visible) { mVisible = visible; } +void Widget::setArea(const RectF& area) { mArea = area; } + +const RectF& Widget::getArea() const { return mArea; } +bool Widget::isFocus() const { return mInFocus; } +bool Widget::isPressed() const { return mPressed; } +bool Widget::isReleased() const { return mReleased; } +bool Widget::isHolding() const { return mHolding; } + +void Widget::clearEvents() { + mReleased = false; + mPressed = false; + mHolding = false; +} diff --git a/.back/WidBack/private/WidgetManager.cpp b/.back/WidBack/private/WidgetManager.cpp new file mode 100644 index 0000000..268059c --- /dev/null +++ b/.back/WidBack/private/WidgetManager.cpp @@ -0,0 +1,74 @@ +#include "WidgetManager.hpp" + +using namespace tp; + +WidgetManager::WidgetManager() { initGlobalParameters(); } +WidgetManager::~WidgetManager() { mConfigurations.removeAll(); } + +const RGBA& WidgetManager::getColor(const std::string& parameterId, const RGBA& defaultValue) { + WidgetConfig& config = getWidgetConfig(mActiveId); + Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue)); + return parameter.color; +} + +const RGBA& WidgetManager::getColor(const std::string& parameterId, const char* globalRef) { + WidgetConfig& config = getWidgetConfig(mActiveId); + Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::COL)); + return parameter.color; +} + +halnf WidgetManager::getNumber(const std::string& parameterId, halnf defaultValue) { + WidgetConfig& config = getWidgetConfig(mActiveId); + Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue)); + return parameter.value; +} + +halnf WidgetManager::getNumber(const std::string& parameterId, const char* globalRef) { + WidgetConfig& config = getWidgetConfig(mActiveId); + Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::VAL)); + return parameter.value; +} + +void WidgetManager::setActiveId(const std::string& id) { mActiveId = id; } + +WidgetConfig& WidgetManager::getWidgetConfig(const std::string& id) { + auto idx = mConfigurations.presents(id); + if (idx) return mConfigurations.getSlotVal(idx); + mConfigurations.put(id, {}); + return mConfigurations.get(id); +} + +WidgetManager::Parameter& WidgetManager::getParameter(WidgetConfig& config, const std::string& id, const Parameter& defaultValue) { + auto idx = config.mParameters.presents(id); + + if (!idx) { + config.mParameters.put(id, defaultValue); + } + + Parameter& parameter = config.mParameters.get(id); + + if (parameter.globalReference) { + return mGlobalConfig.mParameters.get(parameter.globalId); + } else { + return parameter; + } +} + +void WidgetManager::initGlobalParameters() { + auto& params = mGlobalConfig.mParameters; + + params.put("FontSize", Parameter(15.f)); + + params.put("FontSizeDim", Parameter(12.f)); + params.put("Rounding", Parameter(5.f)); + params.put("Padding", Parameter(5.f)); + params.put("HandleSize", Parameter(5.f)); + + params.put("Background", Parameter(RGBA{ 0.03f, 0.03f, 0.03f, 1.f })); + params.put("Base", Parameter(RGBA{ 0.07f, 0.07f, 0.07f, 1.f })); + params.put("Accent", Parameter(RGBA{ 0.13f, 0.13f, 0.13f, 1.f })); + params.put("Interaction", Parameter(RGBA{ 0.33f, 0.33f, 0.3f, 1.f })); + params.put("Action", Parameter(RGBA{ 0.44f, 0.44f, 0.4f, 1.f })); + params.put("Front", Parameter(RGBA{ 1.f, 1.f, 1.f, 1.f })); + params.put("FrontDim", Parameter(RGBA{ 0.7f, 0.7f, 0.7f, 1.f })); +} diff --git a/.back/WidBack/private/WorkspaceWidget.cpp b/.back/WidBack/private/WorkspaceWidget.cpp new file mode 100644 index 0000000..0e5ac2a --- /dev/null +++ b/.back/WidBack/private/WorkspaceWidget.cpp @@ -0,0 +1,73 @@ +#include "WorkspaceWidget.hpp" + +using namespace tp; + +WorkspaceWidget::WorkspaceWidget() { + this->mChildWidgets.pushBack(&mFloatingLayer); + this->mChildWidgets.pushBack(&mDockSpace); +} + +void WorkspaceWidget::eventProcess(const Events& events) { + mDockSpace.setArea(this->mArea); + mFloatingLayer.setArea(this->mArea); + + mDockSpace.mPreview = false; + mDockSpace.mHandlesEvents = !mFloatingLayer.handlesEvent(); + + for (auto floatingChild : mFloatingLayer.mChildWidgets) { + auto widget = dynamic_cast(floatingChild.data()); + if (!widget) continue; + + if (widget->mDropped) { + auto side = mDockSpace.getPreviewSide(); + if (side != DockWidget::NONE) { + mFloatingLayer.mChildWidgets.removeNode(mFloatingLayer.mChildWidgets.find(widget)); + widget->setCollapsed(false); + widget->stopFloating(); + mDockSpace.addSideWidget(widget, side); + } + } + + if (widget->isFloating()) { + mDockSpace.mHandlesEvents = true; + mDockSpace.mPreview = true; + } + } + + for (auto& dockedChild : mDockSpace.mSideWidgets) { + auto widget = dynamic_cast(dockedChild.widget); + if (!widget) continue; + + if (widget->isFloating()) { + mDockSpace.removeSideWidget(dockedChild.side); + mFloatingLayer.mChildWidgets.pushBack(widget); + widget->mArea.pos = events.getPointer() - 20; + widget->mArea.size = mDefaultFloatSize; + + widget->mResizable = true; + // widget->mBorders = true; + } + } + + // toggle hide state + if (events.isDown(InputID::LEFT_ALT)) { + if (events.isPressed(InputID::N1)) { + mDockSpace.toggleHiddenState(DockWidget::LEFT); + } else if (events.isPressed(InputID::N2)) { + mDockSpace.toggleHiddenState(DockWidget::TOP); + } else if (events.isPressed(InputID::N3)) { + mDockSpace.toggleHiddenState(DockWidget::RIGHT); + } else if (events.isPressed(InputID::N4)) { + mDockSpace.toggleHiddenState(DockWidget::BOTTOM); + } + } + + for (auto& dockedChild : mDockSpace.mSideWidgets) { + auto widget = dynamic_cast(dockedChild.widget); + if (!widget) continue; + + widget->setCollapsed(false); + widget->mResizable = false; + // widget->mBorders = false; + } +} \ No newline at end of file diff --git a/Widgets/public/Animations.hpp b/.back/WidBack/public/Animations.hpp similarity index 100% rename from Widgets/public/Animations.hpp rename to .back/WidBack/public/Animations.hpp diff --git a/.back/WidBack/public/ButtonWidget.hpp b/.back/WidBack/public/ButtonWidget.hpp new file mode 100644 index 0000000..160e880 --- /dev/null +++ b/.back/WidBack/public/ButtonWidget.hpp @@ -0,0 +1,35 @@ +#pragma once + +#include "LabelWidget.hpp" + +#include + +namespace tp { + + class ButtonWidget : public Widget { + public: + // enum State { NONE, ANTICIPATION, ACTIVATED, CONFIRMED }; + + public: + ButtonWidget(); + ButtonWidget(const std::string& label, const tp::RectF& aArea); + bool isFired(); + void eventProcess(const Events&) override; + void eventDraw(Canvas& canvas) override; + void setLabel(const std::string& string); + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + public: + LabelWidget mLabel; + // State mStat = NONE; + + RGBA pressedColor; + RGBA hoveredColor; + RGBA accentColor; + halnf rounding = 0; + + std::function mCallback = [](){}; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/CollapsableMenu.hpp b/.back/WidBack/public/CollapsableMenu.hpp new file mode 100644 index 0000000..4c31490 --- /dev/null +++ b/.back/WidBack/public/CollapsableMenu.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include "ScrollableWidget.hpp" +#include "ButtonWidget.hpp" + +namespace tp { + + class CollapsableMenu : public Widget { + public: + CollapsableMenu(); + void eventProcess(const Events&) override; + void eventDraw(Canvas& canvas) override; + + public: + void addWidgetToMenu(Widget* widget); + void setLabel(const std::string& string); + + void toggleCollapsed(); + void setCollapsed(bool collapsed); + [[nodiscard]] bool getCollapsed() const; + void updateGeometry(); + + private: + RectF getHeaderRect(); + RectF getBodyRect(); + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + protected: + ScrollableWindow mBody; + LabelWidget mHeader; + + RGBA mMenuColor; + RGBA mBorderColor; + + halnf headerHeight = 30; + halnf rounding = 0; + halnf mBorderSize = 0; + halnf mPadding = 0; + + halnf mPrevHeight = 200; + + bool mCollapsed = true; + bool mLocked = false; + bool mAdjustHeight = true; + + public: + bool mBorders = true; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/FloatingLayoutWidget.hpp b/.back/WidBack/public/FloatingLayoutWidget.hpp new file mode 100644 index 0000000..b8c7267 --- /dev/null +++ b/.back/WidBack/public/FloatingLayoutWidget.hpp @@ -0,0 +1,18 @@ +#include "FloatingWidget.hpp" + +namespace tp { + class FloatingLayoutWidget : public Widget { + public: + FloatingLayoutWidget(); + + void eventProcess(const Events& events) override; + + [[nodiscard]] bool handlesEvent() const; + + private: + void updateActiveWindow(const tp::Events& events); + + private: + bool mIsPassThrough = false; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/FloatingWidget.hpp b/.back/WidBack/public/FloatingWidget.hpp new file mode 100644 index 0000000..29657d8 --- /dev/null +++ b/.back/WidBack/public/FloatingWidget.hpp @@ -0,0 +1,38 @@ +#pragma once + +#include "CollapsableMenu.hpp" + +namespace tp { + class FloatingWidget : public CollapsableMenu { + public: + FloatingWidget(); + + void eventProcess(const Events& events) override; + void eventDraw(Canvas& canvas) override; + void eventUpdateConfiguration(WidgetManager& wm) override; + + [[nodiscard]] bool isFloating() const; + void stopFloating(); + + private: + void checkFloating(const Events& events); + void checkResizing(const Events& events); + RectF getResizeHandle(); + + private: + Vec2F mMinSize = { 70, 70 }; + + halnf mResizeHandleSize = 10; + RGBA mResizeHandleColor = {}; + + bool mFloating = false; + bool mResizing = false; + + Vec2F mActionStartRelativePos = {}; + + public: + bool mResizable = true; + + bool mDropped = false; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/GridLayoutWidget.hpp b/.back/WidBack/public/GridLayoutWidget.hpp new file mode 100644 index 0000000..7b4a058 --- /dev/null +++ b/.back/WidBack/public/GridLayoutWidget.hpp @@ -0,0 +1,88 @@ +#include "WidgetBase.hpp" + +namespace tp { + class DockWidget : public Widget { + public: + enum Side { LEFT, TOP, RIGHT, BOTTOM, NONE }; + + private: + struct ResizeHandle { + RectF area{ 0, 0, 0, 0 }; + halnf start{ 0 }; + halnf end{ 0 }; + bool active = false; + bool hover = false; + }; + + struct SideWidgetData { + Widget* widget = nullptr; + bool hidden = false; + halnf absoluteSize = 200; + alni order = -1; + + Side side = { TOP }; + + RectF area = {}; + RectF headerArea = {}; + RectF previewHandleArea = {}; + + ResizeHandle resizeHandle; + }; + + public: + DockWidget(); + + void eventProcess(const Events& events) override; + void eventDraw(Canvas& canvas) override; + void eventDrawOver(Canvas& canvas) override; + + void addSideWidget(Widget* widget, Side side); + void removeSideWidget(Side side); + + void toggleHiddenState(Side side); + + void setCenterWidget(Widget* widget); + + Side getPreviewSide(); + + private: + void calculateSideAreas(); + void calculateResizeHandles(); + void handleResizeEvents(const Events& events); + void updateChildSideWidgets(); + + void calculateHeaderAreas(); + + bool isSideVisible(Side side); + bool sideExists(DockWidget::Side side); + ualni getVisibleSidesSize(); + void handlePreview(const Events& events); + + private: + RectF mPreviewArea = {}; + Side mPreviewSide = NONE; + int resizeType[2] = { 0, 0 }; + + public: + SideWidgetData mSideWidgets[4]; + + private: + Widget* mCenterWidget = nullptr; + RectF mCenterArea {}; + + // Parameters + halnf mSideSizePadding = 150.f; + halnf mPadding = 4; + halnf mHeaderSize = 27; + halnf mRounding = 10; + Vec2F mPreviewHandleSize = { 50, 50 }; + + RGBA mResizeHandleColorHovered = RGBA(0.3, 0.3, 0.3, 1); + RGBA mResizeHandleColorActive = RGBA(0.6, 0.6, 0.6, 1); + RGBA mBackgroundColor = RGBA(0, 0, 0, 1); + RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 1); + + public: + bool mPreview = false; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/LabelWidget.hpp b/.back/WidBack/public/LabelWidget.hpp new file mode 100644 index 0000000..02ad90a --- /dev/null +++ b/.back/WidBack/public/LabelWidget.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include "WidgetBase.hpp" + +namespace tp { + + class LabelWidget : public Widget { + public: + LabelWidget(); + + void eventDraw(Canvas& canvas) override; + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + public: + std::string mLabel = "Label"; + + halnf fontSize = 10; + halnf padding = 0; + RGBA fontColor = { 1, 1, 1, 1 }; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/ScrollableWidget.hpp b/.back/WidBack/public/ScrollableWidget.hpp new file mode 100644 index 0000000..71ed13f --- /dev/null +++ b/.back/WidBack/public/ScrollableWidget.hpp @@ -0,0 +1,71 @@ +#pragma once + +#include "WidgetBase.hpp" +#include "Buffer.hpp" + +namespace tp { + + class ScrollBarWidget : public Widget { + public: + ScrollBarWidget(); + + // takes whole area + void eventProcess(const Events& events) override; + void eventDraw(Canvas& canvas) override; + + RectF getHandleHandle() const; + RectF getViewport() const; + RectF getHandle() const; + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + public: + bool mIsScrolling = false; + halnf mSizeFraction = 1.f; + halnf mPositionFraction = 0.f; + bool mHovered = false; + + RGBA mDefaultColor; + RGBA mHandleColor; + RGBA mHoveredColor; + RGBA mScrollingColor; + halnf mPadding = 0; + halnf mHandleSize = 10; + halnf mMinSize = 10; + halnf mRounding = 10; + }; + + class ScrollableWindow : public Widget { + public: + ScrollableWindow(); + + virtual ~ScrollableWindow(); + + // takes whole area + void eventProcess(const Events& events) override; + + void addWidget(Widget* widget); + void clearContent(); + List& getContent(); + + void eventUpdateConfiguration(WidgetManager& wm) override; + + [[nodiscard]] halnf getContentSize() const; + + private: + void updateContents(List& contentWidgets); + + // ready content size + void updateContentSize(List& contentWidgets); + void setOffset(List& contentWidgets, const halnf offset); + + private: + Widget mContentWidget; + ScrollBarWidget mScroller; + + halnf mContentSize = 0; + + halnf mPadding = 0; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/SliderWidget.hpp b/.back/WidBack/public/SliderWidget.hpp new file mode 100644 index 0000000..1a33970 --- /dev/null +++ b/.back/WidBack/public/SliderWidget.hpp @@ -0,0 +1,41 @@ +#pragma once + +#include "LabelWidget.hpp" + +namespace tp { + + class SliderWidget : public Widget { + public: + SliderWidget(); + + void eventProcess(const Events& events) override; + void eventDraw(Canvas& canvas) override; + + RectF getHandle() const; + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + public: + halnf mFactor = 0.f; + bool mIsSliding = false; + + RGBA defaultColor; + RGBA handleColor; + halnf handleSize = 0; + halnf rounding = 0; + halnf borderSize = 2; + }; + + class NamedSliderWidget : public Widget { + public: + explicit NamedSliderWidget(const char* name = "Value"); + void eventProcess(const Events& events) override; + + public: + SliderWidget mSlider; + LabelWidget mLabel; + + halnf mFactor = 0.5f; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/TextInputWidget.hpp b/.back/WidBack/public/TextInputWidget.hpp new file mode 100644 index 0000000..7b25fdc --- /dev/null +++ b/.back/WidBack/public/TextInputWidget.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include "WidgetBase.hpp" + +namespace tp { + class TextInputWidget : public Widget { + public: + TextInputWidget(); + + void eventDraw(Canvas&) override; + + public: + void eventUpdateConfiguration(WidgetManager& wm) override; + + public: + enum { mMaxBufferSize = 512 }; + char mBuff[mMaxBufferSize] = ""; + bool nChanged = false; + std::string mValue; + std::string mId = "id"; + bool mMultiline = false; + + RGBA mAccentColor; + RGBA mHoveredColor; + RGBA mBaseColor; + halnf mRounding = 0; + halnf mPadding = 0; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/WidgetBase.hpp b/.back/WidBack/public/WidgetBase.hpp new file mode 100644 index 0000000..44b3d20 --- /dev/null +++ b/.back/WidBack/public/WidgetBase.hpp @@ -0,0 +1,78 @@ +#pragma once + +#include "Graphics.hpp" + +#include "EventHandler.hpp" +#include "WidgetManager.hpp" +#include "List.hpp" + +namespace tp { + + using Events = EventHandler; + + class Widget { + public: + Widget(); + virtual ~Widget(); + + void procWrapper(const Events& events, const RectF& parentArea); + void drawWrapper(Canvas& canvas); + void updateConfigWrapper(WidgetManager& wm); + + virtual void eventProcess(const Events& events); + + // draws before child widgets + virtual void eventDraw(Canvas& canvas); + + // draws overlay after child widgets + virtual void eventDrawOver(Canvas& canvas); + + virtual void eventUpdateConfiguration(WidgetManager& wm); + + virtual void eventVisible(const Events& events); + virtual void eventNotVisible(const Events& events); + + virtual void eventFocusEnter(const Events& events); + virtual void eventFocusLeave(const Events& events); + + virtual void eventPressed(const Events& events); + virtual void eventReleased(const Events& events); + + public: + void setEnable(bool enable); + void setVisible(bool visible); + void setArea(const RectF& area); + + [[nodiscard]] const RectF& getArea() const; + [[nodiscard]] bool isFocus() const; + [[nodiscard]] bool isPressed() const; + [[nodiscard]] bool isReleased() const; + [[nodiscard]] bool isHolding() const; + + void clearEvents(); + + private: + void checkVisibility(const Events& events, const RectF& parentArea); + void checkFocus(const Events& events); + void checkClicked(const Events& events); + + public: + RectF mArea; + RectF mVisibleArea; + + List mChildWidgets; + + bool mVisible = false; + bool mEnable = true; + bool mHandlesEvents = true; + bool mInFocus = false; + + bool mHolding = false; + bool mPressed = false; + bool mReleased = false; + + + // docking + bool mIsDocked = false; + }; +} \ No newline at end of file diff --git a/.back/WidBack/public/WidgetManager.hpp b/.back/WidBack/public/WidgetManager.hpp new file mode 100644 index 0000000..fc1932e --- /dev/null +++ b/.back/WidBack/public/WidgetManager.hpp @@ -0,0 +1,89 @@ +#pragma once + +#include "Animations.hpp" +#include "Map.hpp" +#include "Rect.hpp" + +#include "InputCodes.hpp" +#include "Buffer.hpp" + +namespace tp { + + struct WidgetConfig { + + struct Shortcut { + struct Condition { + std::string name; + std::string state; + }; + + std::string callbackName; + + Shortcut() = default; + Shortcut(const InitialierList&) {} + }; + + struct Parameter { + enum Type { NONE, VAL, COL }; + + halnf value = 0.f; + RGBA color = {}; + Type type = NONE; + bool globalReference = false; + std::string globalId; + + Parameter() = default; + + explicit Parameter(halnf val) { + type = VAL; + value = val; + } + + explicit Parameter(const RGBA& val) { + type = COL; + color = val; + } + + explicit Parameter(const std::string& id, const Type& referenceType) { + type = referenceType; + globalId = id; + globalReference = true; + } + }; + + Map mParameters; + Buffer mShortcuts; + }; + + class WidgetManager { + public: + using Parameter = WidgetConfig::Parameter; + + public: + WidgetManager(); + ~WidgetManager(); + + const RGBA& getColor(const std::string& parameterId, const RGBA& defaultValue); + const RGBA& getColor(const std::string& parameterId, const char* globalRef); + + halnf getNumber(const std::string& parameterId, halnf defaultValue); + halnf getNumber(const std::string& parameterId, const char* globalRef); + + void setActiveId(const std::string& id); + + private: + WidgetConfig& getWidgetConfig(const std::string& id); + Parameter& getParameter(WidgetConfig& config, const std::string& id, const Parameter& defaultValue); + + void initGlobalParameters(); + + private: + Map mConfigurations; + WidgetConfig mGlobalConfig; + + RGBA mErrorColor = { 0, 0, 0, 1 }; + halnf mErrorNumber = 0; + + std::string mActiveId; + }; +} \ No newline at end of file diff --git a/Widgets/public/Widgets.hpp b/.back/WidBack/public/Widgets.hpp similarity index 63% rename from Widgets/public/Widgets.hpp rename to .back/WidBack/public/Widgets.hpp index 7fa4b09..3cd7d13 100644 --- a/Widgets/public/Widgets.hpp +++ b/.back/WidBack/public/Widgets.hpp @@ -1,11 +1,13 @@ #pragma once +#include "Animations.hpp" #include "ButtonWidget.hpp" #include "LabelWidget.hpp" #include "ScrollableWidget.hpp" -#include "SplitViewWidget.hpp" #include "TextInputWidget.hpp" #include "SliderWidget.hpp" #include "CollapsableMenu.hpp" #include "FloatingWidget.hpp" -#include "Animations.hpp" \ No newline at end of file +#include "FloatingLayoutWidget.hpp" +#include "GridLayoutWidget.hpp" +#include "WorkspaceWidget.hpp" diff --git a/.back/WidBack/public/WorkspaceWidget.hpp b/.back/WidBack/public/WorkspaceWidget.hpp new file mode 100644 index 0000000..617a0e4 --- /dev/null +++ b/.back/WidBack/public/WorkspaceWidget.hpp @@ -0,0 +1,19 @@ +#pragma once + +#include "Widgets.hpp" + +namespace tp { + class WorkspaceWidget : public Widget { + public: + WorkspaceWidget(); + + void eventProcess(const Events& events) override; + + protected: + DockWidget mDockSpace; + FloatingLayoutWidget mFloatingLayer; + + // Parameters + Vec2F mDefaultFloatSize = { 200, 200 }; + }; +} diff --git a/.gitmodules b/.gitmodules index 9d1d1de..4d67868 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,12 @@ [submodule "Externals/asio"] path = Externals/asio url = https://github.com/elushaX/asio.git +[submodule "Externals/implot"] + path = Externals/implot + url = https://github.com/epezent/implot.git +[submodule "Externals/googletest"] + path = Externals/googletest + url = https://github.com/google/googletest.git +[submodule "Externals/benchmark"] + path = Externals/benchmark + url = https://github.com/google/benchmark.git diff --git a/3DEditor/CMakeLists.txt b/3DEditor/CMakeLists.txt index 356210b..1a410b4 100644 --- a/3DEditor/CMakeLists.txt +++ b/3DEditor/CMakeLists.txt @@ -2,7 +2,7 @@ project(3DEditor) ### ---------------------- Externals --------------------- ### set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals) -set(BINDINGS_LIBS glfw Imgui) +set(BINDINGS_LIBS glfw Imgui OpenImageDenoise) ### ---------------------- Static Library --------------------- ### file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") @@ -13,12 +13,12 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/) target_link_libraries(${PROJECT_NAME} PUBLIC Widgets RasterRender RayTracer) target_link_libraries(${PROJECT_NAME} PRIVATE ${BINDINGS_LIBS}) -target_link_libraries(${PROJECT_NAME} PRIVATE OpenImageDenoise) ### -------------------------- Applications -------------------------- ### file(GLOB APP_SOURCES "./applications/*.cpp") add_executable(3DEditorApp ${APP_SOURCES}) target_link_libraries(3DEditorApp ${PROJECT_NAME}) -file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") -file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "../RasterRender/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "../3DScene/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") diff --git a/3DEditor/applications/Entry.cpp b/3DEditor/applications/Entry.cpp index a7dfd9d..004bae3 100644 --- a/3DEditor/applications/Entry.cpp +++ b/3DEditor/applications/Entry.cpp @@ -1,39 +1,28 @@ #include "EditorWidget.hpp" -#include "GraphicApplication.hpp" +#include "WidgetApplication.hpp" +#include "RootWidget.hpp" using namespace tp; - -class EditorGUI : public Application { +class EditorGUI : public WidgetApplication { public: EditorGUI() { auto canvas = this->mGraphics->getCanvas(); - mGui = new EditorWidget(canvas, &mEditor); + mGui = new EditorWidget(canvas, &mEditor); mEditor.loadDefaults(); + setRoot(mGui); // mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 }); } ~EditorGUI() override { delete mGui; } - void processFrame(EventHandler* eventHandler) override { - auto rec = RectF({ 0, 0 }, mWindow->getSize()); - - mGui->setArea(rec); - mGui->setVisible(true); - mGui->updateConfigWrapper(mWidgetManager); - mGui->procWrapper(*eventHandler, rec); - } - - void drawFrame(Canvas* canvas) override { mGui->drawWrapper(*canvas); } - private: Editor mEditor; - WidgetManager mWidgetManager; - EditorWidget* mGui; + EditorWidget* mGui; }; int main() { diff --git a/3DEditor/private/Denoise.cpp b/3DEditor/private/Denoise.cpp index 7c4955a..a20672a 100644 --- a/3DEditor/private/Denoise.cpp +++ b/3DEditor/private/Denoise.cpp @@ -37,4 +37,4 @@ void Editor::denoise() { if (device.getError(errorMessage) != oidn::Error::None) { std::cerr << "Error: " << errorMessage << std::endl; } -} \ No newline at end of file +} diff --git a/3DEditor/private/Editor.cpp b/3DEditor/private/Editor.cpp index e8838cf..9641bf8 100644 --- a/3DEditor/private/Editor.cpp +++ b/3DEditor/private/Editor.cpp @@ -24,7 +24,10 @@ Editor::Editor() { void Editor::renderViewport() { switch (mRenderType) { case RenderType::RASTER: - mRasterRenderer.render(mScene, mScene.mRenderSettings.size); + mRasterRenderer.beginRender(mScene, mScene.mRenderSettings.size); + mRasterRenderer.renderDefault(mScene); + if (mActive) mRasterRenderer.renderOutline(mScene.mCamera, *mActive); + mRasterRenderer.endRender(); break; case RenderType::PATH_TRACER: @@ -54,9 +57,12 @@ uint4 Editor::getViewportTexID() { void Editor::loadDefaults() { mScene.load("rsc/scene/script.lua"); + mResetCamera = mScene.mCamera; } void Editor::setViewportSize(const Vec2F& size) { + if (size.x <= 0 || size.y <= 0) return; + // TODO remove // mScene.mCamera.rotate(0.01f, 0.0); @@ -71,6 +77,7 @@ Editor::~Editor() { } void Editor::renderPathFrame() { + mScene.updateCache(); mPathRenderer.render(mScene, mPathTracerBuffers, mScene.mRenderSettings); sendBuffersToGPU(); } @@ -114,5 +121,20 @@ void Editor::navigationZoom(halnf factor) { } void Editor::navigationReset() { - mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 }); -} \ No newline at end of file + mScene.mCamera = mResetCamera; + // mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 }); +} + +void Editor::selectObject(const Vec2F& screenPos) { + mScene.updateCache(); + + auto dir = (mScene.mCamera.project(screenPos) - mScene.mCamera.getPos()).normalize(); + Ray ray = Ray( dir, mScene.mCamera.getPos() ); + + auto rayCastData = mScene.castRay(ray, 1000); + mActive = rayCastData.obj; +} + +Object* Editor::getActiveObject() { return mActive; } + +Scene* Editor::getScene() { return &mScene; } \ No newline at end of file diff --git a/3DEditor/public/Editor.hpp b/3DEditor/public/Editor.hpp index ee16122..a4c3b0f 100644 --- a/3DEditor/public/Editor.hpp +++ b/3DEditor/public/Editor.hpp @@ -28,6 +28,10 @@ namespace tp { void navigationZoom(halnf factor); void navigationReset(); + void selectObject(const Vec2F& screenPos); + Object* getActiveObject(); + + Scene* getScene(); private: void sendBuffersToGPU(); @@ -36,6 +40,8 @@ namespace tp { private: Scene mScene; + Camera mResetCamera; + RenderType mRenderType = RenderType::RASTER; RasterRender mRasterRenderer; @@ -43,5 +49,7 @@ namespace tp { RayTracer::OutputBuffers mPathTracerBuffers; uint4 mPathRenderTexture = 0; + + Object* mActive = nullptr; }; } \ No newline at end of file diff --git a/3DEditor/public/EditorWidget.hpp b/3DEditor/public/EditorWidget.hpp index 36b32bb..7b4e748 100644 --- a/3DEditor/public/EditorWidget.hpp +++ b/3DEditor/public/EditorWidget.hpp @@ -1,11 +1,12 @@ -#include "Widgets.hpp" +#include "Widget.hpp" +#include "DockWidget.hpp" #include "Editor.hpp" +#include "FloatingWidget.hpp" namespace tp { - template - class ViewportWidget : public Widget { + class ViewportWidget : public Widget { public: explicit ViewportWidget(Canvas* canvas, Editor* editor) { mEditor = editor; @@ -13,17 +14,17 @@ namespace tp { mCanvas = canvas; } - ~ViewportWidget() { mCanvas->deleteImageHandle(mImage); } + ~ViewportWidget() override { mCanvas->deleteImageHandle(mImage); } - void eventProcess(const Events& events) override { - mEditor->setViewportSize(this->mArea.size); + void process(const EventHandler& events) override { + mEditor->setViewportSize(getAreaT().size); } - void eventDraw(Canvas& canvas) override { + void draw(Canvas& canvas) override { mEditor->renderViewport(); canvas.updateTextureID(mImage, mEditor->getViewportTexID()); - canvas.drawImage(this->mArea, &mImage, PI); + canvas.drawImage(getArea().relative(), &mImage, PI); } public: @@ -33,147 +34,120 @@ namespace tp { Canvas::ImageHandle mImage; }; - template - class EditorWidget : public Widget { + class EditorWidget : public DockWidget { public: EditorWidget(Canvas* canvas, Editor* editor) : - mViewport(canvas, editor) - { + mViewport(canvas, editor) { mEditor = editor; - this->mChildWidgets.pushBack(&mViewport); - this->mChildWidgets.pushBack(&mSplitView); - this->mChildWidgets.pushBack(&mSettingsWidget); + mPanel.setText("Controls"); + mPanel.addToMenu(&mNavigationMenu); + mPanel.addToMenu(&mRenderMenu); + + dockWidget(&mPanel, DockLayout::RIGHT); + setCenterWidget(&mViewport); // Render { - mRenderPathTracer.setLabel("Render with Path Tracer"); - mRenderRaster.setLabel("Render with Raster"); - mRenderDeNoise.setLabel("Denoise (IntelOpenImage)"); + mRenderPathTracer.setText("Render with Path Tracer"); + mRenderRaster.setText("Render with Raster"); + mRenderDeNoise.setText("Denoise (IntelOpenImage)"); - mRenderMenu.addWidgetToMenu(&mRenderPathTracer); - mRenderMenu.addWidgetToMenu(&mRenderRaster); - mRenderMenu.addWidgetToMenu(&mRenderDeNoise); + mRenderMenu.addToMenu(&mRenderPathTracer); + mRenderMenu.addToMenu(&mRenderRaster); + mRenderMenu.addToMenu(&mRenderDeNoise); - mRenderMenu.setLabel("Render"); + mRenderMenu.setText("Render"); } // Navigation { - mNavigationPan.setLabel("Pan"); - mNavigationOrbit.setLabel("Orbit"); - mNavigationZoom.setLabel("Zoom"); - mNavigationReset.setLabel("Reset"); + mNavigationPan.setText("Pan"); + mNavigationOrbit.setText("Orbit"); + mNavigationZoom.setText("Zoom"); + mNavigationReset.setText("Reset"); + mNavigationSelect.setText("Select"); - mNavigationMenu.addWidgetToMenu(&mNavigationPan); - mNavigationMenu.addWidgetToMenu(&mNavigationOrbit); - mNavigationMenu.addWidgetToMenu(&mNavigationZoom); - mNavigationMenu.addWidgetToMenu(&mNavigationReset); + mNavigationMenu.addToMenu(&mNavigationPan); + mNavigationMenu.addToMenu(&mNavigationOrbit); + mNavigationMenu.addToMenu(&mNavigationZoom); + mNavigationMenu.addToMenu(&mNavigationReset); + mNavigationMenu.addToMenu(&mNavigationSelect); - mNavigationMenu.setLabel("Navigation"); + mNavigationMenu.setText("Navigation"); } - mSettingsWidget.addWidget(&mRenderMenu); - mSettingsWidget.addWidget(&mNavigationMenu); + mRenderPathTracer.setAction([this]() { + mEditor->renderPathFrame(); + mEditor->setRenderType(Editor::RenderType::PATH_TRACER); + }); + + mRenderRaster.setAction( [this]() { mEditor->setRenderType(Editor::RenderType::RASTER); }); + mRenderDeNoise.setAction( [this]() { mEditor->denoisePathRenderBuffers(); }); + mNavigationOrbit.setAction( [this]() { mNavigationType = ORBIT; }); + mNavigationPan.setAction( [this]() { mNavigationType = PAN; }); + mNavigationZoom.setAction( [this](){ mNavigationType = ZOOM; }); + mNavigationSelect.setAction( [this](){ mNavigationType = SELECT; }); + mNavigationReset.setAction( [this]() { mEditor->navigationReset(); }); } - void eventProcess(const Events& events) override { - mSplitView.setArea(this->mArea); + void process(const EventHandler& events) override { + DockWidget::process(events); - mViewport.setArea(mSplitView.getFirst()); - mViewport.mEnable = mSplitView.getFirstEnabled(); - - mSettingsWidget.setArea(mSplitView.getSecond()); - mSettingsWidget.mEnable = mSplitView.getSecondEnabled(); - - // render settings - { - if (mRenderPathTracer.isFired()) { - mEditor->renderPathFrame(); - mEditor->setRenderType(Editor::RenderType::PATH_TRACER); - } - - if (mRenderRaster.isFired()) { - mEditor->setRenderType(Editor::RenderType::RASTER); - } - - if (mRenderDeNoise.isFired()) { - mEditor->denoisePathRenderBuffers(); - } + if (auto obj = mEditor->getActiveObject()) { // dummy rotate active object + auto rotator = obj->mTopology.Basis.rotatorDir({1, 1, 1}, 0.1); + obj->mTopology.Basis = rotator * obj->mTopology.Basis; } - // navigation - { - if (mNavigationOrbit.isFired()) { - mNavigationType = ORBIT; - } + mEditor->getScene()->updateCache(); - if (mNavigationPan.isFired()) { - mNavigationType = PAN; - } + const auto& activeArea = mViewport.getArea(); - if (mNavigationZoom.isFired()) { - mNavigationType = ZOOM; - } + auto pointer = events.getPointer(); + auto pointerPrev = events.getPointerPrev(); + auto pointerRelative = (((pointer - activeArea.pos) / activeArea.size) - 0.5f) * 2; - if (mNavigationReset.isFired()) { - mEditor->navigationReset(); - } + if (activeArea.isInside(pointer) && events.isDown(InputID::MOUSE1)) { + switch (mNavigationType) { + case ORBIT: mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3); break; - const auto& activeArea = mViewport.mArea; - if (this->isHolding() && activeArea.isInside(events.getPointer())) { - switch (mNavigationType) { - case ORBIT: - mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3); - break; + case PAN: + { + auto prevPointerRelative = (((pointerPrev - activeArea.pos) / activeArea.size) - 0.5f) * 2; + mEditor->navigationPan(prevPointerRelative, pointerRelative); + } + break; - case PAN: - { - auto pointer = (((events.getPointer() - activeArea.pos) / activeArea.size) - 0.5f) * 2; - auto prevPointer = (((events.getPointerPrev() - activeArea.pos) / activeArea.size) - 0.5f) * 2; - mEditor->navigationPan(prevPointer, pointer); - } - break; - - case ZOOM: - mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); - break; - } + case ZOOM: mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); break; + case SELECT: mEditor->selectObject(pointerRelative * -1); break; } } } - void eventDraw(Canvas& canvas) override { - canvas.rect(this->mArea, mBaseColor); - } - - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("3DEditor"); - mBaseColor = wm.getColor("Base", "Base"); - } + void draw(Canvas& canvas) override { canvas.rect(getArea().relative(), mBaseColor); } public: Editor* mEditor = nullptr; - SplitView mSplitView; + ViewportWidget mViewport; - ViewportWidget mViewport; - ScrollableWindow mSettingsWidget; + FloatingMenu mPanel; // Controls - CollapsableMenu mRenderMenu; - ButtonWidget mRenderPathTracer; - ButtonWidget mRenderRaster; - ButtonWidget mRenderDeNoise; + FloatingMenu mRenderMenu; + ButtonWidget mRenderPathTracer; + ButtonWidget mRenderRaster; + ButtonWidget mRenderDeNoise; // Navigation - enum NavigationType { ORBIT, PAN, ZOOM } mNavigationType = ORBIT; + enum NavigationType { SELECT, ORBIT, PAN, ZOOM } mNavigationType = ORBIT; - CollapsableMenu mNavigationMenu; - ButtonWidget mNavigationPan; - ButtonWidget mNavigationOrbit; - ButtonWidget mNavigationZoom; - ButtonWidget mNavigationReset; + FloatingMenu mNavigationMenu; + ButtonWidget mNavigationPan; + ButtonWidget mNavigationOrbit; + ButtonWidget mNavigationZoom; + ButtonWidget mNavigationReset; + ButtonWidget mNavigationSelect; RGBA mBaseColor; }; diff --git a/3DEditor/rsc/shaders/default.frag b/3DEditor/rsc/shaders/default.frag deleted file mode 100644 index 2a1ba46..0000000 --- a/3DEditor/rsc/shaders/default.frag +++ /dev/null @@ -1,39 +0,0 @@ -#version 330 core - -in vec2 FragPos; -in vec2 screenSize; - -out vec4 FragColor; - -void drawDepth() { - FragColor = vec4(gl_FragCoord.z, gl_FragCoord.z, gl_FragCoord.z, 1.f); -} - -void drawPoints() -{ - // Define the point size - float pointSize = 15.0; - - // Get the current fragment position in screen coordinates - vec2 fragCoord = gl_FragCoord.xy; - - // Calculate the distance from the fragment to the vertex position - float dist = length(fragCoord - FragPos); - - // If the distance is within the point size, draw the point - if (true || dist < pointSize) - { - FragColor = vec4(1.0, 0.0, 0.0, 1.0); // Red color for the point - } - else - { - FragColor = vec4(1.0, 1.0, 1.0, 1.0); - } - - FragColor = vec4(FragPos.x, FragPos.y, 0, 1); -} - -void main() { - drawPoints(); - // drawDepth(); -} \ No newline at end of file diff --git a/3DEditor/rsc/shaders/default.vert b/3DEditor/rsc/shaders/default.vert deleted file mode 100644 index 7a4c14b..0000000 --- a/3DEditor/rsc/shaders/default.vert +++ /dev/null @@ -1,17 +0,0 @@ -#version 330 core - -layout(location = 0) in vec3 Point; - -uniform vec2 ScreenSize; -uniform vec4 Origin; -uniform mat4 Basis; -uniform mat4 Camera; - -out vec2 FragPos; -out vec2 screenSize; - -void main() { - gl_Position = Camera * vec4(Point.xyz, 1.0); - FragPos = gl_Position.xy; - screenSize = ScreenSize; -} \ No newline at end of file diff --git a/3DScene/private/LuaFormat.cpp b/3DScene/private/LuaFormat.cpp index 3d61aad..acf4c9a 100644 --- a/3DScene/private/LuaFormat.cpp +++ b/3DScene/private/LuaFormat.cpp @@ -7,6 +7,61 @@ extern "C" { } #include +#include + +tp::Vec3F tp::Scene::getVec3(lua_State* state, const char* name) { + int stackSize = lua_gettop(state); + + // Access the "pos" field and validate it + lua_getfield(state, -1, name); + if (!lua_istable(state, -1) || lua_rawlen(state, -1) != 3) { + throw IOError(std::string("Invalid vec3 named ") + name); + } + + // Read the values from the table + float pos[3]; + for (int i = 0; i < 3; i++) { + lua_rawgeti(state, -1, i + 1); + if (lua_isnumber(state, -1)) { + pos[i] = lua_tonumber(state, -1); + } else { + throw IOError("vec3 values must be numbers"); + } + lua_pop(state, 1); // pop number + } + lua_pop(state, 1); // pop vec3 + + ASSERT(stackSize == lua_gettop(state)) + + return { pos[0], pos[1], pos[2] }; +} + +tp::Vec2F tp::Scene::getVec2(lua_State* state, const char* name) { + int stackSize = lua_gettop(state); + + // Access the "pos" field and validate it + lua_getfield(state, -1, name); + if (!lua_istable(state, -1) || lua_rawlen(state, -1) != 2) { + throw IOError(std::string("Invalid vec2 named ") + name); + } + + // Read the values from the table + float pos[2]; + for (int i = 0; i < 2; i++) { + lua_rawgeti(state, -1, i + 1); + if (lua_isnumber(state, -1)) { + pos[i] = lua_tonumber(state, -1); + } else { + throw IOError("vec3 values must be numbers"); + } + lua_pop(state, 1); // pop number + } + lua_pop(state, 1); // pop vec3 + + ASSERT(stackSize == lua_gettop(state)) + + return { pos[0], pos[1] }; +} // Function to read a Lua table representing RenderSettings int readRenderSettings(lua_State* L, tp::RenderSettings& settings) { @@ -53,23 +108,8 @@ int readRenderSettings(lua_State* L, tp::RenderSettings& settings) { } // Function to read a Lua table representing a light -int readLight(lua_State* L, tp::PointLight* light) { - lua_getfield(L, -1, "pos"); // Get the "pos" field from the light table - if (!lua_istable(L, -1)) { - printf("Light is missing the 'pos' table.\n"); - return 0; // Error - } - for (int i = 0; i < 3; i++) { - lua_rawgeti(L, -1, i + 1); // Index is 1-based in Lua - if (!lua_isnumber(L, -1)) { - printf("Light 'pos' field is not a number at index %d.\n", i); - lua_pop(L, 2); // Pop both the number and the 'pos' table - return 0; // Error - } - light->pos[i] = lua_tonumber(L, -1); - lua_pop(L, 1); // Pop the number - } - lua_pop(L, 1); // Pop the 'pos' table +int tp::Scene::readLight(lua_State* L, tp::PointLight* light) { + light->pos = getVec3(L, "pos"); lua_getfield(L, -1, "intensity"); // Get the "intensity" field from the light table if (!lua_isnumber(L, -1)) { @@ -121,66 +161,29 @@ bool tp::Scene::loadLuaFormat(const std::string& scenePath) { } // --- camera - - // Access Camera table - lua_getglobal(L, "Camera"); - if (!lua_istable(L, -1)) { - printf("Camera is not a table.\n"); - lua_close(L); - return false; - } - - // Verify you are inside the "Camera" table - int cameraTableIndex = lua_gettop(L); // Get the index of the "Camera" table - - // Access the "pos" field and validate it - lua_getfield(L, cameraTableIndex, "pos"); - if (!lua_istable(L, -1) || lua_rawlen(L, -1) != 3) { - printf("Invalid 'pos' field in Camera table.\n"); - lua_close(L); - return false; - } - - // Read the values from the table - float pos[3]; - for (int i = 0; i < 3; i++) { - lua_rawgeti(L, -1, i + 1); - if (lua_isnumber(L, -1)) { - pos[i] = lua_tonumber(L, -1); - } else { - printf("Invalid 'pos' field value at index %d.\n", i + 1); + { + lua_getglobal(L, "Camera"); + if (!lua_istable(L, -1)) { + printf("Camera is not a table.\n"); lua_close(L); return false; } + + Vec3F camPos = getVec3(L, "pos"); + Vec3F camTarget = getVec3(L, "target"); + Vec3F camUp = getVec3(L, "up"); + Vec2F camSize = getVec2(L, "size"); + + mRenderSettings.size = camSize; + + mCamera.lookAtPoint(camTarget, camPos, camUp); + mCamera.setFOV(3.14 / 4); + mCamera.setFar(100); + mCamera.setRatio((tp::halnf) camSize.y / (tp::halnf) camSize.x); + lua_pop(L, 1); } - // Access the "size_x" field and validate it - lua_getfield(L, cameraTableIndex, "size_x"); - if (!lua_isnumber(L, -1)) { - printf("Invalid or missing 'size_x' field in Camera table.\n"); - lua_close(L); - return false; - } - int size_x = lua_tointeger(L, -1); - lua_pop(L, 1); // Pop the 'size_x' value from the stack - - // Access the "size_y" field and validate it - lua_getfield(L, cameraTableIndex, "size_y"); - if (!lua_isnumber(L, -1)) { - printf("Invalid or missing 'size_y' field in Camera table.\n"); - lua_close(L); - return false; - } - int size_y = lua_tointeger(L, -1); - - mRenderSettings.size = { (tp::halnf) size_x, (tp::halnf) size_y }; - - mCamera.lookAtPoint({ 0, 0, 0 }, { pos[0], pos[1], pos[2] }, { 0, 0, 1 }); - mCamera.setFOV(3.14 / 4); - mCamera.setFar(100); - mCamera.setRatio((tp::halnf) size_y / (tp::halnf) size_x); - // ---------- LIGHTS { lua_getglobal(L, "Lights"); diff --git a/3DScene/private/OBJFormat.cpp b/3DScene/private/OBJFormat.cpp index 3fcf8ad..b97b87f 100644 --- a/3DScene/private/OBJFormat.cpp +++ b/3DScene/private/OBJFormat.cpp @@ -48,4 +48,39 @@ bool tp::Scene::loadOBJFormat(const std::string& objetsPath) { } return mObjects.size(); +} + +const tp::RayCastData& tp::Scene::castRay(const Ray& ray, alnf farVal) { + auto& out = mRayCastData; + + out.hit = false; + out.obj = nullptr; + + farVal *= farVal; + + for (auto obj : mObjects) { + for (auto trig : obj->mCache.TrigCaches) { + if (trig->castRay(ray)) { + + auto dist = (TrigCache::getHitPos() - ray.pos).length2(); + + if (farVal > dist && dist > EPSILON) { + out.trig = &trig.data(); + out.hitPos = TrigCache::getHitPos(); + out.obj = &obj.data(); + out.hit = true; + + farVal = dist; + } + } + } + } + + return mRayCastData; +} + +void tp::Scene::updateCache() { + for (auto obj : mObjects) { + obj->mCache.updateCache(); + } } \ No newline at end of file diff --git a/3DScene/private/Scene.cpp b/3DScene/private/Scene.cpp index f1927b2..6ef0399 100644 --- a/3DScene/private/Scene.cpp +++ b/3DScene/private/Scene.cpp @@ -2,5 +2,13 @@ #include "Scene.hpp" bool tp::Scene::load(const std::string& scenePath) { - return loadLuaFormat(scenePath); + try { + auto res = loadLuaFormat(scenePath); + if (!res) throw IOError("Failed loading lua script"); + } catch (const IOError& err) { + printf("Failed loading scene : %s\n", err.description.c_str()); + return false; + } + + return true; } \ No newline at end of file diff --git a/3DScene/public/Scene.hpp b/3DScene/public/Scene.hpp index f7aa56f..ac872f5 100644 --- a/3DScene/public/Scene.hpp +++ b/3DScene/public/Scene.hpp @@ -6,6 +6,8 @@ #include +struct lua_State; + namespace tp { struct RenderSettings { uhalni depth = 2; @@ -42,7 +44,22 @@ namespace tp { halnf intensity = 1.f; }; + struct RayCastData { + Object* obj = nullptr; + TrigCache* trig = nullptr; + Vec3F hitPos = { 0, 0, 0 }; + bool hit = false; + bool inv = false; + }; + class Scene { + struct IOError : public std::exception { + explicit IOError(std::string in) : + description(std::move(in)) {} + + std::string description; + }; + public: Scene() = default; @@ -51,11 +68,23 @@ namespace tp { bool loadLuaFormat(const std::string& scenePath); bool loadOBJFormat(const std::string& objectsPath); + const RayCastData& castRay(const Ray& ray, alnf farVal); + + void updateCache(); + + private: + Vec3F getVec3(lua_State* state, const char* name); + Vec2F getVec2(lua_State* state, const char* name); + + int readLight(lua_State* L, tp::PointLight* light); + public: Buffer mObjects; Buffer mLights; Camera mCamera; RenderSettings mRenderSettings; + + RayCastData mRayCastData; }; } diff --git a/3DEditor/rsc/scene/meshes.mtl b/3DScene/rsc/scene/meshes.mtl similarity index 100% rename from 3DEditor/rsc/scene/meshes.mtl rename to 3DScene/rsc/scene/meshes.mtl diff --git a/3DEditor/rsc/scene/meshes.obj b/3DScene/rsc/scene/meshes.obj similarity index 100% rename from 3DEditor/rsc/scene/meshes.obj rename to 3DScene/rsc/scene/meshes.obj diff --git a/3DEditor/rsc/scene/script.lua b/3DScene/rsc/scene/script.lua similarity index 75% rename from 3DEditor/rsc/scene/script.lua rename to 3DScene/rsc/scene/script.lua index ef6d484..42ea4c7 100644 --- a/3DEditor/rsc/scene/script.lua +++ b/3DScene/rsc/scene/script.lua @@ -2,9 +2,10 @@ Meshes = "meshes.obj" Camera = { - pos = { 0.5, 4.5, 0.2 }, - size_x = 600, - size_y = 800, + pos = { 0, 5, 0 }, + target = { 0, 0, 0 }, + up = { 0, 0, 1 }, + size = { 600, 800 }, } Lights = { diff --git a/CMakeLists.txt b/CMakeLists.txt index a8086b5..bf93755 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 20) @@ -8,13 +8,20 @@ set(CMAKE_CXX_STANDARD 20) project(ModulesRoot) -include(CMakeOptions.txt) +include(cmake/ModulesOptions.txt) + +set(WINDOWS_LIBRARIES "../moduleswindowsl" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl") + +include(cmake/FindGLEW.cmake) +include(cmake/FindOIDN.cmake) +include(cmake/FindPortAudio.cmake) + +add_subdirectory(Externals) add_subdirectory(Modules) add_subdirectory(Containers) add_subdirectory(Math) # add_subdirectory(Language) -add_subdirectory(Externals) add_subdirectory(Connection) add_subdirectory(Graphics) add_subdirectory(DataAnalysis) diff --git a/Containers/CMakeLists.txt b/Containers/CMakeLists.txt index 9b0f308..146ae01 100644 --- a/Containers/CMakeLists.txt +++ b/Containers/CMakeLists.txt @@ -1,5 +1,7 @@ project(Containers) +include(GoogleTest) + ### ---------------------- Static Library --------------------- ### file(GLOB SOURCES "./private/*.cpp") file(GLOB HEADERS "./public/*.hpp") @@ -16,6 +18,7 @@ file(GLOB TEST_SOURCES ./tests/ListTest.cpp ./tests/MapTest.cpp ./tests/TreeTest.cpp + ./tests/RingBufferByte.cpp ./tests/Tests.cpp ) @@ -24,5 +27,10 @@ target_link_libraries(Tests${PROJECT_NAME} ${PROJECT_NAME} UnitTest++) add_test(NAME Tests${PROJECT_NAME} COMMAND Tests${PROJECT_NAME}) +add_executable(testLinearRingBuffer ./tests/testLinearRingBuffer.cpp) +target_link_libraries(testLinearRingBuffer ${PROJECT_NAME} gtest) +gtest_discover_tests(testLinearRingBuffer) + + add_executable(AVLTreeSpeedTest ./tests/AVLTreeProfiling.cpp) -target_link_libraries(AVLTreeSpeedTest ${PROJECT_NAME}) \ No newline at end of file +target_link_libraries(AVLTreeSpeedTest ${PROJECT_NAME}) diff --git a/Containers/private/linear_ring.cpp b/Containers/private/linear_ring.cpp new file mode 100644 index 0000000..3b6091c --- /dev/null +++ b/Containers/private/linear_ring.cpp @@ -0,0 +1,65 @@ +#include +#include +#include +#include +#include +#include +#include + +namespace lrbm { + static int create_memfd(const char* name) { + int fd = syscall(SYS_memfd_create, name, 0); + if (fd == -1) throw std::runtime_error("memfd_create failed"); + return fd; + } + + std::pair create_linear_ring(size_t size) { + const size_t page = sysconf(_SC_PAGESIZE); + + size_t aligned = (size + page - 1) & ~(page - 1); + + // Create RAM-backed file descriptor + int fd = create_memfd("linear_ring"); + if (ftruncate(fd, aligned) != 0) throw std::runtime_error("ftruncate failed"); + + // Reserve 2× VA space + uint8_t* base = (uint8_t*) mmap(nullptr, aligned * 2, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (base == MAP_FAILED) throw std::runtime_error("mmap reserve failed"); + + // First mapping + void* p1 = mmap(base, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0); + if (p1 != base) throw std::runtime_error("first mmap failed"); + + // Mirror mapping + void* p2 = mmap(base + aligned, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0); + if (p2 != base + aligned) throw std::runtime_error("mirror mmap failed"); + + close(fd); + return { base, aligned }; // linear region [buf][buf] + } + + void destroy_linear_ring(void* base, size_t size) { munmap(base, size); } + + // void test() { + // const size_t RING_SIZE = 4096; + // uint8_t* ring = (uint8_t*) create_linear_ring(RING_SIZE); + + // printf("Linear ring created at %p (size = %zu)\n", ring, RING_SIZE); + + // const char* msg = "HELLO_LINEAR_RING"; + // size_t msg_len = strlen(msg); + + // size_t head = RING_SIZE - 4; // force boundary crossing + // std::memcpy(ring + head, msg, msg_len); + + // char out[64]; + // std::memcpy(out, ring + head, msg_len); + // out[msg_len] = 0; + + // printf("Expected: %s\n", msg); + // printf("Readback: %s\n", out); + + // if (std::strcmp(msg, out) == 0) printf("SUCCESS: Linear-address ring works!\n"); + // else printf("FAILURE: Ring broken!\n"); + // } +} diff --git a/Containers/public/Buffer.hpp b/Containers/public/Buffer.hpp index 441283e..8a8821c 100644 --- a/Containers/public/Buffer.hpp +++ b/Containers/public/Buffer.hpp @@ -317,6 +317,13 @@ namespace tp { return *this; } + alni find(const tType& val) { + for (ualni idx = 0; idx < mLoad; idx++) { + if (mBuff[idx] == val) return (alni) idx; + } + return -1; + } + tType& append(Arg data) { if (mLoad == mSize) { resizeBuffer(tResizePolicy(mSize)); @@ -368,6 +375,53 @@ namespace tp { } } + void erase(ualni start, ualni end) { + DEBUG_ASSERT(end <= mLoad) + DEBUG_ASSERT(end >= start) + + if (start == end) return; + + for (ualni idx = start; idx < end; idx++) { + mBuff[idx].~tType(); + } + + const auto diff = (end - start); + for (ualni idx = end; idx < mLoad; idx++) { + new (&mBuff[idx - diff]) tType(mBuff[idx]); + mBuff[idx].~tType(); + } + + mLoad -= diff; + ualni prevSize = tResizePolicyDown(mSize); + DEBUG_ASSERT(prevSize < mSize) + if (prevSize > mLoad) { + resizeBuffer(prevSize); + } + } + + template + void erase_if(tRemoveConditionFunctor functor) { + alni lastIndex = mLoad - 1; + alni currentIndex = 0; + while (currentIndex < lastIndex + 1) { + if (functor(mBuff[currentIndex])) { + new (&mBuff[currentIndex]) tType(mBuff[lastIndex]); + mBuff[lastIndex].~tType(); + lastIndex--; + } else { + currentIndex++; + } + } + + erase(lastIndex + 1, mLoad); + } + + void reverse() { + for (ualni idx = 0; idx < mLoad / 2; idx++) { + swapV(mBuff[idx], mBuff[mLoad - idx - 1]); + } + } + public: class IteratorPointer { protected: diff --git a/Containers/public/Buffer2D.hpp b/Containers/public/Buffer2D.hpp index d0a4431..b28fb6d 100644 --- a/Containers/public/Buffer2D.hpp +++ b/Containers/public/Buffer2D.hpp @@ -58,12 +58,13 @@ namespace tp { [[nodiscard]] Index2D size() const { return { mSize.x, mSize.y }; } tType* getBuff() const { return mBuff; } + void setBuff(tType* data, Index2D size) { mBuff = data; mSize = size; } void flipY() { for (Index i = 0; i < mSize.x; i++) { const auto lenIdx = mSize.y - 1; for (Index j = 0; j < mSize.y / 2; j++) { - swap(get({i, j}), get({i, lenIdx - j})); + swapV(get({ i, j }), get({ i, lenIdx - j })); } } } @@ -72,7 +73,7 @@ namespace tp { for (Index i = 0; i < mSize.y; i++) { const auto lenIdx = mSize.x - 1; for (Index j = 0; j < mSize.x / 2; j++) { - swap(get({i, j}), get({i, lenIdx - j})); + swapV(get({ i, j }), get({ i, lenIdx - j })); } } } diff --git a/Containers/public/IntervalTree.hpp b/Containers/public/IntervalTree.hpp index f877ed2..9419f6d 100644 --- a/Containers/public/IntervalTree.hpp +++ b/Containers/public/IntervalTree.hpp @@ -2,6 +2,8 @@ #include "Tree.hpp" +#include + namespace tp { template @@ -31,7 +33,7 @@ namespace tp { template inline void updateNodeCache(const tTreeNodeType* node) { - mMax = 0; + mMax = std::numeric_limits::min(); if (node->mRight && node->mRight->key.mMax > mMax) mMax = node->mRight->key.mMax; if (node->mLeft && node->mLeft->key.mMax > mMax) mMax = node->mLeft->key.mMax; if (mMax < mEnd) mMax = mEnd; diff --git a/Containers/public/LinearRingBuffer.hpp b/Containers/public/LinearRingBuffer.hpp new file mode 100644 index 0000000..ddccca2 --- /dev/null +++ b/Containers/public/LinearRingBuffer.hpp @@ -0,0 +1,54 @@ + +#include +#include +#include + +#include "liniar_ring.hpp" + +class LinearRingBuffer { +public: + LinearRingBuffer(size_t size, size_t history) { + const auto& [mem, aligned_size] = lrbm::create_linear_ring(size); + + mem_ = (uint8_t*) mem; + memSize_ = aligned_size; + bufferSize_ = size; + historySize_ = history; + + write_ptr_ = mem_; + read_ptr_ = mem_; + } + + ~LinearRingBuffer() { lrbm::destroy_linear_ring((void*) mem_, memSize_ * 2); } + + uint8_t* write_data() { return write_ptr_; } + uint8_t* read_data() { return read_ptr_; } + + void write_advance(size_t bytes) { write_ptr_ = advancePointer(write_ptr_, bytes); } + void read_advance(size_t bytes) { read_ptr_ = advancePointer(read_ptr_, bytes); } + + void read_reset_with_history() { + const auto offset = size_t(write_ptr_ - mem_); + + if (historySize_ < offset) { + read_ptr_ = write_ptr_ - historySize_; + return; + } + + read_ptr_ = mem_ + (memSize_ + offset - historySize_); + } + +private: + inline uint8_t* advancePointer(const uint8_t* ptr, size_t bytes) { + return mem_ + (size_t(ptr - mem_) + bytes) % memSize_; + } + + size_t bufferSize_ = 0; + size_t historySize_ = 0; + size_t memSize_ = 0; + + uint8_t* mem_ = nullptr; + + uint8_t* read_ptr_ = 0; + uint8_t* write_ptr_ = 0; +}; diff --git a/Containers/public/List.hpp b/Containers/public/List.hpp index c1fe3d3..4abef32 100644 --- a/Containers/public/List.hpp +++ b/Containers/public/List.hpp @@ -110,6 +110,7 @@ namespace tp { } void attach(Node* node, Node* node_to) { + node->next = node->prev = nullptr; if (node_to) { if (node_to->next) { node->next = node_to->next; @@ -158,15 +159,10 @@ namespace tp { } [[nodiscard]] Node* find(const TypeArg data) const { - Node* found = mFirst; - for (alni i = 0; data != found->data; i++) { - if (i == length()) return nullptr; - if (!found->next) { - return nullptr; - } - found = found->next; + for (Node* found = mFirst; found; found = found->next) { + if (data == found->data) return found; } - return found; + return nullptr; } [[nodiscard]] inline const Type& operator[](Index idx) const { @@ -206,6 +202,7 @@ namespace tp { void insert(TypeArg data, Index idx) { insert(newNode(data), idx); } void removeNode(Node* node) { + if (!node) return; detach(node); deleteNode(node); } @@ -291,9 +288,9 @@ namespace tp { while (iter) { tmp = iter; iter = iter->next; - swap(tmp->next, tmp->prev); + swapV(tmp->next, tmp->prev); } - swap(mFirst, mLast); + swapV(mFirst, mLast); } void detachAll() { diff --git a/Containers/public/RingBufferByte.hpp b/Containers/public/RingBufferByte.hpp new file mode 100644 index 0000000..0f6d92c --- /dev/null +++ b/Containers/public/RingBufferByte.hpp @@ -0,0 +1,127 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +template +class RingBufferByte { +public: + explicit RingBufferByte(size_t maxCapacity) { buffer_.resize(maxCapacity); } + + ~RingBufferByte() = default; + + void pushBack(const uint8_t* buffer, size_t size) { + const auto REQUIRED_SIZE = size + sizeof(size); + const auto DEPOSIT = static_cast(freeSpace()) - static_cast(REQUIRED_SIZE); + + if (DEPOSIT < 0) { + if (ALLOW_BUFFER_OVERRIDE) { + freeupSpace(static_cast(-DEPOSIT)); + } else { + throw std::runtime_error("ring buffer overflow"); + } + } + + push(reinterpret_cast(&size), sizeof(size)); + push(buffer, size); + } + + [[nodiscard]] auto frontSize() const -> size_t { + size_t size = 0; + + if (dataSize() < sizeof(size)) { + throw std::runtime_error("no data in the buffer"); + } + + peek(reinterpret_cast(&size), sizeof(size)); + + return size; + } + + auto popFront(uint8_t* buffer) -> size_t { + size_t size = 0; + + if (dataSize() < sizeof(size)) { + return 0; + } + + pop(reinterpret_cast(&size), sizeof(size)); + pop(buffer, size); + + return size; + } + + void clear() { + end_ = 0; + start_ = 0; + } + + [[nodiscard]] bool empty() const { return start_ == end_; } + +private: + void push(const uint8_t* buffer, size_t size) { + for (size_t simpleIdx = 0; simpleIdx < size; simpleIdx++) { + buffer_[end_++] = buffer == nullptr ? 0 : buffer[simpleIdx]; + + if (end_ == buffer_.size()) { + end_ = 0; + } + } + } + + void pop(uint8_t* buffer, size_t size) { + for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) { + if (buffer != nullptr) { + buffer[sampleIdx] = buffer_[start_]; + } + + start_++; + + if (start_ == buffer_.size()) { + start_ = 0; + } + } + } + + void peek(uint8_t* buffer, size_t size) const { + auto iter = start_; + for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) { + buffer[sampleIdx] = buffer_[iter++]; + + if (iter == buffer_.size()) { + iter = 0; + } + } + } + + void freeupSpace(size_t additionalRequiredSpace) { + const auto CURRENT_DEPOSIT = freeSpace(); + + while (CURRENT_DEPOSIT + additionalRequiredSpace >= freeSpace()) { + popFront(nullptr); + } + } + + [[nodiscard]] size_t freeSpace() const { + if (start_ > end_) { + return start_ - end_; + } + + const auto OUT = buffer_.size() - (end_ - start_); + return OUT; + } + + [[nodiscard]] size_t dataSize() const { return buffer_.size() - freeSpace(); } + + [[nodiscard]] bool hasSpace(unsigned int length) const { return freeSpace() > length; } + + std::vector buffer_; + + size_t end_ = 0; + size_t start_ = 0; +}; diff --git a/Containers/public/liniar_ring.hpp b/Containers/public/liniar_ring.hpp new file mode 100644 index 0000000..ae7f565 --- /dev/null +++ b/Containers/public/liniar_ring.hpp @@ -0,0 +1,9 @@ + +#include +#include + +namespace lrbm { + std::pair create_linear_ring(size_t size); + void destroy_linear_ring(void* base, size_t size); + void test(); +} diff --git a/Containers/tests/AVLTreeProfiling.cpp b/Containers/tests/AVLTreeProfiling.cpp index 66532ce..54ee3f5 100644 --- a/Containers/tests/AVLTreeProfiling.cpp +++ b/Containers/tests/AVLTreeProfiling.cpp @@ -17,7 +17,7 @@ Item buff[size]; int main() { AvlTree, alni> tree; - for (auto i : Range(size)) { + for (auto i : IterRange(size)) { buff[i].data = i; } diff --git a/Containers/tests/BufferTest.cpp b/Containers/tests/BufferTest.cpp index ae631bd..e696b28 100644 --- a/Containers/tests/BufferTest.cpp +++ b/Containers/tests/BufferTest.cpp @@ -9,7 +9,7 @@ SUITE(Buffer) { TEST(Simple1) { Buffer buff; CHECK(buff.size() == 0); - for (auto i : Range(size * 10)) { + for (auto i : IterRange(size * 10)) { buff.append(TestClass(i)); } CHECK(buff.size() == size * 10); @@ -21,7 +21,7 @@ SUITE(Buffer) { TEST(Simple2) { Buffer buff(size); CHECK(buff.size() == size); - for (auto i : Range(size * 10)) + for (auto i : IterRange(size * 10)) buff.append(TestClass(i)); CHECK(buff.size() == size + size * 10); while (buff.size()) diff --git a/Containers/tests/IntervalTreeTests.cpp b/Containers/tests/IntervalTreeTests.cpp index fdf725e..f7fcabb 100644 --- a/Containers/tests/IntervalTreeTests.cpp +++ b/Containers/tests/IntervalTreeTests.cpp @@ -16,9 +16,12 @@ struct Interval { bool ignore = false; void random(halnf span, halnf scale = 1.f) { - start = ((halnf) randomFloat()) * (span); - end = ((halnf) randomFloat()) * (span); - if (start > end) swap(start, end); + auto offset = 0; + + start = ((halnf) randomFloat()) * (span) - offset; + end = ((halnf) randomFloat()) * (span) - offset; + + if (start > end) swapV(start, end); auto len = (end - start) * scale * 0.5f; auto mid = (start + end) / 2.f; @@ -96,7 +99,7 @@ SUITE(IntervalTree) { }; // initialize - for (auto i : Range(NUM_TEST_INTERVALS)) { + for (auto i : IterRange(NUM_TEST_INTERVALS)) { auto interval = Interval(); interval.random(SPAN); @@ -111,7 +114,7 @@ SUITE(IntervalTree) { test(); // remove some - for (auto i : Range(NUM_TEST_INTERVALS / 2)) { + for (auto i : IterRange(NUM_TEST_INTERVALS / 2)) { auto idx = ualni(randomFloat() * (alnf) pool.size()); pool[idx].ignore = true; intervalTree.remove({ pool[idx].start, pool[idx].end }); @@ -136,18 +139,18 @@ SUITE(IntervalTree) { Buffer testIntervals; auto WOBBLE = SPAN * 0; - for (auto i : Range(NUM_TEST_INTERVALS)) { + for (auto i : IterRange(NUM_TEST_INTERVALS)) { auto interval = Interval(); interval.randomSized(SPAN, SCALE, WOBBLE); intervalTree.insert({ interval.start, interval.end }, i); // WOBBLE -= 1.f; } - for (auto i : Range(0)) + for (auto i : IterRange(0)) intervalTree.insert({ (halnf) i * 0.01f, SPAN }, 0); WOBBLE = 0; - for (auto i : Range(NUM_CHECKS)) { + for (auto i : IterRange(NUM_CHECKS)) { auto interval = Interval(); interval.randomSized(SPAN, SCALE, WOBBLE); testIntervals.append(interval); @@ -197,7 +200,7 @@ SUITE(IntervalTree) { }; Buffer stats; - for (auto i : Range(2, 5)) { + for (auto i : IterRange(2, 5)) { Stat stat = test(pow(10, i), 100); stats.append(stat); } diff --git a/Containers/tests/MapTest.cpp b/Containers/tests/MapTest.cpp index 3fb8ef6..feca1f7 100644 --- a/Containers/tests/MapTest.cpp +++ b/Containers/tests/MapTest.cpp @@ -8,26 +8,26 @@ SUITE(HashTable) { TEST(SimpleReference) { tp::Map map; - for (auto i : Range(1000, 100000)) { + for (auto i : IterRange(1000, 100000)) { map.put(i, TestClass(i)); } - for (auto i : Range(1000, 100000)) { + for (auto i : IterRange(1000, 100000)) { CHECK(map.presents(i)); CHECK_EQUAL((tp::ualni) map.get(i).getVal(), (tp::ualni) i); } - for (auto i : Range(1000, 100000)) { + for (auto i : IterRange(1000, 100000)) { map.put(i, TestClass(i)); } - for (auto i : Range(1000, 2000)) { + for (auto i : IterRange(1000, 2000)) { CHECK(map.presents(i)); map.remove(i); CHECK(!map.presents(i)); } - for (auto i : Range(2000, 100000)) { + for (auto i : IterRange(2000, 100000)) { CHECK(map.presents(i)); CHECK_EQUAL((tp::ualni) map.get(i).getVal(), (tp::ualni) i); } @@ -42,29 +42,29 @@ SUITE(HashTable) { TEST(SimplePointer) { tp::Map map; - for (auto i : Range(1000)) { + for (auto i : IterRange(1000)) { map.put(i, new TestClass(i)); } - for (auto i : Range(1000)) { + for (auto i : IterRange(1000)) { CHECK(map.presents(i)); CHECK_EQUAL((tp::ualni) map.get(i)->getVal(), (tp::ualni) i); } - for (auto i : Range(1000)) { + for (auto i : IterRange(1000)) { auto del = map.get(i); map.put(i, new TestClass(i)); delete del; } - for (auto i : Range(900, 1000)) { + for (auto i : IterRange(900, 1000)) { CHECK(map.presents(i)); delete map.get(i); map.remove(i); CHECK(!map.presents(i)); } - for (auto i : Range(900)) { + for (auto i : IterRange(900)) { CHECK(map.presents(i)); CHECK_EQUAL((tp::ualni) map.get(i)->getVal(), (tp::ualni) i); } @@ -80,7 +80,7 @@ SUITE(HashTable) { TEST(Copy) { tp::Map map; - for (auto i : Range(10)) { + for (auto i : IterRange(10)) { map.put(i, TestClass(i)); } @@ -95,7 +95,7 @@ SUITE(HashTable) { TEST(SaveLoad) { tp::Map map; - for (auto i : Range(10)) { + for (auto i : IterRange(10)) { map.put(i, TestClass(i)); } @@ -114,7 +114,7 @@ SUITE(HashTable) { CHECK(map.size() == 10); - for (auto i : Range(10)) { + for (auto i : IterRange(10)) { CHECK(map.presents(i)); CHECK_EQUAL(map.get(i).getVal(), i); } diff --git a/Containers/tests/RingBufferByte.cpp b/Containers/tests/RingBufferByte.cpp new file mode 100644 index 0000000..c9d2bb9 --- /dev/null +++ b/Containers/tests/RingBufferByte.cpp @@ -0,0 +1,69 @@ + +#include "Tests.hpp" +#include "RingBufferByte.hpp" + +SUITE(RingBufferBytes) { + TEST(Simple) { + + using Data = std::vector; + using DataStorage = std::vector; + + constexpr auto BUFFER_SIZE = 395; + constexpr auto MAX_MSG_SIZE = 31; + constexpr auto ITERATIONS = 100000; + + DataStorage pushed; + DataStorage popped; + + RingBufferByte buffer(BUFFER_SIZE); + + Data randomSamples(MAX_MSG_SIZE); + + for (auto idx = 0; idx < MAX_MSG_SIZE; idx++) { + randomSamples[idx] = (idx + 5 * 31) % 13; + } + + const auto PUSH = [&](RingBufferByte& buffer, DataStorage* storage) { + const Data& pushedSample = randomSamples; + + buffer.pushBack(pushedSample.data(), pushedSample.size()); + + if (storage) { + storage->push_back(pushedSample); + } + }; + + const auto POP = [](RingBufferByte& buffer, DataStorage* storage) { + const auto poppedSampleSize = buffer.frontSize(); + + Data poppedSample(poppedSampleSize); + + const auto SIZE = buffer.popFront(poppedSample.data()); + + CHECK(poppedSample.size() == SIZE); + + if (storage) { + storage->push_back(poppedSample); + } + }; + + for (auto iteration = 0; iteration < ITERATIONS; iteration++) { + PUSH(buffer, nullptr); + } + + while (!buffer.empty()) { + POP(buffer, nullptr); + } + + for (auto iteration = 0; iteration < ITERATIONS; iteration++) { + PUSH(buffer, &pushed); + POP(buffer, &popped); + } + + CHECK(pushed.size() == popped.size()); + + for (auto idx = 0; idx < popped.size(); idx++) { + CHECK(pushed[idx] == popped[idx]); + } + } +} diff --git a/Containers/tests/TreeTest.cpp b/Containers/tests/TreeTest.cpp index 8d726ad..e53f06c 100644 --- a/Containers/tests/TreeTest.cpp +++ b/Containers/tests/TreeTest.cpp @@ -37,7 +37,7 @@ SUITE(AvlTree) { Item buff[size]; - for (auto i : Range(size)) { + for (auto i : IterRange(size)) { buff[i].data.setVal(i); } diff --git a/Containers/tests/benchLinearRingBuffer.cpp b/Containers/tests/benchLinearRingBuffer.cpp new file mode 100644 index 0000000..a9293f3 --- /dev/null +++ b/Containers/tests/benchLinearRingBuffer.cpp @@ -0,0 +1,188 @@ +#include "LinearRingBuffer.hpp" + +#include + +#include +#include +#include + +static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); } + +static bool check(const void* ptr, size_t n, uint8_t value) { + const uint8_t* p = static_cast(ptr); + for (size_t i = 0; i < n; ++i) { + if (p[i] != value) return false; + } + return true; +} + +static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) { + const uint8_t* p = static_cast(ptr); + for (size_t i = 0; i < n; ++i) { + if (p[i] != value) return false; + } + return true; +} + +using Data = std::vector; +using DataStorage = std::vector; + +typedef ::testing::Types< + std::integral_constant, + std::integral_constant, + std::integral_constant, + std::integral_constant, + std::integral_constant> + BufferSizes; + +template +class LinearRingBufferTest : public ::testing::Test { +protected: + LinearRingBuffer rb; + + LinearRingBufferTest() : + historySize_(10), + rb(size_t(TypeParam::value), size_t(historySize_)) {} + + static constexpr auto ITERATIONS = TypeParam::value * 10; + + size_t messagesPushed_ = 0; + size_t historySize_ = 0; + + auto iterations() { return ITERATIONS; } + + auto historySize() { return historySize_; } + + size_t randomSize() { + static std::random_device rnd; + std::uniform_int_distribution dist(0, 1000); + return dist(rnd); + } + + auto write_and_advance(size_t messageSize, DataStorage* storage) { + Data pushedSample(messageSize); + + for (auto idx = 0; idx < messageSize; idx++) { + pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321; + } + + std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size()); + this->rb.write_advance(pushedSample.size()); + + if (storage) { + storage->push_back(pushedSample); + } + }; + + auto read_and_advance(size_t messageSize, DataStorage* storage) { + Data poppedSample(messageSize); + + std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size()); + + this->rb.read_advance(poppedSample.size()); + + if (storage) { + storage->push_back(poppedSample); + } + }; + + auto reset_with_history() { this->rb.read_reset_with_history(); }; + + auto read_with_history(size_t messageSize, DataStorage* storage) { + Data poppedSample(messageSize); + + std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size()); + + if (storage) { + storage->push_back(poppedSample); + } + }; +}; + +TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes); + +TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) { + constexpr size_t N = TypeParam::value; + + if (N % 4096 != 0) { + return; + } + + auto* base = this->rb.write_data(); + + size_t half = N - 16; + fill(base, half, 0xAA); + fill(base + half, 32, 0xBB); + + EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true); + EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true); + EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true); +} + +TYPED_TEST(LinearRingBufferTest, Chase) { + + DataStorage pushed; + DataStorage popped; + + static constexpr auto MSG_SIZE = 31; + + for (auto iteration = 0; iteration < this->iterations(); iteration++) { + this->write_and_advance(MSG_SIZE, &pushed); + this->read_and_advance(MSG_SIZE, &popped); + } + + ASSERT_EQ(pushed.size(), popped.size()); + + for (auto idx = 0; idx < popped.size(); idx++) { + ASSERT_EQ(pushed[idx], popped[idx]); + } +} + +Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) { + if (historySize > prev.size()) historySize = prev.size(); + + std::vector result; + + result.reserve(historySize + current.size()); + + result.insert(result.end(), prev.end() - historySize, prev.end()); + result.insert(result.end(), current.begin(), current.end()); + + return result; +} + +TYPED_TEST(LinearRingBufferTest, History) { + + DataStorage pushed; + DataStorage popped; + + pushed.push_back(Data(this->historySize())); + + static constexpr auto MAX_MSG_SIZE = 111; + + for (auto iteration = 0; iteration < this->iterations(); iteration++) { + + const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE; + + auto prevPushed = pushed.back(); + pushed.clear(); + + this->reset_with_history(); + + this->write_and_advance(MSG_SIZE, &pushed); + auto currentPushed = pushed.back(); + + this->read_with_history(this->historySize() + MSG_SIZE, &popped); + auto poppedWithHistory = popped.back(); + popped.clear(); + + auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize()); + + ASSERT_EQ(correctResult, poppedWithHistory); + } +} + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/Containers/tests/testLinearRingBuffer.cpp b/Containers/tests/testLinearRingBuffer.cpp new file mode 100644 index 0000000..a9293f3 --- /dev/null +++ b/Containers/tests/testLinearRingBuffer.cpp @@ -0,0 +1,188 @@ +#include "LinearRingBuffer.hpp" + +#include + +#include +#include +#include + +static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); } + +static bool check(const void* ptr, size_t n, uint8_t value) { + const uint8_t* p = static_cast(ptr); + for (size_t i = 0; i < n; ++i) { + if (p[i] != value) return false; + } + return true; +} + +static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) { + const uint8_t* p = static_cast(ptr); + for (size_t i = 0; i < n; ++i) { + if (p[i] != value) return false; + } + return true; +} + +using Data = std::vector; +using DataStorage = std::vector; + +typedef ::testing::Types< + std::integral_constant, + std::integral_constant, + std::integral_constant, + std::integral_constant, + std::integral_constant> + BufferSizes; + +template +class LinearRingBufferTest : public ::testing::Test { +protected: + LinearRingBuffer rb; + + LinearRingBufferTest() : + historySize_(10), + rb(size_t(TypeParam::value), size_t(historySize_)) {} + + static constexpr auto ITERATIONS = TypeParam::value * 10; + + size_t messagesPushed_ = 0; + size_t historySize_ = 0; + + auto iterations() { return ITERATIONS; } + + auto historySize() { return historySize_; } + + size_t randomSize() { + static std::random_device rnd; + std::uniform_int_distribution dist(0, 1000); + return dist(rnd); + } + + auto write_and_advance(size_t messageSize, DataStorage* storage) { + Data pushedSample(messageSize); + + for (auto idx = 0; idx < messageSize; idx++) { + pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321; + } + + std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size()); + this->rb.write_advance(pushedSample.size()); + + if (storage) { + storage->push_back(pushedSample); + } + }; + + auto read_and_advance(size_t messageSize, DataStorage* storage) { + Data poppedSample(messageSize); + + std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size()); + + this->rb.read_advance(poppedSample.size()); + + if (storage) { + storage->push_back(poppedSample); + } + }; + + auto reset_with_history() { this->rb.read_reset_with_history(); }; + + auto read_with_history(size_t messageSize, DataStorage* storage) { + Data poppedSample(messageSize); + + std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size()); + + if (storage) { + storage->push_back(poppedSample); + } + }; +}; + +TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes); + +TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) { + constexpr size_t N = TypeParam::value; + + if (N % 4096 != 0) { + return; + } + + auto* base = this->rb.write_data(); + + size_t half = N - 16; + fill(base, half, 0xAA); + fill(base + half, 32, 0xBB); + + EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true); + EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true); + EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true); +} + +TYPED_TEST(LinearRingBufferTest, Chase) { + + DataStorage pushed; + DataStorage popped; + + static constexpr auto MSG_SIZE = 31; + + for (auto iteration = 0; iteration < this->iterations(); iteration++) { + this->write_and_advance(MSG_SIZE, &pushed); + this->read_and_advance(MSG_SIZE, &popped); + } + + ASSERT_EQ(pushed.size(), popped.size()); + + for (auto idx = 0; idx < popped.size(); idx++) { + ASSERT_EQ(pushed[idx], popped[idx]); + } +} + +Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) { + if (historySize > prev.size()) historySize = prev.size(); + + std::vector result; + + result.reserve(historySize + current.size()); + + result.insert(result.end(), prev.end() - historySize, prev.end()); + result.insert(result.end(), current.begin(), current.end()); + + return result; +} + +TYPED_TEST(LinearRingBufferTest, History) { + + DataStorage pushed; + DataStorage popped; + + pushed.push_back(Data(this->historySize())); + + static constexpr auto MAX_MSG_SIZE = 111; + + for (auto iteration = 0; iteration < this->iterations(); iteration++) { + + const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE; + + auto prevPushed = pushed.back(); + pushed.clear(); + + this->reset_with_history(); + + this->write_and_advance(MSG_SIZE, &pushed); + auto currentPushed = pushed.back(); + + this->read_with_history(this->historySize() + MSG_SIZE, &popped); + auto poppedWithHistory = popped.back(); + popped.clear(); + + auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize()); + + ASSERT_EQ(correctResult, poppedWithHistory); + } +} + +int main(int argc, char** argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} diff --git a/DataAnalysis/applications/NumRecApp.cpp b/DataAnalysis/applications/NumRecApp.cpp index 421612a..ecde746 100644 --- a/DataAnalysis/applications/NumRecApp.cpp +++ b/DataAnalysis/applications/NumRecApp.cpp @@ -10,6 +10,8 @@ using namespace tp; +#include + void loadImage(Buffer& output, const char* name) { int x, y, channels_in_file; unsigned char* loadedImage = stbi_load(name, &x, &y, &channels_in_file, 4); @@ -18,7 +20,7 @@ void loadImage(Buffer& output, const char* name) { output.reserve(x * y); - for (auto i : Range(output.size())) { + for (auto i : IterRange(output.size())) { output[i] = loadedImage[i * 4] / 255.f; } @@ -28,7 +30,9 @@ void loadImage(Buffer& output, const char* name) { void loadNN(FCNN& nn) { ArchiverLocalConnection archiver; - archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true)); + if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) { + archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true)); + } if (archiver.connection.getConnectionStatus().isOpened()) { archiver % nn; @@ -56,7 +60,7 @@ void executeCmd(const char* imageName) { } int main(int argc, char** argv) { - const char* imageName = "digit.png"; + const char* imageName = "tmp2.png"; if (argc == 2) { imageName = argv[1]; diff --git a/DataAnalysis/applications/NumRecTraining.cpp b/DataAnalysis/applications/NumRecTraining.cpp index 69cd71c..dcba426 100644 --- a/DataAnalysis/applications/NumRecTraining.cpp +++ b/DataAnalysis/applications/NumRecTraining.cpp @@ -1,3 +1,4 @@ +#include #include "FCNN.hpp" #include "LocalConnection.hpp" @@ -52,7 +53,7 @@ bool loadDataset(Dataset& out, const std::string& location) { out.labels.reserve(out.length); out.images.reserve(out.length); - for (auto i : Range(out.length)) { + for (auto i : IterRange(out.length)) { auto& image = out.images[i]; image.reserve(sizeX * sizeY); dataset.readBytes((LocalConnection::Byte*) image.getBuff(), sizeX * sizeY); @@ -71,7 +72,9 @@ struct NumberRec { { ArchiverLocalConnection archiver; - archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true)); + if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) { + archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true)); + } if (archiver.connection.getConnectionStatus().isOpened()) { archiver % nn; @@ -89,7 +92,7 @@ struct NumberRec { } mTestcases.reserve(dataset.images.size()); - for (auto i : Range(dataset.images.size())) { + for (auto i : IterRange(dataset.images.size())) { auto& image = dataset.images[i]; auto label = dataset.labels[i]; @@ -97,13 +100,13 @@ struct NumberRec { testcase.output.reserve(10); - for (auto dig : Range(10)) { + for (auto dig : IterRange(10)) { testcase.output[dig] = label == dig ? 1 : 0; } testcase.input.reserve(image.size()); - for (auto pxl : Range(image.size())) { + for (auto pxl : IterRange(image.size())) { testcase.input[pxl] = (halnf) image[pxl] / 255.f; } } @@ -137,7 +140,7 @@ struct NumberRec { static halni getMaxIdx(const Buffer& in) { halni out = 0; - for (auto i : Range(in.size())) { + for (auto i : IterRange(in.size())) { if (in[i] > in[out]) { out = i; } @@ -165,15 +168,15 @@ struct NumberRec { void displayImage(ualni idx) { auto& testcase = mTestcases[idx]; printf("Image : %i\n", int(getMaxIdx(testcase.output))); - for (auto i : Range(28)) { - for (auto j : Range(28)) { + for (auto i : IterRange(28)) { + for (auto j : IterRange(28)) { printf("%c", char(testcase.input[j * 28 + i] * 255)); } printf("\n"); } } - halnf test(const Range& range) { + halnf test(const IterRange& range) { halnf avgCost = 0; for (auto i : range) { avgCost += eval(i); @@ -182,7 +185,7 @@ struct NumberRec { return avgCost; } - void trainStep(const Range& range) { + void trainStep(const IterRange& range) { nn.clearGrad(); for (auto i : range) { nn.evaluate(mTestcases[i].input, output); @@ -210,18 +213,19 @@ int main() { NumberRec app; auto numBatches = 10; - auto trainRange = Range(0, 50000); - auto testRange = Range(50000, 70000); + auto trainRange = IterRange(0, 50000); + auto testRange = IterRange(50000, 70000); auto batchSize = trainRange.idxDiff() / numBatches; - for (auto epoch : Range(1)) { + for (auto epoch : IterRange(10)) { printf("Epoch %i\n", epoch.index()); - for (auto batchIdx : Range(trainRange.idxDiff() / batchSize)) { + for (auto batchIdx : IterRange(trainRange.idxDiff() / batchSize)) { printf(" - Batch :%i \n", batchIdx.index()); - auto batchRange = Range(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1)); + auto batchRange = + IterRange(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1)); app.trainStep(batchRange); @@ -240,5 +244,5 @@ int main() { // app.displayImage(i); } - printf("\n\nIncorrect - %i out of %i (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff()); + printf("\n\nIncorrect - %i out of %i error percentage (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff()); } \ No newline at end of file diff --git a/DataAnalysis/private/FCNN.cpp b/DataAnalysis/private/FCNN.cpp index be5b322..94b429a 100644 --- a/DataAnalysis/private/FCNN.cpp +++ b/DataAnalysis/private/FCNN.cpp @@ -32,7 +32,7 @@ void FCNN::initializeRandom(const Buffer& description) { mLayers.reserve(description.size()); - for (auto i : Range(0, (halni) description.size())) { + for (auto i : IterRange(0, (halni) description.size())) { mLayers[i].neurons.reserve(description[i]); if (i == 0) { continue; @@ -50,17 +50,17 @@ void FCNN::initializeRandom(const Buffer& description) { void FCNN::evaluate(const Buffer& input, Buffer& output) { ASSERT(output.size() == mLayers.last().neurons.size() && input.size() == mLayers.first().neurons.size()) - for (auto idx : Range(input.size())) { + for (auto idx : IterRange(input.size())) { mLayers.first().neurons[idx].activationValue = input[idx]; } - for (auto layerIdx : Range(1, (halni) mLayers.size())) { + for (auto layerIdx : IterRange(1, (halni) mLayers.size())) { auto& layer = mLayers[layerIdx]; auto& layerPrev = mLayers[layerIdx - 1]; for (auto neuron : layer.neurons) { neuron->activationValue = 0; - for (auto connectionIdx : Range(neuron->weights.size())) { + for (auto connectionIdx : IterRange(neuron->weights.size())) { neuron->activationValue += neuron->weights[connectionIdx].val * layerPrev.neurons[connectionIdx].activationValue; } neuron->activationValue += neuron->bias.val; @@ -69,26 +69,26 @@ void FCNN::evaluate(const Buffer& input, Buffer& output) { } } - for (auto idx : Range(output.size())) { + for (auto idx : IterRange(output.size())) { output[idx] = mLayers.last().neurons[idx].activationValue; } } halnf FCNN::calcCost(const Buffer& output) { halnf out = 0; - for (auto neuronIdx : Range(mLayers.last().neurons.size())) { + for (auto neuronIdx : IterRange(mLayers.last().neurons.size())) { out += pow(output[neuronIdx] - mLayers.last().neurons[neuronIdx].activationValue, 2); } return out; } void FCNN::clearGrad() { - for (auto layIdx : Range(1, (halni) mLayers.size())) { + for (auto layIdx : IterRange(1, (halni) mLayers.size())) { auto& layer = mLayers[layIdx]; for (auto neuron : layer.neurons) { neuron->bias.grad = 0; - for (auto weightIdx : Range(neuron->weights.size())) { + for (auto weightIdx : IterRange(neuron->weights.size())) { neuron->weights[weightIdx].grad = 0; } } @@ -102,7 +102,7 @@ void FCNN::calcGrad(const Buffer& output) { auto& lastLayer = mLayers.last(); // calculate chaining cache value for each neuron in last layer - for (auto neuronIdx : Range(lastLayer.neurons.size())) { + for (auto neuronIdx : IterRange(lastLayer.neurons.size())) { auto& neuron = lastLayer.neurons[neuronIdx]; neuron.cache = 2 * (neuron.activationValue - output[neuronIdx]); } @@ -113,7 +113,7 @@ void FCNN::calcGrad(const Buffer& output) { auto& currentLayer = mLayers[layerIdx]; auto& inputLayer = mLayers[layerIdx - 1]; - for (auto currentNeuronIdx : Range(currentLayer.neurons.size())) { + for (auto currentNeuronIdx : IterRange(currentLayer.neurons.size())) { auto& currentNeuron = currentLayer.neurons[currentNeuronIdx]; // calculate cache value (chaining) @@ -131,7 +131,7 @@ void FCNN::calcGrad(const Buffer& output) { currentNeuron.bias.grad += currentNeuron.cache; // calculate gradient for weights of current neuron - for (auto weightIdx : Range(currentNeuron.weights.size())) { + for (auto weightIdx : IterRange(currentNeuron.weights.size())) { currentNeuron.weights[weightIdx].grad += inputLayer.neurons[weightIdx].activationValue * currentNeuron.cache; } } @@ -142,12 +142,12 @@ void FCNN::calcGrad(const Buffer& output) { void FCNN::applyGrad(halnf step) { - for (auto layIdx : Range(1, (halni) mLayers.size())) { + for (auto layIdx : IterRange(1, (halni) mLayers.size())) { auto& layer = mLayers[layIdx]; for (auto neuron : layer.neurons) { neuron->bias.val -= neuron->bias.grad / (halnf) mAvgCount * step; - for (auto weightIdx : Range(neuron->weights.size())) { + for (auto weightIdx : IterRange(neuron->weights.size())) { neuron->weights[weightIdx].val -= (neuron->weights[weightIdx].grad / (halnf) mAvgCount) * step; } } diff --git a/DataAnalysis/tests/Tests.cpp b/DataAnalysis/tests/Tests.cpp index af7b914..f0886e9 100644 --- a/DataAnalysis/tests/Tests.cpp +++ b/DataAnalysis/tests/Tests.cpp @@ -31,11 +31,11 @@ SUITE(FCNN) { Buffer outputExpected(layers.last()); Buffer output(layers.last()); - for (auto inputVal : Range(layers.first())) { + for (auto inputVal : IterRange(layers.first())) { input[inputVal] = inputLayer[inputVal]; } - for (auto outIdx : Range(layers.last())) { + for (auto outIdx : IterRange(layers.last())) { outputExpected[outIdx] = outputLayer[outIdx]; } @@ -44,7 +44,7 @@ SUITE(FCNN) { halnf cost = 0; - for (auto i : Range(150)) { + for (auto i : IterRange(150)) { nn.evaluate(input, output); diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt index 70947cd..ec85993 100644 --- a/Externals/CMakeLists.txt +++ b/Externals/CMakeLists.txt @@ -1,42 +1,5 @@ # find_package(ALSA REQUIRED) -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - message("Configuring for windows...") - message("Libraries path is - ${WINDOWS_LIBRARIES}") - - set(CMAKE_PREFIX_PATH "${WINDOWS_LIBRARIES}/glew-2.1.0") - find_package(GLEW REQUIRED) - set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE) - - # Your relative paths - set(RELATIVE_INCLUDE_DIR "${WINDOWS_LIBRARIES}/portaudio/include") - set(RELATIVE_LIB "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib") - - # Convert to absolute paths - get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE) - get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE) - - # Set absolute paths with respect to the parent scope - set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" PARENT_SCOPE) - set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" PARENT_SCOPE) -else() - find_package(GLEW REQUIRED) - set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE) - - set(PORTAUDIO_LIB portaudio PARENT_SCOPE) -endif() - -#add_subdirectory(glew/build/cmake/) -#target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU) - -#add_subdirectory(unittest-cpp) -add_subdirectory(lalr) -if(CMAKE_SYSTEM_NAME STREQUAL "Windows") -else() - target_compile_options(UnitTest++ PUBLIC -Wno-error) -endif() - - add_subdirectory(glfw) project(Imgui) @@ -45,14 +8,18 @@ set(${PROJECT_NAME}_SOURCES imgui/imgui_draw.cpp imgui/imgui_tables.cpp imgui/imgui_widgets.cpp + imgui/imgui_demo.cpp imgui/backends/imgui_impl_glfw.cpp imgui/backends/imgui_impl_opengl3.cpp + + implot/implot.cpp + implot/implot_items.cpp ) add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES}) include_directories(${PROJECT_NAME} ./glfw/include) -target_include_directories(${PROJECT_NAME} PUBLIC ./imgui/ ./imgui/backends/) +target_include_directories(${PROJECT_NAME} PUBLIC ./imgui/ ./imgui/backends/ ./implot/) project(Nanovg) set(${PROJECT_NAME}_SOURCES @@ -86,8 +53,6 @@ project(ImageIO) add_library(${PROJECT_NAME} INTERFACE) target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/) +add_subdirectory(lalr) -#set(OIDN_DEVICE_CPU ON) -#set(OIDN_STATIC_LIB ON) -#add_subdirectory(oidn) -find_package(OpenImageDenoise REQUIRED) +add_subdirectory(googletest) diff --git a/Externals/benchmark b/Externals/benchmark new file mode 160000 index 0000000..c3f8657 --- /dev/null +++ b/Externals/benchmark @@ -0,0 +1 @@ +Subproject commit c3f86578bb2081b52cee9d51615912ca4aa52fe4 diff --git a/Externals/googletest b/Externals/googletest new file mode 160000 index 0000000..1b96fa1 --- /dev/null +++ b/Externals/googletest @@ -0,0 +1 @@ +Subproject commit 1b96fa13f549387b7549cc89e1a785cf143a1a50 diff --git a/Externals/imgui b/Externals/imgui index 4144d7d..7237d3e 160000 --- a/Externals/imgui +++ b/Externals/imgui @@ -1 +1 @@ -Subproject commit 4144d7d772a800f08693b8b13f7c81f1f22a73c4 +Subproject commit 7237d3e5c3a6b837b7b457460877cf5eea8c3745 diff --git a/Externals/implot b/Externals/implot new file mode 160000 index 0000000..f156599 --- /dev/null +++ b/Externals/implot @@ -0,0 +1 @@ +Subproject commit f156599faefe316f7dd20fe6c783bf87c8bb6fd9 diff --git a/Externals/lalr b/Externals/lalr index 6d16a6b..4986122 160000 --- a/Externals/lalr +++ b/Externals/lalr @@ -1 +1 @@ -Subproject commit 6d16a6bb60490a2ee4e86f689c86e647b300c7fb +Subproject commit 498612239713a6dbbf9f26b8e412e985538a0650 diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt index 1159d2a..3d4118b 100644 --- a/Graphics/CMakeLists.txt +++ b/Graphics/CMakeLists.txt @@ -19,5 +19,5 @@ target_link_libraries(Example${PROJECT_NAME} ${PROJECT_NAME} ${BINDINGS_LIBS}) target_include_directories(Example${PROJECT_NAME} PRIVATE ${BINDINGS_INCLUDE}) -file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") diff --git a/Graphics/examples/Example.cpp b/Graphics/examples/Example.cpp index 021a159..39907ef 100644 --- a/Graphics/examples/Example.cpp +++ b/Graphics/examples/Example.cpp @@ -1,5 +1,8 @@ #include "GraphicApplication.hpp" +#include + + #include "imgui.h" using namespace tp; @@ -8,15 +11,20 @@ class ExampleApplication : public Application { public: ExampleApplication() = default; - void processFrame(EventHandler* eventHandler) override { + void processFrame(EventHandler* eventHandler, halnf) override { // example } virtual void drawFrame(Canvas* canvas) override { - ImGui::Text("Frames processed per second: %f", this->mFramesProcessedPerSecond); - ImGui::Text("Frames drawn per second: %f", this->mFramesDrawnPerSecond); + glClear(GL_COLOR_BUFFER_BIT); + + ImGui::ShowDemoWindow(); + + drawDebug(); } + bool forceNewFrame() override { return false; } + virtual ~ExampleApplication() = default; }; diff --git a/Graphics/private/Canvas.cpp b/Graphics/private/Canvas.cpp index 2346b9d..82a2cc5 100644 --- a/Graphics/private/Canvas.cpp +++ b/Graphics/private/Canvas.cpp @@ -27,7 +27,7 @@ Canvas::Canvas(Window* window) { mContext->vg = nvgCreateGL3(NVG_ANTIALIAS | NVG_STENCIL_STROKES); - if (nvgCreateFont(mContext->vg, "default", "Font.ttf") == -1) { + if (nvgCreateFont(mContext->vg, "default", "rsc/Font.ttf") == -1) { ASSERT(!"Cant create NVG font") } } @@ -37,7 +37,9 @@ Canvas::~Canvas() { delete mContext; } -void Canvas::rect(const RectF& rec, const RGBA& col, halnf round) { +void Canvas::rect(RectF rec, const RGBA& col, halnf round) { + rec.pos += mOrigin; + nvgBeginPath(mContext->vg); if (round == 0) { @@ -50,13 +52,70 @@ void Canvas::rect(const RectF& rec, const RGBA& col, halnf round) { nvgFill(mContext->vg); } +void Canvas::debugCross(RectF rec, const RGBA& col) { + nvgBeginPath(mContext->vg); + + nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y); + nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y); + + nvgMoveTo(mContext->vg, rec.p2().x, rec.p2().y); + nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y); + + nvgStrokeWidth(mContext->vg, 2); + nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a }); + nvgStroke(mContext->vg); + // nvgFill(mContext->vg); +} + +void Canvas::frame(RectF rec, const RGBA& col, halnf round) { + nvgBeginPath(mContext->vg); + + nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y); + nvgLineTo(mContext->vg, rec.p2().x, rec.p2().y); + nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y); + nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y); + nvgLineTo(mContext->vg, rec.p1().x, rec.p1().y); + + nvgStrokeWidth(mContext->vg, 2); + nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a }); + nvgStroke(mContext->vg); + // nvgFill(mContext->vg); +} + +void Canvas::line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness) { + start += mOrigin; + end += mOrigin; + + nvgBeginPath(mContext->vg); + nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a}); + nvgMoveTo(mContext->vg, start.x, start.y); + nvgLineTo(mContext->vg, end.x, end.y); + nvgStrokeWidth(mContext->vg, thickness); + nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a }); + nvgStroke(mContext->vg); +} + +void Canvas::circle(Vec2F pos, halnf size, const RGBA& col) { + pos += mOrigin; + + nvgBeginPath(mContext->vg); + nvgCircle(mContext->vg, pos.x, pos.y, size); + + nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a }); + nvgFill(mContext->vg); +} + +void Canvas::setOrigin(const Vec2F& origin) { + mOrigin = origin; +} + void Canvas::pushClamp(const RectF& rec) { RectF intersection = rec; if (mScissors.size()) { mScissors.last().calcIntersection(rec, intersection); } nvgScissor(mContext->vg, intersection.x, intersection.y, intersection.z, intersection.w); - mScissors.append(rec); + mScissors.append(intersection); } void Canvas::popClamp() { @@ -71,10 +130,16 @@ void Canvas::popClamp() { } } +const RectF& Canvas::getClampedArea() const { + return mScissors.last(); +} + void Canvas::text( const char* string, const RectF& aRec, halnf size, Align align, halnf marging, const RGBA& col ) { + RectF rec = { aRec.x + marging, aRec.y + marging, aRec.z - marging * 2, aRec.w - marging * 2 }; + rec.pos += mOrigin; pushClamp(rec); @@ -113,7 +178,9 @@ void Canvas::text( popClamp(); } -void Canvas::drawImage(const RectF& rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) { +void Canvas::drawImage(RectF rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) { + rec.pos += mOrigin; + auto imgPaint = nvgImagePattern(mContext->vg, rec.x, rec.y, rec.z, rec.w, angle, image->id, alpha); nvgBeginPath(mContext->vg); nvgRoundedRect(mContext->vg, rec.x, rec.y, rec.z, rec.w, rounding); @@ -155,3 +222,195 @@ void Canvas::drawEnd() { glViewport(0, 0, size.x, size.y); nvgEndFrame(mContext->vg); } + + +void Canvas::colorWheel(const RectF& rec, const ColorWheel& colorWheel) { + auto NVG = mContext->vg; + const auto sizeInner = 5.f; + const auto sizeOuter = 7.f; + + float const x = rec.x + mOrigin.x; + float const y = rec.y + mOrigin.y; + float const w = rec.z; + float const h = rec.w; + + const HSV& hsv = colorWheel.color; + float const hue = hsv.h / (NVG_PI * 2); + + int i; + float r0, r1, ax, ay, bx, by, cx, cy, aeps, r; + NVGpaint paint; + + nvgSave(mContext->vg); + + cx = x + w * 0.5f; + cy = y + h * 0.5f; + r1 = (w < h ? w : h) * 0.5f - colorWheel.margin; + r0 = r1 - colorWheel.thickness; + + aeps = 0.5f / r1; // half a pixel arc length in radians (2pi cancels out). + + for (i = 0; i < 6; i++) { + float a0 = (float)i / 6.0f * NVG_PI * 2.0f - aeps; + float a1 = (float)(i + 1.0f) / 6.0f * NVG_PI * 2.0f + aeps; + nvgBeginPath(NVG); + nvgArc(NVG, cx, cy, r0, a0, a1, NVG_CW); + nvgArc(NVG, cx, cy, r1, a1, a0, NVG_CCW); + nvgClosePath(NVG); + ax = cx + cosf(a0) * (r0 + r1) * 0.5f; + ay = cy + sinf(a0) * (r0 + r1) * 0.5f; + bx = cx + cosf(a1) * (r0 + r1) * 0.5f; + by = cy + sinf(a1) * (r0 + r1) * 0.5f; + paint = nvgLinearGradient(NVG, ax, ay, bx, by, nvgHSLA(a0 / (NVG_PI * 2), 1.0f, 0.55f, 255), nvgHSLA(a1 / (NVG_PI * 2), 1.0f, 0.55f, 255)); + nvgFillPaint(NVG, paint); + nvgFill(NVG); + } + + nvgBeginPath(NVG); + nvgCircle(NVG, cx, cy, r0 - 0.5f); + nvgCircle(NVG, cx, cy, r1 + 0.5f); + nvgStrokeColor(NVG, nvgRGBA(0, 0, 0, 64)); + nvgStrokeWidth(NVG, 1.0f); + nvgStroke(NVG); + + // Selector + nvgSave(NVG); + nvgTranslate(NVG, cx, cy); + nvgRotate(NVG, hue * NVG_PI * 2); + + // Marker on + nvgStrokeWidth(NVG, 2.0f); + nvgBeginPath(NVG); + nvgRect(NVG, r0 - 1, -3, r1 - r0 + 2, 6); + nvgStrokeColor(NVG, nvgRGBA(255, 255, 255, 192)); + nvgStroke(NVG); + + paint = nvgBoxGradient(NVG, r0 - 3, -5, r1 - r0 + 6, 10, 2, 4, nvgRGBA(0, 0, 0, 128), nvgRGBA(0, 0, 0, 0)); + nvgBeginPath(NVG); + nvgRect(NVG, r0 - 2 - 10, -4 - 10, r1 - r0 + 4 + 20, 8 + 20); + nvgRect(NVG, r0 - 2, -4, r1 - r0 + 4, 8); + nvgPathWinding(NVG, NVG_HOLE); + nvgFillPaint(NVG, paint); + nvgFill(NVG); + + // Center triangle + r = r0 - 6; + ax = cosf(120.0f / 180.0f * NVG_PI) * r; + ay = sinf(120.0f / 180.0f * NVG_PI) * r; + bx = cosf(-120.0f / 180.0f * NVG_PI) * r; + by = sinf(-120.0f / 180.0f * NVG_PI) * r; + nvgBeginPath(NVG); + nvgMoveTo(NVG, r, 0); + nvgLineTo(NVG, ax, ay); + nvgLineTo(NVG, bx, by); + nvgClosePath(NVG); + paint = nvgLinearGradient(NVG, r, 0, ax, ay, nvgHSLA(hue, 1.0f, 0.5f, 255), nvgRGBA(255, 255, 255, 255)); + nvgFillPaint(NVG, paint); + nvgFill(NVG); + paint = nvgLinearGradient(NVG, (r + ax) * 0.5f, (0 + ay) * 0.5f, bx, by, nvgRGBA(0, 0, 0, 0), nvgRGBA(0, 0, 0, 255)); + nvgFillPaint(NVG, paint); + nvgFill(NVG); + nvgStrokeColor(NVG, nvgRGBA(0, 0, 0, 64)); + nvgStroke(NVG); + + // Select circle on triangle + float yt = hsv.v * hsv.s; + float xt = hsv.v - 0.5 * yt; + ay = sinf(120.0f / 180.0f * NVG_PI) * r * (-1.0f + xt * 2.0f); + ax = cosf(120.0f / 180.0f * NVG_PI) * r * (1.0f - yt * 3.f); + nvgStrokeWidth(NVG, 2.0f); + nvgBeginPath(NVG); + nvgCircle(NVG, ax, ay, sizeInner); + nvgStrokeColor(NVG, nvgRGBA(255, 255, 255, 192)); + nvgStroke(NVG); + + paint = nvgRadialGradient(NVG, ax, ay, 7, 9, nvgRGBA(0, 0, 0, 64), nvgRGBA(0, 0, 0, 0)); + nvgBeginPath(NVG); + nvgRect(NVG, ax - 20, ay - 20, 40, 40); + nvgCircle(NVG, ax, ay, sizeOuter); + nvgPathWinding(NVG, NVG_HOLE); + nvgFillPaint(NVG, paint); + nvgFill(NVG); + + nvgRestore(NVG); + + nvgRestore(NVG); +} + +void Canvas::ColorWheel::fromPoint(const tp::RectF& area, const tp::Vec2F& crs) { + auto wheel_rec = area; + wheel_rec.pos += margin; + wheel_rec.size -= margin * 2; + + auto center = wheel_rec.pos + wheel_rec.size / 2.f; + auto edge = min(wheel_rec.size.x, wheel_rec.size.y); + wheel_rec.pos = center - edge / 2.f; + wheel_rec.size = edge; + + HSV hsv = color; + + auto pos = crs - center; + + auto r = (crs - center).length(); + if (r < edge / 2.f) { + if (r > edge / 2.f - thickness) { + auto angle = halnf(atan2(pos.y, pos.x)); + angle = halnf(angle > 0 ? angle : PI * 2 + angle); + angle = clamp(angle, 0.f, halnf(PI * 2)); + hsv.h = angle; + } + else { + pos.y *= -1; + pos /= (edge / 2.f) - thickness - 10; + + auto angle = PI * 2 - hsv.h - PI / 2; + if (angle < 0) { + angle += PI * 2; + } + + auto sin = halnf(::sin(-angle)); + auto cos = halnf(::cos(-angle)); + auto sv_pos = Vec2F{ pos.x * cos - pos.y * sin, pos.x * sin + pos.y * cos }; + + auto sv_angle = halnf(atan2(sv_pos.x, sv_pos.y)); + sv_angle = halnf(sv_angle > 0 ? sv_angle : PI * 2 + sv_angle); + sv_angle = clamp(sv_angle, 0.f, halnf(PI * 2)); + + auto p1 = Vec2F(0, 1); + auto p2 = Vec2F(::cos(PI / 6), -::sin(PI / 6)); + auto p3 = Vec2F{ -p2.x, p2.y }; + + Vec2F intersection = sv_pos; + if (sv_angle < PI / 3 * 2) { + if (intersectLines2D({ 0, 0 }, sv_pos, p1, p2, &intersection)) { + sv_pos = intersection; + } + } + else if (sv_angle < PI / 3 * 4) { + if (intersectLines2D({ 0, 0 }, sv_pos, p3, p2, &intersection)) { + sv_pos = intersection; + } + } + else { + if (intersectLines2D({ 0, 0 }, sv_pos, p1, p3, &intersection)) { + sv_pos = intersection; + } + } + + sv_pos.y = halnf((sv_pos.y + 1 / 2.f) * 2 / 3.f * 1.0); + sv_pos.x = halnf(sv_pos.x * 2 / sqrt(3) * 1.0); + sv_pos.x = (sv_pos.x + 1.f) / 2; + + sv_pos.x = clamp(sv_pos.x, 0.f, 1.f); + sv_pos.y = clamp(sv_pos.y, 0.f, 1.f); + + auto v = sv_pos.y * 0.5f + sv_pos.x; + auto s = sv_pos.y / v; + + hsv.v = clamp(v, 0.001f, 0.999f); + hsv.s = clamp(s, 0.001f, 0.999f); + } + } + + color = hsv; +} \ No newline at end of file diff --git a/Graphics/private/DebugGUI.cpp b/Graphics/private/DebugGUI.cpp index 35d5061..5880db1 100644 --- a/Graphics/private/DebugGUI.cpp +++ b/Graphics/private/DebugGUI.cpp @@ -9,6 +9,8 @@ #include #include +#include "implot.h" + namespace tp { class DebugGUI::Context { public: @@ -34,19 +36,65 @@ DebugGUI::DebugGUI(Window* window) { ImGui_ImplOpenGL3_Init("#version 330"); ImGuiIO& io = ImGui::GetIO(); - io.Fonts->AddFontFromFileTTF("Font.ttf", 20.f); + io.Fonts->AddFontFromFileTTF("rsc/Font.ttf", 20.f); io.ConfigInputTrickleEventQueue = false; + + // appearance + io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; + + ImPlot::CreateContext(); + + return; + + auto& colors = ImGui::GetStyle().Colors; + colors[ImGuiCol_WindowBg] = ImVec4{ 0.1f, 0.105f, 0.11f, 1.0f }; + + // Headers + colors[ImGuiCol_Header] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f }; + colors[ImGuiCol_HeaderHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f }; + colors[ImGuiCol_HeaderActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + + // Buttons + colors[ImGuiCol_Button] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f }; + colors[ImGuiCol_ButtonHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f }; + colors[ImGuiCol_ButtonActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + + // Frame BG + colors[ImGuiCol_FrameBg] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f }; + colors[ImGuiCol_FrameBgHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f }; + colors[ImGuiCol_FrameBgActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + + // Tabs + colors[ImGuiCol_Tab] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + colors[ImGuiCol_TabHovered] = ImVec4{ 0.38f, 0.3805f, 0.381f, 1.0f }; + colors[ImGuiCol_TabActive] = ImVec4{ 0.28f, 0.2805f, 0.281f, 1.0f }; + colors[ImGuiCol_TabUnfocused] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + colors[ImGuiCol_TabUnfocusedActive] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f }; + + // Title + colors[ImGuiCol_TitleBg] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + colors[ImGuiCol_TitleBgActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; + colors[ImGuiCol_TitleBgCollapsed] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f }; } DebugGUI::~DebugGUI() { + ImPlot::DestroyContext(); + ImGui_ImplOpenGL3_Shutdown(); ImGui_ImplGlfw_Shutdown(); ImGui::DestroyContext(); + delete mContext; } +void DebugGUI::procBegin() { +} + +void DebugGUI::procEnd() { +} + void DebugGUI::drawBegin() { ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplGlfw_NewFrame(); diff --git a/Graphics/private/EventHandler.cpp b/Graphics/private/EventHandler.cpp index f1f5c10..1f49e0d 100644 --- a/Graphics/private/EventHandler.cpp +++ b/Graphics/private/EventHandler.cpp @@ -3,7 +3,10 @@ using namespace tp; -EventHandler::EventHandler() = default; +EventHandler::EventHandler() { + mTimerEvent.reset(); +} + EventHandler::~EventHandler() = default; void EventHandler::postEvent(InputID inputID, InputEvent inputEvent) { @@ -16,6 +19,12 @@ bool EventHandler::isEvents() { mMutex.lock(); auto res = mEventQueue.length(); mMutex.unlock(); + + if (mTimerEvent.isTimeout()) { + mTimerEvent.reset(); + res = true; + } + return res; } @@ -33,12 +42,38 @@ bool transitionsReduce[4][4] = { { true, true, true, true }, }; +void EventHandler::processAllEvent() { + mMutex.lock(); + + mPointerPrev = mPointer; + + while (mEventQueue.size()) { + processEventUnguarded(); + } + mMutex.unlock(); +} + void EventHandler::processEvent() { mMutex.lock(); - auto lastEvent = &mEventQueue.last(); - const auto& eventData = lastEvent->second; - const auto& inputId = lastEvent->first; + mPointerPrev = mPointer; + + if (!mEventQueue.size()) { + mMutex.unlock(); + return; + } + + processEventUnguarded(); + + mMutex.unlock(); +} + +void EventHandler::processEventUnguarded() { + + auto firstEvent = &mEventQueue.first(); + + const auto& eventData = firstEvent->second; + const auto& inputId = firstEvent->first; switch (eventData.type) { case InputEvent::Type::MOUSE_POS: @@ -56,8 +91,6 @@ void EventHandler::processEvent() { mInputStates[(int) inputId].mCurrentState = transitions[currentState][reportedEvent]; - // printf("%i - %i \n", reportedEvent, mInputStates[(int) InputID::A].mCurrentState); - if (transitionsReduce[currentState][reportedEvent]) { mEventQueue.popFront(); } @@ -65,6 +98,17 @@ void EventHandler::processEvent() { break; } + case InputEvent::Type::SCROLL: + { + if (mScrollDelta == Vec2F { 0, 0 }) { + mScrollDelta = eventData.scrollDelta; + } else { + mEventQueue.popFront(); + mScrollDelta = 0; + } + break; + } + default: { mEventQueue.popFront(); @@ -72,29 +116,41 @@ void EventHandler::processEvent() { } mPointerPressure = mInputStates[(int) InputID::MOUSE1].mCurrentState != InputState::State::NONE; - - mMutex.unlock(); } -const Vec2F& EventHandler::getPointer() const { return mPointer; } +void EventHandler::setCursorOrigin(const Vec2F& origin) { + mPointerOrigin = origin; +} -const Vec2F& EventHandler::getPointerPrev() const { return mPointerPrev; } +Vec2F EventHandler::getPointer() const { return mPointer - mPointerOrigin; } + +Vec2F EventHandler::getPointerPrev() const { return mPointerPrev - mPointerOrigin; } bool EventHandler::isPressed(InputID id) const { + if (!mEnableKeyEvents) return false; return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED; } bool EventHandler::isReleased(InputID id) const { + if (!mEnableKeyEvents) return false; return mInputStates[(int) id].mCurrentState == InputState::State::RELEASED; } -halnf EventHandler::getPointerPressure() const { return mPointerPressure; } +halnf EventHandler::getPointerPressure() const { + if (!mEnableKeyEvents) return 0; + return mPointerPressure; +} bool EventHandler::isDown(InputID id) const { + if (!mEnableKeyEvents) return false; return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED || mInputStates[(int) id].mCurrentState == InputState::State::HOLD; } -halnf EventHandler::getScrollY() const { return 0; } +halnf EventHandler::getScrollY() const { return mScrollDelta.y; } Vec2F EventHandler::getPointerDelta() const { return mPointer - mPointerPrev; } + +void EventHandler::setEnableKeyEvents(bool enable) { + mEnableKeyEvents = enable; +} \ No newline at end of file diff --git a/Graphics/private/GraphicApplication.cpp b/Graphics/private/GraphicApplication.cpp index 270c94d..e59ddc7 100644 --- a/Graphics/private/GraphicApplication.cpp +++ b/Graphics/private/GraphicApplication.cpp @@ -1,10 +1,12 @@ #include "GraphicApplication.hpp" +#include "imgui.h" + using namespace tp; Application::Application() { - mWindow = Window::createWindow(); + mWindow = Window::createWindow({1500, 900}); mGraphics = new Graphics(mWindow); mDrawTimer.setDuration(1000.f / mDrawPerSecond); @@ -12,7 +14,7 @@ Application::Application() { mPerSecondTimer.setDuration(1000.f); } -void Application::run() { +void Application::runDefaultLoop() { auto eventHandler = new EventHandler(); mWindow->setEventHandler(eventHandler); @@ -25,8 +27,8 @@ void Application::run() { // proc first frame by default { - mWindow->processEvents(); - processFrame(eventHandler); + mWindow->processEvents(false); + processFrame(eventHandler, 0); mGraphics->drawBegin(); drawFrame(mGraphics->getCanvas()); @@ -34,17 +36,33 @@ void Application::run() { mWindow->draw(); } + time_ms prevProcTime = get_time(); + + bool isForcedNewFrame = true; + while (!mWindow->shouldClose()) { - if (mProcTimer.isTimeout()) { + mWindow->processEvents(!isForcedNewFrame); + updateGlobalTime(); - mWindow->processEvents(); + if (mProcTimer.isTimeout() || eventHandler->isEvents() || isForcedNewFrame) { + + while ((eventHandler->isEvents() || isForcedNewFrame)) { - while (eventHandler->isEvents()) { eventHandler->processEvent(); - processFrame(eventHandler); + + time_ms currentTime = get_time(); + processFrame(eventHandler, halnf(currentTime - prevProcTime)); + prevProcTime = currentTime; redrawNeeded = true; mFramesProcessed++; + + isForcedNewFrame = forceNewFrame(); + + if (isForcedNewFrame) { + // mWindow->processEvents(); + break; + } } mProcTimer.wait(); @@ -82,13 +100,46 @@ void Application::run() { delete eventHandler; } -void Application::processFrame(EventHandler* eventHandler) {} +void Application::runDebugLoop() { + auto eventHandler = new EventHandler(); + mWindow->setEventHandler(eventHandler); + + time_ms prevProcTime = get_time(); + + while (!mWindow->shouldClose()) { + mWindow->processEvents(); + eventHandler->processAllEvent(); + time_ms currentTime = get_time(); + processFrame(eventHandler, halnf(currentTime - prevProcTime)); + prevProcTime = currentTime; + + + mGraphics->drawBegin(); + drawFrame(mGraphics->getCanvas()); + mGraphics->drawEnd(); + mWindow->draw(); + } + + delete eventHandler; +} + +void Application::run() { + runDefaultLoop(); + // runDebugLoop(); +} + +void Application::processFrame(EventHandler* eventHandler, halnf deltaTime) {} void Application::drawFrame(Canvas* canvas) { // ImGui::Text("Frames processed per second: %f", mFramesProcessedPerSecond); // ImGui::Text("Frames drawn per second: %f", mFramesDrawnPerSecond); } +void Application::drawDebug() { + ImGui::Text("Frames processed per second: %f", this->mFramesProcessedPerSecond); + ImGui::Text("Frames drawn per second: %f", this->mFramesDrawnPerSecond); +} + Application::~Application() { delete mGraphics; Window::destroyWindow(mWindow); diff --git a/Graphics/private/Window.cpp b/Graphics/private/Window.cpp index f844e21..ccaa39b 100644 --- a/Graphics/private/Window.cpp +++ b/Graphics/private/Window.cpp @@ -26,7 +26,10 @@ static void scrollCallback(GLFWwindow* window, double xOffset, double yOffset); Window::Window(Vec2F size, const char* title) { mContext = new Context(); - glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1); + // glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1); + // glfwWindowHint(GLFW_DECORATED, GLFW_FALSE); + + mSize = size; // Create a window and OpenGL context mContext->window = glfwCreateWindow((int) size.x, (int) size.y, title, nullptr, nullptr); @@ -40,6 +43,7 @@ Window::Window(Vec2F size, const char* title) { // Initialize GLEW if (glewInit() != GLEW_OK) { printf("Failed to initialize GLEW\n"); + exit(1); return; } @@ -63,7 +67,10 @@ Window* Window::createWindow(Vec2F size, const char* title) { } count--; - glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); + #ifdef ENV_OS_LINUX + glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); + #endif + // glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR); // Initialize GLFW if (!glfwInit()) { @@ -88,8 +95,9 @@ void Window::destroyWindow(Window* window) { bool Window::shouldClose() const { return glfwWindowShouldClose(mContext->window); } -void Window::processEvents() { - glfwWaitEvents(); +void Window::processEvents(bool wait) { + if (wait) glfwWaitEvents(); + else glfwPollEvents(); checkAxisUpdates(); } @@ -119,13 +127,13 @@ void Window::checkAxisUpdates() { double x, y; glfwGetCursorPos(mContext->window, &x, &y); - int posX, posY; - glfwGetWindowPos(mContext->window, &posX, &posY); + // int posX, posY; + // glfwGetWindowPos(mContext->window, &posX, &posY); if (mPointerPos != Vec2F{ (halnf) x, (halnf) y }) { mPointerPos = { (halnf) x, (halnf) y }; - auto pos = Vec2F{ (halnf) posX, (halnf) posY }; + // auto pos = Vec2F{ (halnf) posX, (halnf) posY }; RectF windowRec = { { 0, 0 }, mSize }; if (windowRec.isInside(mPointerPos)) { @@ -163,13 +171,20 @@ static void mouseButtonCallback(GLFWwindow* window, int button, int action, int auto id = (InputID) ((int) InputID::MOUSE1 + button); if (action == GLFW_PRESS) { - eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} } - ); + // printf("mouse\n"); + eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} }); } else if (action == GLFW_RELEASE) { eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::RELEASE, {} }); } + } static void scrollCallback(GLFWwindow* window, double xOffset, double yOffset) { - // ignore for now + auto* self = static_cast(glfwGetWindowUserPointer(window)); + if (!self) return; + + EventHandler* eventHandler = self->getEventHandler(); + if (!eventHandler) return; + + eventHandler->postEvent(InputID::SCROLL, { InputEvent::Type::SCROLL, {}, {}, { xOffset, yOffset } }); } \ No newline at end of file diff --git a/Graphics/public/EventHandler.hpp b/Graphics/public/EventHandler.hpp index 802a427..c62bd89 100644 --- a/Graphics/public/EventHandler.hpp +++ b/Graphics/public/EventHandler.hpp @@ -4,6 +4,7 @@ #include "Vec.hpp" #include "List.hpp" #include "Map.hpp" +#include "Timing.hpp" #include @@ -15,6 +16,7 @@ namespace tp { BUTTON_ACTION, MOUSE_DELTA, MOUSE_POS, + SCROLL, } type = Type::NONE; enum class ButtonAction { @@ -26,6 +28,7 @@ namespace tp { } buttonAction = ButtonAction::NONE; Vec2F mouseEvent = { 0, 0 }; + Vec2F scrollDelta = { 0, 0 }; }; class InputState { @@ -68,9 +71,12 @@ namespace tp { public: // User interface bool isEvents(); void processEvent(); + void processAllEvent(); - [[nodiscard]] const Vec2F& getPointer() const; - [[nodiscard]] const Vec2F& getPointerPrev() const; + void setCursorOrigin(const Vec2F& origin); + + [[nodiscard]] Vec2F getPointer() const; + [[nodiscard]] Vec2F getPointerPrev() const; [[nodiscard]] Vec2F getPointerDelta() const; [[nodiscard]] bool isPressed(InputID id) const; @@ -80,6 +86,11 @@ namespace tp { [[nodiscard]] halnf getPointerPressure() const; + void setEnableKeyEvents(bool); + + private: + void processEventUnguarded(); + private: std::mutex mMutex = {}; @@ -87,12 +98,19 @@ namespace tp { List> mEventQueue; // input states + Vec2F mPointerOrigin = { 0, 0 }; + Vec2F mPointer; Vec2F mPointerPrev; + Vec2F mScrollDelta; halnf mPointerPressure = 0; InputState mInputStates[(int) InputID::LAST_KEY_CODE]{}; + + Timer mTimerEvent = Timer(1000); + + bool mEnableKeyEvents = true; }; } \ No newline at end of file diff --git a/Graphics/public/GraphicApplication.hpp b/Graphics/public/GraphicApplication.hpp index bc9e930..253314d 100644 --- a/Graphics/public/GraphicApplication.hpp +++ b/Graphics/public/GraphicApplication.hpp @@ -12,16 +12,24 @@ namespace tp { void run(); - virtual void processFrame(EventHandler* eventHandler); + virtual bool forceNewFrame() { return false; } + + virtual void processFrame(EventHandler* eventHandler, halnf deltaTime); virtual void drawFrame(Canvas* canvas); virtual ~Application(); + void drawDebug(); + + private: + void runDefaultLoop(); + void runDebugLoop(); + protected: bool mInitialized = false; - ualni mDrawPerSecond = 60; - ualni mProcPerSecond = 160; + ualni mDrawPerSecond = 1160; + ualni mProcPerSecond = 1300; Timer mDrawTimer; Timer mProcTimer; diff --git a/Graphics/public/Graphics.hpp b/Graphics/public/Graphics.hpp index dfa1650..afbc325 100644 --- a/Graphics/public/Graphics.hpp +++ b/Graphics/public/Graphics.hpp @@ -17,8 +17,8 @@ namespace tp { explicit DebugGUI(Window* window); ~DebugGUI(); - void procBegin() {} - void procEnd() {} + void procBegin(); + void procEnd(); void drawBegin(); void drawEnd(); @@ -55,20 +55,38 @@ namespace tp { ualni id = 0; }; + struct ColorWheel { + HSV color = { 0.13, 0.5, 1 }; + halnf thickness = 20; + halnf margin = 5; + + void fromPoint(const RectF& area, const Vec2F& point); + }; + + void setOrigin(const Vec2F& origin); + void pushClamp(const RectF& rec); void popClamp(); - void rect(const RectF& rec, const RGBA& col, halnf round = 0); + [[nodiscard]] const RectF& getClampedArea() const; + + void debugCross(RectF rec, const RGBA& col); + void rect(RectF rec, const RGBA& col, halnf round = 0); + void frame(RectF rec, const RGBA& col, halnf round = 0); + void circle(Vec2F pos, halnf size, const RGBA& col); void text(const char*, const RectF&, halnf size, Align, halnf padding, const RGBA&); + void colorWheel(const RectF& rec, const ColorWheel& colorWheel); + void line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness); ImageHandle createImageFromTextId(ualni id, Vec2F size); void updateTextureID(ImageHandle handle, ualni id); void deleteImageHandle(ImageHandle image); - void drawImage(const RectF& rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f); + void drawImage(RectF rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f); private: Buffer mScissors; bool mIsClamping = false; + Vec2F mOrigin = { 0, 0 }; }; class Graphics { diff --git a/Graphics/public/InputCodes.hpp b/Graphics/public/InputCodes.hpp index cae8e99..1cc8f40 100644 --- a/Graphics/public/InputCodes.hpp +++ b/Graphics/public/InputCodes.hpp @@ -143,8 +143,10 @@ namespace tp { MOUSE4 = 504, MOUSE5 = 505, - LAST_KEY_CODE = 508, + SCROLL, - WINDOW_RESIZE = 1000, + WINDOW_RESIZE, + + LAST_KEY_CODE, }; } \ No newline at end of file diff --git a/Graphics/public/Window.hpp b/Graphics/public/Window.hpp index 15c9680..c37d656 100644 --- a/Graphics/public/Window.hpp +++ b/Graphics/public/Window.hpp @@ -12,12 +12,12 @@ namespace tp { ~Window(); public: - static Window* createWindow(Vec2F size = { 500.f, 500.f }, const char* title = "Window"); + static Window* createWindow(Vec2F size = { 1000.f, 700.f }, const char* title = "Window"); static void destroyWindow(Window* window); public: void draw(); - void processEvents(); + void processEvents(bool wait = true); void setEventHandler(EventHandler* eventHandler); [[nodiscard]] EventHandler* getEventHandler(); diff --git a/Graphics/examples/Font.ttf b/Graphics/rsc/Font.ttf similarity index 100% rename from Graphics/examples/Font.ttf rename to Graphics/rsc/Font.ttf diff --git a/LICENSE b/LICENSE index d159169..74b5cc8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,339 +1,37 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +SOFTWARE LICENSE AGREEMENT +This Software License Agreement ("Agreement") is made and entered into as of 2024-11-24 ("Effective Date") by Ilya Shurupov. - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +WHEREAS, Licensor owns certain software that it desires to license to Licensee; - Preamble +WHEREAS, Licensee desires to use such software under the terms and conditions set forth herein. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. +NOW, THEREFORE, in consideration of the mutual promises contained herein and for other good and valuable consideration, the receipt and sufficiency of which are hereby acknowledged, the parties agree as follows: - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +1. Definition of Software: +The term "Software" refers to the Modules, including any updates, modifications, or associated documentation provided by Licensor. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +2. Grant of License: +Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee a no license to use the Software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +3. Derivative Works: +No modifications or derivative works are allowed. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. +4. Commercial Use: +Commercial use is not allowed. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. +5. Attribution: +No attribution is required. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +6. Intellectual Property Rights: +All intellectual property rights in the Software shall remain the property of Licensor. The Licensee does not acquire any rights to the Software except for the limited use rights specified in this Agreement. - The precise terms and conditions for copying, distribution and -modification follow. +7. Warranty and Liability: +The Software is provided "as is" without warranty of any kind. Licensor shall not be liable for any damages arising out of or related to the use or inability to use the Software. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +8. Termination: +This Agreement shall terminate automatically if Licensee breaches any of its terms and conditions. Upon termination, Licensee must cease all use of the Software and destroy all copies. - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". +9. Governing Law: +This Agreement shall be governed by and construed in accordance with the laws of . -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +https://www.binpress.com/license-generator/ diff --git a/LibraryViewer/CMakeLists.txt b/LibraryViewer/CMakeLists.txt index becb208..4400a13 100644 --- a/LibraryViewer/CMakeLists.txt +++ b/LibraryViewer/CMakeLists.txt @@ -15,7 +15,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets) target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) file(COPY "library" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}") -file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc/") ### -------------------------- Applications -------------------------- ### add_executable(libView ./applications/Entry.cpp) diff --git a/LibraryViewer/applications/Entry.cpp b/LibraryViewer/applications/Entry.cpp index 38dfca0..ad43539 100644 --- a/LibraryViewer/applications/Entry.cpp +++ b/LibraryViewer/applications/Entry.cpp @@ -1,10 +1,10 @@ #include "GUI.hpp" -#include "GraphicApplication.hpp" +#include "WidgetApplication.hpp" using namespace tp; -class LibraryViewer : public Application { +class LibraryViewer : public WidgetApplication { public: LibraryViewer() : gui(&library, &player) { @@ -12,25 +12,15 @@ public: library.checkExisting(); gui.updateTracks(); + + setRoot(&gui); } - void processFrame(EventHandler* eventHandler) override { - auto rec = RectF{ { 0, 0 }, mWindow->getSize() }; - - gui.setVisible(true); - gui.setArea(rec); - gui.updateConfigWrapper(mWidgetManager); - gui.procWrapper(*eventHandler, rec); - } - - void drawFrame(Canvas* canvas) override { gui.drawWrapper(*canvas); } - private: Player player; Library library; - tp::WidgetManager mWidgetManager; - LibraryWidget gui; + LibraryWidget gui; }; int main() { diff --git a/LibraryViewer/private/Library.cpp b/LibraryViewer/private/Library.cpp index d94ea1b..a0127cd 100644 --- a/LibraryViewer/private/Library.cpp +++ b/LibraryViewer/private/Library.cpp @@ -1,7 +1,6 @@ #include "Library.hpp" #include "LocalConnection.hpp" -#include "WidgetBase.hpp" #include "picojson.h" #include diff --git a/LibraryViewer/public/GUI.hpp b/LibraryViewer/public/GUI.hpp index 4403553..10a1ad7 100644 --- a/LibraryViewer/public/GUI.hpp +++ b/LibraryViewer/public/GUI.hpp @@ -2,67 +2,95 @@ #include "Library.hpp" #include "Player.hpp" -#include "Widgets.hpp" +#include "FloatingWidget.hpp" +#include "DockWidget.hpp" #include "imgui.h" namespace tp { - template - class TrackWidget : public Widget { + class TrackWidget : public Widget { public: - explicit TrackWidget(const Track* track = nullptr) : - mTrack(track) { - this->mArea.w = 70; - col.mColor.setAnimTime(0); - col.mColor.setNoTransition({ 0.15f, 0.15f, 0.15f, 0.f }); + enum State { + IDLE, + HOVER, + SELECTED, }; - void eventProcess(const Events& events) override { - mSelected = false; - if (!mTrack) return; - if (this->mArea.isInside(events.getPointer())) { - col.set({ 0.15f, 0.15f, 0.15f, 1.f }); - mSelected = events.isReleased(InputID::MOUSE1); - } else { - col.set({ 0.15f, 0.15f, 0.15f, 0.f }); + explicit TrackWidget(const Track* track = nullptr) : + mTrack(track) { + + getLayout()->setMinSize({ 70, 70 }); + }; + + void process(const EventHandler& events) override { + mState = IDLE; + + if (!mTrack) { + mState = IDLE; + return; + } + + switch (mState) { + case HOVER: + case IDLE: + mState = getArea().relative().isInside(events.getPointer()) ? HOVER : IDLE; + if (events.isPressed(InputID::MOUSE1)) { + mState = SELECTED; + } + break; + + case SELECTED: + break; } } - void eventDraw(Canvas& canvas) override { + void draw(Canvas& canvas) override { if (!mTrack) return; + auto area = getArea().relative(); - canvas.rect(this->mArea, col.get(), 4.f); + switch (mState) { + case IDLE: canvas.rect(area, colorIdle, rounding); break; + case HOVER: canvas.rect(area, colorHover, rounding); break; + case SELECTED: canvas.rect(area, colorSelected, rounding); break; + } - const RectF imageArea = { - this->mArea.x + margin, this->mArea.y + margin, this->mArea.w - margin * 2, this->mArea.w - margin * 2 + + const RectF imageArea = { area.x + margin, area.y + margin, area.w - margin * 2, area.w - margin * 2 }; + canvas.rect(imageArea, colorImage, rounding); + + const RectF textArea = { + area.x + area.w + margin, area.y + margin, area.z - area.w - margin * 2, area.w - margin * 2 }; - canvas.rect(imageArea, { 0.25f, 0.25f, 0.25f, 1.f }, 4.f); - - const RectF textArea = { this->mArea.x + this->mArea.w + margin, - this->mArea.y + margin, - this->mArea.z - this->mArea.w - margin * 2, - this->mArea.w - margin * 2 }; - // canvas.rect(textArea, { 0.25f, 0.25f, 0.25f, 1.f }, 4.f); const RectF textAreaName = { textArea.x, textArea.y, textArea.z, textArea.w * 0.5f }; const RectF textAreaAuthor = { textArea.x, textArea.y + textArea.w * 0.5f, textArea.z, textArea.w * 0.5f }; - canvas.text(mTrack->mName.c_str(), textAreaName, 15.f, Canvas::LC, 4.f, { 0.9f, 0.9f, 0.9f, 1.f }); - canvas.text(mTrack->mArtist.c_str(), textAreaAuthor, 12.f, Canvas::LC, 4.f, { 0.8f, 0.8f, 0.8f, 1.f }); + canvas.text(mTrack->mName.c_str(), textAreaName, 15.f, Canvas::LC, rounding, colorNameTrack); + canvas.text(mTrack->mArtist.c_str(), textAreaAuthor, 12.f, Canvas::LC, rounding, colorNameArtist); } + [[nodiscard]] bool processesEvents() const override { return true; } + public: - halnf margin = 5.f; - AnimColor col; const Track* mTrack; - bool mSelected = false; + State mState = IDLE; + + private: + halnf margin = 5.f; + halnf rounding = 5.f; + + RGBA colorIdle = 0; + RGBA colorNameTrack = { 0.9f, 0.9f, 0.9f, 1.f }; + RGBA colorNameArtist = { 0.8f, 0.8f, 0.8f, 1.f }; + RGBA colorImage = { 0.5, 0.5, 0.5, 1.0 }; + RGBA colorHover = { 0.13, 0.13, 0.13, 0.9 }; + RGBA colorSelected = { 0.43, 0.43, 0.43, 0.9 }; }; - template - class TrackInfoWidget : public Widget { + class TrackInfoWidget : public Widget { struct SortType { std::string text; bool dec = false; @@ -76,21 +104,23 @@ namespace tp { items.append({ "Date Last Played" }); } - void eventDraw(Canvas&) override { + void draw(Canvas&) override { if (!mTrack) return; // canvas.rect(this->mArea, { 0.13f, 0.13f, 0.13f, 1.f }, 4.f); renderUI(); } void renderUI() { - ImGui::SetNextWindowPos({ this->mArea.x, this->mArea.y }); - ImGui::SetNextWindowSize({ this->mArea.z, this->mArea.w }); + // auto area = getArea(); + + // ImGui::SetNextWindowPos({ area.x, this->mArea.y }); + // ImGui::SetNextWindowSize({ area.z, this->mArea.w }); ImGui::Begin( "InfoWindow", - nullptr, - ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground | - ImGuiWindowFlags_NoResize + nullptr //, + //ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground | + // ImGuiWindowFlags_NoResize ); if (mTrack) { @@ -186,54 +216,59 @@ namespace tp { int filterExisting = 0; // all existing no-existing }; - template - class LibraryWidget : public Widget { + class LibraryWidget : public DockWidget { public: LibraryWidget(Library* lib, Player* player) { mLibrary = (lib); mPlayer = (player); - updateTracks(); + // updateTracks(); mCurrentTrackInfo.mPlayer = mPlayer; - this->mChildWidgets.pushBack(&mSplitView); - this->mChildWidgets.pushBack(&mSongList); - this->mChildWidgets.pushBack(&mCurrentTrackInfo); - this->mChildWidgets.pushBack(&mCurrentTrack); + setCenterWidget(&mSongList); + dockWidget(&mCurrentTrackInfo, DockLayout::RIGHT); + + // this->mChildWidgets.pushBack(&mCurrentTrackInfo); + // this->mChildWidgets.pushBack(&mCurrentTrack); } void updateTracks() { mTracks.clear(); + + for (auto track : mTracks) { + delete track.data(); + } + for (auto track : mLibrary->mTraks) { - mTracks.append(TrackWidget(&track.data())); + mTracks.append(new TrackWidget(&track.data())); } } - void eventProcess(const Events& events) override { + void process(const EventHandler& events) override { filter(); - mSplitView.setArea(this->mArea); - mSongList.setArea(mSplitView.getFirst()); - - for (auto track : mSongList.getContent()) { - auto trackWidget = (TrackWidget*) track.data(); - if (trackWidget->mSelected) { - mCurrentTrackInfo.mTrack = trackWidget->mTrack; + for (auto track : mSongList.getContainer()->getChildren()) { + if (auto trackWidget = dynamic_cast(track.data())) { + if (trackWidget->mState == TrackWidget::SELECTED) { + mCurrentTrackInfo.mTrack = trackWidget->mTrack; + } } } - mCurrentTrackInfo.setArea(mSplitView.getSecond()); - // mCurrentTrack.proc(events, this->mArea, mSplitView.getFirst()); + + DockWidget::process(events); } - void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, { 0.1f, 0.1f, 0.1f, 1.f }); } + // void eventDraw(Canvas& canvas) override { + // canvas.rect(this->mArea, { 0.1f, 0.1f, 0.1f, 1.f }); + // } void filter() { if (!mCurrentTrackInfo.isSongFilterChanged) return; - mSongList.clearContent(); + mSongList.getContainer()->clear(); for (auto track : mTracks) { if (!mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mName.c_str()) && @@ -255,7 +290,7 @@ namespace tp { break; } - mSongList.addWidget(&track.data()); + mSongList.getContainer()->addChild(track.data()); } mCurrentTrackInfo.isSongFilterChanged = false; @@ -265,11 +300,10 @@ namespace tp { Library* mLibrary = nullptr; Player* mPlayer = nullptr; - Buffer> mTracks; + Buffer mTracks; - SplitView mSplitView; - ScrollableWindow mSongList; - TrackInfoWidget mCurrentTrackInfo; - TrackWidget mCurrentTrack; + ScrollableWidget mSongList; + TrackInfoWidget mCurrentTrackInfo; + TrackWidget mCurrentTrack; }; } \ No newline at end of file diff --git a/Math/private/Camera.cpp b/Math/private/Camera.cpp index fffc32e..621297e 100644 --- a/Math/private/Camera.cpp +++ b/Math/private/Camera.cpp @@ -88,7 +88,7 @@ void Camera::lookAtPoint(const Vec3F& aTarget, const Vec3F& aPos, Vec3F aUp) { } mPos = aPos; mTarget = aTarget; - Vec3F f = (mPos - mTarget).normalize(); + Vec3F f = (mTarget - mPos).normalize(); mUp = f * (aUp.normalize() * f); } @@ -117,16 +117,20 @@ void Camera::rotate(halnf angleX, halnf angleY) { Vec3F wup(0, 0, 1); mPos -= mTarget; - mat3f rotZ = mat3f::rotatorDir(wup, angleX); + Mat3F rotZ = Mat3F::rotatorDir(wup, angleX); mPos = rotZ * mPos; mUp = rotZ * mUp; Vec3F f = mPos.unitV(); Vec3F s = mUp * f; - mPos = mat3f::rotatorDir(s, -angleY) * mPos; + mPos = Mat3F::rotatorDir(s, -angleY) * mPos; mPos += mTarget; lookAtPoint(mTarget, mPos, mUp); } + +void Camera::setPos(Vec3F pos) { + mPos = pos; +} diff --git a/Math/private/Topology.cpp b/Math/private/Topology.cpp index 90583c2..96af391 100644 --- a/Math/private/Topology.cpp +++ b/Math/private/Topology.cpp @@ -88,18 +88,18 @@ void TopologyCache::updateCache() { } TransformedPoints.reserve(Source->Points.size()); - for (auto idx : Range(TransformedPoints.size())) { + for (auto idx : IterRange(TransformedPoints.size())) { TransformedPoints[idx] = Source->Basis.transform(Source->Points[idx]); TransformedPoints[idx] += Source->Origin; } TransformedNormals.reserve(Source->Normals.size()); - for (auto idx : Range(TransformedNormals.size())) { + for (auto idx : IterRange(TransformedNormals.size())) { TransformedNormals[idx] = Source->Basis.transform(Source->Normals[idx]); } TrigCaches.reserve(Source->Indexes.size()); - for (auto idx : Range(TrigCaches.size())) { + for (auto idx : IterRange(TrigCaches.size())) { TrigCaches[idx].mP1 = Source->Indexes[idx].x; TrigCaches[idx].mP2 = Source->Indexes[idx].y; TrigCaches[idx].mP3 = Source->Indexes[idx].z; diff --git a/Math/public/Camera.hpp b/Math/public/Camera.hpp index 2b2ba45..6ebc5b3 100644 --- a/Math/public/Camera.hpp +++ b/Math/public/Camera.hpp @@ -18,6 +18,7 @@ namespace tp { void setRatio(halnf ratio); void setFOV(halnf fov); void setFar(halnf far); + void setPos(Vec3F pos); [[nodiscard]] const Vec3F& getPos() const; [[nodiscard]] const Vec3F& getTarget() const; diff --git a/Math/public/Color.hpp b/Math/public/Color.hpp index 2c3dce7..7cebe3d 100644 --- a/Math/public/Color.hpp +++ b/Math/public/Color.hpp @@ -79,6 +79,15 @@ namespace tp { bool operator==(const RGBA& in) const { return r == in.r && g == in.g && b == in.b && a == in.a; } + static RGBA random() { + return RGBA{ + (halnf) randomFloat(), + (halnf) randomFloat(), + (halnf) randomFloat(), + 1.f, + }; + } + public: union { RGB rgbs; diff --git a/Math/public/Mat.hpp b/Math/public/Mat.hpp index 967a832..97e73c1 100644 --- a/Math/public/Mat.hpp +++ b/Math/public/Mat.hpp @@ -221,7 +221,7 @@ namespace tp { static_assert(tNRows == tNColoumns); for (halni i = 0; i < tNColoumns; i++) { for (halni j = i + 1; j < tNColoumns; j++) { - swap((*this)[i][j], (*this)[j][i]); + swapV((*this)[i][j], (*this)[j][i]); } } return *this; @@ -465,8 +465,15 @@ namespace tp { } // Matrix Properties - MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.y + j.y * in.x); } + MVec toGlobal(const MVec &in) const { return i * in.x + j * in.y; } + Mat toGlobal(const Mat &in) const { return {toGlobal(in.i), toGlobal(in.j)}; } + + MVec toLocal(const MVec &in) const { return transform(in); } + + MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.x + j.y * in.y); } + + // ??? Mat transform(const Mat& in) const { Mat out; out.i.x = i.x * in.i.x + j.x * in.i.y; @@ -479,7 +486,7 @@ namespace tp { Mat operator*(const Mat& in) { return transform(in); } Mat& transpose() { - swap(j.x, i.y); + swapV(j.x, i.y); return *this; } @@ -495,8 +502,8 @@ namespace tp { }; template - using mat3 = Mat; - using mat3f = mat3; + using Mat3 = Mat; + using Mat3F = Mat3; template class Mat { @@ -635,9 +642,9 @@ namespace tp { } Mat& transpose() { - swap(I.y, J.x); - swap(I.z, K.x); - swap(J.z, K.y); + swapV(I.y, J.x); + swapV(I.z, K.x); + swapV(J.z, K.y); return *this; } @@ -647,22 +654,22 @@ namespace tp { Mat inv() { return cofactors() /= det(); } - Mat rotatorX(alnf angle) { + Mat rotatorX(alnf angle) const { alnf cosA = (alnf) cos(angle); alnf sinA = (alnf) sin(angle); return { { 1, 0, 0 }, { 0, cosA, -sinA }, { 0, sinA, cosA } }; } - Mat rotatorY(alnf angle) { + Mat rotatorY(alnf angle) const { alnf cosA = (alnf) cos(angle); alnf sinA = (alnf) sin(angle); return { { cosA, 0, sinA }, { 0, 1, 0 }, { -sinA, 0, cosA } }; } - Mat rotatorZ(alnf angle) { - alnf cosA = (alnf) cos(angle); - alnf sinA = (alnf) sin(angle); - return { { cosA, -sinA, 0 }, { sinA, cosA, 0 }, { 0, 0, 1 } }; + static Mat rotatorZ(alnf angle) { + Type cosA = (Type) cos(angle); + Type sinA = (Type) sin(angle); + return { vec{ cosA, -sinA, 0 }, vec{ sinA, cosA, 0 }, vec{ 0, 0, 1 } }; } static Mat rotatorDir(vec dir, alnf angle) { @@ -707,4 +714,14 @@ namespace tp { Type det() { return Type(); } }; + + template + Mat toMat4(const Mat& in) { + Mat out; + out[0] = { in[0][0], in[0][1], in[0][2], 0 }; + out[1] = { in[1][0], in[1][1], in[1][2], 0 }; + out[2] = { in[2][0], in[2][1], in[2][2], 0 }; + out[3] = { Type(0), Type(0), Type(0), Type(1) }; + return out; + } } diff --git a/Math/public/Range.hpp b/Math/public/Range.hpp new file mode 100644 index 0000000..208d23b --- /dev/null +++ b/Math/public/Range.hpp @@ -0,0 +1,39 @@ + +#pragma once + +#include "Common.hpp" + +namespace tp { + template + class Range { + public: + Range() = default; + Range(Type v1, Type v2) : start(v1), end(v2) {} + + Type mid() const { return (start + end) / 2.f; } + Type size() const { return (end - start); } + + void resizeFromCenter(Type newSize) { + const auto middle = mid(); + const auto len = newSize / 2; + start = middle - len; + end = middle + len; + } + + void clamp(const Range& inside, const Range& outside) { + start = tp::clamp(start, outside.start, inside.start); + end = tp::clamp(end, inside.end, outside.end); + } + + void clamp(const Range& outside) { + start = tp::clamp(start, outside.start, outside.end); + end = tp::clamp(end, outside.start, outside.end); + } + + public: + Type start{}; + Type end{}; + }; + + using RangeF = Range; +} \ No newline at end of file diff --git a/Math/public/Rect.hpp b/Math/public/Rect.hpp index c1045fb..47ab3ef 100644 --- a/Math/public/Rect.hpp +++ b/Math/public/Rect.hpp @@ -2,6 +2,7 @@ #pragma once #include "Vec.hpp" +#include "Range.hpp" #include "Intersections.hpp" @@ -35,6 +36,11 @@ namespace tp { this->size = size; } + Rect(const Range& rx, const Range& ry) { + this->pos = { rx.start, ry.start }; + this->size = { rx.size(), ry.size() }; + } + Rect(Type aPosX, Type posy, Type aSizeX, Type aSizeY) { pos.assign(aPosX, posy); size.assign(aSizeX, aSizeY); @@ -64,7 +70,30 @@ namespace tp { return *this; } - bool operator==(Rect& rect) const { return (pos == rect.pos && size == rect.size); } + Rect& adjust(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) { + x += left; + y += bottom; + size.x += -left + right; + size.y += -bottom + top; + return *this; + } + + Rect adjusted(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) const { + return Rect(*this).adjust(left, bottom, right, top); + } + + [[nodiscard]] halnf left() const { return x; } + [[nodiscard]] halnf bottom() { return y; } + [[nodiscard]] halnf top() { return y + size.y; } + [[nodiscard]] halnf right() { return x + size.x; } + + static Rect fromPoints(const Vec2& p1, const Vec2& p2) { + tp::Vec2F min = {tp::min(p1.x, p2.x), tp::min(p1.y, p2.y)}; + tp::Vec2F max = {tp::max(p1.x, p2.x), tp::max(p1.y, p2.y)}; + return { min, max - min }; + } + + bool operator==(const Rect& rect) const { return (pos == rect.pos && size == rect.size); } bool isEnclosedIn(const Rect& rect, bool aParent = false) const { if (aParent) { @@ -91,6 +120,10 @@ namespace tp { } } + Rect relative() const { + return { { 0, 0 }, size }; + } + // argument isInside bool isInside(const Vec2& p) const { return isInside(p.x, p.y); } @@ -102,12 +135,17 @@ namespace tp { void invertY(Type scr_y) { pos.y = scr_y - pos.y - size.y; } + Rect& move(Vec2 delta) { + move(delta.x, delta.y); + return *this; + } + void move(Type dx, Type dy) { pos.x += dx; pos.y += dy; } - Rect& scaleFromCenter(tp::halnf fac, bool add = false) { + Rect& shrinkFromCenter(tp::halnf fac, bool add = false) { if (add) { pos += fac; size -= fac * 2; @@ -119,13 +157,18 @@ namespace tp { return *this; } - Vec2 p1() { return pos; } + Range getRangeX() const { return { x, x + z }; } + Range getRangeY() const { return { y, y + w }; } - Vec2 p3() { return pos + size; } + // pos + Vec2 p1() const { return pos; } - Vec2 p2() { return { pos.x, pos.y + size.y }; } + Vec2 p2() const { return { pos.x, pos.y + size.y }; } - Vec2 p4() { return { pos.x + size.x, pos.y }; } + // pos + size + Vec2 p3() const { return pos + size; } + + Vec2 p4() const { return { pos.x + size.x, pos.y }; } inline bool isAbove(const Rect& rect) const { return (pos.y + size.y < rect.pos.y); } @@ -163,6 +206,31 @@ namespace tp { return { pos + val, size - val * 2 }; } + void expand(const Vec2& point) { + if (point.x < x) { + size.x += x - point.x; + x = point.x; + } + + if (point.y < y) { + size.y += y - point.y; + y = point.y; + } + + if (point.x > x + size.x) { + size.x = point.x - x; + } + + if (point.y > y + size.y) { + size.y = point.y - y; + } + } + + void expand(const Rect& rect) { + expand(rect.pos); + expand(rect.pos + rect.size); + } + // if only one point isInside bool clampOutside(Vec2& v1, Vec2& v2) { bool const in1 = isInside(v1); @@ -222,7 +290,32 @@ namespace tp { return out; } - Vec2 center() { return pos + size / 2.f; } + Vec2 center() const { return pos + size / 2.f; } + + // splits by Factor Horizontally returning Left rect + Rect splitByFactorHL(halnf factor) const { + return { x, y, size.x * factor, size.y }; + } + + Rect splitByFactorHR(halnf factor) const { + const auto abs = size.x * factor; + return { x + abs, y, size.x - abs, size.y }; + } + + Rect splitByFactorVT(halnf factor) const { + return { x, y, size.x, size.y * factor }; + } + + Rect splitByFactorVB(halnf factor) const { + const auto abs = size.y * factor; + return { x, y + abs, size.x, size.y - abs }; + } + + Rect getSizedFromCenter(Vec2 size) { + const auto pivot = center(); + const auto sizeHalf = size / 2; + return { pivot - sizeHalf, size }; + } public: union { @@ -241,6 +334,10 @@ namespace tp { Type z; Type w; }; + struct { + Type width; + Type height; + }; }; }; } \ No newline at end of file diff --git a/Math/public/SpringAnimations.hpp b/Math/public/SpringAnimations.hpp new file mode 100644 index 0000000..0c8b4f2 --- /dev/null +++ b/Math/public/SpringAnimations.hpp @@ -0,0 +1,155 @@ +#pragma once + +#include "Color.hpp" +#include "Rect.hpp" +#include "Timing.hpp" + +namespace tp { + class SpringValue { + public: + SpringValue() = default; + + void updateCurrentPosition() { + const auto deltaTime = halnf(gCurrentTime - mPrevTime); + const auto deltaPos = mTargetPosition - mCurrentPosition; + + auto deltaVelocity = deltaPos * mSpringStiffness; + deltaVelocity -= mVelocity * (mVelocityDamping); + + mVelocity += deltaVelocity; + mCurrentPosition += mVelocity * deltaTime; + mPrevTime = gCurrentTime; + } + + void setTargetPosition(halnf pos) { + mTargetPosition = pos; + if (mVelocity == 0) mPrevTime = gCurrentTime; + } + + [[nodiscard]] halnf getCurrentPos() const { return mCurrentPosition; } + [[nodiscard]] halnf getTargetPos() const { return mTargetPosition; } + [[nodiscard]] halnf getVelocity() const { return mVelocity; } + [[nodiscard]] halnf getDeltaPos() const { return mTargetPosition - mCurrentPosition; } + + void endAnimation() { + mCurrentPosition = mTargetPosition; + mVelocity = 0; + } + + private: + time_ms mPrevTime = 0; + + halnf mTargetPosition = 0; + halnf mCurrentPosition = 0; + + halnf mVelocity = 0; + + halnf mSpringStiffness = 0.0041; + halnf mVelocityDamping = 0.25f; + }; + + class SpringVec { + public: + SpringVec() = default; + + void updateCurrentPosition() { + mPosX.updateCurrentPosition(); + mPosY.updateCurrentPosition(); + } + + void setTargetPosition(Vec2F pos) { + mPosX.setTargetPosition(pos.x); + mPosY.setTargetPosition(pos.y); + } + + [[nodiscard]] Vec2F getCurrentPos() const { + return { mPosX.getCurrentPos(), mPosY.getCurrentPos() }; + } + + [[nodiscard]] Vec2F getTargetPos() const { + return { mPosX.getTargetPos(), mPosY.getTargetPos() }; + } + + [[nodiscard]] Vec2F getVelocity() const { + return { mPosX.getVelocity(), mPosY.getVelocity() }; + } + + [[nodiscard]] bool checkAnimationShouldEnd() const { + halnf velocityEpsilon = 0.0001f; + halnf positionEpsilon = 1; + + const auto vel = abs(mPosY.getVelocity()) > velocityEpsilon || abs(mPosX.getVelocity()) > velocityEpsilon; + const auto pos = abs(mPosY.getDeltaPos()) > positionEpsilon || abs(mPosX.getDeltaPos()) > positionEpsilon; + + return !(pos || vel); + } + + void endAnimation() { + mPosX.endAnimation(); + mPosY.endAnimation(); + } + + private: + SpringValue mPosY; + SpringValue mPosX; + }; + + class SpringRect { + public: + SpringRect() = default; + + [[nodiscard]] RectF getTargetRect() const { + const auto start = mStartPos.getTargetPos(); + const auto end = mEndPos.getTargetPos(); + return { start, end - start }; + } + + [[nodiscard]] RectF getCurrentRect() const { + const auto start = mStartPos.getCurrentPos(); + const auto end = mEndPos.getCurrentPos(); + return { start, end - start }; + } + + [[nodiscard]] RGBA getCurrentColor() const { + const auto start = mStartPos.getCurrentPos(); + const auto end = mEndPos.getCurrentPos(); + return { start.x, start.y, end.x, end.y }; + } + + void setTargetRect(const RectF& rect) { + mStartPos.setTargetPosition(rect.p1()); + mEndPos.setTargetPosition(rect.p3()); + } + + void setTargetColor(const RGBA& color) { + mStartPos.setTargetPosition({ color.r, color.g }); + mEndPos.setTargetPosition({ color.b, color.a }); + } + + SpringVec& getStart() { + return mStartPos; + } + + SpringVec& getEnd() { + return mEndPos; + } + + void updateCurrentRect() { + mStartPos.updateCurrentPosition(); + mEndPos.updateCurrentPosition(); + } + + [[nodiscard]] bool shouldEndTransition() const { + return mStartPos.checkAnimationShouldEnd() && mEndPos.checkAnimationShouldEnd(); + } + + void endAnimation() { + mStartPos.endAnimation(); + mEndPos.endAnimation(); + } + + private: + SpringVec mStartPos; + SpringVec mEndPos; + }; +} \ No newline at end of file diff --git a/Math/public/Topology.hpp b/Math/public/Topology.hpp index 92cb1a0..31efc10 100644 --- a/Math/public/Topology.hpp +++ b/Math/public/Topology.hpp @@ -30,7 +30,7 @@ namespace tp { struct Topology { Vec3F Origin = { 0, 0, 0 }; - mat3f Basis = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } }; + Mat3F Basis = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } }; Buffer Points; Buffer Normals; diff --git a/Math/public/Vec.hpp b/Math/public/Vec.hpp index 27d502d..0729046 100644 --- a/Math/public/Vec.hpp +++ b/Math/public/Vec.hpp @@ -110,6 +110,13 @@ namespace tp { return *this; } + Vec& operator=(Type val) { + for (ualni i = 0; i < tSize; i++) { + get(i) = val; + } + return *this; + } + void assign(Type val) { for (ualni i = 0; i < tSize; i++) { get(i) = val; @@ -226,8 +233,8 @@ namespace tp { Type y; Vec() : - x(0), - y(0) {} + x{}, + y{} {} // Initialization template @@ -360,6 +367,8 @@ namespace tp { Vec normal() { return { -y, x }; } [[nodiscard]] alnf length2() const { return (x * x + y * y); } + [[nodiscard]] halnf max() const { return tp::max(x, y); } + [[nodiscard]] halnf min() const { return tp::min(x, y); } [[nodiscard]] alnf length() const { Type const tmp = (Type) (x * x + y * y); @@ -374,8 +383,8 @@ namespace tp { } void clamp(const Vec& min, const Vec& max) { - tp::clamp(x, min.x, max.x); - tp::clamp(y, min.y, max.y); + x = tp::clamp(x, min.x, max.x); + y = tp::clamp(y, min.y, max.y); } }; @@ -574,4 +583,14 @@ namespace tp { using Vec4F = Vec4; using Vec4I = Vec4; + + template + Vec toVec4(const Vec& in) { + Vec out; + out[0] = in[0]; + out[1] = in[1]; + out[2] = in[2]; + out[3] = 0; + return out; + } } \ No newline at end of file diff --git a/Modules/private/Timing.cpp b/Modules/private/Timing.cpp index 45bc56d..0a71c76 100644 --- a/Modules/private/Timing.cpp +++ b/Modules/private/Timing.cpp @@ -17,6 +17,10 @@ namespace tp { return gCurrentTime; } + void updateGlobalTime() { + get_time(); + } + void sleep(time_ms mDuration) { THREAD_SLEEP(mDuration); } Timer::Timer() { diff --git a/Modules/public/Assert.hpp b/Modules/public/Assert.hpp index f1f8a5f..f54ab24 100644 --- a/Modules/public/Assert.hpp +++ b/Modules/public/Assert.hpp @@ -33,9 +33,12 @@ namespace tp { __builtin_debugtrap(); \ } #elif defined(ENV_OS_LINUX) + +#include + #define DEBUG_BREAK(expr) \ if (expr) { \ - __builtin_trap(); \ + raise(SIGTRAP); \ } #else #define DEBUG_BREAK(expr) () diff --git a/Modules/public/Common.hpp b/Modules/public/Common.hpp index 423a6c2..f357e01 100644 --- a/Modules/public/Common.hpp +++ b/Modules/public/Common.hpp @@ -85,7 +85,7 @@ namespace tp { } template - inline void swap(T& t1, T& t2) { + inline void swapV(T& t1, T& t2) { const T tmp = t1; t1 = t2; t2 = tmp; diff --git a/Modules/public/Timing.hpp b/Modules/public/Timing.hpp index 3909bfd..505738b 100644 --- a/Modules/public/Timing.hpp +++ b/Modules/public/Timing.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include "Environment.hpp" namespace tp { @@ -34,6 +35,7 @@ namespace tp { void sleep(time_ms duration); time_ms get_time(); + void updateGlobalTime(); struct FpsCounter { halni frames = 0; @@ -55,4 +57,19 @@ namespace tp { } } }; + + struct TimerWrapper { + explicit TimerWrapper(const std::function& arg) { + codeSnippet = arg; + } + + time_ms exec() { + Timer timer; + codeSnippet(); + return timer.timePassed(); + } + + private: + std::function codeSnippet; + }; } \ No newline at end of file diff --git a/Modules/public/Utils.hpp b/Modules/public/Utils.hpp index eaa1c37..0466b61 100644 --- a/Modules/public/Utils.hpp +++ b/Modules/public/Utils.hpp @@ -34,19 +34,19 @@ namespace tp { } } - bool get(int1 idx) { return mFlags & (1l << idx); } + [[nodiscard]] bool get(int1 idx) const { return mFlags & (1l << idx); } void set(int1 idx, bool val) { if (val) { - mFlags |= (1l << idx); + mFlags |= (1 << idx); } else { - mFlags &= ~(1l << idx); + mFlags &= ~(1 << idx); } } }; template - class Range { + class IterRange { public: class Iterator { public: @@ -71,13 +71,13 @@ namespace tp { tType mBegin{}; tType mEnd{}; - Range() = default; + IterRange() = default; - explicit Range(tType pEndIndex) : + explicit IterRange(tType pEndIndex) : mBegin(0), mEnd(pEndIndex) {} - Range(tType pStartIndex, tType pEndIndex) : + IterRange(tType pStartIndex, tType pEndIndex) : mBegin(pStartIndex), mEnd(pEndIndex) {} diff --git a/Modules/tests/Test.cpp b/Modules/tests/Test.cpp index 0dee468..6786409 100644 --- a/Modules/tests/Test.cpp +++ b/Modules/tests/Test.cpp @@ -241,4 +241,23 @@ SUITE(BaseModule) { } } +SUITE(BitFields) { + TEST(Basic) { + Bits bits; + + for (auto i = 0; i < 8; i ++) { + bits.set((int1) i, true); + CHECK(bits.get(i)); + } + + bits.set(1, false); + CHECK(!bits.get(1)); + + bits.set(3, false); + CHECK(!bits.get(3)); + + bits.set(4, false); + CHECK(!bits.get(4)); + } +} int main() { return UnitTest::RunAllTests(); } \ No newline at end of file diff --git a/Objects/applications/GUI.cpp b/Objects/applications/GUI.cpp index 97e90c2..4eced90 100644 --- a/Objects/applications/GUI.cpp +++ b/Objects/applications/GUI.cpp @@ -697,13 +697,13 @@ obj::ObjectsGUI::ViewStackNode obj::ObjectsGUI::listView(obj::ListObject* obj) { } if (childo.node()->prev && ImGui::Selectable("Move Up")) { - tp::swap(childo.node()->prev->data, childo.data()); + tp::swapV(childo.node()->prev->data, childo.data()); ImGui::EndPopup(); break; } if (childo.node()->next && ImGui::Selectable("Move Down")) { - tp::swap(childo.node()->next->data, childo.data()); + tp::swapV(childo.node()->next->data, childo.data()); ImGui::EndPopup(); break; } @@ -887,7 +887,7 @@ void obj::ObjectsGUI::explorer() { "child_path", { 0, 45 }, false, - ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_HorizontalScrollbar + ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_HorizontalScrollbar ); tp::List rev_path; for (auto childo = mViewStack.lastNode(); childo; childo = childo->prev) { diff --git a/Objects/applications/GUIEntry.cpp b/Objects/applications/GUIEntry.cpp index b5c518e..8eef964 100644 --- a/Objects/applications/GUIEntry.cpp +++ b/Objects/applications/GUIEntry.cpp @@ -10,7 +10,7 @@ class SimpleGUI : public Application { public: SimpleGUI() { gui.cd(objects_api::create(), "root"); } - void processFrame(EventHandler* eventHandler) override {} + void processFrame(EventHandler* eventHandler, halnf delta) override {} void drawFrame(Canvas* canvas) override { canvas->rect({ { 0, 0 }, mWindow->getSize() }, RGBA(0.f, 0.f, 0.f, 1.f), 0); diff --git a/Objects/private/compiler/Functions.cpp b/Objects/private/compiler/Functions.cpp index cce4ee8..3ae4407 100644 --- a/Objects/private/compiler/Functions.cpp +++ b/Objects/private/compiler/Functions.cpp @@ -410,14 +410,14 @@ alni instSize(const Instruction& inst) { } void writeConst(ByteCode& out, alni& idx, uint2 data) { - for (auto byte : Range(sizeof(uint2))) { + for (auto byte : IterRange(sizeof(uint2))) { out.mInstructions[idx] = OpCode((int1) (data >> byte * 8)); idx++; } } void writeParam(ByteCode& out, alni& idx, const int1* data, alni size) { - for (auto byte : Range(size)) { + for (auto byte : IterRange(size)) { out.mInstructions[idx] = OpCode(data[byte]); idx++; } diff --git a/RasterRender/private/FrameBuffer.cpp b/RasterRender/private/FrameBuffer.cpp index fd61110..0520051 100644 --- a/RasterRender/private/FrameBuffer.cpp +++ b/RasterRender/private/FrameBuffer.cpp @@ -102,7 +102,7 @@ void RenderBuffer::setViewport(const RectF& viewport) { void RenderBuffer::clear() { AssertGL(glClearColor(mClearCol.r, mClearCol.g, mClearCol.b, mClearCol.a)); - AssertGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)); + AssertGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)); } void RenderBuffer::endDraw() { diff --git a/RasterRender/private/Render.cpp b/RasterRender/private/Render.cpp index 1c640cf..9b6da2c 100644 --- a/RasterRender/private/Render.cpp +++ b/RasterRender/private/Render.cpp @@ -3,26 +3,42 @@ using namespace tp; -RasterRender::RasterRender() : - mRenderBuffer({ 100, 100 }) -{ +RasterRender::RasterRender() { mDefaultShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/default.frag", true); + mSolidShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/solid.frag", true); } RasterRender::~RasterRender() {} +void RasterRender::resize(const Vec2& size) { + auto sizeF = Vec2F(size.x, size.y); + mRenderBuffer.resize(sizeF); + mTempBuffer.resize(sizeF); +} + uint4 RasterRender::getRenderBufferID() { return mRenderBuffer.texId(); } Vec2F RasterRender::getBufferSize() { return mRenderBuffer.getSize(); } -void RasterRender::render(const Scene& geometry, const Vec2& size) { +void RasterRender::bindCameraShaderAttributes(const Mat4F& cameraMat) { + static auto camera = (GLint) mDefaultShader.getu("Camera"); + glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]); +} - for (auto object : geometry.mObjects) { - if (!object->mGUPBuffers) { - object->mGUPBuffers = new ObjectBuffers(&object.data()); - } - } +void RasterRender::bindObjectShaderAttributes(const Object& object) { + static auto origin = (GLint) mDefaultShader.getu("Origin"); + static auto basis = (GLint) mDefaultShader.getu("Basis"); + Mat4F basisMat = toMat4(object.mTopology.Basis); + Vec4F originPoint = toVec4(object.mTopology.Origin); + + basisMat = basisMat.transpose(); + + glUniform4fv(origin, 1, &originPoint[0]); + glUniformMatrix4fv(basis, 1, false, &basisMat[0][0]); +} + +void RasterRender::renderDefault(const Scene& geometry) { mRenderBuffer.mClearCol = { 0.0f, 0.0f, 0.0f, 0.f }; mRenderBuffer.beginDraw(); @@ -37,26 +53,21 @@ void RasterRender::render(const Scene& geometry, const Vec2& size) { // glPolygonMode(GL_FRONT, GL_LINE); // glPolygonMode(GL_BACK, GL_LINE); + // auto rotator = Mat3F::rotatorZ(alnf(0.001)); + + bindCameraShaderAttributes(cameraMat); + for (auto object : geometry.mObjects) { + // object->mTopology.Origin += 0.01; + // object->mTopology.Basis = rotator * object->mTopology.Basis; - static auto origin = (GLint) mDefaultShader.getu("Origin"); - static auto basis = (GLint) mDefaultShader.getu("Basis"); - static auto camera = (GLint) mDefaultShader.getu("Camera"); - static auto screenSize = (GLint) mDefaultShader.getu("ScreenSize"); - - Mat4F basisMat; - Vec4F originPoint; - - glUniform4fv(origin, 1, &originPoint[0]); - glUniformMatrix4fv(basis, 1, false, &basisMat[0][0]); - glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]); - glUniform2fv(screenSize, 1, &mRenderBuffer.getSize().x); - + bindObjectShaderAttributes(object.data()); object->mGUPBuffers->drawCall(); } mDefaultShader.unbind(); + glDisable(GL_DEPTH_TEST); // glPolygonMode(GL_FRONT, GL_FILL); // glPolygonMode(GL_BACK, GL_FILL); @@ -64,4 +75,37 @@ void RasterRender::render(const Scene& geometry, const Vec2& size) { mRenderBuffer.endDraw(); } +void RasterRender::renderOutline(const Camera& camera, const Object& object) { + mRenderBuffer.beginDraw(); + + // glEnable(GL_STENCIL_TEST); + + mSolidShader.bind(); + + bindCameraShaderAttributes(camera.calculateTransformationMatrix()); + bindObjectShaderAttributes(object); + + object.mGUPBuffers->drawCall(); + + mSolidShader.unbind(); + + // glDisable(GL_STENCIL_TEST); + + mRenderBuffer.endDraw(); +} + +void RasterRender::beginRender(const Scene& geometry, const Vec2& size) { + resize(size); + + for (auto object : geometry.mObjects) { + if (!object->mGUPBuffers) { + object->mGUPBuffers = new ObjectBuffers(&object.data()); + } + } +} + +void RasterRender::endRender() { + // pass +} + RenderBuffer* RasterRender::getRenderBuffer() { return &mRenderBuffer; } diff --git a/RasterRender/public/FrameBuffer.hpp b/RasterRender/public/FrameBuffer.hpp index 09dc82a..8c20aeb 100644 --- a/RasterRender/public/FrameBuffer.hpp +++ b/RasterRender/public/FrameBuffer.hpp @@ -7,7 +7,7 @@ namespace tp { class RenderBuffer { public: - explicit RenderBuffer(const Vec2F& size); + explicit RenderBuffer(const Vec2F& size = { 10, 10 }); RenderBuffer(const Vec2F& size, tp::uint1 samples); ~RenderBuffer(); diff --git a/RasterRender/public/RasterRender.hpp b/RasterRender/public/RasterRender.hpp index 229029d..4824c93 100644 --- a/RasterRender/public/RasterRender.hpp +++ b/RasterRender/public/RasterRender.hpp @@ -12,13 +12,27 @@ namespace tp { RasterRender(); ~RasterRender(); - void render(const Scene& geometry, const Vec2& size); + void beginRender(const Scene& geometry, const Vec2& size); + void endRender(); + + void renderDefault(const Scene& geometry); + void renderOutline(const Camera& camera, const Object& object); + + void resize(const Vec2& size); + uint4 getRenderBufferID(); RenderBuffer* getRenderBuffer(); Vec2F getBufferSize(); + private: + void bindObjectShaderAttributes(const Object& object); + void bindCameraShaderAttributes(const Mat4F& cameraMat); + private: RenderBuffer mRenderBuffer; + RenderBuffer mTempBuffer; + RenderShader mDefaultShader; + RenderShader mSolidShader; }; } \ No newline at end of file diff --git a/RasterRender/rsc/shaders/default.frag b/RasterRender/rsc/shaders/default.frag new file mode 100644 index 0000000..e142a37 --- /dev/null +++ b/RasterRender/rsc/shaders/default.frag @@ -0,0 +1,7 @@ +#version 330 core + +out vec4 FragColor; + +void main() { + FragColor = vec4(gl_FragCoord.z, gl_FragCoord.z, gl_FragCoord.z, 1.f); +} \ No newline at end of file diff --git a/RasterRender/rsc/shaders/default.vert b/RasterRender/rsc/shaders/default.vert new file mode 100644 index 0000000..1d325ed --- /dev/null +++ b/RasterRender/rsc/shaders/default.vert @@ -0,0 +1,13 @@ +#version 330 core + +layout(location = 0) in vec3 Point; + +uniform vec4 Origin; +uniform mat4 Basis; +uniform mat4 Camera; + +void main() { + // vec4 transformed = vec4(Point.xyz, 1.0); + vec4 transformed = (Basis * vec4(Point.xyz, 1.0)) + Origin; + gl_Position = Camera * transformed; +} \ No newline at end of file diff --git a/RasterRender/rsc/shaders/solid.frag b/RasterRender/rsc/shaders/solid.frag new file mode 100644 index 0000000..31e99ca --- /dev/null +++ b/RasterRender/rsc/shaders/solid.frag @@ -0,0 +1,7 @@ +#version 330 core + +out vec4 FragColor; + +void main() { + FragColor = vec4(1, 0, 0, 1.f); +} \ No newline at end of file diff --git a/RayTracer/private/RayTracer.cpp b/RayTracer/private/RayTracer.cpp index 994e5e8..b7b85f0 100644 --- a/RayTracer/private/RayTracer.cpp +++ b/RayTracer/private/RayTracer.cpp @@ -43,6 +43,8 @@ normal = n1 * barycentric.x + n2 * barycentric.y + n3 * barycentric.z; using namespace tp; + +// TODO : de-duplicate in Scene? void RayTracer::castRay(const Ray& ray, RayCastData& out, alnf farVal) { out.hit = false; out.obj = nullptr; @@ -79,7 +81,7 @@ void RayTracer::cycle(const RayCastData& castData, LightData& out, uhalni depth) const auto delta1 = castData.trig->mEdgeP1P2.unitV(); const auto delta2 = normal.cross(delta1); - for (auto idx : Range(mSettings.spray)) { + for (auto idx : IterRange(mSettings.spray)) { RayCastData materialCastData; LightData lightData; diff --git a/RayTracer/public/RayTracer.hpp b/RayTracer/public/RayTracer.hpp index 4067247..a21964a 100644 --- a/RayTracer/public/RayTracer.hpp +++ b/RayTracer/public/RayTracer.hpp @@ -30,14 +30,6 @@ namespace tp { void render(const Scene& scene, OutputBuffers& out, const RenderSettings& settings); private: - struct RayCastData { - const Object* obj = nullptr; - TrigCache* trig = nullptr; - Vec3F hitPos = { 0, 0, 0 }; - bool hit = false; - bool inv = false; - }; - struct LightData { halnf intensity = 0; }; diff --git a/Sketch3D/CMakeLists.txt b/Sketch3D/CMakeLists.txt index 248c80d..b5eb9f8 100644 --- a/Sketch3D/CMakeLists.txt +++ b/Sketch3D/CMakeLists.txt @@ -19,4 +19,4 @@ add_executable(Sketch3DApp ./applications/Entry.cpp) target_link_libraries(Sketch3DApp ${PROJECT_NAME}) file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") -file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc") diff --git a/Sketch3D/applications/Entry.cpp b/Sketch3D/applications/Entry.cpp index 15cb949..ef799c8 100644 --- a/Sketch3D/applications/Entry.cpp +++ b/Sketch3D/applications/Entry.cpp @@ -1,30 +1,23 @@ -#include "GraphicApplication.hpp" +#include "WidgetApplication.hpp" #include "Sketch3D.hpp" -#include "Sketch3DWidget.hpp" +#include "SketchGUI.hpp" using namespace tp; -class Sketch3DApplication : public Application { +class Sketch3DApplication : public WidgetApplication { public: - Sketch3DApplication() : - mGui(*mGraphics->getCanvas(), { 1920, 1080 }) {} + Sketch3DApplication() { + setRoot(&mGui); - void processFrame(EventHandler* eventHandler) override { - auto rec = RectF({ 0, 0 }, mWindow->getSize()); - - mGui.setVisible(true); - mGui.setArea(rec); - mGui.updateConfigWrapper(mWidgetManager); - mGui.procWrapper(*eventHandler, rec); + mGui.createRenderWidget(mGraphics->getCanvas(), { 2560, 1440 }); + mGui.setProject(&mSketch); } - void drawFrame(Canvas* canvas) override { mGui.drawWrapper(*canvas); } - private: - WidgetManager mWidgetManager; - Sketch3DGUI mGui; + SketchGUI mGui; + Project mSketch; }; void runApp() { @@ -32,4 +25,4 @@ void runApp() { app.run(); } -int main() { runApp(); } \ No newline at end of file +int main() { runApp(); } diff --git a/Sketch3D/private/Sketch3D.cpp b/Sketch3D/private/Sketch3D.cpp index 7c58868..183036b 100644 --- a/Sketch3D/private/Sketch3D.cpp +++ b/Sketch3D/private/Sketch3D.cpp @@ -35,16 +35,16 @@ const RGBA& Stroke::getColor() const { return mColor; } void Stroke::updateGpuBuffers() { mGPUHandles.sendDataToGPU(&mPoints); } void Stroke::denoisePos(halni passes) { - for (auto pass : Range(passes)) { - for (auto pi : Range(mPoints.size() - 2)) { + for (auto pass : IterRange(passes)) { + for (auto pi : IterRange(mPoints.size() - 2)) { mPoints[pi + 1].pos = (mPoints[pi + 1].pos + mPoints[pi].pos + mPoints[pi + 2].pos) / 3.f; } } } void Stroke::denoiseThickness(halni passes) { - for (auto pass : Range(passes)) { - for (auto pi : Range(mPoints.size() - 2)) { + for (auto pass : IterRange(passes)) { + for (auto pi : IterRange(mPoints.size() - 2)) { mPoints[pi + 1].thickness = (mPoints[pi].thickness + mPoints[pi + 2].thickness) / 2.f; } } @@ -57,7 +57,7 @@ void Stroke::compress(halnf factor) { List passed_poits; - for (auto idx : Range(mPoints.size())) { + for (auto idx : IterRange(mPoints.size())) { passed_poits.pushBack(mPoints[idx]); } @@ -100,14 +100,14 @@ void Stroke::subdiv(halnf precision, const Camera* cam, halni passes) { } List new_points; - for (auto idx : Range(mPoints.size())) { + for (auto idx : IterRange(mPoints.size())) { new_points.pushBack(mPoints[idx]); } auto viewmat = cam->calculateViewMatrix(); auto projmat = cam->calculateProjectionMatrix(); - for (auto i : Range(passes)) { + for (auto i : IterRange(passes)) { auto n_points = new_points.length(); @@ -283,6 +283,14 @@ PencilBrush::~PencilBrush() { if (mStroke) delete mStroke; } +void PencilBrush::finish(Project* proj) { + if (mStroke) { + ensureReady(mStroke, &proj->mCamera); + proj->mLayers[proj->mActiveLayer]->strokes.pushBack(mStroke); + mStroke = nullptr; + } +} + Layer::~Layer() { for (auto str : strokes) { delete str.data(); @@ -316,6 +324,20 @@ void Project::sample(halnf pressure, halnf cameraRatio, Vec2F relativeCameraPos) } } +void Project::setPencil() { + if (auto idx = mBrushes.presents(mActiveBrush)) { + mBrushes.getSlotVal(idx)->finish(this); + } + mActiveBrush = "pencil"; +} + +void Project::setEraser() { + if (auto idx = mBrushes.presents(mActiveBrush)) { + mBrushes.getSlotVal(idx)->finish(this); + } + mActiveBrush = "eraser"; +} + Project::~Project() { for (auto brush : mBrushes) { delete brush->val; diff --git a/Sketch3D/private/SketchGUI.cpp b/Sketch3D/private/SketchGUI.cpp new file mode 100644 index 0000000..91c76bb --- /dev/null +++ b/Sketch3D/private/SketchGUI.cpp @@ -0,0 +1,184 @@ +#include "SketchGUI.hpp" +#include "SimpleLayouts.hpp" + +using namespace tp; + +SketchRenderWidget::SketchRenderWidget(Canvas& canvas, Vec2F renderResolution) : + mRenderer(renderResolution) { + mImage = canvas.createImageFromTextId(mRenderer.getBuff()->texId(), mRenderer.getBuff()->getSize()); + mCanvas = &canvas; + + setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + + setDebug("render", {}); +} + +SketchRenderWidget::~SketchRenderWidget() { mCanvas->deleteImageHandle(mImage); } + +void SketchRenderWidget::draw(Canvas& canvas) { + auto area = getArea().relative(); + if (mProject) { + mRenderer.renderToTexture(mProject, area.size); + canvas.drawImage(area, &mImage, 0, 1, 12); + } +} + +void SketchRenderWidget::setProject(Project* project) { mProject = project; } + +void SketchViewportWidget::setProject(Project* project) { + mProject = project; + mProject->mBackgroundColor = { 0.13f, 0.13f, 0.13f, 0.8f }; +} + +void SketchViewportWidget::setColor(const RGBA& color) { + ((PencilBrush*) mProject->mBrushes.get("pencil"))->mCol = color; +} + +void SketchViewportWidget::setRenderWidget(SketchRenderWidget* widget) { addChild(widget); } + +void SketchViewportWidget::process(const EventHandler& events) { + if (!mProject) return; + + auto area = getArea().relative(); + Vec2F pointer = events.getPointer(); + auto crs = events.getPointer(); + + if (!area.isInside(events.getPointer())) return; + + crs.x /= area.z; + crs.y /= area.w; + crs = (crs - 0.5) * 2; + + if (events.isPressed(InputID::MOUSE1)) { + mAction = true; + lockFocus(); + + } else if (events.isReleased(InputID::MOUSE1)) { + mAction = false; + freeFocus(); + } + + mProject->mCamera.setRatio(area.w / area.z); + + if (mAction) { + Vec2F relativePos = ((pointer / area.size) - 0.5f) * 2.f; + Vec2F relativePosPrev = ((mActionPosAbsolutePrev / area.size) - 0.5f) * 2.f; + Vec2F relativeDelta = relativePos - relativePosPrev; + + if (events.isDown(InputID::LEFT_SHIFT)) { + mProject->mCamera.move(relativePos, relativePosPrev); + } else if (events.isDown(InputID::LEFT_ALT)) { + mProject->mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI)); + } else if (events.isDown(InputID::LEFT_CONTROL)) { + halnf factor = pointer.y / mActionPosAbsolutePrev.y; + mProject->mCamera.zoom(factor); + } else { + mProject->sample(events.getPointerPressure(), area.w / area.z, crs); + } + + } else { + mProject->sample(0, area.w / area.z, crs); + } + + mActionPosAbsolutePrev = pointer; +} + +SketchViewportWidget::SketchViewportWidget() { + setLayout(new ToolBarLayout(this)); + + setDebug("viewport", {}); +} + +void SketchViewportWidget::setToolbarWidget(Widget* widget) { + addChild(widget); + widget->bringToFront(); +} + +ToolbarWidget::ToolbarWidget() { + setDirection(false); + setDebug("toolbar", {}); + + addToToolbar(&mFileHover); + addToToolbar(&mPencilHover); + addToToolbar(&mViewHover); + + mFileHover.setText("File"); + mViewHover.setText("View"); + mPencilHover.setText("Brush"); +} + +void ToolbarWidget::addToToolbar(Widget* button) { + button->getLayout()->setMinSize({60, 30}); + getContainer()->addChild(button); +} + +SketchGUI::SketchGUI() : + DockWidget() { + + setCenterWidget(&mViewport); + dockWidget(&mPanel, DockLayout::RIGHT); + toggleWidgetVisibility(DockLayout::RIGHT); + + mPanel.addToMenu(&mControls); + mPanel.setText("Controls"); + mPanel.setArea({ 110, 110, 300, 500 }); + + mControls.setText("Tools"); + mControls.addToMenu(&mSelectPencil); + mControls.addToMenu(&mSelectEraser); + mControls.setArea({ 0, 0, 300, 400 }); + + // brush + { + auto popup = mToolbar.mPencilHover.getPopup(); + popup->addChild(&mColorPicker); + popup->addChild(&mBrushSizeSlider); + + mColorPicker.setArea({10, 10, 300, 300}); + } + + // view + { + auto popup = mToolbar.mViewHover.getPopup(); + popup->addChild(&mToggleSidePanel); + + mToggleSidePanel.setText("Toggle Panel"); + mToggleSidePanel.setAction([this](){ + toggleWidgetVisibility(getSide(&mPanel)); + }); + } + + mSelectPencil.setAction([this](){ mProject->setPencil(); }); + mSelectPencil.setText("Pencil"); + + mSelectEraser.setAction([this](){ mProject->setEraser(); }); + mSelectEraser.setText("Eraser TODO"); +} + +void SketchGUI::createRenderWidget(Canvas* canvas, const Vec2F& renderResolution) { + mRenderWidget = new SketchRenderWidget(*canvas, renderResolution); + + mViewport.setRenderWidget(mRenderWidget); + mViewport.setToolbarWidget(&mToolbar); +} + +void SketchGUI::setProject(Project* project) { + mProject = project; + mViewport.setProject(project); + if (mRenderWidget) mRenderWidget->setProject(project); +} + +SketchGUI::~SketchGUI() { delete mRenderWidget; } + +void SketchGUI::process(const EventHandler& events) { + DockWidget::process(events); + + if (!mProject) return; + + auto pencil = dynamic_cast(mProject->mBrushes.get("pencil")); + + pencil->mCol = mColorPicker.mColorWheel.color; + pencil->mSize = mBrushSizeSlider.val() * 0.2f + 0.001f; +} + +void SketchGUI::draw(Canvas& canvas) { canvas.rect(getArea().relative(), mBackgroundColor, mRounding); } diff --git a/Sketch3D/public/Sketch3D.hpp b/Sketch3D/public/Sketch3D.hpp index 3e8c334..c2d546b 100644 --- a/Sketch3D/public/Sketch3D.hpp +++ b/Sketch3D/public/Sketch3D.hpp @@ -97,6 +97,9 @@ namespace tp { Project(); ~Project(); + void setPencil(); + void setEraser(); + // pos from -1 to 1 (left ot right bottom to top) void sample(halnf pressure, halnf cameraRatio, Vec2F relativeCameraPos); @@ -116,6 +119,7 @@ namespace tp { std::string mType = "equal"; Brush() = default; virtual void sample(Project* proj, Vec2F crs, halnf pressure) {} + virtual void finish(Project* proj) {} virtual void draw(Renderer* render, const Camera* camera) {} virtual ~Brush() = default; }; @@ -125,8 +129,9 @@ namespace tp { PencilBrush(); ~PencilBrush() override; - virtual void sample(Project* proj, Vec2F crs, halnf pressure) override; - virtual void draw(Renderer* render, const Camera* camera) override; + void finish(Project* proj) override; + void sample(Project* proj, Vec2F crs, halnf pressure) override; + void draw(Renderer* render, const Camera* camera) override; private: void ensureReady(Stroke* stroke, const Camera* cam, bool debug = false) const; diff --git a/Sketch3D/public/Sketch3DWidget.hpp b/Sketch3D/public/Sketch3DWidget.hpp deleted file mode 100644 index 9c81d01..0000000 --- a/Sketch3D/public/Sketch3DWidget.hpp +++ /dev/null @@ -1,173 +0,0 @@ -#pragma once - -#include "Sketch3D.hpp" -#include "Widgets.hpp" - -namespace tp { - - template - class Sketch3DWidget : public Widget { - public: - Sketch3DWidget(Canvas& canvas, Vec2F renderResolution) : - mRenderer(renderResolution) { - mImage = canvas.createImageFromTextId(mRenderer.getBuff()->texId(), mRenderer.getBuff()->getSize()); - mCanvas = &canvas; - - mProject.mBackgroundColor = { 0.13f, 0.13f, 0.13f, 1.f }; - } - - ~Sketch3DWidget() { mCanvas->deleteImageHandle(mImage); } - - void eventProcess(const Events& events) override { - if (!this->mArea.isInside(events.getPointer())) { - return; - } - - auto crs = (events.getPointer() - this->mArea.pos); - crs.x /= this->mArea.z; - crs.y /= this->mArea.w; - crs = (crs - 0.5) * 2; - - // TODO : make better api for events - Vec2F absolutePos = events.getPointer() - this->mArea.pos; - - if (events.isPressed(InputID::MOUSE1)) { - mAction = true; - } else if (events.isReleased(InputID::MOUSE1)) { - mAction = false; - } - - Vec2F relativePos = ((absolutePos / this->mArea.size) - 0.5f) * 2.f; - Vec2F relativePosPrev = ((mActionPosAbsolutePrev / this->mArea.size) - 0.5f) * 2.f; - Vec2F relativeDelta = relativePos - relativePosPrev; - - mProject.mCamera.setRatio(this->mArea.w / this->mArea.z); - - switch (mMode) { - case Mode::MOVE: - { - if (mAction) mProject.mCamera.move(relativePos, relativePosPrev); - break; - } - case Mode::ZOOM: - { - halnf factor = absolutePos.y / mActionPosAbsolutePrev.y; - if (mAction) mProject.mCamera.zoom(factor); - break; - } - case Mode::ROTATE: - { - if (mAction) mProject.mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI)); - break; - } - case Mode::DRAW: - { - mProject.sample(events.getPointerPressure(), this->mArea.w / this->mArea.z, crs); - break; - } - default: break; - } - - mActionPosAbsolutePrev = absolutePos; - } - - void eventDraw(Canvas& canvas) override { - mRenderer.renderToTexture(&mProject, this->mArea.size); - canvas.drawImage(this->mArea, &mImage, 0, 1, 12); - } - - void setColor(const RGBA& color) { ((PencilBrush*) mProject.mBrushes.get("pencil"))->mCol = color; } - - public: - enum class Mode { MOVE, ROTATE, ZOOM, DRAW, NONE } mMode = Mode::NONE; - - Vec2F mActionPosAbsolutePrev = { 0, 0 }; - bool mAction = false; - - private: - Renderer mRenderer; - Project mProject; - Canvas::ImageHandle mImage; - Canvas* mCanvas = nullptr; - }; - - template - class Sketch3DGUI : public Widget { - public: - Sketch3DGUI(Canvas& canvas, Vec2F renderResolution) : - mViewport(canvas, renderResolution) { - mDrawButton = new ButtonWidget("Draw", { 0, 0, 100, 30 }); - mMoveButton = new ButtonWidget("Pan View", { 0, 0, 100, 30 }); - mRotateButton = new ButtonWidget("Rotate view", { 0, 0, 100, 30 }); - mZoomButton = new ButtonWidget("Zoom view", { 0, 0, 100, 30 }); - - mOptions.addWidget(mDrawButton); - mOptions.addWidget(mMoveButton); - mOptions.addWidget(mRotateButton); - mOptions.addWidget(mZoomButton); - - // add color sliders - mRed = new NamedSliderWidget("Red"); - mGreen = new NamedSliderWidget("Green"); - mBlue = new NamedSliderWidget("Blue"); - - mOptions.addWidget(mRed); - mOptions.addWidget(mGreen); - mOptions.addWidget(mBlue); - - this->mChildWidgets.pushBack(&mViewport); - this->mChildWidgets.pushBack(&mSplitView); - this->mChildWidgets.pushBack(&mOptions); - } - - ~Sketch3DGUI() { - for (auto item : mOptions.getContent()) { - delete item.data(); - } - } - - void eventProcess(const Events& events) override { - mSplitView.setArea(this->mArea); - mViewport.setArea(mSplitView.getFirst()); - mOptions.setArea(mSplitView.getSecond()); - - if (mDrawButton->isFired()) { - mViewport.mMode = Sketch3DWidget::Mode::DRAW; - } else if (mMoveButton->isFired()) { - mViewport.mMode = Sketch3DWidget::Mode::MOVE; - } else if (mRotateButton->isFired()) { - mViewport.mMode = Sketch3DWidget::Mode::ROTATE; - } else if (mZoomButton->isFired()) { - mViewport.mMode = Sketch3DWidget::Mode::ZOOM; - } - - mViewport.setColor(RGBA(mRed->mSlider.mFactor, mGreen->mSlider.mFactor, mBlue->mSlider.mFactor, 1.f)); - } - - void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, mBackgroundColor, mRounding); } - - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("Sketch3DGui"); - - mBackgroundColor = wm.getColor("Background", "Background"); - mRounding = wm.getNumber("Rounding", "Rounding"); - } - - private: - Sketch3DWidget mViewport; - SplitView mSplitView; - ScrollableWindow mOptions; - - ButtonWidget* mDrawButton = nullptr; - ButtonWidget* mMoveButton = nullptr; - ButtonWidget* mRotateButton = nullptr; - ButtonWidget* mZoomButton = nullptr; - - NamedSliderWidget* mRed = nullptr; - NamedSliderWidget* mGreen = nullptr; - NamedSliderWidget* mBlue = nullptr; - - RGBA mBackgroundColor; - halnf mRounding = 0; - }; -} \ No newline at end of file diff --git a/Sketch3D/public/SketchGUI.hpp b/Sketch3D/public/SketchGUI.hpp new file mode 100644 index 0000000..f4770b2 --- /dev/null +++ b/Sketch3D/public/SketchGUI.hpp @@ -0,0 +1,95 @@ +#pragma once + +#include "Sketch3D.hpp" +#include "Widget.hpp" +#include "DockWidget.hpp" +#include "FloatingWidget.hpp" +#include "ColorPickerWidget.hpp" + +namespace tp { + + class SketchRenderWidget : public Widget { + public: + SketchRenderWidget(Canvas& canvas, Vec2F renderResolution); + ~SketchRenderWidget() override; + + void draw(Canvas& canvas) override; + void setProject(Project* project); + + private: + Renderer mRenderer; + Project* mProject = nullptr; + Canvas::ImageHandle mImage; + Canvas* mCanvas = nullptr; + }; + + class SketchViewportWidget : public Widget { + public: + SketchViewportWidget(); + + void setProject(Project* project); + void setColor(const RGBA& color); + + void setRenderWidget(SketchRenderWidget* widget); + void setToolbarWidget(Widget* widget); + + void process(const EventHandler& events) override; + [[nodiscard]] bool processesEvents() const override { return true; } + + private: + Project* mProject = nullptr; + + public: + Vec2F mActionPosAbsolutePrev = { 0, 0 }; + bool mAction = false; + }; + + + class ToolbarWidget : public ScrollableWidget { + public: + ToolbarWidget(); + + private: + void addToToolbar(Widget* button); + + public: + HoverPopupTriggerWidget mFileHover; + HoverPopupTriggerWidget mPencilHover; + HoverPopupTriggerWidget mViewHover; + }; + + class SketchGUI : public DockWidget { + public: + SketchGUI(); + void createRenderWidget(Canvas* canvas, const Vec2F& renderResolution); + void setProject(Project* project); + ~SketchGUI() override; + + void process(const EventHandler& events) override; + void draw(Canvas& canvas) override; + + private: + Project* mProject = nullptr; + + SketchViewportWidget mViewport; + ToolbarWidget mToolbar; + + SketchRenderWidget* mRenderWidget = nullptr; + + FloatingMenu mPanel; + + RGBPickerWidget mColorPicker; + + ButtonWidget mToggleSidePanel; + + ButtonWidget mSelectPencil; + ButtonWidget mSelectEraser; + + SliderWidget mBrushSizeSlider; + + FloatingMenu mControls; + + RGBA mBackgroundColor; + halnf mRounding = 0; + }; +} diff --git a/TODO b/TODO index 07a8f33..f13e92e 100644 --- a/TODO +++ b/TODO @@ -1,14 +1,50 @@ +Widgets: + Basic scrollable widget + Collapsing menus + + Icons + Toolbar widget + Fix focus locking mechanism + Hover PopUps + Color Picker + + Optimize: + Make visual parameters static + Make get-areas fetch cache and not animation objects + + New Widgets: + Check Boxes + Drop-Downs + Toaster notifications + Confirmations Popups + Hover menus + Tool-tips + + Implement: + Make visual parameters configurable + Add UI scaling + Add Theming + + Refactor: + Refactor Update Manager + change Widget::clampMinMax function to include child enclosure + + +Sketch3D: + Use new widgets + add gizmos + add save and loads + add better bui + selection ALL: - Gradually introduce STL into the project (replace own classes or add seamless interface and conversions into STL) - Remove BaseModule and Connection modules - remove archiver and add boost serialization - Bring windows old window to graphics - + remove archiver and add boost serialization ?? + Bring ms-windows old window to graphics Check Warnings Make all modules stable with tests + Modules: Remove all static variable into module's data @@ -65,22 +101,23 @@ Language: Make two grammars Regular and Context-free For each grammar make grammar rules parser, example sentence generation and sentence parsing Make automations itself a universal tool - NFA DFA conversions - + Widgets: - Add tree structure interface to simplify code - Add shortcuts - Config cache may be static + Add shortcuts + Config cache may be static + Cleanup + Add animations LibraryViewer: - artworks - how to easily add more songs? - seeker - song idx - non-existing highlight - prev next - remove debug gui - queue & repeat & shuffle... - new database with history + artworks + how to easily add more songs? + seeker + song idx + non-existing highlight + prev next + remove debug gui + queue & repeat & shuffle... + new database with history Math: FFT @@ -91,7 +128,6 @@ Math: RayTracer: Features: - iodn Normals flag Material, Normals, per trig info diff --git a/Widgets/CMakeLists.txt b/Widgets/CMakeLists.txt index dc1b591..c4a68a5 100644 --- a/Widgets/CMakeLists.txt +++ b/Widgets/CMakeLists.txt @@ -5,17 +5,13 @@ file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") file(GLOB HEADERS "./public/*.hpp") add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) -target_include_directories(${PROJECT_NAME} PUBLIC ./public/) +target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ./public/layouts ./public/mangers ./public/widgets) target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui) ### -------------------------- Applications -------------------------- ### -add_executable(SimpleGui examples/SimpleGUI.cpp) -target_link_libraries(SimpleGui ${PROJECT_NAME} ${GLEW_LIB}) -target_include_directories(SimpleGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) +add_executable(WidgetsExample examples/Example.cpp) +target_link_libraries(WidgetsExample ${PROJECT_NAME} ${GLEW_LIB}) +target_include_directories(WidgetsExample PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) -add_executable(ChatGui examples/ChatGUI.cpp) -target_link_libraries(ChatGui ${PROJECT_NAME} ${GLEW_LIB}) -target_include_directories(ChatGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) - -file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") \ No newline at end of file +file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc") diff --git a/Widgets/examples/Example.cpp b/Widgets/examples/Example.cpp new file mode 100644 index 0000000..d0e7b31 --- /dev/null +++ b/Widgets/examples/Example.cpp @@ -0,0 +1,227 @@ + +#include "WidgetApplication.hpp" + +#include "RootWidget.hpp" +#include "FloatingWidget.hpp" +#include "DockWidget.hpp" +#include "ColorPickerWidget.hpp" + +#include "ScrollableLayout.hpp" + +using namespace tp; + + +class Example : public WidgetApplication { +public: + Example() { + exampleColorPicker(); + } + + void exampleAll() { + static DockWidget dock; + static LabelWidget centralWidget; + static FloatingMenu menus[4]; + static FloatingMenu nestedMenus[4]; + static FloatingMenu buttons[10]; + + dock.setCenterWidget(¢ralWidget); + + for (auto& menu : menus) { + dock.addChild(&menu); + } + + for (auto& menu : nestedMenus) { + menus[0].addToMenu(&menu); + } + + setRoot(&dock); + } + + void exampleColorPicker() { + static DockWidget dock; + static RGBPickerWidget colorPicker; + + dock.dockWidget(&colorPicker, DockLayout::RIGHT); + + setRoot(&dock); + } + + void exampleBasic() { + static Widget widget; + static LabelWidget label; + static SliderWidget slider; + static ButtonWidget button; + + widget.addChild(&label); + widget.addChild(&button); + widget.addChild(&slider); + + setRoot(&widget); + } + + void exampleScrolling() { + static ScrollableWidget widget; + static ButtonWidget buttons[10]; + + widget.setDirection(false); + + setRoot(&widget); + + for (auto& button : buttons) { + widget.getContainer()->addChild(&button); + } + + RootWidget::setWidgetArea(*widget.getContainer(), { 333, 333, 522, 522 }); + } + + void examplePopup() { + static Widget root; + static Widget popup; + + static ButtonWidget closeButton; + static ButtonWidget openButton; + static ButtonWidget buttons[3]; + + for (auto& button : buttons) { + popup.addChild(&button); + } + + popup.addChild(&closeButton); + + root.addChild(&openButton); + ((BasicLayout*)root.getLayout())->setLayoutPolicy(LayoutPolicy::Passive); + + openButton.setAction([&](){ + popup.setArea({ 50, 50, 300, 300 }); + openButton.openPopup(&popup); + }); + + closeButton.setAction([&](){ + closeButton.closePopup(&popup); + }); + + openButton.setText("open"); + closeButton.setText("close"); + + RootWidget::setWidgetArea(openButton, { 333, 333, 222, 222 }); + + setRoot(&root); + } + + void exampleNestedMenus() { + static DockWidget dock; + static FloatingMenu menu1; + static FloatingMenu menu2; + static ButtonWidget buttons[15]; + + setRoot(&dock); + + dock.addChild(&menu1); + dock.addChild(&menu2); + + dock.setCenterWidget(&buttons[5]); + dock.dockWidget(&buttons[6], DockLayout::RIGHT); + + menu1.addToMenu(&buttons[0]); + + menu2.addToMenu(&buttons[2]); + menu2.addToMenu(&buttons[3]); + menu2.addToMenu(&buttons[4]); + + menu2.addToMenu(&menu1); + + // popup + { + buttons[0].setAction([&](){ + buttons[10].setArea({ 30, 30, 100, 100 }); + buttons[0].openPopup(&buttons[10]); + }); + + buttons[0].setText("open popup"); + + buttons[10].setAction([&](){ + buttons[10].closePopup(&buttons[10]); + }); + + buttons[10].setText("close popup"); + } + + RootWidget::setWidgetArea(menu1, { 300, 100, 150, 500 }); + RootWidget::setWidgetArea(menu2, { 100, 100, 150, 300 }); + } + + void exampleLayouts() { + static Widget widgets[15]; + static ButtonWidget buttons[15]; + + setRoot(&widgets[0]); + + widgets[0].addChild(&widgets[1]); + + widgets[1].addChild(&buttons[1]); + widgets[1].addChild(&buttons[2]); + widgets[1].addChild(&widgets[2]); + + RootWidget::setWidgetArea(buttons[1], { 300, 100, 350, 800 }); + RootWidget::setWidgetArea(buttons[2], { 100, 100, 150, 300 }); + + widgets[2].addChild(&buttons[3]); + widgets[2].addChild(&buttons[4]); + widgets[2].addChild(&buttons[5]); + widgets[2].addChild(&buttons[6]); + + buttons[1].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + buttons[2].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + buttons[3].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + buttons[4].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + buttons[5].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + buttons[6].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + + widgets[2].setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + ((BasicLayout*)widgets[1].getLayout())->setLayoutPolicy(LayoutPolicy::Horizontal); + } + + void exampleDock() { + static DockWidget dock; + static FloatingMenu menu1; + static FloatingMenu menu2; + static ButtonWidget buttons[15]; + + setRoot(&dock); + + dock.addChild(&menu2); + dock.addChild(&menu1); + + dock.setCenterWidget(&buttons[5]); + dock.dockWidget(&buttons[6], DockLayout::RIGHT); + + menu1.addToMenu(&buttons[0]); + menu2.addToMenu(&buttons[2]); + //menu2.addToMenu(&menu1); + menu2.addToMenu(&buttons[3]); + menu2.addToMenu(&buttons[4]); + + buttons[0].setAction([&]() { buttons[2].setColor(RGBA::random()); }); + buttons[2].setAction([&]() { buttons[0].setColor(RGBA::random()); }); + + buttons[5].setAction([&]() { dock.dockWidget(&menu1, DockLayout::LEFT); }); + buttons[6].setAction([&]() { dock.undockWidget(DockLayout::LEFT); }); + + buttons[3].setAction([&]() { dock.toggleWidgetVisibility(DockLayout::LEFT); }); + // buttons[4].setAction([this]() { mDockLayout.undockWidget(DockLayout::LEFT); }); + + buttons[3].setText("toggle"); + buttons[5].setText("dock"); + buttons[6].setText("undock"); + + RootWidget::setWidgetArea(menu2, { 300, 100, 150, 500 }); + RootWidget::setWidgetArea(menu1, { 100, 100, 150, 300 }); + } +}; + +int main() { + { + Example gui; + gui.run(); + } +} diff --git a/Widgets/examples/SimpleGUI.hpp b/Widgets/examples/SimpleGUI.hpp deleted file mode 100644 index 5ced83e..0000000 --- a/Widgets/examples/SimpleGUI.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "Widgets.hpp" - -namespace tp { - - template - class SimpleWidget : public ScrollableWindow { - public: - SimpleWidget() { - this->addWidget(&mLabel); - this->addWidget(&mButton); - this->addWidget(&mSlider); - this->addWidget(&mCollapsableMenu); - - mCollapsableMenu.addWidgetToMenu(&mInMenuButton1); - mCollapsableMenu.addWidgetToMenu(&mInMenuButton2); - - mInMenuButton1.mLabel.mLabel = "Button1"; - mInMenuButton2.mLabel.mLabel = "Button2"; - - this->mArea.size = { 500, 500 }; - } - - private: - CollapsableMenu mCollapsableMenu; - ButtonWidget mInMenuButton1; - ButtonWidget mInMenuButton2; - - ButtonWidget mButton; - LabelWidget mLabel; - NamedSliderWidget mSlider; - }; - - template - class SimpleWidget2 : public Widget { - public: - SimpleWidget2() { - this->mChildWidgets.pushBack(&mFloating); - mFloating.addWidgetToMenu(&mWidget); - } - - private: - FloatingWidget mFloating; - SimpleWidget mWidget; - }; -} \ No newline at end of file diff --git a/Widgets/private/Layout.cpp b/Widgets/private/Layout.cpp new file mode 100644 index 0000000..bd56f95 --- /dev/null +++ b/Widgets/private/Layout.cpp @@ -0,0 +1,96 @@ +#include +#include "Layout.hpp" + +#include "Widget.hpp" + +using namespace tp; + +const RectF& WidgetLayout::getArea() const { + return mWidget->mAreaCache; +} + +RectF WidgetLayout::getAnimatedArea() const { + return mWidget->getArea(); +} + +void WidgetLayout::setArea(const RectF& area) { + mWidget->setAreaCache(area); +} + +Widget* WidgetLayout::parent() const { return mWidget->mParent; } + +const std::vector& WidgetLayout::children() const { return mWidget->mChildren; } + +const Vec2F& WidgetLayout::getMinSize() { return mMinSize; } + +void WidgetLayout::setMinSize(const Vec2F& size) { mMinSize = size; } + +const Vec2& WidgetLayout::getSizePolicy() const { return mSizePolicy; } + +void WidgetLayout::setSizePolicy(SizePolicy x, SizePolicy y) { mSizePolicy = { x, y }; } + +RangeF WidgetLayout::pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical) const { + RangeF out; + + switch (mSizePolicy[vertical]) { + case SizePolicy::Fixed: out = current; break; + case SizePolicy::Expanding: out = parent; break; + case SizePolicy::Minimal: out = children; break; + } + + out = clampRange(out, children, parent, vertical); + return out; +} + +void WidgetLayout::clampMinMaxSize() { + auto current = getArea(); + current.size.clamp(mMinSize, mMaxSize); + setArea(current); +} + +RangeF WidgetLayout::clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool vertical) const { + auto out = current; + + if (!children().empty()) { + auto clampedChild = child; + clampedChild.clamp(parent); + out.clamp(clampedChild, parent); + } else { + out.clamp(parent); + } + + // clamp min max sizes + auto len = clamp(current.size(), mMinSize[vertical], mMaxSize[vertical]); + if (len != current.size()) { + out.resizeFromCenter(len); + } + + return out; +} + +RectF WidgetLayout::getChildrenEnclosure() const { + RectF out; + + if (children().empty()) { + out = { getArea().center(), { 0, 0 } }; + } else { + out = children().front()->getLayout()->getArea(); + for (auto child : children()) { + out.expand(child->getLayout()->getArea()); + } + out.pos += getArea().pos; + } + + return out; +} + +RectF WidgetLayout::getAvailableChildArea() const { + return getArea().relative(); +} + +RectF WidgetLayout::getParentEnclosure() const { + DEBUG_ASSERT(parent()) + if (!parent()) return { { 0, 0 }, mMaxSize }; + auto out = parent()->getLayout()->getAvailableChildArea(); + return out; +} \ No newline at end of file diff --git a/Widgets/private/RootWidget.cpp b/Widgets/private/RootWidget.cpp new file mode 100644 index 0000000..41697b6 --- /dev/null +++ b/Widgets/private/RootWidget.cpp @@ -0,0 +1,156 @@ + +#include "RootWidget.hpp" + +#include "BasicLayout.hpp" +#include "SimpleLayouts.hpp" + +#include + +using namespace tp; + +#define SAMPLE(label, scope) gDebugWidget.##label.addSample(TimerWrapper([&]() scope ).exec()); + +WidgetLayout* WidgetManagerInterface::defaultLayout(Widget* widget) { + return new BasicLayout(widget); +} + +RootWidget::RootWidget() { + setDebug("root", RGBA(1)); + + addChild(&mRoot); + + mRoot.addChild(&mPopups); + mRoot.setLayout(new OverlayLayout(&mRoot)); + + dynamic_cast(mPopups.getLayout())->setLayoutPolicy(LayoutPolicy::Passive); +} + +void RootWidget::setRootWidget(Widget* widget) { + mRoot.removeChild(mUserRoot); + mRoot.addChild(widget); + + widget->bringToBack(); + + mUserRoot = widget; +} + +void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) { + mRoot.setArea(screenArea); + + gDebugWidget.mUpdManager.addSample(TimerWrapper([&]() { + // construct hierarchy tree of widgets to process + mUpdateManager.updateTreeToProcess(&mRoot); + + updateAnimations(); + updateAreaCache(&mRoot, true); + + // update all events and call all event processing callbacks + mUpdateManager.processWidgets(&mRoot, *events); + + updateAreaCache(&mRoot, true); + }).exec()); + + gDebugWidget.mLayManager.addSample(TimerWrapper([&]() { + // update widget sizes base on individual size policies + mLayoutManager.adjust(&mRoot); + }).exec()); + + updateAreaCache(&mRoot, false); + + // trigger some widgets by moise pointer + mUpdateManager.handleFocusChanges(&mRoot, *events); + + // check triggered widgets for removal + mUpdateManager.clean(); +} + +bool RootWidget::needsUpdate() const { + if (gDebugWidget.isRedrawAlways()) return true; + return mUpdateManager.isPendingUpdates(); +} + +void RootWidget::drawFrame(Canvas& canvas) { + canvas.rect(mRoot.getAreaT(), RGBA(0, 0, 0, 1)); + drawRecursion(canvas, &mRoot, { 0, 0 }); +} + +void RootWidget::drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos) { + if (!active->mFlags.get(ENABLED)) return; + + canvas.setOrigin(pos); + canvas.pushClamp({ pos, active->getArea().size }); + + if (canvas.getClampedArea().size.length2() > EPSILON) { + if (active->getArea().sizeVecW() > active->getArea().pos) { + active->draw(canvas); + } + + for (auto child = active->mDepthOrder.lastNode(); child; child = child->prev) { + drawRecursion(canvas, child->data, pos + child->data->getArea().pos); + } + } + + canvas.setOrigin(pos); + canvas.popClamp(); + + active->drawOverlay(canvas); +} + +void RootWidget::setWidgetArea(Widget& widget, const RectF& rect) { + widget.mArea.setTargetRect(rect); + widget.mArea.endAnimation(); +} + +void RootWidget::updateAnimations() { + dfs(&mRoot, [](Widget* widget) { + widget->updateAnimations(); + }); +} + +void RootWidget::updateAreaCache(Widget* iter, bool read) { + if (!iter || !iter->isUpdate()) return; + + if (read) { + iter->mAreaCache = iter->getAreaT(); + } else { + iter->setArea(iter->mAreaCache); + iter->mArea.updateCurrentRect(); + } + + for (auto child : iter->mChildren) { + if (read) { + child->mAreaCache = child->getAreaT(); + } else { + child->setArea(child->mAreaCache); + child->mArea.updateCurrentRect(); + } + } + + for (auto child : iter->mDepthOrder) { + updateAreaCache(child.data(), read); + } +} + +void RootWidget::updateWidget(Widget* widget, const char* reason) { + DEBUG_ASSERT(reason) + mUpdateManager.scheduleUpdate(widget, reason); +} + +void RootWidget::openPopup(Widget* widget) { + auto relativeArea = widget->getAreaT(); + for (auto iter = widget->mParent; iter && iter->mParent; iter = iter->mParent) { + relativeArea.pos += iter->getAreaT().pos; + } + setWidgetArea(*widget, relativeArea); + + mPopups.addChild(widget); + mUpdateManager.lockFocus(widget); +} + +void RootWidget::closePopup(Widget* widget) { + mPopups.removeChild(widget); + mUpdateManager.freeFocus(widget); +} + +void RootWidget::lockFocus(Widget* widget) { mUpdateManager.lockFocus(widget); } +void RootWidget::freeFocus(Widget* widget) { mUpdateManager.freeFocus(widget); } diff --git a/Widgets/private/Widget.cpp b/Widgets/private/Widget.cpp new file mode 100644 index 0000000..5b7dc2c --- /dev/null +++ b/Widgets/private/Widget.cpp @@ -0,0 +1,152 @@ +#include "Widget.hpp" + +#include + +using namespace tp; + +Widget::Widget() { + mArea.setTargetRect({ 100, 100, 10, 10 }); + setLayout(WidgetManagerInterface::defaultLayout(this)); + mArea.endAnimation(); + + mFlags.set(ENABLED, true); +} + +Widget::~Widget() { + delete mLayout; +} + +void Widget::addChild(Widget* child, bool front) { + if (auto node = mDepthOrder.find(child)) { + node->data->bringToFront(); + return; + } + + if (child->mParent) { + child->mParent->removeChild(child); + } + + mChildren.push_back(child); + + if (front) { + mDepthOrder.pushFront(child); + } else { + mDepthOrder.pushBack(child); + } + + child->mParent = this; + + triggerWidgetUpdate("add child"); + child->triggerWidgetUpdate("new parent"); +} + +void Widget::removeChild(Widget* child) { + auto node = mDepthOrder.find(child); + if (!node) return; + + mDepthOrder.removeNode(node); + mChildren.erase(std::remove(mChildren.begin(), mChildren.end(), child), mChildren.end()); + + triggerWidgetUpdate("removed child"); + child->triggerWidgetUpdate("parent changed"); +} + +void Widget::clear() { + mChildren.clear(); + mDepthOrder.removeAll(); +} + +void Widget::endAnimations() { mArea.endAnimation(); } +bool Widget::processesEvents() const { return false; } +void Widget::updateAnimations() { mArea.updateCurrentRect(); } +bool Widget::needsNextFrame() const { return !mArea.shouldEndTransition(); } + +void Widget::bringToFront() { + if (!mParent) return; + auto& order = mParent->mDepthOrder; + auto node = order.find(this); + DEBUG_ASSERT(node) + order.detach(node); + order.pushFront(node); +} + +void Widget::bringToBack() { + if (!mParent) return; + auto& order = mParent->mDepthOrder; + auto node = order.find(this); + DEBUG_ASSERT(node) + order.detach(node); + order.pushBack(node); +} + +void Widget::mouseEnter() { mFlags.set(IN_FOCUS, true); } +void Widget::mouseLeave() { mFlags.set(IN_FOCUS, false); } + +bool Widget::propagateEventsToChildren() const { return true; } + +void Widget::setLayout(tp::WidgetLayout* layout) { + delete mLayout; + mLayout = layout; + triggerWidgetUpdate("chane layout"); +} + +WidgetLayout* Widget::getLayout() { return mLayout; } + +const WidgetLayout* Widget::getLayout() const { return mLayout; } + +WidgetManagerInterface* Widget::getRoot() { + Widget* iter = mParent; + while (iter && iter->mParent) { + iter = iter->mParent; + } + return dynamic_cast(iter); +} + +void Widget::setAreaCache(const tp::RectF& area) { mAreaCache = area; } + +void Widget::setArea(const RectF& area) { + if (mArea.getTargetRect() == area) return; + + mArea.setTargetRect(area); + triggerWidgetUpdate("new area"); +} + +RectF Widget::getArea() const { return mArea.getCurrentRect(); } + +RectF Widget::getAreaT() const { return mArea.getTargetRect(); } + +RectF Widget::getRelativeArea() const { return { {}, mArea.getCurrentRect().size }; } + +RectF Widget::getRelativeAreaT() const { return { {}, mArea.getTargetRect().size }; } + +void Widget::setDebug(const char* name, RGBA col) { + mDebug.id = name; + mDebug.col = col; +} + +void Widget::setSizePolicy(SizePolicy x, SizePolicy y) { + getLayout()->setSizePolicy(x, y); +} + +void Widget::triggerWidgetUpdate(const char* reason) { + if (auto root = getRoot()) { + root->updateWidget(this, reason); + } +} + +void Widget::openPopup(Widget* widget) { + addChild(widget); + getRoot()->openPopup(widget); +} + +void Widget::closePopup(Widget* widget) { + getRoot()->closePopup(widget); +} + +void Widget::lockFocus() { + getRoot()->lockFocus(this); +} + +void Widget::freeFocus() { + getRoot()->freeFocus(this); +} \ No newline at end of file diff --git a/Widgets/private/WidgetApplication.cpp b/Widgets/private/WidgetApplication.cpp new file mode 100644 index 0000000..70e5aa0 --- /dev/null +++ b/Widgets/private/WidgetApplication.cpp @@ -0,0 +1,62 @@ +#include "WidgetApplication.hpp" + +#include "imgui.h" + +using namespace tp; + +void WidgetApplication::debugUI() { + // pass +} + +void WidgetApplication::setRoot(Widget* widget) { + mRootWidget.setRootWidget(widget); + + tp::RootWidget::setWidgetArea(*widget, {{}, mWindow->getSize()}); +} + +void WidgetApplication::processFrame(EventHandler* eventHandler, halnf deltaTime) { + const auto area = RectF({ 0, 0 }, mWindow->getSize()); + + gDebugWidget.update(&mRootWidget, *eventHandler); + + if (gDebugWidget.isDebug()) { + mGuiArea = area.splitByFactorHL(mDebugSplitFactor); + mDebugArea = area.splitByFactorHR(mDebugSplitFactor); + } else { + mGuiArea = area; + } + + if (gDebugWidget.isFrozen()) return; + + Timer timer; + mRootWidget.processFrame(eventHandler, mGuiArea); + gDebugWidget.mProcTime.addSample(timer.timePassed()); +} + +void WidgetApplication::drawFrame(Canvas* canvas) { + Timer timer; + mRootWidget.drawFrame(*canvas); + gDebugWidget.mDrawTime.addSample(timer.timePassed()); + + if (gDebugWidget.isDebug()) { + ImGui::SetNextWindowPos(ImVec2(mDebugArea.x, mDebugArea.y)); + ImGui::SetNextWindowSize(ImVec2(mDebugArea.z, mDebugArea.w)); + + if (ImGui::Begin( + "Existing Window Name", + nullptr, + ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoDecoration + )) { + + drawDebug(); + debugUI(); + + gDebugWidget.drawDebug(&mRootWidget, *canvas); + } + ImGui::End(); + } +} + +bool WidgetApplication::forceNewFrame() { + return mRootWidget.needsUpdate(); +} \ No newline at end of file diff --git a/Widgets/private/layouts/BasicLayout.cpp b/Widgets/private/layouts/BasicLayout.cpp new file mode 100644 index 0000000..c02b14d --- /dev/null +++ b/Widgets/private/layouts/BasicLayout.cpp @@ -0,0 +1,149 @@ + +#include "BasicLayout.hpp" +#include "Widget.hpp" + +#include + +using namespace tp; + + +void BasicLayout::pickRect(bool vertical) { + auto current = getArea(); + auto children = getChildrenEnclosure(); + auto parent = getParentEnclosure(); + + children.shrinkFromCenter(-mLayoutMargin, true); + + RectF newArea; + if (vertical) { + auto rangeY = pickRange(current.getRangeY(), children.getRangeY(), parent.getRangeY(), true); + newArea = RectF(current.getRangeX(), rangeY); + } else { + auto rangeX = pickRange(current.getRangeX(), children.getRangeX(), parent.getRangeX(), false); + newArea = RectF(rangeX, current.getRangeY()); + } + + setArea(newArea); +} + +void BasicLayout::clampRect() { + DEBUG_ASSERT(0) + + auto current = getArea(); + auto children = getChildrenEnclosure(); + auto parent = getParentEnclosure(); + + auto rangeX = clampRange(current.getRangeX(), children.getRangeX(), parent.getRangeX(), false); + auto rangeY = clampRange(current.getRangeY(), children.getRangeY(), parent.getRangeY(), true); + + setArea(RectF(rangeX, rangeY)); +} + +void BasicLayout::updateLayout(bool vertical) { + if (children().empty()) return; + + if (vertical) { + switch (mLayoutPolicy) { + case LayoutPolicy::Vertical: adjustLayout(true); break; + case LayoutPolicy::Passive: + case LayoutPolicy::Horizontal: break; + } + } else { + switch (mLayoutPolicy) { + case LayoutPolicy::Horizontal: adjustLayout(false); break; + case LayoutPolicy::Passive: + case LayoutPolicy::Vertical: break; + } + } +} + + +halnf BasicLayout::changeChildSize(tp::Widget* widget, halnf diff, bool vertical) { + auto prevSize = widget->getLayout()->getArea().size[vertical]; + { + auto area = widget->getLayout()->getArea(); + area.size[vertical] += diff; + widget->setAreaCache(area); + + widget->getLayout()->clampMinMaxSize(); + } + auto newSize = widget->getLayout()->getArea().size[vertical]; + return newSize - prevSize; +} + +void BasicLayout::adjustLayout(bool vertical) { + std::vector> contributors; + Vec2F contentSize = { 0, 0 }; + Vec2F availableSize = getArea().size; + + for (auto child : children()) { + child->getLayout()->pickRect(vertical); + + if (child->getLayout()->getSizePolicy()[vertical] == SizePolicy::Expanding) { + contributors.emplace_back( child, true ); + + auto area = child->getLayout()->getArea(); + area.size[vertical] = 0; + child->setAreaCache(area); + child->getLayout()->clampMinMaxSize(); + } + + contentSize += child->getLayout()->getArea().size; + } + + availableSize -= mLayoutGap * ((halnf) children().size() - 1) + mLayoutMargin * 2; + + auto diff = availableSize - contentSize; + + // expand or contract as much as possible + while (!contributors.empty() && (diff[vertical] != 0)) { + auto quota = diff / (halnf) contributors.size(); + + for (auto& contributor : contributors) { + if (!contributor.second) continue; + + // contributor.first->endAnimations(); + auto contribution = changeChildSize(contributor.first, quota[vertical], vertical); + + if (contribution == 0) { + contributor.second = false; + } + + diff[vertical] -= contribution; + } + + contributors.erase( + std::remove_if(contributors.begin(), contributors.end(), [](auto node) { return !node.second; }), + contributors.end() + ); + } + + // set opposite direction size + for (auto child : children()) { + // if (child->getLayout()->getSizePolicy()[!vertical] != SizePolicy::Minimal) { + auto area = child->getLayout()->getArea(); + area.size[!vertical] = getArea().size[!vertical] - mLayoutMargin * 2; + child->setAreaCache(area); + // } + } + + // set pos + halnf iterPos = mLayoutMargin; + for (auto child : children()) { + auto area = child->getLayout()->getArea(); + + area.pos[vertical] = iterPos; + area.pos[!vertical] = mLayoutMargin; + + iterPos += area.size[vertical] + mLayoutGap; + child->setAreaCache(area); + + // child->updateAnimations(); + // child->triggerWidgetUpdate("layout changed"); + } +} + +RectF BasicLayout::getAvailableChildArea() const { + auto out = WidgetLayout::getAvailableChildArea(); + return out.shrinkFromCenter(mLayoutMargin, true); +} \ No newline at end of file diff --git a/Widgets/private/layouts/DockLayout.cpp b/Widgets/private/layouts/DockLayout.cpp new file mode 100644 index 0000000..62f3023 --- /dev/null +++ b/Widgets/private/layouts/DockLayout.cpp @@ -0,0 +1,294 @@ +#include "DockLayout.hpp" + +using namespace tp; + +DockLayout::DockLayout(Widget* widget) : + WidgetLayout(widget) { + mSideWidgets[0].side = LEFT; + mSideWidgets[1].side = TOP; + mSideWidgets[2].side = RIGHT; + mSideWidgets[3].side = BOTTOM; +} + +bool DockLayout::setCenterWidget(Widget* widget) { + if (mCenterWidget) return false; + mCenterWidget = widget; + return true; +} + +bool DockLayout::dockWidget(Widget* widget, Side side) { + if (sideExists(side) || side == Side::NONE) return false; + + auto& sideWidget = mSideWidgets[side]; + sideWidget.widget = widget; + + for (auto& order : mSideWidgets) { + if (order.order == -1) { + order.order = side; + break; + } + } + + sideWidget.hidden = false; + sideWidget.areaBeforeDocking = widget->getArea(); + + return true; +} + +bool DockLayout::undockWidget(Side side) { + if (!sideExists(side) || (side == Side::NONE)) return false; + + bool removed = false; + for (ualni i = 0; i < 3; i++) { + if (mSideWidgets[i].order == side) { + removed = true; + } + if (removed) { + swapV(mSideWidgets[i].order, mSideWidgets[i + 1].order); + } + } + mSideWidgets[3].order = -1; + mSideWidgets[side].widget = nullptr; + + return true; +} + +void DockLayout::toggleWidgetVisibility(Side side) { + DEBUG_ASSERT(sideExists(side)) + mSideWidgets[side].hidden = !mSideWidgets[side].hidden; +} + +void DockLayout::calculateSideAreas() { + auto startArea = getArea().relative(); + + if (startArea.size.x <= 0 || startArea.size.y <= 0) return; + + for (auto& sideWidget : mSideWidgets) { + const auto side = sideWidget.order; + + if (side == -1) break; + if (!isSideVisible(Side(side))) continue; + + bool vertical = side == TOP || side == BOTTOM; + bool opposite = side == BOTTOM || side == RIGHT; + + auto& sideSize = mSideWidgets[side].absoluteSize; + + auto factor = sideSize / startArea.size[vertical]; + if (opposite) factor = factor * -1 + 1; + auto& area = mSideWidgets[side].area; + + if (!vertical) { + const auto first = startArea.splitByFactorHL(factor); + const auto second = startArea.splitByFactorHR(factor); + area = side == LEFT ? first : second; + startArea = side == LEFT ? second : first; + } else { + const auto first = startArea.splitByFactorVT(factor); + const auto second = startArea.splitByFactorVB(factor); + area = side == TOP ? first : second; + startArea = side == TOP ? second : first; + } + + area = area.shrink(mPadding); + } + + mCenterArea = startArea.shrink(mPadding); +} + +void DockLayout::calculateResizeHandles() { + RectF rec; + RectF area = getArea().relative(); + + for (auto& sideWidget : mSideWidgets) { + if (!sideWidget.widget) continue; + + auto& sideSize = sideWidget.absoluteSize; + auto& resizeHandle = sideWidget.resizeHandle; + + if (resizeHandle.end < mSideSizePadding * 2) { + // sideSize = resizeHandle.end / 2.f; + } else { + sideSize = clamp(sideSize, resizeHandle.start + mSideSizePadding, resizeHandle.end - mSideSizePadding); + } + } + + if (isSideVisible(LEFT)) { + auto& side = mSideWidgets[LEFT]; + rec = { side.area.p4(), { mPadding * 2, side.area.size.y } }; + side.resizeHandle.area = rec; + side.resizeHandle.start = 0; + side.resizeHandle.end = mCenterArea.p3().x; + } + if (isSideVisible(RIGHT)) { + auto& side = mSideWidgets[RIGHT]; + rec = { side.area.p1(), { mPadding * 2, side.area.size.y } }; + rec.x -= mPadding * 2; + side.resizeHandle.area = rec; + side.resizeHandle.start = 0; + side.resizeHandle.end = (area.p3() - mCenterArea.p1()).x; + } + if (isSideVisible(TOP)) { + auto& side = mSideWidgets[TOP]; + rec = { side.area.p2(), { side.area.size.x, mPadding * 2 } }; + side.resizeHandle.area = rec; + side.resizeHandle.start = 0; + side.resizeHandle.end = mCenterArea.p2().y; + } + if (isSideVisible(BOTTOM)) { + auto& side = mSideWidgets[BOTTOM]; + rec = { side.area.p1(), { side.area.size.x, mPadding * 2 } }; + rec.y -= mPadding * 2; + side.resizeHandle.area = rec; + side.resizeHandle.start = 0; + side.resizeHandle.end = (area.p3() - mCenterArea.p1()).y; + } +} + +void DockLayout::updateChildSideWidgets() { + for (ualni i = 0; i < 4; i++) { + if (!sideExists(Side(i))) continue; + auto widget = mSideWidgets[i].widget; + + if (!isSideVisible(Side(i))) { + // FIXME : widget->mEnable = false; + } else { + widget->setAreaCache(mSideWidgets[i].area); + // FIXME : widget->mEnable = true; + } + } + + if (mCenterWidget) mCenterWidget->setAreaCache(mCenterArea); +} + +void DockLayout::calculateHeaderAreas() { + for (ualni i = 0; i < 4; i++) { + if (!isSideVisible(Side(i))) continue; + auto& area = mSideWidgets[i].area; + const auto factor = mHeaderSize / area.size.y; + mSideWidgets[i].headerArea = area.splitByFactorVT(factor); + area = area.splitByFactorVB(factor); + + mSideWidgets[i].headerArea.size.y -= mPadding; + } +} + +ualni DockLayout::getVisibleSidesSize() const { + ualni out = 0; + for (ualni i = 0; i < 4; i++) { + if (isSideVisible(Side(i))) out++; + } + return out; +} + +auto DockLayout::getSideFromWidget(Widget* widget) -> Side { + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget == widget) return sideWidget.side; + } + return DockLayout::NONE; +} + +void DockLayout::updateLayout(bool vertical) { + for (auto child : children()) { + child->getLayout()->pickRect(vertical); + } + + if (vertical) return; + adjustChildrenRect(); +} + +void DockLayout::adjustChildrenRect() { + calculateSideAreas(); + calculateResizeHandles(); + updateChildSideWidgets(); +} + +void DockLayout::updatePreviewSide(const Vec2F& pointer) { + const auto handleSize = min(mCenterArea.size.x, mCenterArea.size.y) * mHandleFactor; + + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget) continue; + + switch (sideWidget.side) { + case TOP: sideWidget.area = mCenterArea.splitByFactorVT(mHandleSplitFactor); break; + case BOTTOM: sideWidget.area = mCenterArea.splitByFactorVB(1 - mHandleSplitFactor); break; + case LEFT: sideWidget.area = mCenterArea.splitByFactorHL(mHandleSplitFactor); break; + case RIGHT: sideWidget.area = mCenterArea.splitByFactorHR(1 - mHandleSplitFactor); break; + default: break; + } + + sideWidget.area = sideWidget.area.shrink(mPadding * 2); + sideWidget.previewHandleArea = sideWidget.area.getSizedFromCenter({ handleSize, handleSize }); + } + + mPreviewArea = {}; + mPreviewSide = NONE; + + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.widget) continue; + + if (sideWidget.previewHandleArea.isInside(pointer)) { + mPreviewArea = sideWidget.area; + mPreviewSide = sideWidget.side; + } + } +} + +DockLayout::Side DockLayout::getPreviewSide() { + return mPreviewSide; +} + +void DockLayout::updateResizeHover(const Vec2F& pointer) { + for (auto& sideWidget : mSideWidgets) { + sideWidget.resizeHandle.hover = sideWidget.resizeHandle.area.isInside(pointer); + } +} + +void DockLayout::updateResize(const Vec2F& pointerDelta) { + if (!mResizing) return; + + // do the resizing + for (auto& sideWidget : mSideWidgets) { + if (!sideWidget.resizeHandle.active) continue; + halnf delta = pointerDelta[(sideWidget.side == TOP || sideWidget.side == BOTTOM)]; + if (sideWidget.side == BOTTOM || sideWidget.side == RIGHT) { + delta *= -1; + } + sideWidget.absoluteSize += delta; + } +} + +bool DockLayout::startResize(const Vec2F& pointer) { + for (auto& sideWidget : mSideWidgets) { + if (sideWidget.resizeHandle.hover) { + sideWidget.resizeHandle.active = true; + mResizing = true; + return true; + } + } + return false; +} + +void DockLayout::endResize() { + for (auto& sideWidget : mSideWidgets) { + sideWidget.resizeHandle.active = false; + } + mResizing = false; +} + +bool DockLayout::isSideVisible(DockLayout::Side side) const { + return sideExists(side) && !mSideWidgets[side].hidden; +} + +bool DockLayout::sideExists(DockLayout::Side side) const { + return mSideWidgets[side].widget; +} + +const std::vector& DockLayout::getDockedWidgets() { + mDockedWidgets.resize(5); + for (auto i = 0; i < 4; i++) { + mDockedWidgets[i] = mSideWidgets[i].widget; + } + mDockedWidgets[4] = mCenterWidget; + return mDockedWidgets; +} \ No newline at end of file diff --git a/Widgets/private/layouts/FloatingLayout.cpp b/Widgets/private/layouts/FloatingLayout.cpp new file mode 100644 index 0000000..229de43 --- /dev/null +++ b/Widgets/private/layouts/FloatingLayout.cpp @@ -0,0 +1,52 @@ +#include "FloatingLayout.hpp" +#include "Widget.hpp" + +using namespace tp; + +void FloatingLayout::pickRect(bool vertical) { + if (mIsFloating) { + auto area = getArea(); + + if (mIsResizing) { + mPointerCurrent.clamp(mMinSize, mMaxSize); + + area.size[vertical] = (mPointerCurrent + mHandleSize / 2.f)[vertical]; + + for (auto child : children()) { + child->triggerWidgetUpdate("floating menu resized"); + } + + } else if (mIsFloating) { + area.pos[vertical] += (mPointerCurrent - mPointerStart)[vertical]; + } + + setArea(area); + } + + clampMinMaxSize(); +} + +RectF FloatingLayout::resizeHandleRect() { + auto area = getAnimatedArea().relative(); + area.pos = area.p3() - mHandleSize; + area.size = mHandleSize; + area.shrink(mHandlePadding); + return area; +} + +void FloatingLayout::startAction(const Vec2F& pointer) { + mPointerStart = pointer; + + mIsFloating = true; + if (resizeHandleRect().isInside(mPointerStart)) { + mIsResizing = true; + } +} + +void FloatingLayout::updateAction(const Vec2F& pointer) { + mPointerCurrent = pointer; +} + +void FloatingLayout::endAction() { + mIsResizing = mIsFloating = false; +} \ No newline at end of file diff --git a/Widgets/private/layouts/ScrollableLayout.cpp b/Widgets/private/layouts/ScrollableLayout.cpp new file mode 100644 index 0000000..dd2a1cf --- /dev/null +++ b/Widgets/private/layouts/ScrollableLayout.cpp @@ -0,0 +1,53 @@ +#include "ScrollableLayout.hpp" + +// fixme : this dependency should be removed +#include "ScrollableWidget.hpp" + +using namespace tp; + +void ScrollableLayout::updateLayout(bool vertical) { + if (vertical) return; + + // TODO : make better interface to get scroller and content widget + if (children().size() != 2) return; + + auto scroller = dynamic_cast(children().front()); + auto content = children().back(); + + if (!scroller || !content) return; + + updateWidgetRects(getArea().relative(), content, scroller); +} + +void ScrollableLayout::updateWidgetRects(const RectF& area, Widget* content, ScrollableBarWidget* scroller) const { + bool dir = scroller->getDirection(); + + // update content + // auto contentItems = content->getLayout()->getChildrenEnclosure(); + // content->getLayout()->setArea(contentItems.shrinkFromCenter(-10, true)); + content->getLayout()->pickRect(dir); + + auto sizeFactor = (area.size[dir] / content->getLayout()->getArea().size[dir]); + auto splitFactor = 1 - ((sizeFactor > 1.f) ? 0 : mScrollerSize / area.size[!dir]); + + auto holderArea = dir ? area.splitByFactorHL(splitFactor) : area.splitByFactorVT(splitFactor); + auto contentArea = content->getLayout()->getArea(); + auto scrollerArea = dir ? area.splitByFactorHR(splitFactor) : area.splitByFactorVB(splitFactor); + + scroller->updateSizeFactor(sizeFactor); + + contentArea.pos[dir] = -scroller->getPosFactor() * contentArea.size[dir]; + contentArea.size[!dir] = holderArea.size[!dir]; + contentArea.pos[!dir] = 0; + + scroller->getLayout()->setArea(scrollerArea); + content->getLayout()->setArea(contentArea); +} + +RectF ScrollableLayout::getAvailableChildArea() const { + auto out = getArea(); + // dont constrain on scroll axis + out.pos = -FLT_MAX / 4; + out.size = FLT_MAX / 2; + return out; +} diff --git a/Widgets/private/layouts/SimpleLayouts.cpp b/Widgets/private/layouts/SimpleLayouts.cpp new file mode 100644 index 0000000..c65ea62 --- /dev/null +++ b/Widgets/private/layouts/SimpleLayouts.cpp @@ -0,0 +1,32 @@ + +#include "SimpleLayouts.hpp" +#include "Widget.hpp" + + +using namespace tp; + +void OverlayLayout::updateLayout(bool vertical) { + if (vertical) return; + + if (children().empty()) return; + + for (auto child : children()) { + child->getLayout()->setArea(getArea().relative()); + } +} + +void ToolBarLayout::updateLayout(bool vertical) { + if (vertical) return; + + if (children().size() != 2) return; + + auto toolbar = children().back(); + auto content = children().front(); + + auto factor = mToolBarHeight / getArea().w; + + auto area = getArea().relative(); + + toolbar->getLayout()->setArea(area.splitByFactorVT(factor)); + content->getLayout()->setArea(area); +} \ No newline at end of file diff --git a/Widgets/private/managers/DebugManager.cpp b/Widgets/private/managers/DebugManager.cpp new file mode 100644 index 0000000..921f7e1 --- /dev/null +++ b/Widgets/private/managers/DebugManager.cpp @@ -0,0 +1,191 @@ +#include "DebugManager.hpp" +#include "RootWidget.hpp" +#include "BasicLayout.hpp" + +#include "imgui.h" +#include "implot.h" + +#include + +using namespace tp; + +DebugManager tp::gDebugWidget; + +#define LIST_SIZE \ + { -FLT_MIN, 150 } + +void DebugManager::update(RootWidget* rootWidget, EventHandler& events) { + mRootWidget = rootWidget; + + events.setEnableKeyEvents(true); + if (events.isPressed(InputID::D)) mDebug = !mDebug; + + if (mDebug) { + events.setEnableKeyEvents(true); + if (events.isPressed(InputID::K)) mDebugStopProcessing = !mDebugStopProcessing; + + if (auto widget = rootWidget->mUpdateManager.mInFocusWidget) { + if (auto lay = dynamic_cast(widget->getLayout())) { + if (events.isPressed(InputID::V)) lay->setLayoutPolicy(LayoutPolicy::Vertical); + if (events.isPressed(InputID::H)) lay->setLayoutPolicy(LayoutPolicy::Horizontal); + + auto sizing = lay->getSizePolicy(); + + if (events.isDown(InputID::X)) { + if (events.isPressed(InputID::S)) lay->setSizePolicy(SizePolicy::Minimal, sizing.y); + if (events.isPressed(InputID::E)) lay->setSizePolicy(SizePolicy::Expanding, sizing.y); + } + if (events.isDown(InputID::Y)) { + if (events.isPressed(InputID::S)) lay->setSizePolicy(sizing.x, SizePolicy::Minimal); + if (events.isPressed(InputID::E)) lay->setSizePolicy(sizing.x, SizePolicy::Expanding); + } + } + } + + if (auto breakWidget = rootWidget->mUpdateManager.mInFocusWidget) { + if (events.isPressed(InputID::P)) mProcBreakpoints.insert(breakWidget); + if (events.isPressed(InputID::L)) mLayBreakpoints.insert(breakWidget); + } + } +} + +void DebugManager::drawDebug(RootWidget* rootWidget, Canvas& canvas) { + mRootWidget = rootWidget; + + if (!mDebug) { + return; + } + + drawPerformance(); + + // ImGui::Checkbox("Draw debug", &mDebug); + + ImGui::SameLine(); + ImGui::Text("To Toggle processing press k"); + + auto& upd = rootWidget->mUpdateManager; + + ImGui::Text("Triggered: %i", (int) upd.mTriggeredWidgets.size()); + ImGui::SameLine(); + ImGui::Text("Processing: %i", upd.mDebugWidgetsToProcess); + + ImGui::Checkbox("Stop processing", &mDebugStopProcessing); + ImGui::SameLine(); + ImGui::Checkbox("Force new frames", &mDebugRedrawAlways); + ImGui::SameLine(); + ImGui::Checkbox("Detailed", &mDetailed); + + if (upd.mInFocusWidget) { + ImGui::Text("Under cursor"); + { + if (ImGui::BeginListBox("##under_cursor", LIST_SIZE)) { + for (auto widget = upd.mInFocusWidget; widget && widget->mParent; widget = widget->mParent) { + widgetMenu(widget); + } + ImGui::EndListBox(); + } + } + } + + if (mDetailed) { + ImGui::Text("Triggered"); + { + if (ImGui::BeginListBox("##triggered", LIST_SIZE)) { + for (auto widget : upd.mTriggeredWidgets) { + widgetMenu(widget.first); + } + ImGui::EndListBox(); + } + } + + drawLayoutOrder(); + + recursiveDraw(canvas, &rootWidget->mRoot, { 0, 0 }, 0); + } +} + +void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder) { + auto area = RectF{ pos, active->getAreaT().size }; + + if (active->isUpdate()) { + RGBA color = { 1, 0, 0, 1 }; + canvas.frame(area, color); + canvas.text((active->mDebug.id + ":" + std::to_string(depthOrder)).c_str(), area, 22, Canvas::Align::LC, 2, color); + } + + if (active->mFlags.get(Widget::IN_FOCUS)) { + if (active->isUpdate()) { + canvas.circle(pos + active->mDebug.pLocal, 5, active->mDebug.col); + canvas.circle(active->mDebug.pGlobal, 15, active->mDebug.col); + } + + RGBA color = { 1, 0, 0, 0.3f }; + canvas.debugCross(area, color); + } + + int orderIdx = 0; + for (auto child = active->mDepthOrder.lastNode(); child; child = child->prev) { + recursiveDraw(canvas, child->data, pos + child->data->getAreaT().pos, orderIdx++); + } +} + +void DebugManager::widgetMenu(Widget* widget) { + + ImGui::PushID(widget); + + if (ImGui::CollapsingHeader((widget->mDebug.id + std::to_string((long) widget)).c_str())) { + + ImGui::Text("trigger reason: %s", widget->mDebug.triggerReason.c_str()); + + auto area = widget->getAreaT(); + if (ImGui::InputFloat4("rect", &area.x)) { + widget->setArea(area); + } + + auto layout = widget->getLayout(); + + ImGui::InputFloat2("min size", &layout->mMinSize.x); + ImGui::InputFloat2("max size", &layout->mMaxSize.x); + + { + int sizePolicyX = int(widget->getLayout()->getSizePolicy().x); + int sizePolicyY = int(widget->getLayout()->getSizePolicy().y); + + if (ImGui::Combo("Size Policy X", &sizePolicyX, "Fixed\0Expanding\0Minimal\0")) { + widget->setSizePolicy(SizePolicy(sizePolicyX), SizePolicy(sizePolicyY)); + } + + if (ImGui::Combo("Size Policy Y", &sizePolicyY, "Fixed\0Expanding\0Minimal\0")) { + widget->setSizePolicy(SizePolicy(sizePolicyX), SizePolicy(sizePolicyY)); + } + } + + if (auto pBasicLayout = dynamic_cast(widget->getLayout())) { + int policy = int(pBasicLayout->mLayoutPolicy); + if (ImGui::Combo("Layout", &policy, "Passive\0Vertical\0Horizontal\0")) { + pBasicLayout->mLayoutPolicy = LayoutPolicy(policy); + } + } + } + ImGui::PopID(); +} + +void DebugManager::drawLayoutOrder() { + ImGui::Text("Layout Processing Order"); + if (ImGui::BeginListBox("##layout_order", LIST_SIZE)) { + for (auto iter : mRootWidget->mLayoutManager.mLayOrder) { + ImGui::Text("%i %s (%s)", iter.second, iter.first->mDebug.id.c_str(), std::to_string((long) iter.first).c_str()); + } + ImGui::EndListBox(); + } +} + +void DebugManager::drawPerformance() { + if (ImPlot::BeginPlot("Per Frame Time")) { + ImPlot::PlotLine("Proc ms", mProcTime.get(), mProcTime.size()); + ImPlot::PlotLine("Draw ms", mDrawTime.get(), mDrawTime.size()); + ImPlot::PlotLine("UPD ms", mUpdManager.get(), mUpdManager.size()); + ImPlot::PlotLine("LAY ms", mLayManager.get(), mLayManager.size()); + ImPlot::EndPlot(); + } +} \ No newline at end of file diff --git a/Widgets/private/managers/LayoutManager.cpp b/Widgets/private/managers/LayoutManager.cpp new file mode 100644 index 0000000..83f51ba --- /dev/null +++ b/Widgets/private/managers/LayoutManager.cpp @@ -0,0 +1,102 @@ +#include "LayoutManager.hpp" +#include "DebugManager.hpp" + +#include "DockLayout.hpp" +#include "ScrollableLayout.hpp" + +#include + +using namespace tp; + +void LayoutManager::adjust(Widget* root) { + for (auto i : IterRange(2)) { + mVertical = bool(i); + + mDepGraph.clear(); + mLayOrder.clear(); + mRoots.clear(); + + findDependencies(root); + + // TODO : implement better topological-sort + for (auto iterRoot : mRoots) { + topologicalSort(iterRoot); + } + + adjustLayouts(); + } +} + +void LayoutManager::findDependencies(Widget* root) { + mDepGraph.insert({ root, {} }); + + Widget::dfs(root, [this](Widget* widget) { mDepGraph.insert({ widget, {} }); }); + + for (auto& [widget, deps] : mDepGraph) { + if (!widget->isUpdate()) continue; + + for (auto child : widget->mChildren) { + // if (!child->isUpdate()) continue; + + mDepGraph.insert({ child, {} }); + + if (auto depOrder = getLayoutOrder(widget->getLayout(), child->getLayout())) { + if (depOrder > 0) { + deps.depends.push_back(child); + mDepGraph[child].references++; + } else { + mDepGraph[child].depends.push_back(widget); + mDepGraph[widget].references++; + } + } + } + } + + // find root + for (auto& node : mDepGraph) { + if (node.second.references == 0) { + mRoots.push_back(node.first); + } + } +} + +void LayoutManager::topologicalSort(Widget* root, int depth) { + mDepGraph.at(root).depth = max(mDepGraph.at(root).depth, depth); + + for (auto& dep : mDepGraph.at(root).depends) { + topologicalSort(dep, depth + 1); + } +} + +void LayoutManager::adjustLayouts() { + for (auto& iter : mDepGraph) { + mLayOrder.emplace_back(iter.first, iter.second.depth); + } + + std::sort(mLayOrder.begin(), mLayOrder.end(), [](auto first, auto second){ + return first.second > second.second; + }); + + for (auto& [iter, _] : mLayOrder) { + iter->getLayout()->updateLayout(mVertical); + } +} + +static int sizePolicyDep[3][3] = { + // f s e child + { 1, 1, 1 }, // parent fixed + { 1, 1, 1 }, // parent shrink + { 1, 1, 1 }, // parent expand +}; + +int LayoutManager::getLayoutOrder(WidgetLayout* parent, WidgetLayout* child) const { + if (!parent || !child) return 0; + + auto policyParent = parent->getSizePolicy()[mVertical]; + auto policyChild = parent->getSizePolicy()[mVertical]; + + if (dynamic_cast(parent)) return -1; + // if (dynamic_cast(parent)) return -1; + + return sizePolicyDep[int(policyParent)][int(policyChild)]; +} diff --git a/Widgets/private/managers/UpdateManager.cpp b/Widgets/private/managers/UpdateManager.cpp new file mode 100644 index 0000000..d1af2cd --- /dev/null +++ b/Widgets/private/managers/UpdateManager.cpp @@ -0,0 +1,220 @@ +#include "UpdateManager.hpp" +#include "DebugManager.hpp" + +using namespace tp; + +void UpdateManager::processWidgets(Widget* root, EventHandler& events) { + events.setEnableKeyEvents(true); + events.setCursorOrigin({ 0, 0 }); + + processFocusItems(events); + + events.setEnableKeyEvents(false); + events.setCursorOrigin({ 0, 0 }); + + processActiveTree(root, events, { 0, 0 }); +} + +void UpdateManager::clean() { + erase_if(mTriggeredWidgets, [](auto iter) { + auto widget = iter.first; + auto flag = iter.second; + + if (!flag) return false; + + // if (mWidgetsToProcess.find(widget) == mWidgetsToProcess.end()) return false; + widget->updateAnimations(); + auto end = !widget->needsNextFrame(); + if (end) { + widget->endAnimations(); + widget->mDebug.triggerReason = "del"; + } + return end; + }); +} + +void UpdateManager::scheduleUpdate(Widget* widget, const char* reason) { + widget->mDebug.triggerReason = reason; + mTriggeredWidgets.insert({ widget, false }); +} + +void UpdateManager::updateTreeToProcess(Widget* root) { + Widget::dfs(root, [](Widget* widget) { + widget->mFlags.set(Widget::NEEDS_UPDATE, false); + }); + + for (auto& [widget, flag] : mTriggeredWidgets) { + flag = true; + + for (auto iter = widget; iter && iter->mParent; iter = iter->mParent) { + iter->mFlags.set(Widget::NEEDS_UPDATE, true); + } + } + + mDebugWidgetsToProcess = 0; + Widget::dfs(root, [this](Widget*) { + mDebugWidgetsToProcess++; + }); +} + +void UpdateManager::getWidgetPath(Widget* widget, std::vector& out) { + if (!widget) return; + + for (auto iter = widget; iter && iter->mParent; iter = iter->mParent) { + out.push_back(iter); + } + + for (auto i = 0; i < out.size() / 2; i++) { + swapV(out[i], out[out.size() - i - 1]); + } +} + +void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) { + auto prevFocus = mInFocusWidget; + + events.setCursorOrigin({ 0, 0 }); + + mInFocusWidget = nullptr; + + findFocusWidget(root, &mInFocusWidget, events.getPointer()); + + if (mFocusLockWidget) { + bool hasLockedWidget = false; + for (auto iter = mInFocusWidget; iter; iter = iter->mParent) { + if (iter == mFocusLockWidget) { + hasLockedWidget = true; + break; + } + } + if (!hasLockedWidget) { + mInFocusWidget = mFocusLockWidget; + } + } + + // if (mInFocusWidget == prevFocus) return; + if (mInFocusWidget) scheduleUpdate(mInFocusWidget, "focus entered"); + + if (!mInFocusWidget && !prevFocus) return; + + std::vector path2; + getWidgetPath(mInFocusWidget, path2); + size_t propLen2 = path2.size(); + for (auto i = 0; i < path2.size(); i++) { + if (!path2[i]->propagateEventsToChildren()) { + propLen2 = i + 1; + break; + } + } + + std::vector path1; + getWidgetPath(prevFocus, path1); + size_t propLen1 = path1.size(); + for (auto i = 0; i < path1.size(); i++) { + if (!path1[i]->propagateEventsToChildren()) { + propLen1 = i + 1; + break; + } + } + + int mostCommonIdx = 0; + if (!(path1.empty() || path2.empty())) { + while (mostCommonIdx < min(path1.size(), path2.size()) && path1[mostCommonIdx] == path2[mostCommonIdx]) { + mostCommonIdx++; + } + } + mostCommonIdx--; + + for (auto i = 0; i < path1.size(); i++) { + path1[i]->mFlags.set(Widget::IN_FOCUS, false); + if (i > mostCommonIdx && i < propLen1) path1[i]->mouseLeave(); + } + + for (auto i = 0; i < path2.size(); i++) { + path2[i]->mFlags.set(Widget::IN_FOCUS, true); + if (i > mostCommonIdx && i < propLen2) path2[i]->mouseEnter(); + } +} + +void UpdateManager::findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer) { + if (!iter->mArea.getTargetRect().isInside(pointer) || !iter->mFlags.get(Widget::ENABLED)) return; + + if (iter->processesEvents()) { + *focus = iter; + } + + for (auto child = iter->mDepthOrder.lastNode(); child; child = child->prev) { + findFocusWidget(child->data, focus, pointer - iter->mArea.getTargetRect().pos); + } +} + +void UpdateManager::processActiveTree(Widget* iter, EventHandler& events, Vec2F parent) { + if (!iter || !iter->isUpdate()) return; + + auto current = parent + iter->getAreaT().pos; + + if (!iter->mFlags.get(Widget::IN_FOCUS)) { + iter->mDebug.pGlobal = current; + + events.setCursorOrigin(current); + procWidget(iter, events, false); + } + + for (auto child : iter->mDepthOrder) { + processActiveTree(child.data(), events, current); + } +} + +void UpdateManager::processFocusItems(EventHandler& events) { + if (!mInFocusWidget) return; + + std::vector path; + getWidgetPath(mInFocusWidget, path); + + size_t len = path.size(); + for (auto i = 0; i < len; i++) { + if (!path[i]->propagateEventsToChildren()) { + len = i + 1; + break; + } + } + + std::vector widgetGlobalPos(path.size()); + + widgetGlobalPos[0] = 0; + for (auto widget = 0; widget < path.size() - 1; widget++) { + widgetGlobalPos[widget + 1] = widgetGlobalPos[widget] + path[widget + 1]->getAreaT().pos; + // path[widget]->mGlobalPoint = widgetGlobalPos[widget]; + } + + bool eventsProcessed = false; + + for (int iter = (int) len - 1; iter >= 0; iter--) { + auto widget = path[iter]; + + events.setCursorOrigin(widgetGlobalPos[iter]); + + widget->mDebug.pGlobal = widgetGlobalPos[iter]; + + if (!eventsProcessed && widget->processesEvents()) { + procWidget(widget, events, true); + eventsProcessed = true; + } else { + procWidget(widget, events, false); + } + } +} + +void UpdateManager::procWidget(Widget* widget, EventHandler& events, bool withEvents) { + events.setEnableKeyEvents(withEvents); + gDebugWidget.checkProcBreakPoints(widget); + widget->process(events); +} + +void UpdateManager::lockFocus(tp::Widget* widget) { + mFocusLockWidget = widget; +} + +void UpdateManager::freeFocus(tp::Widget* widget) { + // DEBUG_ASSERT(mFocusLockWidget == widget) + mFocusLockWidget = nullptr; +} \ No newline at end of file diff --git a/Widgets/private/widgets/AnimationTestWidget.cpp b/Widgets/private/widgets/AnimationTestWidget.cpp new file mode 100644 index 0000000..8b09d57 --- /dev/null +++ b/Widgets/private/widgets/AnimationTestWidget.cpp @@ -0,0 +1,28 @@ +#include "AnimationTestWidget.hpp" + +using namespace tp; + +void AnimationTestWidget::process(const EventHandler& events) { + if (events.isDown(tp::InputID::MOUSE1)) { + mTestSpring.getStart().setTargetPosition(events.getPointer()); + } + + if (events.isDown(tp::InputID::MOUSE2)) { + mTestSpring.getEnd().setTargetPosition(events.getPointer()); + } + + mTestSpring.updateCurrentRect(); + + if (mTestSpring.shouldEndTransition()) { + mTestSpring.endAnimation(); + } +} + +void AnimationTestWidget::draw(Canvas& canvas) { + canvas.rect(getRelativeArea(), { 0, 0, 0, 1 }, 10); + canvas.rect(mTestSpring.getCurrentRect(), RGBA(1.f), 10); +} + +bool AnimationTestWidget::needsNextFrame() const { + return Widget::needsNextFrame() || !mTestSpring.shouldEndTransition(); +} diff --git a/Widgets/private/widgets/ColorPickerWidget.cpp b/Widgets/private/widgets/ColorPickerWidget.cpp new file mode 100644 index 0000000..1f5c018 --- /dev/null +++ b/Widgets/private/widgets/ColorPickerWidget.cpp @@ -0,0 +1,22 @@ +#include "ColorPickerWidget.hpp" + +using namespace tp; + +void RGBPickerWidget::process(const EventHandler& events) { + if (events.isPressed(InputID::MOUSE1)) { + mColorWheel.fromPoint(getArea().relative(), events.getPointer()); + lockFocus(); + } + + if (events.isReleased(InputID::MOUSE1)) { + freeFocus(); + } + + if (events.getPointerDelta().length() > EPSILON && events.isDown(InputID::MOUSE1)) { + mColorWheel.fromPoint(getArea().relative(), events.getPointer()); + } +} + +void RGBPickerWidget::draw(Canvas& canvas) { + canvas.colorWheel(getArea().relative(), mColorWheel); +} diff --git a/Widgets/private/widgets/DockWidget.cpp b/Widgets/private/widgets/DockWidget.cpp new file mode 100644 index 0000000..b75a35c --- /dev/null +++ b/Widgets/private/widgets/DockWidget.cpp @@ -0,0 +1,142 @@ +#include "DockWidget.hpp" +#include "FloatingWidget.hpp" + +using namespace tp; + +DockWidget::DockWidget() : Widget() { + setDebug("dock", { 1, 1, 1, 1 }); + setLayout(new DockLayout(this)); +} + +void DockWidget::dockWidget(Widget* widget, DockLayout::Side side) { + if (layout()->dockWidget(widget, side)) { + addChild(widget); + + for (auto child : layout()->getDockedWidgets()) { + if (child) child->bringToBack(); + } + } +} + +void DockWidget::undockWidget(DockLayout::Side side, bool restoreArea) { + if (layout()->sideExists(side) && side != DockLayout::NONE) { + auto widget = layout()->getSideWidget(side); + + widget->bringToFront(); + if (restoreArea) { + widget->setArea(layout()->getRectBeforeDocked(side)); + } else { + // FIXME : widget->endAnimations(); + } + + layout()->undockWidget(side); + } +} + +void DockWidget::setCenterWidget(Widget* widget) { + if (layout()->setCenterWidget(widget)) { + addChild(widget); + } +} + +void DockWidget::toggleWidgetVisibility(DockLayout::Side side) { + if (layout()->sideExists(side)) { + auto widget = layout()->getSideWidget(side); + widget->setEnabled(!layout()->isSideVisible(side)); + widget->bringToBack(); + + layout()->toggleWidgetVisibility(side); + + widget->triggerWidgetUpdate("dock visibility changed"); + } +} + +void DockWidget::process(const EventHandler& events) { + // calculateHeaderAreas(); + + Widget* floater = nullptr; + for (auto child : mChildren) { + if (auto iter = dynamic_cast(child)) { + if (iter->isFloating()) { + floater = iter; + break; + } + } + } + + if (floater) undockWidget(layout()->getSideFromWidget(floater), false); + + if (floater) { + layout()->updatePreviewSide(events.getPointer()); + } + + if (mPreviewWidget && !floater) { + dockWidget(mPreviewWidget, layout()->getPreviewSide()); + } + + mPreviewWidget = floater; + + if (!mPreviewWidget) { + layout()->updateResizeHover(events.getPointer()); + + if (events.isPressed(InputID::MOUSE1)) { + if (layout()->startResize(events.getPointer())) { + triggerWidgetUpdate("dock layout resizing"); + lockFocus(); + } + } else if (events.isReleased(InputID::MOUSE1)) { + layout()->endResize(); + freeFocus(); + } + + if (layout()->isResizing()) { + layout()->updateResize(events.getPointerDelta()); + } + } +} + +bool DockWidget::propagateEventsToChildren() const { + return !layout()->isResizing(); +} + +bool DockWidget::needsNextFrame() const { + return Widget::needsNextFrame() || layout()->isResizing(); +} + +void DockWidget::draw(Canvas& canvas) { + canvas.rect(getRelativeArea(), mBackgroundColor, 0); +} + +void DockWidget::drawSide(DockLayout::Side side, tp::Canvas& canvas) { + auto lay = layout(); + + if (lay->isSideVisible(side)) { + // header + canvas.rect(lay->getHeaderArea(side), mResizeHandleColorActive, 0); + + // resize + if (lay->isResizing(side)) { + canvas.rect(lay->getResizeHandleArea(side).shrink(mPadding / 1.5f), mResizeHandleColorActive, 0); + } else if (lay->isResizeHandleHover(side)) { + canvas.rect(lay->getResizeHandleArea(side).shrink(mPadding / 1.5f), mResizeHandleColorHovered, 0); + } + + } else { + // preview handles + if (mPreviewWidget) { + // preview active + if (lay->getPreviewSide() == side) { + canvas.rect(lay->getPreviewArea().shrink(mPadding * 2), mPreviewColor, mRounding); + } else { + canvas.rect(lay->getPreviewHandleArea(side), mPreviewColor, mRounding); + } + } + } +} + +void DockWidget::drawOverlay(Canvas& canvas) { + drawSide(DockLayout::Side::LEFT, canvas); + drawSide(DockLayout::Side::RIGHT, canvas); + drawSide(DockLayout::Side::TOP, canvas); + drawSide(DockLayout::Side::BOTTOM, canvas); +} \ No newline at end of file diff --git a/Widgets/private/widgets/FloatingWidget.cpp b/Widgets/private/widgets/FloatingWidget.cpp new file mode 100644 index 0000000..0a8579a --- /dev/null +++ b/Widgets/private/widgets/FloatingWidget.cpp @@ -0,0 +1,76 @@ +#include "FloatingWidget.hpp" +#include "ScrollableLayout.hpp" + +using namespace tp; + +void FloatingWidget::process(const EventHandler& events) { + const auto pointer = events.getPointer(); + + if (getRelativeAreaT().isInside(pointer) && events.isPressed(InputID::MOUSE1)) { + layout()->startAction(pointer); + + bringToFront(); + lockFocus(); + } + + if (layout()->isFloating() && events.isReleased(InputID::MOUSE1)) { + layout()->endAction(); + freeFocus(); + } + + layout()->updateAction(pointer); +} + +void FloatingWidget::draw(Canvas& canvas) { + canvas.rect(layout()->resizeHandleRect(), RGBA(0.7f), 2); + canvas.rect(getRelativeArea(), RGBA(0.5f), 10); +} + +bool FloatingWidget::processesEvents() const { + return true; +} + +bool FloatingWidget::propagateEventsToChildren() const { + return !layout()->isFloating(); +} + +bool FloatingWidget::isFloating() const { + return layout()->isFloating(); +} + +bool FloatingWidget::needsNextFrame() const { + return Widget::needsNextFrame() || isFloating(); +} + +FloatingLayout* FloatingWidget::layout() { return dynamic_cast(Widget::getLayout()); } + +const FloatingLayout* FloatingWidget::layout() const { + return dynamic_cast(Widget::getLayout()); +} + +FloatingMenu::FloatingMenu() : FloatingWidget() { + setDebug("float menu", { 0.0, 0.9, 0.1, 0.7 }); + + // addChild(&mMenuLayout); + + addChild(&mHeader); + addChild(&mBodyLayout); + + mHeader.setText("Menu"); + + mHeader.setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal); + mBodyLayout.setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + + mBodyLayout.setLayout(new ScrollableLayout(&mBodyLayout)); + mBodyLayout.addChild(&mScrollBar); + mBodyLayout.addChild(&mContentWidget); + + mContentWidget.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal); + + // getLayout()->setLayoutPolicy(LayoutPolicy::Vertical); + // mBodyLayout.getLayout()->setLayoutPolicy(LayoutPolicy::Vertical); +} + +void FloatingMenu::setText(const std::string& text) { + mHeader.setText(text); +} diff --git a/Widgets/private/widgets/ScrollableWidget.cpp b/Widgets/private/widgets/ScrollableWidget.cpp new file mode 100644 index 0000000..e67f0fa --- /dev/null +++ b/Widgets/private/widgets/ScrollableWidget.cpp @@ -0,0 +1,106 @@ +#include "ScrollableWidget.hpp" +#include "ScrollableLayout.hpp" +#include "BasicLayout.hpp" + +using namespace tp; + +void ScrollableBarWidget::process(const EventHandler& events) { + // all content is visible no need to process anything + if (mSizeFactor >= 1) { + mScrolling = false; + mPosFactor = mSizeFactor / 2.f; + freeFocus(); + return; + } + + updateHandleRect(); + + auto pointer = events.getPointer(); + auto size = getArea().size; + + mHandleHovered = getHandleRect().isInside(pointer); + + if (getRelativeAreaT().isInside(pointer) && events.isPressed(InputID::MOUSE1)) { + if (!mHandleHovered) { + jumpTo((pointer / size)[mVertical]); + mStartPos = { 0, 0 }; + } else { + mStartPos = pointer - getHandleRect().center(); + } + mScrolling = true; + lockFocus(); + } + + if (mScrolling && events.isReleased(InputID::MOUSE1)) { + mScrolling = false; + freeFocus(); + } + + if (mScrolling) { + updateHandleRect(); + auto dragDelta = (pointer - getHandleRect().center()) - mStartPos; + moveBy((dragDelta / size)[mVertical]); + } +} + +void ScrollableBarWidget::jumpTo(halnf pos) { + mPosFactor = pos; + clamp(); +} + +void ScrollableBarWidget::moveBy(halnf delta) { + mPosFactor += delta; + clamp(); +} + +void ScrollableBarWidget::updateSizeFactor(halnf factor) { + mSizeFactor = factor; + clamp(); +} + +void ScrollableBarWidget::clamp() { + mSizeFactor = ::clamp(mSizeFactor, 0.f, 1.f); + mPosFactor = ::clamp(mPosFactor, mSizeFactor / 2, 1.f - mSizeFactor / 2); +} + +void ScrollableBarWidget::draw(Canvas& canvas) { + updateHandleRect(); + + canvas.rect(getArea().relative(), mBGColor, mRounding); + + auto& handleColor = mScrolling ? mHandleSlideColor : (mHandleHovered ? mHandleHoverColor : mHandleColor); + canvas.rect(getHandleRect(), handleColor, mRounding); +} + +void ScrollableBarWidget::updateHandleRect() { + auto area = getArea().relative(); + + mHandleRect = area; + mHandleRect.size[mVertical] = area.size[mVertical] * mSizeFactor; + mHandleRect.pos[mVertical] = area.size[mVertical] * mPosFactor; + + mHandleRect.pos[mVertical] -= mHandleRect.size[mVertical] / 2; + + mHandleRect.shrinkFromCenter(mHandlePadding, true); +} + +const RectF& ScrollableBarWidget::getHandleRect() const { + return mHandleRect; +} + +ScrollableWidget::ScrollableWidget() { + addChild(&mScroller); + addChild(&mContent); + + setLayout(new ScrollableLayout(this)); + + mContent.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal); +} + +void ScrollableWidget::setDirection(bool direction) { + if (auto lay = dynamic_cast(mContent.getLayout())) { + lay->setLayoutPolicy(direction ? LayoutPolicy::Vertical : LayoutPolicy::Horizontal); + } + + mScroller.setDirection(direction); +} diff --git a/Widgets/private/widgets/SimpleWidgets.cpp b/Widgets/private/widgets/SimpleWidgets.cpp new file mode 100644 index 0000000..3407fa4 --- /dev/null +++ b/Widgets/private/widgets/SimpleWidgets.cpp @@ -0,0 +1,174 @@ + +#include "SimpleWidgets.hpp" + +using namespace tp; + +void LabelWidget::setText(const std::string& text) { + mText = text; +} + +const std::string& LabelWidget::getText() const { + return mText; +} + +void LabelWidget::draw(Canvas& canvas) { + canvas.text(mText.c_str(), getRelativeArea(), mSize, Canvas::LC, mPadding, mColor); +} + +ButtonWidget::ButtonWidget() { + mAction = []() { + printf("Button Pressed!\n"); + }; + + setDebug("button", { 0.1, 0.1, 0.7, 0.7 }); + + mColorAnimated.setTargetColor(mColor); + mColorAnimated.endAnimation(); +} + +void ButtonWidget::setAction(const std::function& action) { + mAction = action; +} + +void ButtonWidget::setColor(const RGBA& in) { + mColor = in; + mColorAnimated.setTargetColor(mColor); + triggerWidgetUpdate("color changed"); +} + +void ButtonWidget::process(const EventHandler& eventHandler) { + if (getRelativeArea().isInside(eventHandler.getPointer())) { + if (eventHandler.isPressed(InputID::MOUSE1)) { + mAction(); + } + } +} + +void ButtonWidget::draw(Canvas& canvas) { + canvas.rect(getRelativeArea(), mColorAnimated.getCurrentColor(), mRounding); + LabelWidget::draw(canvas); +} + +bool ButtonWidget::needsNextFrame() const { + return LabelWidget::needsNextFrame() || !mColorAnimated.shouldEndTransition(); +} + +void ButtonWidget::endAnimations() { + mColorAnimated.endAnimation(); + LabelWidget::endAnimations(); +} + +void ButtonWidget::updateAnimations() { + mColorAnimated.updateCurrentRect(); + LabelWidget::updateAnimations(); +} + +void ButtonWidget::mouseEnter() { + mColorAnimated.setTargetColor(mColor); + mColorAnimated.endAnimation(); + + mColorAnimated.setTargetColor(mColorHovered); + + // mColorAnimated.updateCurrentRect(); + triggerWidgetUpdate("button hovered"); +} + +void ButtonWidget::mouseLeave() { + mColorAnimated.setTargetColor(mColor); + //mColorAnimated.updateCurrentRect(); + + triggerWidgetUpdate("button out of focus"); +} + + +void SliderWidget::process(const EventHandler& events) { + const auto pointer = events.getPointer(); + + switch (mState) { + case SLIDING: + if (events.isReleased(InputID::MOUSE1)) { + mState = IDLE; + freeFocus(); + } + + mFactor = ((pointer - mHandleSize / 2) / (getArea().relative().size - mHandleSize)).x; + mFactor = clamp(mFactor, 0.f, 1.f); + break; + + case IDLE: + case HOVER: + mState = getHandleArea().isInside(pointer) ? HOVER : IDLE; + if (getRelativeAreaT().isInside(pointer) && events.isPressed(InputID::MOUSE1)) { + mState = SLIDING; + lockFocus(); + } + break; + } +} + +void SliderWidget::draw(Canvas& canvas) { + canvas.rect(getArea().relative(), mColorBG, mRounding); + + switch (mState) { + case IDLE: canvas.rect(getHandleArea(), mColorIdle, mRounding); break; + case HOVER: canvas.rect(getHandleArea(), mColorHovered, mRounding); break; + case SLIDING: canvas.rect(getHandleArea(), mColorActive, mRounding); break; + } +} + +RectF SliderWidget::getHandleArea() const { + auto area = getArea().relative(); + + const auto& size = area.size; + auto center = area.center(); + auto tilt = -(mFactor - 0.5f) * 2; + + area.pos.x = center.x - (tilt * ((size.x - mHandleSize) / 2)) - mHandleSize / 2; + area.size.x = mHandleSize; + + return area; +} + +void PopupWidget::open(Widget* parent, const RectF& at) { + mParentArea = parent->getArea().relative(); + mParentArea.pos = at.pos * -1; + mParentArea.shrinkFromCenter(-10, true); + + setArea(at); + parent->openPopup(this); +} + +void PopupWidget::process(const EventHandler& events) { + bool insideParent = mParentArea.isInside(events.getPointer()); + bool insideMenu = getArea().relative().isInside(events.getPointer()); + + if (!(insideMenu || insideParent)) { + closePopup(this); + } +} + +void PopupWidget::draw(Canvas& canvas) { + canvas.rect(getArea().relative(), col, rounding); +} + +void HoverPopupTriggerWidget::mouseEnter() { + auto area = getArea().relative(); + auto size = Vec2F(300, 400); + + if (mDirection == Right) { + auto popupArea = RectF{ area.p4() + Vec2F{ gap, 0.f }, size }; + mPopup.open(this, popupArea); + } else { + auto popupArea = RectF{ area.p2() + Vec2F{ 0.f, gap }, size }; + mPopup.open(this, popupArea); + } +} + +PopupWidget* HoverPopupTriggerWidget::getPopup() { + return &mPopup; +} + +void HoverPopupTriggerWidget::draw(Canvas& canvas) { + canvas.rect(getArea().relative(), col, rounding); + LabelWidget::draw(canvas); +} diff --git a/Widgets/public/ButtonWidget.hpp b/Widgets/public/ButtonWidget.hpp deleted file mode 100644 index 9281709..0000000 --- a/Widgets/public/ButtonWidget.hpp +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include "LabelWidget.hpp" - -namespace tp { - - template - class ButtonWidget : public Widget { - public: - ButtonWidget() { - this->setArea({ 0, 0, 100, 30 }); - this->mChildWidgets.pushBack(&mLabel); - } - - ButtonWidget(const std::string& label, const tp::RectF& aArea) { - this->setArea(aArea); - mLabel.mLabel = label; - this->mChildWidgets.pushBack(&mLabel); - } - - bool isFired() { return this->isReleased(); } - - void eventProcess(const Events&) override { mLabel.setArea(this->mArea); } - - void eventDraw(Canvas& canvas) override { - if (this->isHolding()) { - canvas.rect(this->mArea, pressedColor, rounding); - } else if (this->isFocus()) { - canvas.rect(this->mArea, hoveredColor, rounding); - } else { - canvas.rect(this->mArea, accentColor, rounding); - } - } - - void setLabel(const std::string& string) { - mLabel.mLabel = string; - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("Button"); - - pressedColor = wm.getColor("Pressed", "Action"); - hoveredColor = wm.getColor("Hovered", "Interaction"); - accentColor = wm.getColor("Default", "Accent"); - rounding = wm.getNumber("Rounding", "Rounding"); - } - - public: - LabelWidget mLabel; - - RGBA pressedColor; - RGBA hoveredColor; - RGBA accentColor; - halnf rounding = 0; - }; -} \ No newline at end of file diff --git a/Widgets/public/CollapsableMenu.hpp b/Widgets/public/CollapsableMenu.hpp deleted file mode 100644 index 3ba76f5..0000000 --- a/Widgets/public/CollapsableMenu.hpp +++ /dev/null @@ -1,91 +0,0 @@ -#pragma once - -#include "ScrollableWidget.hpp" -#include "ButtonWidget.hpp" - -namespace tp { - - template - class CollapsableMenu : public Widget { - public: - CollapsableMenu() { - this->mChildWidgets.pushBack(&mHeader); - this->mChildWidgets.pushBack(&mBody); - } - - void eventProcess(const Events&) override { - if (mHeader.isReleased()) { - mCollapsed = !mCollapsed; - } - - mHeader.setArea(getHeaderRect()); - - mBody.mEnable = !mCollapsed; - if (mCollapsed) { - this->mArea.size.y = headerHeight; - } else { - this->mArea.size.y = headerHeight + getBodyRect().size.y + mPadding * 2; - mBody.setArea(getBodyRect()); - } - } - - void eventDraw(Canvas& canvas) override { - canvas.rect(this->mArea, mBorderColor, rounding); - canvas.rect(this->mArea.shrink(mBorderSize), mMenuColor, rounding); - } - - public: - void addWidgetToMenu(Widget* widget) { - mBody.addWidget(widget); - } - - void setLabel(const std::string& string) { - mHeader.mLabel = string; - } - - private: - RectF getHeaderRect() { - RectF out = { this->mArea.pos, { this->mArea.size.x, headerHeight } }; - return out.shrink(mPadding); - } - - RectF getBodyRect() { - RectF out = { { this->mArea.pos.x, this->mArea.pos.y + headerHeight }, - { this->mArea.size.x, mBody.getContentSize() } - }; - - if (mBody.getContentSize()) { - out = out.shrink(mPadding); - out.size.y += mPadding * 2 + 1; - } - - return out; - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("CollapsableMenu"); - - headerHeight = wm.getNumber("HeaderHeight", 35); - mMenuColor = wm.getColor("MenuColor", RGBA(0, 0, 0, 1.f)); - rounding = wm.getNumber("Rounding", "Rounding"); - mBorderColor = wm.getColor("BorderColor", RGBA(0.16, 0.16, 0.16, 1.f)); - mBorderSize = wm.getNumber("BorderSize", 2.f); - mPadding = wm.getNumber("Padding", "Padding"); - } - - protected: - ScrollableWindow mBody; - LabelWidget mHeader; - - RGBA mMenuColor; - RGBA mBorderColor; - - halnf headerHeight = 30; - halnf rounding = 0; - halnf mBorderSize = 0; - halnf mPadding = 0; - - bool mCollapsed = true; - }; -} \ No newline at end of file diff --git a/Widgets/public/FloatingWidget.hpp b/Widgets/public/FloatingWidget.hpp deleted file mode 100644 index 5c7065f..0000000 --- a/Widgets/public/FloatingWidget.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include "CollapsableMenu.hpp" - -namespace tp { - template - class FloatingWidget : public CollapsableMenu { - public: - FloatingWidget() { - this->mArea = { 0, 0, 300, 300 }; - } - - virtual void procWrapper(const Events& events, const RectF& parentArea) override { - if (!this->mEnable) return; - - this->checkVisibility(events, parentArea); - - if (!this->mVisible) return; - - this->checkFocus(events); - - this->checkClicked(events); - - mParentArea = parentArea; - this->eventProcess(events); - - for (auto child : this->mChildWidgets) { - child->procWrapper(events, this->getArea()); - } - } - - void eventProcess(const Events& events) override { - CollapsableMenu::eventProcess(events); - - if (this->mHeader.isHolding()) { - this->mArea.pos += events.getPointerDelta(); - if (!this->mArea.isEnclosedIn(mParentArea)) { - this->mArea.pos -= events.getPointerDelta(); - } - } - } - - RectF mParentArea; - - }; -} \ No newline at end of file diff --git a/Widgets/public/LabelWidget.hpp b/Widgets/public/LabelWidget.hpp deleted file mode 100644 index fd3630d..0000000 --- a/Widgets/public/LabelWidget.hpp +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "WidgetBase.hpp" - -namespace tp { - template - class LabelWidget : public Widget { - public: - LabelWidget() { - this->mArea = { 0, 0, 100, 30 }; - } - - void eventDraw(Canvas& canvas) override { - canvas.text(mLabel.c_str(), this->mArea, fontSize, Canvas::LC, padding, fontColor); - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("Label"); - - fontSize = wm.getNumber("Size", "FontSize"); - padding = wm.getNumber("Padding", "Padding"); - fontColor = wm.getColor("Default", "Front"); - } - - public: - std::string mLabel = "Label"; - - halnf fontSize = 10; - halnf padding = 0; - RGBA fontColor = { 1, 1, 1, 1 }; - }; -} \ No newline at end of file diff --git a/Widgets/public/Layout.hpp b/Widgets/public/Layout.hpp new file mode 100644 index 0000000..b878d32 --- /dev/null +++ b/Widgets/public/Layout.hpp @@ -0,0 +1,70 @@ +#pragma once + +#include "Rect.hpp" +#include + +namespace tp { + class Widget; + + enum class SizePolicy { + Fixed, + Expanding, + Minimal, + }; + + enum class LayoutPolicy { + Passive, + Vertical, + Horizontal, + }; + + class WidgetLayout { + friend class DebugManager; + friend class LayoutManager; + + public: + explicit WidgetLayout(Widget* widget) { mWidget = widget; } + virtual ~WidgetLayout() = default; + + virtual void updateLayout(bool vertical) {} + + virtual void pickRect(bool vertical) {} + virtual void clampRect() {} + [[nodiscard]] virtual RectF getAvailableChildArea() const; + + public: + const Vec2F& getMinSize(); + void setMinSize(const Vec2F& size); + + [[nodiscard]] const Vec2& getSizePolicy() const; + void setSizePolicy(SizePolicy x, SizePolicy y); + + public: + [[nodiscard]] const RectF& getArea() const; + [[nodiscard]] RectF getAnimatedArea() const; + + void setArea(const RectF& area); + [[nodiscard]] Widget* parent() const; + [[nodiscard]] const std::vector& children() const; + + public: + void clampMinMaxSize(); + + [[nodiscard]] RangeF pickRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const; + [[nodiscard]] RangeF clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const; + + [[nodiscard]] RectF getChildrenEnclosure() const; + [[nodiscard]] RectF getParentEnclosure() const; + + private: + Widget* mWidget = nullptr; + + protected: + Vec2 mSizePolicy = { SizePolicy::Fixed, SizePolicy::Fixed }; + Vec2F mMinSize = { 30, 30 }; + Vec2F mMaxSize = { FLT_MAX / 2, FLT_MAX / 2 }; + + private: + // RectF mPrevArea{}; + }; +} \ No newline at end of file diff --git a/Widgets/public/RootWidget.hpp b/Widgets/public/RootWidget.hpp new file mode 100644 index 0000000..d66b1b0 --- /dev/null +++ b/Widgets/public/RootWidget.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include "Widget.hpp" + +#include "UpdateManager.hpp" +#include "LayoutManager.hpp" +#include "DebugManager.hpp" + +namespace tp { + class RootWidget : public WidgetManagerInterface { + friend DebugManager; + + public: + RootWidget(); + + // User Interface + public: + void setRootWidget(Widget* widget); + static void setWidgetArea(Widget& widget, const RectF& rect); + + // Graphic Application Interface + public: + void processFrame(EventHandler* events, const RectF& screenArea); + void drawFrame(Canvas& canvas); + [[nodiscard]] bool needsUpdate() const; + + // Internals + private: + void drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos); + + void updateWidget(Widget*, const char* reason = nullptr) override; + + void openPopup(Widget*) override; + void closePopup(Widget*) override; + + void lockFocus(Widget*) override; + void freeFocus(Widget*) override; + + void updateAnimations(); + void updateAreaCache(Widget* iter, bool read); + + private: + Widget mRoot; + Widget mPopups; + + Widget* mUserRoot = nullptr; + + LayoutManager mLayoutManager; + UpdateManager mUpdateManager; + }; +} \ No newline at end of file diff --git a/Widgets/public/ScrollableWidget.hpp b/Widgets/public/ScrollableWidget.hpp deleted file mode 100644 index 31a7351..0000000 --- a/Widgets/public/ScrollableWidget.hpp +++ /dev/null @@ -1,221 +0,0 @@ -#pragma once - -#include "WidgetBase.hpp" -#include "Buffer.hpp" - -namespace tp { - - template - class ScrollBarWidget : public Widget { - public: - ScrollBarWidget() = default; - - // takes whole area - void eventProcess(const Events& events) override { - auto area = getHandle(); - mHovered = getHandleHandle().isInside(events.getPointer()); - - if (mSizeFraction > 1.f) { - mPositionFraction = 0; - return; - } - - if (events.getScrollY() != 0) { - auto offset = events.getScrollY() < 0 ? 1.0f : -1.0f; - if (scrollInertia * offset > 0) { - scrollInertia += offset; - } else { - scrollInertia = -scrollInertia + offset; - } - } - - if (tp::abs(scrollInertia) > 0.1f) { - auto offset = scrollInertia * mScrollFactor; - mPositionFraction += offset; - mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction); - scrollInertia *= 0.f; - return; - } - - if (events.isPressed(InputID::MOUSE1) && area.isInside(events.getPointer())) { - mIsScrolling = true; - } else if (events.isReleased(InputID::MOUSE1)) { - mIsScrolling = false; - } - - if (mIsScrolling) { - tp::halnf pos = events.getPointer().y; - pos = (pos - area.y - mSizeFraction * area.w / 2.f) / area.w; - mPositionFraction = tp::clamp(pos, 0.f, 1.f - mSizeFraction); - } - - mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction); - } - - void eventDraw(Canvas& canvas) override { - auto area = getHandle(); - - if (mSizeFraction > 1.f) return; - // if (!areaParent.isOverlap(getHandle())) return; - - tp::RGBA col = mHandleColor; - - if (mIsScrolling) { - col = mScrollingColor; - } else if (mHovered) { - col = mHoveredColor; - } - - canvas.rect(area, mDefaultColor, mRounding); - canvas.rect(getHandleHandle(), col, mRounding); - } - - RectF getHandleHandle() const { - auto area = getHandle(); - auto sliderSize = tp::clamp(area.w * mSizeFraction, mMinSize * 2, area.w); - auto diffSize = sliderSize - area.w * mSizeFraction; - return { area.x, area.y + (area.w - diffSize) * mPositionFraction, area.z, sliderSize }; - } - - RectF getViewport() const { - if (mSizeFraction > 1.f) { - return this->mArea; - } - return { this->mArea.x, this->mArea.y, this->mArea.z - mHandleSize, this->mArea.w }; - } - - RectF getHandle() const { - return { this->mArea.x + this->mArea.z - mHandleSize + mPadding, - this->mArea.y + mPadding, - mHandleSize - mPadding * 2, - this->mArea.w - mPadding * 2 }; - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("Scrollbar"); - - mDefaultColor = wm.getColor("Default", "Base"); - mHandleColor = wm.getColor("Handle", "Accent"); - mHoveredColor = wm.getColor("Hovered", "Interaction"); - mScrollingColor = wm.getColor("Scrolling", "Action"); - mPadding = wm.getNumber("Padding", "Padding"); - mHandleSize = wm.getNumber("HandleSize", 20.f); - mMinSize = wm.getNumber("MinSize", 20.f); - mRounding = wm.getNumber("Rounding", "Rounding"); - } - - public: - halnf mScrollFactor = 0.f; - halnf scrollInertia = 0.f; - bool mIsScrolling = false; - halnf mSizeFraction = 1.f; - halnf mPositionFraction = 0.f; - bool mHovered = false; - - RGBA mDefaultColor; - RGBA mHandleColor; - RGBA mHoveredColor; - RGBA mScrollingColor; - halnf mPadding = 0; - halnf mHandleSize = 10; - halnf mMinSize = 10; - halnf mRounding = 10; - }; - - template - class ScrollableWindow : public Widget { - public: - ScrollableWindow() { - this->mChildWidgets.pushBack(&mScroller); - this->mChildWidgets.pushBack(&mContentWidget); - } - - virtual ~ScrollableWindow() = default; - - // takes whole area - void eventProcess(const Events& events) override { - List*>& content = mContentWidget.mChildWidgets; - - updateContents(content); - updateContentSize(content); - - const auto padding = mPadding; - - mScroller.mSizeFraction = mContentWidget.mArea.w / mContentSize; - mScroller.setArea(this->mArea); - mContentWidget.setArea(mScroller.getViewport()); - - if (mScroller.mSizeFraction > 1.f) { - setOffset(content, 0); - } else { - setOffset(content, (-mScroller.mPositionFraction) * mContentSize); - } - - for (auto widget : content) { - widget->setArea({ mContentWidget.mArea.x + padding, - mContentWidget.mArea.y + widget->mArea.y, - mScroller.getViewport().z - padding * 2, - widget->mArea.w }); - } - } - - void addWidget(Widget* widget) { mContentWidget.mChildWidgets.pushBack(widget); } - void clearContent() { mContentWidget.mChildWidgets.removeAll(); } - List*>& getContent() { return mContentWidget.mChildWidgets; } - - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("ScrollableWidget"); - mPadding = wm.getNumber("Padding", "Padding"); - } - - [[nodiscard]] halnf getContentSize() const { - return mContentSize; - } - - private: - void updateContents(List*>& contentWidgets) { - if (!contentWidgets.size()) { - return; - } - - const halnf offset = contentWidgets.first()->mArea.y + mPadding; - - halnf start = 0; - for (auto widget : contentWidgets) { - widget->mArea.y = start; - start += widget->mArea.w + mPadding; - } - - for (auto widget : contentWidgets) { - widget->mArea.y += offset; - } - } - - // ready content size - void updateContentSize(List*>& contentWidgets) { - mContentSize = 0; - if (contentWidgets.size()) { - mContentSize = contentWidgets.last()->mArea.y - contentWidgets.first()->mArea.y; - mContentSize += contentWidgets.last()->mArea.w; - mContentSize += 2 * mPadding; - } - } - - void setOffset(List*>& contentWidgets, const halnf offset) { - if (!contentWidgets.size()) return; - auto newOffset = offset - contentWidgets.first()->mArea.y + mPadding; - for (auto widget : contentWidgets) { - widget->mArea.y += newOffset; - } - } - - private: - Widget mContentWidget; - ScrollBarWidget mScroller; - - halnf mContentSize = 0; - - halnf mPadding = 0; - }; -} \ No newline at end of file diff --git a/Widgets/public/SliderWidget.hpp b/Widgets/public/SliderWidget.hpp deleted file mode 100644 index c0bf884..0000000 --- a/Widgets/public/SliderWidget.hpp +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once - -#include "LabelWidget.hpp" - -namespace tp { - - template - class SliderWidget : public Widget { - public: - SliderWidget() = default; - - void eventProcess(const Events& events) override { - if (this->isPressed()) { - mIsSliding = true; - } else if (events.isReleased(InputID::MOUSE1)) { - mIsSliding = false; - } - - if (mIsSliding) { - mFactor = (events.getPointer().x - this->mArea.x - handleSize / 2.f) / (this->mArea.z - handleSize); - } - - mFactor = tp::clamp(mFactor, 0.f, 1.f); - } - - void eventDraw(Canvas& canvas) override { - canvas.rect(this->mArea, defaultColor, rounding); - canvas.rect(getHandle(), handleColor, rounding); - } - - RectF getHandle() const { - const auto left = this->mArea.x + (this->mArea.z - handleSize) * mFactor; - return { left, this->mArea.y, handleSize, this->mArea.w }; - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("Slider"); - defaultColor = wm.getColor("Default", "Base"); - handleColor = wm.getColor("Handle", "Accent"); - handleSize = wm.getNumber("HandleSize", 20.f); - rounding = wm.getNumber("Rounding", "Rounding"); - } - - public: - halnf mFactor = 0.f; - bool mIsSliding = false; - - RGBA defaultColor; - RGBA handleColor; - halnf handleSize = 0; - halnf rounding = 0; - }; - - template - class NamedSliderWidget : public Widget { - public: - explicit NamedSliderWidget(const char* name = "Value") { - mLabel.mLabel = name; - this->mArea = { 0, 0, 100, 30 }; - - this->mChildWidgets.pushBack(&mSlider); - this->mChildWidgets.pushBack(&mLabel); - } - - void eventProcess(const Events& events) override { - const auto widthFirst = this->mArea.z * mFactor; - const auto widthSecond = this->mArea.z * (1.f - mFactor); - - RectF rec = this->mArea; - rec.size.x = widthFirst; - - mLabel.setArea(rec); - - rec.pos.x += widthFirst; - rec.size.x = widthSecond; - - mSlider.setArea(rec); - } - - public: - SliderWidget mSlider; - LabelWidget mLabel; - - halnf mFactor = 0.5f; - }; -} \ No newline at end of file diff --git a/Widgets/public/SplitViewWidget.hpp b/Widgets/public/SplitViewWidget.hpp deleted file mode 100644 index 7f83bfb..0000000 --- a/Widgets/public/SplitViewWidget.hpp +++ /dev/null @@ -1,168 +0,0 @@ -#pragma once - -#include "LabelWidget.hpp" - -namespace tp { - - //TODO : clean up this mess - // takes the whole parent area - template - class SplitView : public Widget { - public: - SplitView() { - mLeftLabel.mLabel = "Left"; - mRightLabel.mLabel = "Right"; - - this->mChildWidgets.pushBack(&mLeftLabel); - this->mChildWidgets.pushBack(&mRightLabel); - } - - void eventProcess(const Events& events) override { - mIsHover = getHandle().isInside(events.getPointer()); - - if (events.isPressed(InputID::MOUSE1) && mIsHover) { - mResizeInProcess = true; - } else if (events.isReleased(InputID::MOUSE1)) { - mResizeInProcess = false; - } - - if (mResizeInProcess) { - halnf pos = events.getPointer().x; - auto diff = pos - (this->mArea.x + mFactor * this->mArea.z); - mFactor += diff / this->mArea.z; - } - - mFactor = tp::clamp(mFactor, mMinSize / this->mArea.z, 1 - mMinSize / this->mArea.z); - - if (mMinSize * 2.f > this->mArea.z) { - mFactor = 0.5f; - } - - mLeftLabel.mEnable = mHeaders && mCollapsedSide != LEFT; - mRightLabel.mEnable = mHeaders && mCollapsedSide != RIGHT; - - if (mHeaders) { - mLeftLabel.setArea(getFirstHeader()); - mRightLabel.setArea(getSecondHeader()); - } - - if (mLeftLabel.isReleased()) { - mCollapsedSide = (mCollapsedSide == NONE) ? RIGHT : NONE; - } - - if (mRightLabel.isReleased()) { - mCollapsedSide = (mCollapsedSide == NONE) ? LEFT : NONE; - } - } - - void eventDraw(Canvas& canvas) override { - if (mResizeInProcess) canvas.rect(getHandle(), mResizingColor); - else if (mIsHover) canvas.rect(getHandle(), mHoveredColor); - else canvas.rect(getHandle(), mHandleColor); - } - - [[nodiscard]] bool getFirstEnabled() const { - return mCollapsedSide != CollapsedSize::LEFT; - } - - [[nodiscard]] bool getSecondEnabled() const { - return mCollapsedSide != CollapsedSize::RIGHT; - } - - RectF getFirst() const { - Rect out = { this->mArea.x, this->mArea.y, mFactor * this->mArea.z - mHandleSize / 2.f, this->mArea.w }; - - if (mCollapsedSide == RIGHT) { - out.pos.x = this->mArea.pos.x; - out.size.x = this->mArea.size.x; - } - - if (mHeaders) { - out.pos.y += mHeaderSize; - out.size.y -= mHeaderSize; - } - - return out; - } - - RectF getFirstHeader() const { - Rect out = { this->mArea.x, this->mArea.y, mFactor * this->mArea.z - mHandleSize / 2.f, mHeaderSize }; - - if (mCollapsedSide == RIGHT) { - out.pos.x = this->mArea.pos.x; - out.size.x = this->mArea.size.x; - } - - return out; - } - - RectF getSecondHeader() const { - RectF out = { this->mArea.x + mFactor * this->mArea.z + mHandleSize / 2.f, - this->mArea.y, - (1.f - mFactor) * this->mArea.z - mHandleSize / 2.f, - mHeaderSize }; - - if (mCollapsedSide == LEFT) { - out.pos.x = this->mArea.pos.x; - out.size.x = this->mArea.size.x; - } - - return out; - } - - RectF getSecond() const { - RectF out = { this->mArea.x + mFactor * this->mArea.z + mHandleSize / 2.f, - this->mArea.y, - (1.f - mFactor) * this->mArea.z - mHandleSize / 2.f, - this->mArea.w }; - - if (mCollapsedSide == LEFT) { - out.pos.x = this->mArea.pos.x; - out.size.x = this->mArea.size.x; - } - - if (mHeaders) { - out.pos.y += mHeaderSize; - out.size.y -= mHeaderSize; - } - - return out; - } - - RectF getHandle() const { - if (mCollapsedSide != NONE) return {}; - return { this->mArea.x + mFactor * this->mArea.z - mHandleSize / 2.f, this->mArea.y, mHandleSize, this->mArea.w }; - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("SplitView"); - - mHandleColor = wm.getColor("Handle", "Accent"); - mHoveredColor = wm.getColor("Hovered", "Interaction"); - mResizingColor = wm.getColor("Resizing", "Action"); - mMinSize = wm.getNumber("Min", 200.f); - mHandleSize = wm.getNumber("HandleSize", 7.f); - mHeaderSize = wm.getNumber("HeaderSize", 30.f); - } - - public: - halnf mFactor = 0.7f; - bool mResizeInProcess = false; - bool mIsHover = false; - - RGBA mHandleColor; - RGBA mHoveredColor; - RGBA mResizingColor; - halnf mMinSize = 0; - halnf mHandleSize = 0; - - // Headers - halnf mHeaderSize = 0; - bool mHeaders = true; - enum CollapsedSize { NONE, LEFT, RIGHT } mCollapsedSide = NONE; - - LabelWidget mLeftLabel; - LabelWidget mRightLabel; - }; -} \ No newline at end of file diff --git a/Widgets/public/TextInputWidget.hpp b/Widgets/public/TextInputWidget.hpp deleted file mode 100644 index 67e95e7..0000000 --- a/Widgets/public/TextInputWidget.hpp +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once - -#include "WidgetBase.hpp" - -#include "imgui.h" -#include "imgui_internal.h" - -namespace tp { - template - class TextInputWidget : public Widget { - public: - TextInputWidget() = default; - - void eventDraw(Canvas&) override { - nChanged = false; - - const auto col = mAccentColor; - const auto colSel = mHoveredColor; - - ImGui::GetStyle().Colors[ImGuiCol_FrameBg] = { col.r, col.g, col.b, col.a }; - ImGui::GetStyle().Colors[ImGuiCol_TextSelectedBg] = { colSel.r, colSel.g, colSel.b, colSel.a }; - - ImGui::SetNextWindowPos({ this->mArea.x, this->mArea.y }); - ImGui::SetNextWindowSize({ this->mArea.z, this->mArea.w }); - ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 0, 0 }); - ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, mRounding * 1.5f); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { mPadding, mPadding }); - - // ImGui::PushID((int) alni(this)); - ImGui::Begin( - mId.c_str(), - 0, - ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground | - ImGuiWindowFlags_NoResize - ); - - if (mMultiline) { - if (ImGui::InputTextMultiline("input", mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w })) { - mValue = mBuff; - nChanged = true; - } - } else { - if (ImGui::InputTextEx("input", mId.c_str(), mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w }, 0)) { - mValue = mBuff; - nChanged = true; - } - } - - ImGui::End(); - ImGui::PopStyleVar(3); - } - - public: - void eventUpdateConfiguration(WidgetManager& wm) override { - wm.setActiveId("TextInput"); - - mAccentColor = wm.getColor("Accent", "Accent"); - mBaseColor = wm.getColor("Base", "Base"); - mRounding = wm.getNumber("Rounding", "Rounding"); - mHoveredColor = wm.getColor("Hovered", "Accent"); - mPadding = wm.getNumber("Padding", "Padding"); - } - - public: - enum { mMaxBufferSize = 512 }; - char mBuff[mMaxBufferSize] = ""; - bool nChanged = false; - std::string mValue; - std::string mId = "id"; - bool mMultiline = false; - - RGBA mAccentColor; - RGBA mHoveredColor; - RGBA mBaseColor; - halnf mRounding = 0; - halnf mPadding = 0; - }; -} \ No newline at end of file diff --git a/Widgets/public/Widget.hpp b/Widgets/public/Widget.hpp new file mode 100644 index 0000000..c44d718 --- /dev/null +++ b/Widgets/public/Widget.hpp @@ -0,0 +1,156 @@ +#pragma once + +#include "SpringAnimations.hpp" + +#include "Layout.hpp" + +#include "EventHandler.hpp" +#include "Graphics.hpp" + +#include +#include + +namespace tp { + class WidgetLayout; + + class LayoutManager; + class UpdateManager; + class DebugManager; + + class WidgetManagerInterface; + class RootWidget; + + class Widget { + friend RootWidget; + + friend LayoutManager; + friend UpdateManager; + friend DebugManager; + + using BitField = Bits; + + using DFSAction = std::function; + + enum Flags : int1 { + ENABLED = 0, + NEEDS_UPDATE, + IN_FOCUS, + TRIGGERED, + }; + + public: + Widget(const Widget&&) = delete; + Widget(const Widget&) = delete; + void operator=(const Widget&) = delete; + + Widget(); + virtual ~Widget(); + + void addChild(Widget* child, bool front = false); + void removeChild(Widget* child); + void clear(); + + const List& getChildren() { return mDepthOrder; } + + void bringToFront(); + void bringToBack(); + + void setLayout(WidgetLayout* layout); + void setSizePolicy(SizePolicy x, SizePolicy y); + + void setEnabled(bool val) { mFlags.set(ENABLED, val); } + [[nodiscard]] bool getEnabled() const { return mFlags.get(ENABLED); } + + WidgetLayout* getLayout(); + [[nodiscard]] const WidgetLayout* getLayout() const; + + void triggerWidgetUpdate(const char* reason = nullptr); + + void openPopup(Widget*); + void closePopup(Widget*); + + void lockFocus(); + void freeFocus(); + + protected: + virtual void process(const EventHandler& events) {} + virtual void draw(Canvas& canvas) {} + virtual void drawOverlay(Canvas& canvas) {} + virtual void endAnimations(); + virtual void updateAnimations(); + + [[nodiscard]] virtual bool processesEvents() const; + [[nodiscard]] virtual bool propagateEventsToChildren() const; + [[nodiscard]] virtual bool needsNextFrame() const; + + virtual void mouseEnter(); + virtual void mouseLeave(); + + protected: + void setDebug(const char* name, RGBA col); + WidgetManagerInterface* getRoot(); + + public: + [[nodiscard]] RectF getArea() const; + [[nodiscard]] RectF getAreaT() const; + + [[nodiscard]] RectF getRelativeArea() const; + [[nodiscard]] RectF getRelativeAreaT() const; + + void setArea(const RectF& area); + void setAreaCache(const RectF& area); + + private: + [[nodiscard]] bool isUpdate() const { return mFlags.get(ENABLED) && mFlags.get(NEEDS_UPDATE); } + [[nodiscard]] bool isDraw() const { return mFlags.get(ENABLED); } + + static void dfs(Widget* iter, const DFSAction& before, const DFSAction& after = [](auto){}) { + if (!iter->isUpdate()) return; + + before(iter); + + for (auto child : iter->mDepthOrder) { + dfs(child.data(), before, after); + } + + after(iter); + } + + protected: + friend WidgetLayout; + + Widget* mParent = nullptr; + + std::vector mChildren; + List mDepthOrder; + + // relative to the parent + SpringRect mArea; + RectF mAreaCache; + + WidgetLayout* mLayout = nullptr; + + BitField mFlags; + + // debug + struct { + std::string id = "widget base"; + RGBA col = { 1, 1, 1, 0.3 }; + std::string triggerReason = "none"; + Vec2F pLocal; + Vec2F pGlobal; + } mDebug; + }; + + struct WidgetManagerInterface : public Widget { + virtual void updateWidget(Widget*, const char* reason) = 0; + + virtual void openPopup(Widget*) = 0; + virtual void closePopup(Widget*) = 0; + + virtual void lockFocus(Widget*) = 0; + virtual void freeFocus(Widget*) = 0; + + static WidgetLayout* defaultLayout(Widget* widget); + }; +} \ No newline at end of file diff --git a/Widgets/public/WidgetApplication.hpp b/Widgets/public/WidgetApplication.hpp new file mode 100644 index 0000000..7bf6fbe --- /dev/null +++ b/Widgets/public/WidgetApplication.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include "GraphicApplication.hpp" +#include "RootWidget.hpp" +#include "Timing.hpp" + +namespace tp { + class WidgetApplication : public Application { + public: + WidgetApplication() = default; + + void setRoot(Widget* widget); + virtual void debugUI(); + + private: + void processFrame(EventHandler* eventHandler, halnf deltaTime) override; + + void drawFrame(Canvas* canvas) override; + bool forceNewFrame() override ; + + + private: + halnf mDebugSplitFactor = 0.7; + + RootWidget mRootWidget; + + private: + RectF mGuiArea; + RectF mDebugArea; + }; +} \ No newline at end of file diff --git a/Widgets/public/WidgetBase.hpp b/Widgets/public/WidgetBase.hpp deleted file mode 100644 index 1656b88..0000000 --- a/Widgets/public/WidgetBase.hpp +++ /dev/null @@ -1,149 +0,0 @@ -#pragma once - -#include "EventHandler.hpp" -#include "WidgetManager.hpp" -#include "List.hpp" - -namespace tp { - - template - class Widget { - public: - Widget() { mArea = { 0, 0, 100, 100 }; } - - virtual ~Widget() = default; - - virtual void procWrapper(const Events& events, const RectF& parentArea) { - if (!mEnable) return; - - checkVisibility(events, parentArea); - - if (!mVisible) return; - - checkFocus(events); - - checkClicked(events); - - eventProcess(events); - - for (auto child : mChildWidgets) { - child->procWrapper(events, getArea()); - } - } - - virtual void drawWrapper(Canvas& canvas) { - if (!mEnable || !mVisible) return; - - eventDraw(canvas); - - // draw child widgets - canvas.pushClamp(this->mArea); - for (auto child : mChildWidgets) { - child->drawWrapper(canvas); - } - canvas.popClamp(); - } - - virtual void updateConfigWrapper(WidgetManager& wm) { - wm.setActiveId("Global"); - - eventUpdateConfiguration(wm); - - for (auto child : mChildWidgets) { - child->updateConfigWrapper(wm); - } - } - - virtual void eventProcess(const Events& events) {} - virtual void eventDraw(Canvas& canvas) {} - virtual void eventUpdateConfiguration(WidgetManager& wm) {} - - virtual void eventVisible(const Events& events) {} - virtual void eventNotVisible(const Events& events) {} - - virtual void eventFocusEnter(const Events& events) {} - virtual void eventFocusLeave(const Events& events) {} - - virtual void eventPressed(const Events& events) {} - virtual void eventReleased(const Events& events) {} - - public: - void checkVisibility(const Events& events, const RectF& parentArea) { - const bool currentVisibility = parentArea.isOverlap(getArea()); - - if (currentVisibility != mVisible) { - if (currentVisibility) eventVisible(events); - else eventNotVisible(events); - } - - mVisible = currentVisibility; - - if (!mVisible) { - mHolding = false; - mPressed = false; - mReleased = false; - } - } - - void checkFocus(const Events& events) { - const bool currentFocus = getArea().isInside(events.getPointer()); - - if (currentFocus != mInFocus) { - if (currentFocus) eventFocusEnter(events); - else eventFocusLeave(events); - } - - mInFocus = currentFocus; - - if (!mInFocus) { - mHolding = false; - mPressed = false; - mReleased = false; - } - } - - void checkClicked(const Events& events) { - mPressed = false; - mReleased = false; - - if (!mInFocus) return; - - if (mHolding) { - if (events.isReleased(InputID::MOUSE1)) { - eventReleased(events); - mReleased = true; - mHolding = false; - } - } else { - if (events.isPressed(InputID::MOUSE1)) { - eventPressed(events); - mHolding = true; - mPressed = true; - } - } - } - - public: - void setEnable(bool enable) { mEnable = enable; } - void setVisible(bool visible) { mVisible = visible; } - void setArea(const RectF& area) { mArea = area; } - - const RectF& getArea() const { return mArea; } - bool isFocus() const { return mInFocus; } - bool isPressed() const { return mPressed; } - bool isReleased() const { return mReleased; } - bool isHolding() const { return mHolding; } - - public: - RectF mArea; - List*> mChildWidgets; - - bool mVisible = false; - bool mEnable = true; - bool mInFocus = false; - - bool mHolding = false; - bool mPressed = false; - bool mReleased = false; - }; -} \ No newline at end of file diff --git a/Widgets/public/WidgetManager.hpp b/Widgets/public/WidgetManager.hpp deleted file mode 100644 index 8ef875a..0000000 --- a/Widgets/public/WidgetManager.hpp +++ /dev/null @@ -1,144 +0,0 @@ -#pragma once - -#include "Animations.hpp" -#include "Map.hpp" -#include "Rect.hpp" - -#include "InputCodes.hpp" -#include "Buffer.hpp" - -namespace tp { - - struct WidgetConfig { - - struct Shortcut { - struct Condition { - std::string name; - std::string state; - }; - - std::string callbackName; - - Shortcut() = default; - Shortcut(const InitialierList&) {} - }; - - struct Parameter { - enum Type { NONE, VAL, COL }; - - halnf value = 0.f; - RGBA color = {}; - Type type = NONE; - bool globalReference = false; - std::string globalId; - - Parameter() = default; - - explicit Parameter(halnf val) { - type = VAL; - value = val; - } - - explicit Parameter(const RGBA& val) { - type = COL; - color = val; - } - - explicit Parameter(const std::string& id, const Type& referenceType) { - type = referenceType; - globalId = id; - globalReference = true; - } - }; - - Map mParameters; - Buffer mShortcuts; - }; - - class WidgetManager { - public: - using Parameter = WidgetConfig::Parameter; - - public: - WidgetManager() { initGlobalParameters(); } - ~WidgetManager() { mConfigurations.removeAll(); } - - const RGBA& getColor(const std::string& parameterId, const RGBA& defaultValue) { - WidgetConfig& config = getWidgetConfig(mActiveId); - Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue)); - return parameter.color; - } - - const RGBA& getColor(const std::string& parameterId, const char* globalRef) { - WidgetConfig& config = getWidgetConfig(mActiveId); - Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::COL)); - return parameter.color; - } - - halnf getNumber(const std::string& parameterId, halnf defaultValue) { - WidgetConfig& config = getWidgetConfig(mActiveId); - Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue)); - return parameter.value; - } - - halnf getNumber(const std::string& parameterId, const char* globalRef) { - WidgetConfig& config = getWidgetConfig(mActiveId); - Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::VAL)); - return parameter.value; - } - - void setActiveId(const std::string& id) { mActiveId = id; } - - private: - WidgetConfig& getWidgetConfig(const std::string& id) { - auto idx = mConfigurations.presents(id); - if (idx) return mConfigurations.getSlotVal(idx); - mConfigurations.put(id, {}); - return mConfigurations.get(id); - } - - Parameter& getParameter(WidgetConfig& config, const std::string& id, const Parameter& defaultValue) { - auto idx = config.mParameters.presents(id); - - if (!idx) { - config.mParameters.put(id, defaultValue); - } - - Parameter& parameter = config.mParameters.get(id); - - if (parameter.globalReference) { - return mGlobalConfig.mParameters.get(parameter.globalId); - } else { - return parameter; - } - } - - void initGlobalParameters() { - auto& params = mGlobalConfig.mParameters; - - params.put("FontSize", Parameter(15.f)); - - params.put("FontSizeDim", Parameter(12.f)); - params.put("Rounding", Parameter(5.f)); - params.put("Padding", Parameter(5.f)); - params.put("HandleSize", Parameter(5.f)); - - params.put("Background", Parameter(RGBA{ 0.03f, 0.03f, 0.03f, 1.f })); - params.put("Base", Parameter(RGBA{ 0.07f, 0.07f, 0.07f, 1.f })); - params.put("Accent", Parameter(RGBA{ 0.13f, 0.13f, 0.13f, 1.f })); - params.put("Interaction", Parameter(RGBA{ 0.33f, 0.33f, 0.3f, 1.f })); - params.put("Action", Parameter(RGBA{ 0.44f, 0.44f, 0.4f, 1.f })); - params.put("Front", Parameter(RGBA{ 1.f, 1.f, 1.f, 1.f })); - params.put("FrontDim", Parameter(RGBA{ 0.7f, 0.7f, 0.7f, 1.f })); - } - - private: - Map mConfigurations; - WidgetConfig mGlobalConfig; - - RGBA mErrorColor = { 0, 0, 0, 1 }; - halnf mErrorNumber = 0; - - std::string mActiveId; - }; -} \ No newline at end of file diff --git a/Widgets/public/layouts/BasicLayout.hpp b/Widgets/public/layouts/BasicLayout.hpp new file mode 100644 index 0000000..185e154 --- /dev/null +++ b/Widgets/public/layouts/BasicLayout.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "Layout.hpp" + +namespace tp { + + class BasicLayout : public WidgetLayout { + friend class DebugManager; + + public: + explicit BasicLayout(Widget* widget) : WidgetLayout(widget) {} + + void updateLayout(bool vertical) override; + + void pickRect(bool vertical) override; + void clampRect() override; + [[nodiscard]] RectF getAvailableChildArea() const override; + + void setLayoutPolicy(LayoutPolicy layout) { mLayoutPolicy = layout; } + + private: + void adjustLayout(bool vertical); + static halnf changeChildSize(Widget*, halnf diff, bool vertical); + + private: + LayoutPolicy mLayoutPolicy = LayoutPolicy::Vertical; + halnf mLayoutGap = 5; + halnf mLayoutMargin = 9; + }; +} \ No newline at end of file diff --git a/Widgets/public/layouts/DockLayout.hpp b/Widgets/public/layouts/DockLayout.hpp new file mode 100644 index 0000000..47de346 --- /dev/null +++ b/Widgets/public/layouts/DockLayout.hpp @@ -0,0 +1,109 @@ +#include "Widget.hpp" + +namespace tp { + class DockLayout : public WidgetLayout { + public: + enum Side { LEFT, TOP, RIGHT, BOTTOM, NONE }; + + private: + struct ResizeHandle { + RectF area{ 0, 0, 0, 0 }; + halnf start{ 0 }; + halnf end{ 0 }; + bool active = false; + bool hover = false; + }; + + struct SideWidgetData { + Widget* widget = nullptr; + bool hidden = false; + halnf absoluteSize = 300; + alni order = -1; + + Side side = { TOP }; + + RectF area = {}; + RectF headerArea = {}; + RectF previewHandleArea = {}; + + ResizeHandle resizeHandle; + + RectF areaBeforeDocking = {}; + }; + + public: + explicit DockLayout(Widget* widget); + + void updateResizeHover(const Vec2F& pointer); + bool startResize(const Vec2F& pointer); + void updateResize(const Vec2F& pointerDelta); + void endResize(); + + void updatePreviewSide(const Vec2F& pointer); + + public: + void pickRect(bool vertical) override {} + void clampRect() override {}; + void updateLayout(bool vertical) override; + void adjustChildrenRect(); + + public: + bool setCenterWidget(Widget* widget); + + bool dockWidget(Widget* widget, Side side); + bool undockWidget(Side side); + void toggleWidgetVisibility(Side side); + + public: + [[nodiscard]] bool isSideVisible(Side side) const; + [[nodiscard]] bool sideExists(Side side) const; + + [[nodiscard]] bool isResizing() const { return mResizing; } + [[nodiscard]] bool isResizing(Side side) const { return mSideWidgets[side].resizeHandle.active; } + [[nodiscard]] bool isResizeHandleHover(Side side) const { return mSideWidgets[side].resizeHandle.hover; } + + Side getSideFromWidget(Widget*); + Side getPreviewSide(); + + [[nodiscard]] RectF getRectBeforeDocked(Side side) const { return mSideWidgets[side].areaBeforeDocking; } + [[nodiscard]] RectF getResizeHandleArea(Side side) const { return mSideWidgets[side].resizeHandle.area; } + [[nodiscard]] RectF getHeaderArea(Side side) const { return mSideWidgets[side].headerArea; } + [[nodiscard]] RectF getPreviewHandleArea(Side side) const { return mSideWidgets[side].previewHandleArea; } + [[nodiscard]] RectF getPreviewArea() const { return mPreviewArea; } + + Widget* getSideWidget(Side side) { return mSideWidgets[side].widget; } + + const std::vector& getDockedWidgets(); + + private: + ualni getVisibleSidesSize() const; + + void calculateSideAreas(); + void calculateResizeHandles(); + void updateChildSideWidgets(); + void calculateHeaderAreas(); + + private: + RectF mPreviewArea = {}; + Side mPreviewSide = NONE; + int resizeType[2] = { 0, 0 }; + + SideWidgetData mSideWidgets[4]; + + std::vector mDockedWidgets; + + private: + bool mResizing = false; + + Widget* mCenterWidget = nullptr; + RectF mCenterArea { 0, 0, 10, 10 }; + + // Parameters + const halnf mHandleSplitFactor = 0.3; + const halnf mHandleFactor = 0.1; + + halnf mSideSizePadding = 150.f; + halnf mPadding = 4; + halnf mHeaderSize = 27; + }; +} \ No newline at end of file diff --git a/Widgets/public/layouts/FloatingLayout.hpp b/Widgets/public/layouts/FloatingLayout.hpp new file mode 100644 index 0000000..c1418fe --- /dev/null +++ b/Widgets/public/layouts/FloatingLayout.hpp @@ -0,0 +1,34 @@ +#pragma once + +#include "BasicLayout.hpp" + +namespace tp { + class FloatingLayout : public BasicLayout { + public: + explicit FloatingLayout(Widget* widget) : + BasicLayout(widget) {} + + public: + void startAction(const Vec2F& pointer); + void updateAction(const Vec2F& pointer); + void endAction(); + + bool isFloating() const { return mIsFloating; } + + RectF resizeHandleRect(); + + public: + void pickRect(bool vertical) override; + + private: + bool mIsFloating = false; + bool mIsResizing = false; + + Vec2F mPointerStart; + Vec2F mPointerCurrent; + + // TODO : remove? + halnf mHandleSize = 10; + halnf mHandlePadding = 2; + }; +} \ No newline at end of file diff --git a/Widgets/public/layouts/ScrollableLayout.hpp b/Widgets/public/layouts/ScrollableLayout.hpp new file mode 100644 index 0000000..329131e --- /dev/null +++ b/Widgets/public/layouts/ScrollableLayout.hpp @@ -0,0 +1,24 @@ +#pragma once + +#include "Layout.hpp" + +namespace tp { + class ScrollableBarWidget; + + class ScrollableLayout : public WidgetLayout { + public: + explicit ScrollableLayout(Widget* widget) : + WidgetLayout(widget) { + setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding); + } + + void updateLayout(bool vertical) override; + [[nodiscard]] RectF getAvailableChildArea() const override; + + private: + void updateWidgetRects(const RectF& area, Widget* content, ScrollableBarWidget* scroller) const; + + private: + halnf mScrollerSize = 15; + }; +} \ No newline at end of file diff --git a/Widgets/public/layouts/SimpleLayouts.hpp b/Widgets/public/layouts/SimpleLayouts.hpp new file mode 100644 index 0000000..2a16ae1 --- /dev/null +++ b/Widgets/public/layouts/SimpleLayouts.hpp @@ -0,0 +1,33 @@ +#pragma once + +#include "Layout.hpp" + +namespace tp { + + class OverlayLayout : public WidgetLayout { + friend class DebugManager; + + public: + explicit OverlayLayout(Widget* widget) : WidgetLayout(widget) {} + + void updateLayout(bool vertical) override; + + void pickRect(bool vertical) override {} + void clampRect() override {} + }; + + class ToolBarLayout : public WidgetLayout { + friend class DebugManager; + + public: + explicit ToolBarLayout(Widget* widget) : WidgetLayout(widget) {} + + void updateLayout(bool vertical) override; + + void pickRect(bool vertical) override {} + void clampRect() override {} + + private: + halnf mToolBarHeight = 55; + }; +} \ No newline at end of file diff --git a/Widgets/public/mangers/DebugManager.hpp b/Widgets/public/mangers/DebugManager.hpp new file mode 100644 index 0000000..0b4ce92 --- /dev/null +++ b/Widgets/public/mangers/DebugManager.hpp @@ -0,0 +1,104 @@ +#pragma once + +#include "Widget.hpp" + +#include + +namespace tp { + class DebugTimeline { + enum { + STEP = 10, + LEN = 200, + }; + + public: + DebugTimeline() = default; + + void addSample(time_ms time) { + samples[end] = time; + start++; + end++; + shift(); + } + + [[nodiscard]] int size() const { + return LEN - STEP; + } + + [[nodiscard]] const time_ms* get() const { + return samples + start; + } + + private: + void shift() { + if (end >= LEN) { + for (ualni i = STEP; i < LEN; i++) { + samples[i - STEP] = samples[i]; + } + start = 0; + end = LEN - STEP; + } + } + + private: + ualni start = 0; + ualni end = LEN - STEP; + + time_ms samples[LEN + 1] {}; + }; + + class DebugManager { + public: + DebugManager() = default; + + [[nodiscard]] bool isFrozen() const { return mDebugStopProcessing; } + [[nodiscard]] bool isRedrawAlways() const { return mDebugRedrawAlways; } + + void update(RootWidget* rootWidget, EventHandler& events); + void drawDebug(RootWidget* rootWidget, Canvas& canvas); + + void checkProcBreakPoints(Widget* widget) { + if (mProcBreakpoints.find(widget) != mProcBreakpoints.end()) { + mProcBreakpoints.erase(widget); + DEBUG_BREAK(1) + } + } + + void checkLayoutBreakpoints(Widget* widget) { + if (mLayBreakpoints.find(widget) != mLayBreakpoints.end()) { + mLayBreakpoints.erase(widget); + DEBUG_BREAK(1) + } + } + + [[nodiscard]] bool isDebug() const { return mDebug; } + + private: + void recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder); + + void drawPerformance(); + static void widgetMenu(Widget*); + void drawLayoutOrder(); + + private: + RootWidget* mRootWidget = nullptr; + + // debug + bool mDebug = false; + bool mDebugStopProcessing = false; + bool mDebugRedrawAlways = false; + bool mDetailed = false; + + std::set mProcBreakpoints; + std::set mLayBreakpoints; + + public: + DebugTimeline mProcTime; + DebugTimeline mUpdManager; + DebugTimeline mLayManager; + + DebugTimeline mDrawTime; + }; + + extern DebugManager gDebugWidget; +} \ No newline at end of file diff --git a/Widgets/public/mangers/LayoutManager.hpp b/Widgets/public/mangers/LayoutManager.hpp new file mode 100644 index 0000000..7b2eaef --- /dev/null +++ b/Widgets/public/mangers/LayoutManager.hpp @@ -0,0 +1,39 @@ +#pragma once + +#include "Layout.hpp" +#include "DebugManager.hpp" + +#include +#include + +namespace tp { + class LayoutManager { + friend DebugManager; + + struct DepNode { + std::vector depends; + int references = 0; + int depth = 0; + }; + + public: + LayoutManager() = default; + + void adjust(Widget* root); + + private: + void findDependencies(Widget* root); + void topologicalSort(Widget* root, int depth = 0); + void adjustLayouts(); + + private: + int getLayoutOrder(WidgetLayout* parent, WidgetLayout* child) const; + + private: + std::map mDepGraph; + std::vector mRoots; + + std::vector> mLayOrder; + bool mVertical = false; + }; +} \ No newline at end of file diff --git a/Widgets/public/mangers/UpdateManager.hpp b/Widgets/public/mangers/UpdateManager.hpp new file mode 100644 index 0000000..33c5ecf --- /dev/null +++ b/Widgets/public/mangers/UpdateManager.hpp @@ -0,0 +1,46 @@ +#pragma once + +#include "Widget.hpp" + +#include + +namespace tp { + // FIXME : desperately needs refactor + class UpdateManager { + friend DebugManager; + + public: + UpdateManager() = default; + + void scheduleUpdate(Widget* widget, const char* reason); + + void lockFocus(Widget* widget); + void freeFocus(Widget* widget); + + [[nodiscard]] bool isPendingUpdates() const { + return !mTriggeredWidgets.empty(); + } + + void processWidgets(Widget* root, EventHandler& eventHandler); + void clean(); + + void updateTreeToProcess(Widget* root); + void handleFocusChanges(Widget* root, EventHandler& events); + + void findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer); + static void getWidgetPath(Widget* widget, std::vector& out); + void processActiveTree(Widget* iter, EventHandler& events, Vec2F pos); + void processFocusItems(EventHandler& events); + + private: + static void procWidget(Widget* widget, EventHandler& events, bool withEvents = false); + + private: + std::map mTriggeredWidgets; + Widget* mInFocusWidget = nullptr; + Widget* mFocusLockWidget = nullptr; + + private: + int mDebugWidgetsToProcess = 0; + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/AnimationTestWidget.hpp b/Widgets/public/widgets/AnimationTestWidget.hpp new file mode 100644 index 0000000..dd3f66c --- /dev/null +++ b/Widgets/public/widgets/AnimationTestWidget.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "Widget.hpp" + +namespace tp { + class AnimationTestWidget : public Widget { + + public: + AnimationTestWidget() = default; + ~AnimationTestWidget() override = default; + + void draw(Canvas& canvas) override; + void process(const EventHandler& events) override; + + [[nodiscard]] bool needsNextFrame() const override; + + private: + mutable SpringRect mTestSpring; + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/ColorPickerWidget.hpp b/Widgets/public/widgets/ColorPickerWidget.hpp new file mode 100644 index 0000000..e9d592c --- /dev/null +++ b/Widgets/public/widgets/ColorPickerWidget.hpp @@ -0,0 +1,18 @@ +#pragma once + +#include "Widget.hpp" + +namespace tp { + class RGBPickerWidget : public Widget { + public: + RGBPickerWidget() = default; + + void process(const EventHandler& events) override; + void draw(Canvas& canvas) override; + + [[nodiscard]] bool processesEvents() const override { return true; } + + public: + Canvas::ColorWheel mColorWheel; + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/DockWidget.hpp b/Widgets/public/widgets/DockWidget.hpp new file mode 100644 index 0000000..0e07f2f --- /dev/null +++ b/Widgets/public/widgets/DockWidget.hpp @@ -0,0 +1,44 @@ +#include "DockLayout.hpp" + +namespace tp { + class DockWidget : public Widget { + public: + DockWidget(); + + public: + void process(const EventHandler& events) override; + void draw(Canvas& canvas) override; + void drawOverlay(Canvas& canvas) override; + + [[nodiscard]] bool propagateEventsToChildren() const override; + [[nodiscard]] bool needsNextFrame() const override; + [[nodiscard]]bool processesEvents() const override { return true; } + + void drawSide(DockLayout::Side side, Canvas& canvas); + + public: + DockLayout::Side getSide(Widget* widget) { return layout()->getSideFromWidget(widget); } + + void setCenterWidget(Widget* widget); + + void dockWidget(Widget* widget, DockLayout::Side side); + void undockWidget(DockLayout::Side side, bool restoreArea = true); + void toggleWidgetVisibility(DockLayout::Side side); + + private: + DockLayout* layout() { return dynamic_cast(mLayout); } + const DockLayout* layout() const { return dynamic_cast(mLayout); } + + private: + Widget* mPreviewWidget = nullptr; + + private: + halnf mRounding = 10; + halnf mPadding = 4; + + RGBA mResizeHandleColorHovered = RGBA(0.3, 0.3, 0.3, 1); + RGBA mResizeHandleColorActive = RGBA(0.6, 0.6, 0.6, 1); + RGBA mBackgroundColor = RGBA(0, 0, 0, 1); + RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 0.2); + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/FloatingWidget.hpp b/Widgets/public/widgets/FloatingWidget.hpp new file mode 100644 index 0000000..71f1686 --- /dev/null +++ b/Widgets/public/widgets/FloatingWidget.hpp @@ -0,0 +1,62 @@ +#pragma once + +#include "SimpleWidgets.hpp" +#include "FloatingLayout.hpp" +#include "ScrollableWidget.hpp" + +namespace tp { + class FloatingWidget : public Widget { + public: + FloatingWidget() : Widget() { + setDebug("float", { 0.0, 0.9, 0.1, 1 }); + setLayout(new FloatingLayout(this)); + } + + void process(const EventHandler& events) override; + + void draw(Canvas& canvas) override; + + + [[nodiscard]] bool needsNextFrame() const override; + + [[nodiscard]] bool propagateEventsToChildren() const override; + [[nodiscard]] bool processesEvents() const override; + + [[nodiscard]] bool isFloating() const; + + private: + FloatingLayout* layout(); + [[nodiscard]] const FloatingLayout* layout() const; + }; + + class FloatingMenu : public FloatingWidget { + public: + FloatingMenu(); + + public: + void addToMenu(Widget* widget) { + widget->setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal); + mContentWidget.addChild(widget); + } + + const List& getContent() { + return mContentWidget.getChildren(); + } + + void clearChildren() { + mContentWidget.clear(); + } + + void setText(const std::string& text); + + private: + // VerticalLayout mMenuLayout; + Widget mBodyLayout; + Widget mContentWidget; + ScrollableBarWidget mScrollBar; + + LabelWidget mHeader; + + // ButtonWidget mTestButton; + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/ScrollableWidget.hpp b/Widgets/public/widgets/ScrollableWidget.hpp new file mode 100644 index 0000000..1903df2 --- /dev/null +++ b/Widgets/public/widgets/ScrollableWidget.hpp @@ -0,0 +1,67 @@ +#pragma once + +#include "Widget.hpp" + +namespace tp { + // just the scrolling bar + class ScrollableBarWidget : public Widget { + public: + ScrollableBarWidget() = default; + + [[nodiscard]] bool processesEvents() const override { return true; } + [[nodiscard]] bool propagateEventsToChildren() const override { return false; } + [[nodiscard]] bool needsNextFrame() const override { return mScrolling; } + + void process(const EventHandler& events) override; + void draw(Canvas& canvas) override; + + void updateSizeFactor(halnf factor); // holder-size divided by content-size + + [[nodiscard]] bool getDirection() const { return mVertical; } + [[nodiscard]] halnf getPosFactor() const { return mPosFactor - mSizeFactor / 2; } + + void setDirection(bool direction) { mVertical = direction; } + + private: + [[nodiscard]] const RectF& getHandleRect() const; + void updateHandleRect(); + void jumpTo(halnf); + void moveBy(halnf); + void clamp(); + + private: // state + bool mVertical = true; + bool mScrolling = false; + bool mHandleHovered = false; + + Vec2F mStartPos = {}; + + halnf mPosFactor = 0.2f; // (center-of-holder - content-start) / content-size + halnf mSizeFactor = 0.3f; + + private: // TODO : make params static + halnf mRounding = 5; + halnf mHandlePadding = 0; + + RGBA mBGColor = { 0.1, 0.1, 0.1, 0.0 }; + RGBA mHandleColor = { 0.2, 0.2, 0.2, 1 }; + RGBA mHandleHoverColor = { 0.3, 0.3, 0.3, 1 }; + RGBA mHandleSlideColor = { 0.5, 0.5, 0.5, 1 }; + + private: // cache + RectF mHandleRect; + }; + + class ScrollableWidget : public Widget { + public: + ScrollableWidget(); + + void setDirection(bool direction); + + Widget* getContainer() { return &mContent; } + + private: + Widget mContent; + ScrollableBarWidget mScroller; + }; +} \ No newline at end of file diff --git a/Widgets/public/widgets/SimpleWidgets.hpp b/Widgets/public/widgets/SimpleWidgets.hpp new file mode 100644 index 0000000..b1036cc --- /dev/null +++ b/Widgets/public/widgets/SimpleWidgets.hpp @@ -0,0 +1,140 @@ +#pragma once + +#include "Widget.hpp" + +#include + +namespace tp { + class LabelWidget : public Widget { + public: + LabelWidget() : Widget() { + setDebug("label", { 0.1, 0.1, 0.1, 0.1 }); + } + + void setText(const std::string& text); + + [[nodiscard]] const std::string& getText() const; + + void draw(Canvas& canvas) override; + + [[nodiscard]] bool processesEvents() const override { return false; } + + private: + std::string mText = "Text"; + + halnf mPadding = 5; + RGBA mColor = 1.f; + halnf mSize = 17.f; + }; + + class ButtonWidget : public LabelWidget { + public: + ButtonWidget(); + + void setAction(const std::function& action); + + void process(const EventHandler& eventHandler) override; + void draw(Canvas& canvas) override; + + void mouseEnter() override; + void mouseLeave() override; + + [[nodiscard]] bool processesEvents() const override { return true; } + [[nodiscard]] bool needsNextFrame() const override; + + void endAnimations() override; + void updateAnimations() override; + + void setColor(const RGBA& in); + + private: + std::function mAction; + + SpringRect mColorAnimated; + + halnf mRounding = 5; + RGBA mColorHovered = { 0.0f, 0.4f, 0.4f, 1.f }; + RGBA mColor = { 0.13f, 0.13f, 0.13f, 1.f }; + }; + + class SliderWidget : public Widget { + enum State { + IDLE, + HOVER, + SLIDING, + }; + + public: + SliderWidget() = default; + + void process(const EventHandler& eventHandler) override; + void draw(Canvas& canvas) override; + + [[nodiscard]] bool processesEvents() const override { return true; } + [[nodiscard]] bool needsNextFrame() const override { return mState != IDLE; } + + [[nodiscard]] halnf val() const { return mFactor; } + + private: + [[nodiscard]] RectF getHandleArea() const; + + private: + halnf mFactor = 0; + State mState = IDLE; + + private: + halnf mHandleSize = 20; + halnf mRounding = 5; + + RGBA mColorActive = { 0.99f, 0.99f, 0.99f, 1.f }; + RGBA mColorHovered = { 0.9f, 0.9f, 0.9f, 1.f }; + RGBA mColorIdle = { 0.8f, 0.8f, 0.8f, 1.f }; + RGBA mColorBG = { 0.3f, 0.3f, 0.3f, 1.0f }; + }; + + class PopupWidget : public Widget { + public: + PopupWidget() = default; + + public: + void process(const EventHandler& events) override; + void draw(Canvas& canvas) override; + + void open(Widget* parent, const RectF& at); + [[nodiscard]] bool processesEvents() const override { return true; } + + private: + RectF mParentArea {}; + RGBA col = RGBA(0.03f, 0.03f, 0.03f, 0.9f); + halnf rounding = 5; + halnf borders = 2; + }; + + class HoverPopupTriggerWidget : public LabelWidget { + public: + enum ExpandDirection { + Right, + Bottom, + }; + + public: + HoverPopupTriggerWidget() = default; + + [[nodiscard]] bool processesEvents() const override { return true; } + void mouseEnter() override; + + void draw(Canvas& canvas) override; + + PopupWidget* getPopup(); + void setDirection(ExpandDirection dir) { mDirection = dir; } + + private: + PopupWidget mPopup; + + private: + ExpandDirection mDirection = Bottom; + RGBA col = RGBA(0.03f, 0.03f, 0.03f, 0.07f); + halnf rounding = 5; + halnf gap = 7; + }; +} \ No newline at end of file diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake new file mode 100644 index 0000000..d4bc483 --- /dev/null +++ b/cmake/FindGLEW.cmake @@ -0,0 +1,10 @@ +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_PREFIX_PATH "${WINDOWS_LIBRARIES}/glew-2.1.0") + + find_package(GLEW REQUIRED) + set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib CACHE STRING "Path to PortAudio includes") + +else() + find_package(GLEW REQUIRED) + set(GLEW_LIB ${GLEW_LIBRARIES} GL CACHE STRING "Path to PortAudio includes") +endif() \ No newline at end of file diff --git a/cmake/FindOIDN.cmake b/cmake/FindOIDN.cmake new file mode 100644 index 0000000..5e57893 --- /dev/null +++ b/cmake/FindOIDN.cmake @@ -0,0 +1,21 @@ +#set(OIDN_DEVICE_CPU ON) +#set(OIDN_STATIC_LIB ON) +#add_subdirectory(oidn) + +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_PREFIX_PATH "${WINDOWS_LIBRARIES}/oidn-2.3.0.x64.windows") +endif() + +find_package(OpenImageDenoise REQUIRED) + + + +set(TARGETS_LIST OpenImageDenoise) + +foreach(TARGET ${TARGETS_LIST}) + if(TARGET ${TARGET}) + message("Found ${TARGET}.") + else() + message(ERROR "Not Found ${TARGET}.") + endif() +endforeach() \ No newline at end of file diff --git a/cmake/FindPortAudio.cmake b/cmake/FindPortAudio.cmake new file mode 100644 index 0000000..84d69bc --- /dev/null +++ b/cmake/FindPortAudio.cmake @@ -0,0 +1,16 @@ +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + # relative paths + set(RELATIVE_INCLUDE_DIR "${WINDOWS_LIBRARIES}/portaudio/include") + set(RELATIVE_LIB "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib") + + # Convert to absolute paths + get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE) + get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE) + + # Set absolute paths with respect to the parent scope + set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" CACHE STRING "Path to PortAudio includes") + set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" CACHE STRING "Path to PortAudio library") + +else() + set(PORTAUDIO_LIB portaudio CACHE STRING "Path to PortAudio library") +endif() \ No newline at end of file diff --git a/CMakeOptions.txt b/cmake/ModulesOptions.txt similarity index 67% rename from CMakeOptions.txt rename to cmake/ModulesOptions.txt index 2a080ad..f05b8a7 100644 --- a/CMakeOptions.txt +++ b/cmake/ModulesOptions.txt @@ -1,8 +1,6 @@ option(MODULES_MEMORY_DEBUG "Debug memory" OFF) option(MODULES_MEMORY_DEBUG_STACK_TRACE "Record stack info on memory debug" OFF) -set(WINDOWS_LIBRARIES "../../ModulesWindowsLibraries" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl") - if (MODULES_MEMORY_DEBUG) add_compile_definitions(MEM_DEBUG) endif ()