Debug Tools and Scrollable widget
This commit is contained in:
parent
f68f91f7d5
commit
458e56fb4c
27 changed files with 274 additions and 103 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -19,3 +19,6 @@
|
||||||
[submodule "Externals/asio"]
|
[submodule "Externals/asio"]
|
||||||
path = Externals/asio
|
path = Externals/asio
|
||||||
url = https://github.com/elushaX/asio.git
|
url = https://github.com/elushaX/asio.git
|
||||||
|
[submodule "Externals/implot"]
|
||||||
|
path = Externals/implot
|
||||||
|
url = https://github.com/epezent/implot.git
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ void Editor::loadDefaults() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::setViewportSize(const Vec2F& size) {
|
void Editor::setViewportSize(const Vec2F& size) {
|
||||||
if (size.x < 0 || size.y < 0) return;
|
if (size.x <= 0 || size.y <= 0) return;
|
||||||
|
|
||||||
// TODO remove
|
// TODO remove
|
||||||
// mScene.mCamera.rotate(0.01f, 0.0);
|
// mScene.mCamera.rotate(0.01f, 0.0);
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ namespace tp {
|
||||||
~ViewportWidget() override { mCanvas->deleteImageHandle(mImage); }
|
~ViewportWidget() override { mCanvas->deleteImageHandle(mImage); }
|
||||||
|
|
||||||
void process(const EventHandler& events) override {
|
void process(const EventHandler& events) override {
|
||||||
mEditor->setViewportSize(getArea().size);
|
mEditor->setViewportSize(getAreaT().size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void draw(Canvas& canvas) override {
|
void draw(Canvas& canvas) override {
|
||||||
|
|
|
||||||
5
Externals/CMakeLists.txt
vendored
5
Externals/CMakeLists.txt
vendored
|
|
@ -49,11 +49,14 @@ set(${PROJECT_NAME}_SOURCES
|
||||||
|
|
||||||
imgui/backends/imgui_impl_glfw.cpp
|
imgui/backends/imgui_impl_glfw.cpp
|
||||||
imgui/backends/imgui_impl_opengl3.cpp
|
imgui/backends/imgui_impl_opengl3.cpp
|
||||||
|
|
||||||
|
implot/implot.cpp
|
||||||
|
implot/implot_items.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
|
add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
|
||||||
include_directories(${PROJECT_NAME} ./glfw/include)
|
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)
|
project(Nanovg)
|
||||||
set(${PROJECT_NAME}_SOURCES
|
set(${PROJECT_NAME}_SOURCES
|
||||||
|
|
|
||||||
1
Externals/implot
vendored
Submodule
1
Externals/implot
vendored
Submodule
|
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit f156599faefe316f7dd20fe6c783bf87c8bb6fd9
|
||||||
|
|
@ -9,6 +9,8 @@
|
||||||
#include <imgui_impl_opengl3.h>
|
#include <imgui_impl_opengl3.h>
|
||||||
#include <imgui_internal.h>
|
#include <imgui_internal.h>
|
||||||
|
|
||||||
|
#include "implot.h"
|
||||||
|
|
||||||
namespace tp {
|
namespace tp {
|
||||||
class DebugGUI::Context {
|
class DebugGUI::Context {
|
||||||
public:
|
public:
|
||||||
|
|
@ -41,6 +43,8 @@ DebugGUI::DebugGUI(Window* window) {
|
||||||
// appearance
|
// appearance
|
||||||
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
|
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
|
||||||
|
|
||||||
|
ImPlot::CreateContext();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
auto& colors = ImGui::GetStyle().Colors;
|
auto& colors = ImGui::GetStyle().Colors;
|
||||||
|
|
@ -75,10 +79,13 @@ DebugGUI::DebugGUI(Window* window) {
|
||||||
}
|
}
|
||||||
|
|
||||||
DebugGUI::~DebugGUI() {
|
DebugGUI::~DebugGUI() {
|
||||||
|
ImPlot::DestroyContext();
|
||||||
|
|
||||||
ImGui_ImplOpenGL3_Shutdown();
|
ImGui_ImplOpenGL3_Shutdown();
|
||||||
ImGui_ImplGlfw_Shutdown();
|
ImGui_ImplGlfw_Shutdown();
|
||||||
ImGui::DestroyContext();
|
ImGui::DestroyContext();
|
||||||
|
|
||||||
|
|
||||||
delete mContext;
|
delete mContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,8 @@ Window::Window(Vec2F size, const char* title) {
|
||||||
// glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
|
// glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
|
||||||
// glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
|
// glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
|
||||||
|
|
||||||
|
mSize = size;
|
||||||
|
|
||||||
// Create a window and OpenGL context
|
// Create a window and OpenGL context
|
||||||
mContext->window = glfwCreateWindow((int) size.x, (int) size.y, title, nullptr, nullptr);
|
mContext->window = glfwCreateWindow((int) size.x, (int) size.y, title, nullptr, nullptr);
|
||||||
if (!mContext->window) {
|
if (!mContext->window) {
|
||||||
|
|
|
||||||
|
|
@ -248,7 +248,7 @@ namespace tp {
|
||||||
void process(const EventHandler& events) override {
|
void process(const EventHandler& events) override {
|
||||||
filter();
|
filter();
|
||||||
|
|
||||||
for (auto track : mSongList.getContent()) {
|
for (auto track : mSongList.getContainer()->getChildren()) {
|
||||||
if (auto trackWidget = dynamic_cast<TrackWidget*>(track.data())) {
|
if (auto trackWidget = dynamic_cast<TrackWidget*>(track.data())) {
|
||||||
if (trackWidget->mState == TrackWidget::SELECTED) {
|
if (trackWidget->mState == TrackWidget::SELECTED) {
|
||||||
mCurrentTrackInfo.mTrack = trackWidget->mTrack;
|
mCurrentTrackInfo.mTrack = trackWidget->mTrack;
|
||||||
|
|
@ -268,7 +268,7 @@ namespace tp {
|
||||||
void filter() {
|
void filter() {
|
||||||
if (!mCurrentTrackInfo.isSongFilterChanged) return;
|
if (!mCurrentTrackInfo.isSongFilterChanged) return;
|
||||||
|
|
||||||
mSongList.clearChildren();
|
mSongList.getContainer()->clear();
|
||||||
|
|
||||||
for (auto track : mTracks) {
|
for (auto track : mTracks) {
|
||||||
if (!mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mName.c_str()) &&
|
if (!mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mName.c_str()) &&
|
||||||
|
|
@ -290,7 +290,7 @@ namespace tp {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
mSongList.addToMenu(track.data());
|
mSongList.getContainer()->addChild(track.data());
|
||||||
}
|
}
|
||||||
|
|
||||||
mCurrentTrackInfo.isSongFilterChanged = false;
|
mCurrentTrackInfo.isSongFilterChanged = false;
|
||||||
|
|
@ -302,7 +302,7 @@ namespace tp {
|
||||||
|
|
||||||
Buffer<TrackWidget*> mTracks;
|
Buffer<TrackWidget*> mTracks;
|
||||||
|
|
||||||
FloatingMenu mSongList;
|
ScrollableWidget mSongList;
|
||||||
TrackInfoWidget mCurrentTrackInfo;
|
TrackInfoWidget mCurrentTrackInfo;
|
||||||
TrackWidget mCurrentTrack;
|
TrackWidget mCurrentTrack;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <functional>
|
||||||
#include "Environment.hpp"
|
#include "Environment.hpp"
|
||||||
|
|
||||||
namespace tp {
|
namespace tp {
|
||||||
|
|
@ -56,4 +57,19 @@ namespace tp {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct TimerWrapper {
|
||||||
|
explicit TimerWrapper(const std::function<void()>& arg) {
|
||||||
|
codeSnippet = arg;
|
||||||
|
}
|
||||||
|
|
||||||
|
time_ms exec() {
|
||||||
|
Timer timer;
|
||||||
|
codeSnippet();
|
||||||
|
return timer.timePassed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::function<void()> codeSnippet;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
11
TODO
11
TODO
|
|
@ -1,13 +1,18 @@
|
||||||
Widgets:
|
Widgets:
|
||||||
Replace Old Widgets!!
|
Basic scrollable widget
|
||||||
|
Collapsing menus
|
||||||
|
|
||||||
|
Icons
|
||||||
|
Toolbar widget
|
||||||
|
Fix focus locking mechanism
|
||||||
|
Hover PopUps
|
||||||
|
Color Picker
|
||||||
|
|
||||||
Optimize:
|
Optimize:
|
||||||
Make visual parameters static
|
Make visual parameters static
|
||||||
Make get-areas fetch cache and not animation objects
|
Make get-areas fetch cache and not animation objects
|
||||||
|
|
||||||
New Widgets:
|
New Widgets:
|
||||||
Collapsing menu
|
|
||||||
Sliders
|
|
||||||
Check Boxes
|
Check Boxes
|
||||||
Drop-Downs
|
Drop-Downs
|
||||||
Toaster notifications
|
Toaster notifications
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,8 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui)
|
||||||
|
|
||||||
### -------------------------- Applications -------------------------- ###
|
### -------------------------- Applications -------------------------- ###
|
||||||
|
|
||||||
add_executable(Widgets2Example examples/Example.cpp)
|
add_executable(WidgetsExample examples/Example.cpp)
|
||||||
target_link_libraries(Widgets2Example ${PROJECT_NAME} ${GLEW_LIB})
|
target_link_libraries(WidgetsExample ${PROJECT_NAME} ${GLEW_LIB})
|
||||||
target_include_directories(Widgets2Example PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
|
target_include_directories(WidgetsExample PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
|
||||||
|
|
||||||
file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
|
file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
|
||||||
|
|
@ -50,23 +50,18 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void exampleScrolling() {
|
void exampleScrolling() {
|
||||||
static Widget widget;
|
static ScrollableWidget widget;
|
||||||
static Widget content;
|
|
||||||
static ButtonWidget buttons[10];
|
static ButtonWidget buttons[10];
|
||||||
static ScrollableBarWidget scrollBar;
|
|
||||||
|
// widget.setDirection(false);
|
||||||
|
|
||||||
setRoot(&widget);
|
setRoot(&widget);
|
||||||
|
|
||||||
widget.addChild(&scrollBar);
|
|
||||||
widget.addChild(&content);
|
|
||||||
|
|
||||||
for (auto& button : buttons) {
|
for (auto& button : buttons) {
|
||||||
content.addChild(&button);
|
widget.getContainer()->addChild(&button);
|
||||||
}
|
}
|
||||||
|
|
||||||
widget.setLayout(new ScrollableLayout(&widget));
|
RootWidget::setWidgetArea(*widget.getContainer(), { 333, 333, 522, 522 });
|
||||||
|
|
||||||
RootWidget::setWidgetArea(content, { 333, 333, 522, 522 });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void examplePopup() {
|
void examplePopup() {
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@
|
||||||
|
|
||||||
using namespace tp;
|
using namespace tp;
|
||||||
|
|
||||||
|
#define SAMPLE(label, scope) gDebugWidget.##label.addSample(TimerWrapper([&]() scope ).exec());
|
||||||
|
|
||||||
WidgetLayout* WidgetManagerInterface::defaultLayout(Widget* widget) {
|
WidgetLayout* WidgetManagerInterface::defaultLayout(Widget* widget) {
|
||||||
return new BasicLayout(widget);
|
return new BasicLayout(widget);
|
||||||
}
|
}
|
||||||
|
|
@ -35,21 +37,23 @@ void RootWidget::setRootWidget(Widget* widget) {
|
||||||
void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
|
void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
|
||||||
mRoot.setArea(screenArea);
|
mRoot.setArea(screenArea);
|
||||||
|
|
||||||
if (!gDebugWidget.update(this, *events)) return;
|
gDebugWidget.mUpdManager.addSample(TimerWrapper([&]() {
|
||||||
|
// construct hierarchy tree of widgets to process
|
||||||
|
mUpdateManager.updateTreeToProcess(&mRoot);
|
||||||
|
|
||||||
// construct hierarchy tree of widgets to process
|
updateAnimations();
|
||||||
mUpdateManager.updateTreeToProcess(&mRoot);
|
updateAreaCache(&mRoot, true);
|
||||||
|
|
||||||
updateAnimations();
|
// update all events and call all event processing callbacks
|
||||||
updateAreaCache(&mRoot, true);
|
mUpdateManager.processWidgets(&mRoot, *events);
|
||||||
|
|
||||||
// update all events and call all event processing callbacks
|
updateAreaCache(&mRoot, true);
|
||||||
mUpdateManager.processWidgets(&mRoot, *events);
|
}).exec());
|
||||||
|
|
||||||
updateAreaCache(&mRoot, true);
|
gDebugWidget.mLayManager.addSample(TimerWrapper([&]() {
|
||||||
|
// update widget sizes base on individual size policies
|
||||||
// update widget sizes base on individual size policies
|
mLayoutManager.adjust(&mRoot);
|
||||||
mLayoutManager.adjust(&mRoot);
|
}).exec());
|
||||||
|
|
||||||
updateAreaCache(&mRoot, false);
|
updateAreaCache(&mRoot, false);
|
||||||
|
|
||||||
|
|
@ -67,13 +71,9 @@ bool RootWidget::needsUpdate() const {
|
||||||
|
|
||||||
void RootWidget::drawFrame(Canvas& canvas) {
|
void RootWidget::drawFrame(Canvas& canvas) {
|
||||||
canvas.rect(mRoot.getAreaT(), RGBA(0, 0, 0, 1));
|
canvas.rect(mRoot.getAreaT(), RGBA(0, 0, 0, 1));
|
||||||
|
|
||||||
drawRecursion(canvas, &mRoot, { 0, 0 });
|
drawRecursion(canvas, &mRoot, { 0, 0 });
|
||||||
|
|
||||||
gDebugWidget.drawDebug(this, canvas);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RootWidget::drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos) {
|
void RootWidget::drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos) {
|
||||||
if (!active->mFlags.get(ENABLED)) return;
|
if (!active->mFlags.get(ENABLED)) return;
|
||||||
|
|
||||||
|
|
@ -81,7 +81,9 @@ void RootWidget::drawRecursion(Canvas& canvas, Widget* active, const Vec2F& pos)
|
||||||
canvas.pushClamp({ pos, active->getArea().size });
|
canvas.pushClamp({ pos, active->getArea().size });
|
||||||
|
|
||||||
if (canvas.getClampedArea().size.length2() > EPSILON) {
|
if (canvas.getClampedArea().size.length2() > EPSILON) {
|
||||||
active->draw(canvas);
|
if (active->getArea().sizeVecW() > active->getArea().pos) {
|
||||||
|
active->draw(canvas);
|
||||||
|
}
|
||||||
|
|
||||||
for (auto child = active->mDepthOrder.lastNode(); child; child = child->prev) {
|
for (auto child = active->mDepthOrder.lastNode(); child; child = child->prev) {
|
||||||
drawRecursion(canvas, child->data, pos + child->data->getArea().pos);
|
drawRecursion(canvas, child->data, pos + child->data->getArea().pos);
|
||||||
|
|
@ -152,4 +154,3 @@ void RootWidget::closePopup(Widget* widget) {
|
||||||
|
|
||||||
void RootWidget::lockFocus(Widget* widget) { mUpdateManager.lockFocus(widget); }
|
void RootWidget::lockFocus(Widget* widget) { mUpdateManager.lockFocus(widget); }
|
||||||
void RootWidget::freeFocus(Widget* widget) { mUpdateManager.freeFocus(widget); }
|
void RootWidget::freeFocus(Widget* widget) { mUpdateManager.freeFocus(widget); }
|
||||||
bool RootWidget::isDebug() const { return gDebugWidget.isDebug(); }
|
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,58 @@
|
||||||
using namespace tp;
|
using namespace tp;
|
||||||
|
|
||||||
void WidgetApplication::debugUI() {
|
void WidgetApplication::debugUI() {
|
||||||
ImGui::Text("Proc ms : %i", (int) mProcTime);
|
// pass
|
||||||
ImGui::SameLine(); ImGui::Text("Draw ms : %i", (int) mDrawTime);
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
}
|
}
|
||||||
|
|
@ -61,6 +61,8 @@ void DockLayout::toggleWidgetVisibility(Side side) {
|
||||||
void DockLayout::calculateSideAreas() {
|
void DockLayout::calculateSideAreas() {
|
||||||
auto startArea = getArea().relative();
|
auto startArea = getArea().relative();
|
||||||
|
|
||||||
|
if (startArea.size.x <= 0 || startArea.size.y <= 0) return;
|
||||||
|
|
||||||
for (auto& sideWidget : mSideWidgets) {
|
for (auto& sideWidget : mSideWidgets) {
|
||||||
const auto side = sideWidget.order;
|
const auto side = sideWidget.order;
|
||||||
|
|
||||||
|
|
@ -99,11 +101,13 @@ void DockLayout::calculateResizeHandles() {
|
||||||
RectF area = getArea().relative();
|
RectF area = getArea().relative();
|
||||||
|
|
||||||
for (auto& sideWidget : mSideWidgets) {
|
for (auto& sideWidget : mSideWidgets) {
|
||||||
|
if (!sideWidget.widget) continue;
|
||||||
|
|
||||||
auto& sideSize = sideWidget.absoluteSize;
|
auto& sideSize = sideWidget.absoluteSize;
|
||||||
auto& resizeHandle = sideWidget.resizeHandle;
|
auto& resizeHandle = sideWidget.resizeHandle;
|
||||||
|
|
||||||
if (resizeHandle.end < mSideSizePadding * 2) {
|
if (resizeHandle.end < mSideSizePadding * 2) {
|
||||||
sideSize = resizeHandle.end / 2.f;
|
// sideSize = resizeHandle.end / 2.f;
|
||||||
} else {
|
} else {
|
||||||
sideSize = clamp(sideSize, resizeHandle.start + mSideSizePadding, resizeHandle.end - mSideSizePadding);
|
sideSize = clamp(sideSize, resizeHandle.start + mSideSizePadding, resizeHandle.end - mSideSizePadding);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,9 @@ void ScrollableLayout::updateWidgetRects(const RectF& area, Widget* content, Scr
|
||||||
auto sizeFactor = (area.size[dir] / content->getLayout()->getArea().size[dir]);
|
auto sizeFactor = (area.size[dir] / content->getLayout()->getArea().size[dir]);
|
||||||
auto splitFactor = 1 - ((sizeFactor > 1.f) ? 0 : mScrollerSize / area.size[!dir]);
|
auto splitFactor = 1 - ((sizeFactor > 1.f) ? 0 : mScrollerSize / area.size[!dir]);
|
||||||
|
|
||||||
auto holderArea = area.splitByFactorHL(splitFactor);
|
auto holderArea = dir ? area.splitByFactorHL(splitFactor) : area.splitByFactorVT(splitFactor);
|
||||||
auto contentArea = content->getLayout()->getArea();
|
auto contentArea = content->getLayout()->getArea();
|
||||||
auto scrollerArea = area.splitByFactorHR(splitFactor);
|
auto scrollerArea = dir ? area.splitByFactorHR(splitFactor) : area.splitByFactorVB(splitFactor);
|
||||||
|
|
||||||
scroller->updateSizeFactor(sizeFactor);
|
scroller->updateSizeFactor(sizeFactor);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,28 +3,26 @@
|
||||||
#include "BasicLayout.hpp"
|
#include "BasicLayout.hpp"
|
||||||
|
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
#include "implot.h"
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
using namespace tp;
|
using namespace tp;
|
||||||
|
|
||||||
DebugManager tp::gDebugWidget;
|
DebugManager tp::gDebugWidget;
|
||||||
|
|
||||||
#define LIST_SIZE { -FLT_MIN, 150 }
|
#define LIST_SIZE \
|
||||||
|
{ -FLT_MIN, 150 }
|
||||||
|
|
||||||
bool DebugManager::update(RootWidget* rootWidget, EventHandler& events) {
|
void DebugManager::update(RootWidget* rootWidget, EventHandler& events) {
|
||||||
mRootWidget = rootWidget;
|
mRootWidget = rootWidget;
|
||||||
|
|
||||||
events.setEnableKeyEvents(true);
|
events.setEnableKeyEvents(true);
|
||||||
if (events.isPressed(InputID::D)) mDebug = !mDebug;
|
if (events.isPressed(InputID::D)) mDebug = !mDebug;
|
||||||
|
|
||||||
if (mDebug) {
|
if (mDebug) {
|
||||||
auto area = rootWidget->mRoot.getAreaT();
|
|
||||||
area.size -= { 400, 0 };
|
|
||||||
rootWidget->mRoot.setArea(area);
|
|
||||||
|
|
||||||
events.setEnableKeyEvents(true);
|
events.setEnableKeyEvents(true);
|
||||||
if (events.isPressed(InputID::K)) mDebugStopProcessing = !mDebugStopProcessing;
|
if (events.isPressed(InputID::K)) mDebugStopProcessing = !mDebugStopProcessing;
|
||||||
if (mDebugStopProcessing) return false;
|
|
||||||
|
|
||||||
if (auto widget = rootWidget->mUpdateManager.mInFocusWidget) {
|
if (auto widget = rootWidget->mUpdateManager.mInFocusWidget) {
|
||||||
if (auto lay = dynamic_cast<BasicLayout*>(widget->getLayout())) {
|
if (auto lay = dynamic_cast<BasicLayout*>(widget->getLayout())) {
|
||||||
|
|
@ -49,8 +47,6 @@ bool DebugManager::update(RootWidget* rootWidget, EventHandler& events) {
|
||||||
if (events.isPressed(InputID::L)) mLayBreakpoints.insert(breakWidget);
|
if (events.isPressed(InputID::L)) mLayBreakpoints.insert(breakWidget);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DebugManager::drawDebug(RootWidget* rootWidget, Canvas& canvas) {
|
void DebugManager::drawDebug(RootWidget* rootWidget, Canvas& canvas) {
|
||||||
|
|
@ -60,20 +56,24 @@ void DebugManager::drawDebug(RootWidget* rootWidget, Canvas& canvas) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
drawPerformance();
|
||||||
|
|
||||||
// ImGui::Checkbox("Draw debug", &mDebug);
|
// ImGui::Checkbox("Draw debug", &mDebug);
|
||||||
|
|
||||||
ImGui::SameLine(); ImGui::Text("To Toggle processing press k");
|
ImGui::SameLine();
|
||||||
|
ImGui::Text("To Toggle processing press k");
|
||||||
|
|
||||||
auto& upd = rootWidget->mUpdateManager;
|
auto& upd = rootWidget->mUpdateManager;
|
||||||
|
|
||||||
recursiveDraw(canvas, &rootWidget->mRoot, { 0, 0 }, 0);
|
|
||||||
|
|
||||||
ImGui::Text("Triggered: %i", (int) upd.mTriggeredWidgets.size());
|
ImGui::Text("Triggered: %i", (int) upd.mTriggeredWidgets.size());
|
||||||
ImGui::SameLine(); ImGui::Text("Processing: %i", upd.mDebugWidgetsToProcess);
|
ImGui::SameLine();
|
||||||
|
ImGui::Text("Processing: %i", upd.mDebugWidgetsToProcess);
|
||||||
|
|
||||||
ImGui::Checkbox("Stop processing", &mDebugStopProcessing);
|
ImGui::Checkbox("Stop processing", &mDebugStopProcessing);
|
||||||
ImGui::SameLine(); ImGui::Checkbox("Force new frames", &mDebugRedrawAlways);
|
ImGui::SameLine();
|
||||||
ImGui::SameLine(); ImGui::Checkbox("Slow-mo", &mSlowMotion);
|
ImGui::Checkbox("Force new frames", &mDebugRedrawAlways);
|
||||||
|
ImGui::SameLine();
|
||||||
|
ImGui::Checkbox("Detailed", &mDetailed);
|
||||||
|
|
||||||
if (upd.mInFocusWidget) {
|
if (upd.mInFocusWidget) {
|
||||||
ImGui::Text("Under cursor");
|
ImGui::Text("Under cursor");
|
||||||
|
|
@ -87,17 +87,21 @@ void DebugManager::drawDebug(RootWidget* rootWidget, Canvas& canvas) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::Text("Triggered");
|
if (mDetailed) {
|
||||||
{
|
ImGui::Text("Triggered");
|
||||||
if (ImGui::BeginListBox("##triggered", LIST_SIZE)) {
|
{
|
||||||
for (auto widget : upd.mTriggeredWidgets) {
|
if (ImGui::BeginListBox("##triggered", LIST_SIZE)) {
|
||||||
widgetMenu(widget.first);
|
for (auto widget : upd.mTriggeredWidgets) {
|
||||||
|
widgetMenu(widget.first);
|
||||||
|
}
|
||||||
|
ImGui::EndListBox();
|
||||||
}
|
}
|
||||||
ImGui::EndListBox();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
drawLayoutOrder();
|
drawLayoutOrder();
|
||||||
|
|
||||||
|
recursiveDraw(canvas, &rootWidget->mRoot, { 0, 0 }, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder) {
|
void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder) {
|
||||||
|
|
@ -175,3 +179,13 @@ void DebugManager::drawLayoutOrder() {
|
||||||
ImGui::EndListBox();
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -33,7 +33,11 @@ void LayoutManager::findDependencies(Widget* root) {
|
||||||
Widget::dfs(root, [this](Widget* widget) { mDepGraph.insert({ widget, {} }); });
|
Widget::dfs(root, [this](Widget* widget) { mDepGraph.insert({ widget, {} }); });
|
||||||
|
|
||||||
for (auto& [widget, deps] : mDepGraph) {
|
for (auto& [widget, deps] : mDepGraph) {
|
||||||
|
if (!widget->isUpdate()) continue;
|
||||||
|
|
||||||
for (auto child : widget->mChildren) {
|
for (auto child : widget->mChildren) {
|
||||||
|
if (!child->isUpdate()) continue;
|
||||||
|
|
||||||
mDepGraph.insert({ child, {} });
|
mDepGraph.insert({ child, {} });
|
||||||
|
|
||||||
if (auto depOrder = getLayoutOrder(widget->getLayout(), child->getLayout())) {
|
if (auto depOrder = getLayoutOrder(widget->getLayout(), child->getLayout())) {
|
||||||
|
|
|
||||||
|
|
@ -80,9 +80,11 @@ void DockWidget::process(const EventHandler& events) {
|
||||||
if (events.isPressed(InputID::MOUSE1)) {
|
if (events.isPressed(InputID::MOUSE1)) {
|
||||||
if (layout()->startResize(events.getPointer())) {
|
if (layout()->startResize(events.getPointer())) {
|
||||||
triggerWidgetUpdate("dock layout resizing");
|
triggerWidgetUpdate("dock layout resizing");
|
||||||
|
lockFocus();
|
||||||
}
|
}
|
||||||
} else if (events.isReleased(InputID::MOUSE1)) {
|
} else if (events.isReleased(InputID::MOUSE1)) {
|
||||||
layout()->endResize();
|
layout()->endResize();
|
||||||
|
freeFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (layout()->isResizing()) {
|
if (layout()->isResizing()) {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#include "ScrollableWidget.hpp"
|
#include "ScrollableWidget.hpp"
|
||||||
|
#include "ScrollableLayout.hpp"
|
||||||
|
#include "BasicLayout.hpp"
|
||||||
|
|
||||||
using namespace tp;
|
using namespace tp;
|
||||||
|
|
||||||
|
|
@ -85,3 +87,20 @@ void ScrollableBarWidget::updateHandleRect() {
|
||||||
const RectF& ScrollableBarWidget::getHandleRect() const {
|
const RectF& ScrollableBarWidget::getHandleRect() const {
|
||||||
return mHandleRect;
|
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<BasicLayout*>(mContent.getLayout())) {
|
||||||
|
lay->setLayoutPolicy(direction ? LayoutPolicy::Vertical : LayoutPolicy::Horizontal);
|
||||||
|
}
|
||||||
|
|
||||||
|
mScroller.setDirection(direction);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ namespace tp {
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Vec2<SizePolicy> mSizePolicy = { SizePolicy::Fixed, SizePolicy::Fixed };
|
Vec2<SizePolicy> mSizePolicy = { SizePolicy::Fixed, SizePolicy::Fixed };
|
||||||
Vec2F mMinSize = { 50, 50 };
|
Vec2F mMinSize = { 30, 30 };
|
||||||
Vec2F mMaxSize = { FLT_MAX / 2, FLT_MAX / 2 };
|
Vec2F mMaxSize = { FLT_MAX / 2, FLT_MAX / 2 };
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@ namespace tp {
|
||||||
void setRootWidget(Widget* widget);
|
void setRootWidget(Widget* widget);
|
||||||
static void setWidgetArea(Widget& widget, const RectF& rect);
|
static void setWidgetArea(Widget& widget, const RectF& rect);
|
||||||
|
|
||||||
[[nodiscard]] bool isDebug() const;
|
|
||||||
|
|
||||||
// Graphic Application Interface
|
// Graphic Application Interface
|
||||||
public:
|
public:
|
||||||
void processFrame(EventHandler* events, const RectF& screenArea);
|
void processFrame(EventHandler* events, const RectF& screenArea);
|
||||||
|
|
|
||||||
|
|
@ -9,41 +9,24 @@ namespace tp {
|
||||||
public:
|
public:
|
||||||
WidgetApplication() = default;
|
WidgetApplication() = default;
|
||||||
|
|
||||||
void setRoot(Widget* widget) {
|
void setRoot(Widget* widget);
|
||||||
mRootWidget.setRootWidget(widget);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void processFrame(EventHandler* eventHandler, halnf deltaTime) override {
|
void processFrame(EventHandler* eventHandler, halnf deltaTime) override;
|
||||||
const auto rec = RectF({ 0, 0 }, mWindow->getSize());
|
|
||||||
|
|
||||||
Timer timer;
|
void drawFrame(Canvas* canvas) override;
|
||||||
mRootWidget.processFrame(eventHandler, rec);
|
bool forceNewFrame() override ;
|
||||||
mProcTime = timer.timePassed();
|
|
||||||
}
|
|
||||||
|
|
||||||
void drawFrame(Canvas* canvas) override {
|
|
||||||
Timer timer;
|
|
||||||
mRootWidget.drawFrame(*canvas);
|
|
||||||
mDrawTime = timer.timePassed();
|
|
||||||
|
|
||||||
if (mRootWidget.isDebug()) {
|
|
||||||
drawDebug();
|
|
||||||
debugUI();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool forceNewFrame() override {
|
|
||||||
return mRootWidget.needsUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void debugUI();
|
void debugUI();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
time_ms mProcTime = 0;
|
halnf mDebugSplitFactor = 0.7;
|
||||||
time_ms mDrawTime = 0;
|
|
||||||
|
|
||||||
RootWidget mRootWidget;
|
RootWidget mRootWidget;
|
||||||
|
|
||||||
|
private:
|
||||||
|
RectF mGuiArea;
|
||||||
|
RectF mDebugArea;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -96,7 +96,7 @@ namespace tp {
|
||||||
bool mResizing = false;
|
bool mResizing = false;
|
||||||
|
|
||||||
Widget* mCenterWidget = nullptr;
|
Widget* mCenterWidget = nullptr;
|
||||||
RectF mCenterArea {};
|
RectF mCenterArea { 0, 0, 10, 10 };
|
||||||
|
|
||||||
// Parameters
|
// Parameters
|
||||||
const halnf mHandleSplitFactor = 0.3;
|
const halnf mHandleSplitFactor = 0.3;
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,56 @@
|
||||||
#include <set>
|
#include <set>
|
||||||
|
|
||||||
namespace tp {
|
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 {
|
class DebugManager {
|
||||||
public:
|
public:
|
||||||
DebugManager() = default;
|
DebugManager() = default;
|
||||||
|
|
||||||
bool isRedrawAlways() const { return mDebugRedrawAlways; }
|
[[nodiscard]] bool isFrozen() const { return mDebugStopProcessing; }
|
||||||
bool update(RootWidget* rootWidget, EventHandler& events);
|
[[nodiscard]] bool isRedrawAlways() const { return mDebugRedrawAlways; }
|
||||||
|
|
||||||
|
void update(RootWidget* rootWidget, EventHandler& events);
|
||||||
void drawDebug(RootWidget* rootWidget, Canvas& canvas);
|
void drawDebug(RootWidget* rootWidget, Canvas& canvas);
|
||||||
|
|
||||||
void checkProcBreakPoints(Widget* widget) {
|
void checkProcBreakPoints(Widget* widget) {
|
||||||
|
|
@ -32,6 +76,7 @@ namespace tp {
|
||||||
private:
|
private:
|
||||||
void recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder);
|
void recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& pos, int depthOrder);
|
||||||
|
|
||||||
|
void drawPerformance();
|
||||||
static void widgetMenu(Widget*);
|
static void widgetMenu(Widget*);
|
||||||
void drawLayoutOrder();
|
void drawLayoutOrder();
|
||||||
|
|
||||||
|
|
@ -42,10 +87,17 @@ namespace tp {
|
||||||
bool mDebug = false;
|
bool mDebug = false;
|
||||||
bool mDebugStopProcessing = false;
|
bool mDebugStopProcessing = false;
|
||||||
bool mDebugRedrawAlways = false;
|
bool mDebugRedrawAlways = false;
|
||||||
bool mSlowMotion = false;
|
bool mDetailed = false;
|
||||||
|
|
||||||
std::set<Widget*> mProcBreakpoints;
|
std::set<Widget*> mProcBreakpoints;
|
||||||
std::set<Widget*> mLayBreakpoints;
|
std::set<Widget*> mLayBreakpoints;
|
||||||
|
|
||||||
|
public:
|
||||||
|
DebugTimeline mProcTime;
|
||||||
|
DebugTimeline mUpdManager;
|
||||||
|
DebugTimeline mLayManager;
|
||||||
|
|
||||||
|
DebugTimeline mDrawTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern DebugManager gDebugWidget;
|
extern DebugManager gDebugWidget;
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,8 @@ namespace tp {
|
||||||
[[nodiscard]] bool getDirection() const { return mVertical; }
|
[[nodiscard]] bool getDirection() const { return mVertical; }
|
||||||
[[nodiscard]] halnf getPosFactor() const { return mPosFactor - mSizeFactor / 2; }
|
[[nodiscard]] halnf getPosFactor() const { return mPosFactor - mSizeFactor / 2; }
|
||||||
|
|
||||||
|
void setDirection(bool direction) { mVertical = direction; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
[[nodiscard]] const RectF& getHandleRect() const;
|
[[nodiscard]] const RectF& getHandleRect() const;
|
||||||
void updateHandleRect();
|
void updateHandleRect();
|
||||||
|
|
@ -53,5 +55,13 @@ namespace tp {
|
||||||
class ScrollableWidget : public Widget {
|
class ScrollableWidget : public Widget {
|
||||||
public:
|
public:
|
||||||
ScrollableWidget();
|
ScrollableWidget();
|
||||||
|
|
||||||
|
void setDirection(bool direction);
|
||||||
|
|
||||||
|
Widget* getContainer() { return &mContent; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
Widget mContent;
|
||||||
|
ScrollableBarWidget mScroller;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -71,7 +71,7 @@ namespace tp {
|
||||||
void draw(Canvas& canvas) override;
|
void draw(Canvas& canvas) override;
|
||||||
|
|
||||||
[[nodiscard]] bool processesEvents() const override { return true; }
|
[[nodiscard]] bool processesEvents() const override { return true; }
|
||||||
[[nodiscard]] bool needsNextFrame() const override { return mState != SLIDING; }
|
[[nodiscard]] bool needsNextFrame() const override { return mState != IDLE; }
|
||||||
|
|
||||||
[[nodiscard]] halnf val() const { return mFactor; }
|
[[nodiscard]] halnf val() const { return mFactor; }
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue