From 9cfae3fe3ee93ab381624693ab72ee1fe10cc7ae Mon Sep 17 00:00:00 2001 From: IlyaShurupov Date: Fri, 12 Apr 2024 15:27:40 +0300 Subject: [PATCH] Update widgets module. Raster example initial. --- 3DEditor/CMakeLists.txt | 22 +++ 3DEditor/applications/Entry.cpp | 43 +++++ 3DEditor/applications/SceneLoad.cpp | 41 +++++ 3DEditor/private/Render.cpp | 110 +++++++++++ 3DEditor/public/EditorWidget.hpp | 79 ++++++++ 3DEditor/public/Render.hpp | 23 +++ 3DEditor/public/Scene.hpp | 34 ++++ 3DEditor/rsc/Font.ttf | Bin 0 -> 42624 bytes 3DEditor/rsc/scene.obj | 112 +++++++++++ 3DEditor/rsc/shaders/default.frag | 7 + 3DEditor/rsc/shaders/default.vert | 11 ++ CMakeLists.txt | 4 +- Containers/public/Map.hpp | 16 +- .../obj}/OBJ_LOADER_LICENSE.txt | 0 .../obj}/OBJ_Loader.h | 0 Graphics/private/EventHandler.cpp | 51 +++-- Graphics/public/Graphics.hpp | 12 +- LibraryViewer/applications/Entry.cpp | 13 +- LibraryViewer/public/GUI.hpp | 41 ++--- Math/public/Topology.hpp | 2 +- Objects/applications/GUIEntry.cpp | 6 +- RasterRender/CMakeLists.txt | 15 ++ .../private/FrameBuffer.cpp | 41 +++-- {Sketch3D => RasterRender}/private/Shader.cpp | 0 .../private/Texture.cpp | 0 .../public/FrameBuffer.hpp | 0 .../public/GraphicsApi.hpp | 0 {Sketch3D => RasterRender}/public/Shader.hpp | 5 +- {Sketch3D => RasterRender}/public/Texture.hpp | 0 RayTracer/CMakeLists.txt | 2 +- RayTracer/applications/SceneLoad.cpp | 11 +- Sketch3D/CMakeLists.txt | 8 +- Sketch3D/applications/Entry.cpp | 19 +- Sketch3D/public/Sketch3DWidget.hpp | 71 +++---- Widgets/CMakeLists.txt | 11 +- Widgets/examples/{Entry.cpp => ChatGUI.cpp} | 17 +- .../examples/{ExampleGUI.hpp => ChatGUI.hpp} | 174 ++++++++++++------ Widgets/examples/SimpleGUI.cpp | 44 +++++ Widgets/private/WidgetConfig.cpp | 4 +- Widgets/public/ButtonWidget.hpp | 65 +++---- Widgets/public/LabelWidget.hpp | 35 ++-- Widgets/public/ScrollableWidget.hpp | 111 ++++++----- Widgets/public/SliderWidget.hpp | 63 +++---- Widgets/public/SplitViewWidget.hpp | 63 +++---- Widgets/public/TextInputWidget.hpp | 45 ++--- Widgets/public/WidgetBase.hpp | 51 ++--- Widgets/public/WidgetConfig.hpp | 73 -------- Widgets/public/WidgetManager.hpp | 144 +++++++++++++++ 48 files changed, 1169 insertions(+), 530 deletions(-) create mode 100644 3DEditor/CMakeLists.txt create mode 100644 3DEditor/applications/Entry.cpp create mode 100644 3DEditor/applications/SceneLoad.cpp create mode 100644 3DEditor/private/Render.cpp create mode 100644 3DEditor/public/EditorWidget.hpp create mode 100644 3DEditor/public/Render.hpp create mode 100644 3DEditor/public/Scene.hpp create mode 100644 3DEditor/rsc/Font.ttf create mode 100644 3DEditor/rsc/scene.obj create mode 100644 3DEditor/rsc/shaders/default.frag create mode 100644 3DEditor/rsc/shaders/default.vert rename {RayTracer/applications => Externals/obj}/OBJ_LOADER_LICENSE.txt (100%) rename {RayTracer/applications => Externals/obj}/OBJ_Loader.h (100%) create mode 100644 RasterRender/CMakeLists.txt rename {Sketch3D => RasterRender}/private/FrameBuffer.cpp (71%) rename {Sketch3D => RasterRender}/private/Shader.cpp (100%) rename {Sketch3D => RasterRender}/private/Texture.cpp (100%) rename {Sketch3D => RasterRender}/public/FrameBuffer.hpp (100%) rename {Sketch3D => RasterRender}/public/GraphicsApi.hpp (100%) rename {Sketch3D => RasterRender}/public/Shader.hpp (99%) rename {Sketch3D => RasterRender}/public/Texture.hpp (100%) rename Widgets/examples/{Entry.cpp => ChatGUI.cpp} (51%) rename Widgets/examples/{ExampleGUI.hpp => ChatGUI.hpp} (63%) create mode 100644 Widgets/examples/SimpleGUI.cpp delete mode 100644 Widgets/public/WidgetConfig.hpp create mode 100644 Widgets/public/WidgetManager.hpp diff --git a/3DEditor/CMakeLists.txt b/3DEditor/CMakeLists.txt new file mode 100644 index 0000000..e11e387 --- /dev/null +++ b/3DEditor/CMakeLists.txt @@ -0,0 +1,22 @@ +project(3DEditor) + +### ---------------------- Externals --------------------- ### +set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals) +set(BINDINGS_LIBS glfw Imgui) + +### ---------------------- Static Library --------------------- ### +file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") +file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp") + +add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) + +target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/) +target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math RasterRender) +target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) + +### -------------------------- Applications -------------------------- ### +add_executable(3DEditorApp ./applications/Entry.cpp ./applications/SceneLoad.cpp) +target_link_libraries(3DEditorApp ${PROJECT_NAME} Lua ImageIO) + +file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") +file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/") diff --git a/3DEditor/applications/Entry.cpp b/3DEditor/applications/Entry.cpp new file mode 100644 index 0000000..7c8bc87 --- /dev/null +++ b/3DEditor/applications/Entry.cpp @@ -0,0 +1,43 @@ + +#include "EditorWidget.hpp" + +#include "GraphicApplication.hpp" + +using namespace tp; + +bool loadMeshes(tp::Scene& scene, const std::string& objetsPath); + +class EditorGUI : public Application { +public: + EditorGUI() { + Vec2F renderResolution = { 1000, 1000 }; + auto canvas = this->mGraphics->getCanvas(); + mGui = new EditorWidget(canvas, &geometry, renderResolution); + + loadMeshes(geometry, "rsc/scene.obj"); + + geometry.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->updateConfigCache(mWidgetManager); + mGui->proc(*eventHandler, rec, rec); + } + + void drawFrame(Canvas* canvas) override { mGui->draw(*canvas); } + +private: + Scene geometry; + WidgetManager mWidgetManager; + EditorWidget* mGui; +}; + +int main() { + EditorGUI gui; + gui.run(); +} diff --git a/3DEditor/applications/SceneLoad.cpp b/3DEditor/applications/SceneLoad.cpp new file mode 100644 index 0000000..bc03e0c --- /dev/null +++ b/3DEditor/applications/SceneLoad.cpp @@ -0,0 +1,41 @@ +#include "Scene.hpp" + +#include "obj/OBJ_Loader.h" +#include + +bool loadMeshes(tp::Scene& scene, const std::string& objetsPath) { + using namespace tp; + + objl::Loader Loader; + + if (!Loader.LoadFile(objetsPath.c_str())) { + std::cout << "Failed to Load File. May have failed to find it or it was not an .obj file.\n"; + return false; + } + + for (auto& curMesh : Loader.LoadedMeshes) { + scene.mObjects.append(Object()); + + auto object = &scene.mObjects.last(); + + for (auto& vertex : curMesh.Vertices) { + // printf("{ %f, %f, %f }, \n", vertex.Position.X, vertex.Position.Y, vertex.Position.Z); + object->mTopology.Points.append(Vec3F{ vertex.Position.X, vertex.Position.Y, vertex.Position.Z }); + object->mTopology.Normals.append(Vec3F{ vertex.Normal.X, vertex.Normal.Y, vertex.Normal.Z }); + } + + for (int j = 0; j < curMesh.Indices.size(); j += 3) { + uint idx1 = (int) curMesh.Indices[j]; + uint idx2 = (int) curMesh.Indices[j + 1]; + uint idx3 = (int) curMesh.Indices[j + 2]; + // printf("{ %i, %i, %i },\n", idx1, idx2, idx3); + object->mTopology.Indexes.append({ idx1, idx2, idx3 }); + } + + if (object->mTopology.Normals.size() != object->mTopology.Points.size()) { + printf("Logic error loading normals\n"); + } + } + + return scene.mObjects.size(); +} diff --git a/3DEditor/private/Render.cpp b/3DEditor/private/Render.cpp new file mode 100644 index 0000000..ec98be5 --- /dev/null +++ b/3DEditor/private/Render.cpp @@ -0,0 +1,110 @@ +#include "Render.hpp" + +#include "GraphicsApi.hpp" + +using namespace tp; + +class ObjectBuffers { +public: + ObjectBuffers(Object* object) { + mObject = (object); + + auto& buff = mObject->mTopology.Points; + auto& indices = mObject->mTopology.Indexes; + + glGenVertexArrays(1, &VAO); + glGenBuffers(1, &VBO); + glGenBuffers(1, &EBO); + + glBindVertexArray(VAO); + + glBindBuffer(GL_ARRAY_BUFFER, VBO); + glBufferData(GL_ARRAY_BUFFER, sizeof(Vec3F) * buff.size(), buff.getBuff(), GL_STATIC_DRAW); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(Vec3) * indices.size(), indices.getBuff(), GL_STATIC_DRAW); + + glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr); + glEnableVertexAttribArray(0); + + // glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glBindVertexArray(0); + } + + Object* mObject = nullptr; + + GLuint VAO = 0; + GLuint VBO = 0; + GLuint EBO = 0; + + void drawCall() { + auto& indices = mObject->mTopology.Indexes; + + glBindVertexArray(VAO); + + // glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO); + glDrawElements(GL_TRIANGLES, indices.size() * 3, GL_UNSIGNED_INT, nullptr); + + // glDrawArrays(GL_TRIANGLES, 0, sizeof(buffer) / (2 * sizeof(float))); + + // glBindVertexArray(0); + } + + ~ObjectBuffers() { + glDeleteBuffers(1, &VBO); + glDeleteVertexArrays(1, &VAO); + } +}; + +Render::Render(Vec2F renderResolution) : + mRenderBuffer(renderResolution) { + + mDefaultShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/default.frag", true); +} + +Render::~Render() {} + +uint4 Render::getRenderBuffer() { return mRenderBuffer.texId(); } + +Vec2F Render::getBufferSize() { return mRenderBuffer.getSize(); } + +void Render::render(const Scene& geometry, Vec2F size) { + + for (auto object : geometry.mObjects) { + if (!object->mBuffers) { + object->mBuffers = std::make_shared(&object.data()); + } + } + + mRenderBuffer.mClearCol = { 0.0f, 0.0f, 0.0f, 0.f }; + + mRenderBuffer.beginDraw(); + mRenderBuffer.clear(); + + mDefaultShader.bind(); + + Mat4F cameraMat = geometry.mCamera.calculateTransformationMatrix(); + + glEnable(GL_DEPTH_TEST); + + for (auto object : geometry.mObjects) { + + static auto origin = (GLint) mDefaultShader.getu("Origin"); + static auto basis = (GLint) mDefaultShader.getu("Basis"); + static auto camera = (GLint) mDefaultShader.getu("Camera"); + + Mat4F basisMat; + Vec4F originPoint; + + glUniform4fv(origin, 1, &originPoint[0]); + glUniformMatrix4fv(basis, 1, false, &basisMat[0][0]); + glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]); + + object->mBuffers->drawCall(); + } + + mDefaultShader.unbind(); + + mRenderBuffer.endDraw(); +} diff --git a/3DEditor/public/EditorWidget.hpp b/3DEditor/public/EditorWidget.hpp new file mode 100644 index 0000000..4f894a7 --- /dev/null +++ b/3DEditor/public/EditorWidget.hpp @@ -0,0 +1,79 @@ +#include "Widgets.hpp" +#include "Render.hpp" + +namespace tp { + + template + class ViewportWidget : public Widget { + public: + explicit ViewportWidget(Canvas* canvas, Scene* geometry, Vec2F renderResolution) : + mRender(renderResolution) { + + mImage = canvas->createImageFromTextId(mRender.getRenderBuffer(), mRender.getBufferSize()); + mGeometry = geometry; + mCanvas = canvas; + } + + ~ViewportWidget() { mCanvas->deleteImageHandle(mImage); } + + void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { + this->mArea = aArea; + this->mVisible = areaParent.isOverlap(aArea); + if (!this->mVisible) return; + + mGeometry->mCamera.rotate(0.01f, 0.0); + } + + void draw(Canvas& canvas) override { + if (!this->mVisible) return; + + mRender.render(*mGeometry, this->mArea.size); + canvas.drawImage(this->mArea, &mImage, PI); + } + + public: + Render mRender; + Scene* mGeometry = nullptr; + Canvas* mCanvas = nullptr; + Canvas::ImageHandle mImage; + }; + + template + class EditorWidget : public Widget { + public: + EditorWidget(Canvas* canvas, Scene* geometry, Vec2F renderResolution) : + mViewport(canvas, geometry, renderResolution) {} + + void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { + this->mArea = aArea; + this->mVisible = areaParent.isOverlap(aArea); + if (!this->mVisible) return; + + mSplitView.proc(events, aArea, aArea); + mViewport.proc(events, aArea, mSplitView.getFirst()); + } + + void draw(Canvas& canvas) override { + if (!this->mVisible) return; + + canvas.rect(this->mArea, mBaseColor); + mSplitView.draw(canvas); + mViewport.draw(canvas); + } + + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("3DEditor"); + + mBaseColor = wm.getColor("Base", "Base"); + + mViewport.updateConfigCache(wm); + mSplitView.updateConfigCache(wm); + } + + public: + ViewportWidget mViewport; + SplitView mSplitView; + + RGBA mBaseColor; + }; +} \ No newline at end of file diff --git a/3DEditor/public/Render.hpp b/3DEditor/public/Render.hpp new file mode 100644 index 0000000..818ffe8 --- /dev/null +++ b/3DEditor/public/Render.hpp @@ -0,0 +1,23 @@ +#pragma once + +#include "Scene.hpp" +#include "Rect.hpp" + +#include "FrameBuffer.hpp" +#include "Shader.hpp" + +namespace tp { + class Render { + public: + explicit Render(Vec2F renderResolution); + ~Render(); + + void render(const Scene& geometry, Vec2F size); + uint4 getRenderBuffer(); + Vec2F getBufferSize(); + + private: + RenderBuffer mRenderBuffer; + RenderShader mDefaultShader; + }; +} \ No newline at end of file diff --git a/3DEditor/public/Scene.hpp b/3DEditor/public/Scene.hpp new file mode 100644 index 0000000..9b995ba --- /dev/null +++ b/3DEditor/public/Scene.hpp @@ -0,0 +1,34 @@ +#pragma once + +#include "Topology.hpp" +#include + +class ObjectBuffers; + +namespace tp { + + class Object { + public: + Object() = default; + + public: + Topology mTopology; + std::shared_ptr mBuffers; + }; + + struct PointLight { + Vec3F pos; + halnf fallOut = 1.f; + halnf intensity = 1.f; + }; + + class Scene { + public: + Scene() = default; + + public: + Buffer mObjects; + Buffer mLights; + Camera mCamera; + }; +} \ No newline at end of file diff --git a/3DEditor/rsc/Font.ttf b/3DEditor/rsc/Font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..8a630544c99ec9956153ebd9509abeac421c6d75 GIT binary patch literal 42624 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 = DefaultHashFunc, int tTableInitialSize = 4> + template < + typename tKey, + typename tVal, + class tAllocator = DefaultAllocator, + ualni (*tHashFunc)(SelectValueOrReference) = DefaultHashFunc, + int tTableInitialSize = 4> class Map { enum { @@ -223,6 +228,13 @@ namespace tp { return mTable[slot]->val; } + tVal& operator[](KeyArg key) { + auto idx = presents(key); + if (idx.isValid()) return getSlotVal(idx); + put(key, {}); + return get(key); + } + tVal& getSlotVal(ualni slot) { DEBUG_ASSERT(slot < mNSlots && (mTable[slot] && !isDeletedNode(mTable[slot])) && "Key Error") return mTable[slot]->val; @@ -242,7 +254,7 @@ namespace tp { if (this == &in) { return *this; } - + for (ualni i = 0; i < mNSlots; i++) { if (mTable[i] && !isDeletedNode(mTable[i])) { deleteNode(mTable[i]); diff --git a/RayTracer/applications/OBJ_LOADER_LICENSE.txt b/Externals/obj/OBJ_LOADER_LICENSE.txt similarity index 100% rename from RayTracer/applications/OBJ_LOADER_LICENSE.txt rename to Externals/obj/OBJ_LOADER_LICENSE.txt diff --git a/RayTracer/applications/OBJ_Loader.h b/Externals/obj/OBJ_Loader.h similarity index 100% rename from RayTracer/applications/OBJ_Loader.h rename to Externals/obj/OBJ_Loader.h diff --git a/Graphics/private/EventHandler.cpp b/Graphics/private/EventHandler.cpp index af7d924..d5b9f40 100644 --- a/Graphics/private/EventHandler.cpp +++ b/Graphics/private/EventHandler.cpp @@ -1,8 +1,6 @@ #include "EventHandler.hpp" -#include - using namespace tp; EventHandler::EventHandler() = default; @@ -35,7 +33,6 @@ bool transitionsReduce[4][4] = { { true, false, true, true }, }; - void EventHandler::processEvent() { mMutex.lock(); auto lastEvent = mEventQueue.last(); @@ -45,30 +42,30 @@ void EventHandler::processEvent() { switch (eventData.type) { case InputEvent::Type::MOUSE_POS: - { - mPointer = eventData.mouseEvent; - mEventQueue.popFront(); - break; - } - - case InputEvent::Type::BUTTON_ACTION: - { - auto currentState = (int) mInputStates[(int) inputId].mCurrentState; - auto reportedEvent = (int) eventData.buttonAction; - - mInputStates[(int) inputId].mCurrentState = transitions[currentState][reportedEvent]; - - if (transitionsReduce[currentState][reportedEvent]) { + { + mPointer = eventData.mouseEvent; mEventQueue.popFront(); + break; } - break; - } + case InputEvent::Type::BUTTON_ACTION: + { + auto currentState = (int) mInputStates[(int) inputId].mCurrentState; + auto reportedEvent = (int) eventData.buttonAction; + + mInputStates[(int) inputId].mCurrentState = transitions[currentState][reportedEvent]; + + if (transitionsReduce[currentState][reportedEvent]) { + mEventQueue.popFront(); + } + + break; + } default: - { - mEventQueue.popFront(); - } + { + mEventQueue.popFront(); + } } mPointerPressure = mInputStates[(int) InputID::MOUSE1].mCurrentState != InputState::State::NONE; @@ -78,7 +75,7 @@ void EventHandler::processEvent() { const Vec2F& EventHandler::getPointer() const { return mPointer; } -bool EventHandler::isPressed(InputID id) const { +bool EventHandler::isPressed(InputID id) const { return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED; } @@ -86,13 +83,11 @@ bool EventHandler::isReleased(InputID id) const { return mInputStates[(int) id].mCurrentState == InputState::State::RELEASED; } -halnf EventHandler::getPointerPressure() const { - return mPointerPressure; -} +halnf EventHandler::getPointerPressure() const { return mPointerPressure; } bool EventHandler::isDown(InputID id) const { - return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED || - mInputStates[(int) id].mCurrentState == InputState::State::HOLD; + return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED || + mInputStates[(int) id].mCurrentState == InputState::State::HOLD; } halnf EventHandler::getScrollY() const { return 0; } \ No newline at end of file diff --git a/Graphics/public/Graphics.hpp b/Graphics/public/Graphics.hpp index 6eb5aa6..4d35595 100644 --- a/Graphics/public/Graphics.hpp +++ b/Graphics/public/Graphics.hpp @@ -62,7 +62,7 @@ namespace tp { ImageHandle createImageFromTextId(ualni id, Vec2F size); void deleteImageHandle(ImageHandle image); - void drawImage(const RectF& rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding); + void drawImage(const RectF& rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f); private: Buffer mScissors; @@ -71,7 +71,9 @@ namespace tp { class Graphics { public: - explicit Graphics(Window* window) : mGui(window), mCanvas(window) {} + explicit Graphics(Window* window) : + mGui(window), + mCanvas(window) {} void procBegin() { mCanvas.procBegin(); @@ -88,14 +90,12 @@ namespace tp { mGui.drawBegin(); } - void drawEnd() { + void drawEnd() { mCanvas.drawEnd(); mGui.drawEnd(); } - Canvas* getCanvas() { - return &mCanvas; - } + Canvas* getCanvas() { return &mCanvas; } private: Canvas mCanvas; diff --git a/LibraryViewer/applications/Entry.cpp b/LibraryViewer/applications/Entry.cpp index 1545d69..13e7d84 100644 --- a/LibraryViewer/applications/Entry.cpp +++ b/LibraryViewer/applications/Entry.cpp @@ -18,7 +18,8 @@ using namespace tp; class LibraryViewer : public Application { public: - LibraryViewer() : gui(&library, &player) { + LibraryViewer() : + gui(&library, &player) { library.loadJson(getHome() + "Library.json"); library.checkExisting(); @@ -27,22 +28,22 @@ public: void processFrame(EventHandler* eventHandler) override { auto rec = RectF{ { 0, 0 }, mWindow->getSize() }; + + gui.updateConfigCache(mWidgetManager); gui.proc(*eventHandler, rec, rec); } - void drawFrame(Canvas* canvas) override { - gui.draw(*canvas); - } + void drawFrame(Canvas* canvas) override { gui.draw(*canvas); } private: Player player; Library library; + + tp::WidgetManager mWidgetManager; LibraryWidget gui; }; int main() { - tp::GlobalGUIConfig config; - tp::gGlobalGUIConfig = &config; LibraryViewer lib; lib.run(); diff --git a/LibraryViewer/public/GUI.hpp b/LibraryViewer/public/GUI.hpp index ae899ca..4befe8a 100644 --- a/LibraryViewer/public/GUI.hpp +++ b/LibraryViewer/public/GUI.hpp @@ -18,15 +18,10 @@ namespace tp { col.mColor.setNoTransition({ 0.15f, 0.15f, 0.15f, 0.f }); }; - void proc(const Events& events, const RectF& areaParent, const RectF& area) override { + void procBody(const Events& events) override { mSelected = false; - this->mArea = area; - this->mVisible = area.isOverlap(areaParent); - if (!this->mVisible) return; - if (!mTrack) return; - if (!areaParent.isOverlap(area)) return; - if (area.isInside(events.getPointer())) { + if (this->mArea.isInside(events.getPointer())) { col.set({ 0.15f, 0.15f, 0.15f, 1.f }); mSelected = events.isReleased(InputID::MOUSE1); } else { @@ -34,8 +29,7 @@ namespace tp { } } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; + void drawBody(Canvas& canvas) override { if (!mTrack) return; canvas.rect(this->mArea, col.get(), 4.f); @@ -82,16 +76,7 @@ namespace tp { items.append({ "Date Last Played" }); } - void proc(const Events&, const RectF& areaParent, const RectF& area) override { - this->mArea = area; - this->mVisible = area.isOverlap(areaParent); - if (!this->mVisible) return; - if (!mTrack) return; - // renderUI(); - } - - void draw(Canvas&) override { - if (!this->mVisible) return; + void drawBody(Canvas&) override { if (!mTrack) return; // canvas.rect(this->mArea, { 0.13f, 0.13f, 0.13f, 1.f }, 4.f); renderUI(); @@ -220,11 +205,7 @@ namespace tp { } } - void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { - this->mArea = aArea; - this->mVisible = this->mArea.isOverlap(areaParent); - if (!this->mVisible) return; - + void procBody(const Events& events) override { filter(); mSplitView.proc(events, this->mArea, this->mArea); @@ -242,9 +223,7 @@ namespace tp { // mCurrentTrack.proc(events, this->mArea, mSplitView.getFirst()); } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - + void drawBody(Canvas& canvas) override { canvas.rect(this->mArea, { 0.1f, 0.1f, 0.1f, 1.f }); mSplitView.draw(canvas); @@ -283,6 +262,14 @@ namespace tp { mCurrentTrackInfo.isSongFilterChanged = false; } + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("LibraryWidget"); + mSplitView.updateConfigCache(wm); + mCurrentTrack.updateConfigCache(wm); + mCurrentTrackInfo.updateConfigCache(wm); + mSongList.updateConfigCache(wm); + } + private: Library* mLibrary = nullptr; Player* mPlayer = nullptr; diff --git a/Math/public/Topology.hpp b/Math/public/Topology.hpp index f29fb36..92cb1a0 100644 --- a/Math/public/Topology.hpp +++ b/Math/public/Topology.hpp @@ -34,7 +34,7 @@ namespace tp { Buffer Points; Buffer Normals; - Buffer Indexes; + Buffer> Indexes; }; struct TopologyCache { diff --git a/Objects/applications/GUIEntry.cpp b/Objects/applications/GUIEntry.cpp index 5b0c4e8..b5c518e 100644 --- a/Objects/applications/GUIEntry.cpp +++ b/Objects/applications/GUIEntry.cpp @@ -6,9 +6,9 @@ using namespace tp; using namespace obj; -class ExampleGUI : public Application { +class SimpleGUI : public Application { public: - ExampleGUI() { gui.cd(objects_api::create(), "root"); } + SimpleGUI() { gui.cd(objects_api::create(), "root"); } void processFrame(EventHandler* eventHandler) override {} @@ -28,7 +28,7 @@ int main() { if (module.initialize()) { { - ExampleGUI gui; + SimpleGUI gui; gui.run(); } module.deinitialize(); diff --git a/RasterRender/CMakeLists.txt b/RasterRender/CMakeLists.txt new file mode 100644 index 0000000..fd8c89c --- /dev/null +++ b/RasterRender/CMakeLists.txt @@ -0,0 +1,15 @@ +project(RasterRender) + +### ---------------------- Externals --------------------- ### +set(BINDINGS_INCLUDE ${GLEW_INCLUDE_DIR}) +set(BINDINGS_LIBS ${GLEW_LIB}) + +### ---------------------- Static Library --------------------- ### +file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") +file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp") + +add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) + +target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/) +target_link_libraries(${PROJECT_NAME} PUBLIC Math Connection) +target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) \ No newline at end of file diff --git a/Sketch3D/private/FrameBuffer.cpp b/RasterRender/private/FrameBuffer.cpp similarity index 71% rename from Sketch3D/private/FrameBuffer.cpp rename to RasterRender/private/FrameBuffer.cpp index 0804fae..a500e5e 100644 --- a/Sketch3D/private/FrameBuffer.cpp +++ b/RasterRender/private/FrameBuffer.cpp @@ -5,20 +5,26 @@ #include void glerr(GLenum type) { printf("GL ERROR\n"); } -#define AssertGL(x) { x; GLenum __gle = glGetError(); if (__gle != GL_NO_ERROR) glerr(__gle); } +#define AssertGL(x) \ + { \ + x; \ + GLenum __gle = glGetError(); \ + if (__gle != GL_NO_ERROR) glerr(__gle); \ + } using namespace tp; RenderBuffer::RenderBuffer(const Vec2F& size) : mSize(size) { - mDrawBuffers[0] = {GL_COLOR_ATTACHMENT0}; + mDrawBuffers[0] = { GL_COLOR_ATTACHMENT0 }; // --------- texture --------- AssertGL(glGenTextures(1, &mTextureId)); AssertGL(glBindTexture(GL_TEXTURE_2D, mTextureId)); // Give an empty image to OpenGL ( the last "0" ) - AssertGL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)size.x, (GLsizei)size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0)); + AssertGL(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei) size.x, (GLsizei) size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0) + ); // Poor filtering. Needed AssertGL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); AssertGL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); @@ -26,7 +32,7 @@ RenderBuffer::RenderBuffer(const Vec2F& size) : // --------- depth --------- AssertGL(glGenRenderbuffers(1, &mDepthBufferID)); AssertGL(glBindRenderbuffer(GL_RENDERBUFFER, mDepthBufferID)); - AssertGL(glRenderbufferStorage(GL_RENDERBUFFER, GLW_CONTEXT_DEPTH_COMPONENT, (GLsizei)size.x, (GLsizei)size.y)); + AssertGL(glRenderbufferStorage(GL_RENDERBUFFER, GLW_CONTEXT_DEPTH_COMPONENT, (GLsizei) size.x, (GLsizei) size.y)); // ------------ framebuffer ------------ AssertGL(glGenFramebuffers(1, &mFrameBufferID)); @@ -49,18 +55,24 @@ RenderBuffer::RenderBuffer(const Vec2F& size, tp::uint1 samples) : AssertGL(glGenTextures(1, &mTextureId)); AssertGL(glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, mTextureId)); #ifdef ENV_OS_ANDROID - AssertGL(glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA, (GLsizei)size.x, (GLsizei)size.y, GL_TRUE)); + AssertGL( + glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA, (GLsizei) size.x, (GLsizei) size.y, GL_TRUE) + ); #else - AssertGL(glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA, (GLsizei)size.x, (GLsizei)size.y, GL_TRUE)); + AssertGL( + glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, samples, GL_RGBA, (GLsizei) size.x, (GLsizei) size.y, GL_TRUE) + ); #endif // !? - //AssertGL(glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); - //AssertGL(glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); + // AssertGL(glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_MAG_FILTER, GL_LINEAR)); + // AssertGL(glTexParameteri(GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_MIN_FILTER, GL_LINEAR)); // ------- depth ------- AssertGL(glGenRenderbuffers(1, &mDepthBufferID)); AssertGL(glBindRenderbuffer(GL_RENDERBUFFER, mDepthBufferID)); - AssertGL(glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GLW_CONTEXT_DEPTH_COMPONENT, (GLsizei)size.x, (GLsizei)size.y)); + AssertGL(glRenderbufferStorageMultisample( + GL_RENDERBUFFER, samples, GLW_CONTEXT_DEPTH_COMPONENT, (GLsizei) size.x, (GLsizei) size.y + )); // ------- fbuff ------- AssertGL(glGenFramebuffers(1, &mFrameBufferID)); @@ -72,9 +84,7 @@ RenderBuffer::RenderBuffer(const Vec2F& size, tp::uint1 samples) : glBindFramebuffer(GL_FRAMEBUFFER, 0); } -uint4 RenderBuffer::buffId() const { - return mFrameBufferID; -} +uint4 RenderBuffer::buffId() const { return mFrameBufferID; } void RenderBuffer::beginDraw() { AssertGL(glBindFramebuffer(GL_FRAMEBUFFER, mFrameBufferID)); @@ -82,7 +92,7 @@ void RenderBuffer::beginDraw() { } void RenderBuffer::setViewport(const RectF& viewport) { - AssertGL(glViewport((GLsizei)viewport.x, (GLsizei)viewport.y, (GLsizei)viewport.z, (GLsizei)viewport.w)); + AssertGL(glViewport((GLsizei) viewport.x, (GLsizei) viewport.y, (GLsizei) viewport.z, (GLsizei) viewport.w)); } void RenderBuffer::clear() { @@ -102,9 +112,6 @@ RenderBuffer::~RenderBuffer() { glDeleteRenderbuffers(1, &mDepthBufferID); } -uint4 RenderBuffer::texId() const { - return mTextureId; -} +uint4 RenderBuffer::texId() const { return mTextureId; } const Vec2F& RenderBuffer::getSize() const { return mSize; } - diff --git a/Sketch3D/private/Shader.cpp b/RasterRender/private/Shader.cpp similarity index 100% rename from Sketch3D/private/Shader.cpp rename to RasterRender/private/Shader.cpp diff --git a/Sketch3D/private/Texture.cpp b/RasterRender/private/Texture.cpp similarity index 100% rename from Sketch3D/private/Texture.cpp rename to RasterRender/private/Texture.cpp diff --git a/Sketch3D/public/FrameBuffer.hpp b/RasterRender/public/FrameBuffer.hpp similarity index 100% rename from Sketch3D/public/FrameBuffer.hpp rename to RasterRender/public/FrameBuffer.hpp diff --git a/Sketch3D/public/GraphicsApi.hpp b/RasterRender/public/GraphicsApi.hpp similarity index 100% rename from Sketch3D/public/GraphicsApi.hpp rename to RasterRender/public/GraphicsApi.hpp diff --git a/Sketch3D/public/Shader.hpp b/RasterRender/public/Shader.hpp similarity index 99% rename from Sketch3D/public/Shader.hpp rename to RasterRender/public/Shader.hpp index 8442e4d..253cdba 100644 --- a/Sketch3D/public/Shader.hpp +++ b/RasterRender/public/Shader.hpp @@ -13,14 +13,15 @@ namespace tp { void geom_bind_source(const char* geom_src); void compile(); - + void bind(); uint4 getu(const char* uid); void unbind(); + void load(const char* vert, const char* geom, const char* frag, bool paths); + private: bool compile_shader(const char* ShaderCode, uint4 ShaderID); - void load(const char* vert, const char* geom, const char* frag, bool paths); private: uint4 programm; diff --git a/Sketch3D/public/Texture.hpp b/RasterRender/public/Texture.hpp similarity index 100% rename from Sketch3D/public/Texture.hpp rename to RasterRender/public/Texture.hpp diff --git a/RayTracer/CMakeLists.txt b/RayTracer/CMakeLists.txt index d40c663..ae8c52b 100644 --- a/RayTracer/CMakeLists.txt +++ b/RayTracer/CMakeLists.txt @@ -4,7 +4,7 @@ project(RayTracer) file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp" "./applications/*.hpp") add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) -target_include_directories(${PROJECT_NAME} PUBLIC ./public/) +target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ../Externals/) target_link_libraries(${PROJECT_NAME} PUBLIC Math Connection) ### -------------------------- Applications -------------------------- ### diff --git a/RayTracer/applications/SceneLoad.cpp b/RayTracer/applications/SceneLoad.cpp index 724e62b..54ea3c1 100644 --- a/RayTracer/applications/SceneLoad.cpp +++ b/RayTracer/applications/SceneLoad.cpp @@ -6,7 +6,7 @@ extern "C" { #include "lualib.h" } -#include "OBJ_Loader.h" +#include "obj/OBJ_Loader.h" #include @@ -32,11 +32,11 @@ bool loadMeshes(tp::Scene& scene, const std::string& objetsPath) { } for (int j = 0; j < curMesh.Indices.size(); j += 3) { - int idx1 = (int) curMesh.Indices[j]; - int idx2 = (int) curMesh.Indices[j + 1]; - int idx3 = (int) curMesh.Indices[j + 2]; + auto idx1 = (uhalni) curMesh.Indices[j]; + auto idx2 = (uhalni) curMesh.Indices[j + 1]; + auto idx3 = (uhalni) curMesh.Indices[j + 2]; // printf("{ %i, %i, %i },\n", idx1, idx2, idx3); - object->mTopology.Indexes.append(Vec3I{ idx1, idx2, idx3 }); + object->mTopology.Indexes.append(Vec3{ idx1, idx2, idx3 }); } if (object->mTopology.Normals.size() != object->mTopology.Points.size()) { @@ -139,7 +139,6 @@ void loadScene(tp::Scene& scene, const std::string& scenePath, tp::RayTracer::Re // Remove the filename from the path fs::path directoryPath = fullPath.remove_filename(); - if (luaL_dofile(L, scenePath.c_str()) != 0) { lua_close(L); printf("Cant open scene script.\n"); diff --git a/Sketch3D/CMakeLists.txt b/Sketch3D/CMakeLists.txt index 21fef33..248c80d 100644 --- a/Sketch3D/CMakeLists.txt +++ b/Sketch3D/CMakeLists.txt @@ -1,8 +1,8 @@ project(Sketch3D) ### ---------------------- Externals --------------------- ### -set(BINDINGS_INCLUDE ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) -set(BINDINGS_LIBS glfw Imgui ${GLEW_LIB}) +set(BINDINGS_INCLUDE ../Externals/glfw/include) +set(BINDINGS_LIBS glfw Imgui) ### ---------------------- Static Library --------------------- ### file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp") @@ -11,12 +11,12 @@ file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp") add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS}) target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/) -target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math) +target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets Math RasterRender) target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS}) ### -------------------------- Applications -------------------------- ### 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}/") diff --git a/Sketch3D/applications/Entry.cpp b/Sketch3D/applications/Entry.cpp index 9cb6be0..f46a6cb 100644 --- a/Sketch3D/applications/Entry.cpp +++ b/Sketch3D/applications/Entry.cpp @@ -8,30 +8,25 @@ using namespace tp; class Sketch3DApplication : public Application { public: - Sketch3DApplication() : mGui(*mGraphics->getCanvas(), {1920, 1080}) {} + Sketch3DApplication() : + mGui(*mGraphics->getCanvas(), { 1920, 1080 }) {} void processFrame(EventHandler* eventHandler) override { - auto rec = RectF( { 0, 0 }, mWindow->getSize() ); + auto rec = RectF({ 0, 0 }, mWindow->getSize()); + mGui.updateConfigCache(mWidgetManager); mGui.proc(*eventHandler, rec, rec); } - void drawFrame(Canvas* canvas) override { - mGui.draw(*canvas); - } + void drawFrame(Canvas* canvas) override { mGui.draw(*canvas); } private: + WidgetManager mWidgetManager; Sketch3DGUI mGui; }; - void runApp() { - tp::GlobalGUIConfig config; - tp::gGlobalGUIConfig = &config; - Sketch3DApplication app; app.run(); } -int main() { - runApp(); -} \ No newline at end of file +int main() { runApp(); } \ No newline at end of file diff --git a/Sketch3D/public/Sketch3DWidget.hpp b/Sketch3D/public/Sketch3DWidget.hpp index 787672a..942164d 100644 --- a/Sketch3D/public/Sketch3DWidget.hpp +++ b/Sketch3D/public/Sketch3DWidget.hpp @@ -9,16 +9,14 @@ namespace tp { class Sketch3DWidget : public Widget { public: Sketch3DWidget(Canvas& canvas, Vec2F renderResolution) : - mRenderer(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); - } + ~Sketch3DWidget() { mCanvas->deleteImageHandle(mImage); } void proc(const Events& events, const RectF& areaParent, const RectF& area) override { @@ -51,20 +49,24 @@ namespace tp { mProject.mCamera.setRatio(this->mArea.w / this->mArea.z); switch (mMode) { - case Mode::MOVE: { + case Mode::MOVE: + { if (mAction) mProject.mCamera.move(relativePos, relativePosPrev); break; } - case Mode::ZOOM: { + case Mode::ZOOM: + { halnf factor = absolutePos.y / mActionPosAbsolutePrev.y; if (mAction) mProject.mCamera.zoom(factor); break; } - case Mode::ROTATE: { + case Mode::ROTATE: + { if (mAction) mProject.mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI)); break; } - case Mode::DRAW: { + case Mode::DRAW: + { mProject.sample(events.getPointerPressure(), this->mArea.w / this->mArea.z, crs); break; } @@ -74,20 +76,15 @@ namespace tp { mActionPosAbsolutePrev = absolutePos; } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; + void drawBody(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; - } + void setColor(const RGBA& color) { ((PencilBrush*) mProject.mBrushes.get("pencil"))->mCol = color; } public: - enum class Mode { - MOVE, ROTATE, ZOOM, DRAW, NONE - } mMode = Mode::NONE; + enum class Mode { MOVE, ROTATE, ZOOM, DRAW, NONE } mMode = Mode::NONE; Vec2F mActionPosAbsolutePrev = { 0, 0 }; bool mAction = false; @@ -102,12 +99,8 @@ namespace tp { template class Sketch3DGUI : public Widget { public: - Sketch3DGUI(Canvas& canvas, Vec2F renderResolution) : mViewport(canvas, renderResolution) { - this->createConfig("Sketch3D"); - - this->addColor("Background", "Background"); - this->addValue("Rounding", "Rounding"); - + 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 }); @@ -119,26 +112,22 @@ namespace tp { mOptions.mContents.append(mZoomButton); // add color sliders - mRed = new NamedSliderWidget < Events, Canvas >("Red"); - mGreen = new NamedSliderWidget < Events, Canvas >("Green"); - mBlue = new NamedSliderWidget < Events, Canvas >("Blue"); + mRed = new NamedSliderWidget("Red"); + mGreen = new NamedSliderWidget("Green"); + mBlue = new NamedSliderWidget("Blue"); mOptions.mContents.append(mRed); mOptions.mContents.append(mGreen); mOptions.mContents.append(mBlue); } - ~Sketch3DGUI() { + ~Sketch3DGUI() { for (auto item : mOptions.mContents) { delete item.data(); } } - void proc(const Events& events, const RectF& areaParent, const RectF& area) override { - this->mArea = area; - this->mVisible = area.isOverlap(areaParent); - if (!this->mVisible) return; - + void procBody(const Events& events) override { mSplitView.proc(events, this->mArea, this->mArea); mViewport.proc(events, this->mArea, mSplitView.getFirst()); mOptions.proc(events, this->mArea, mSplitView.getSecond()); @@ -156,16 +145,25 @@ namespace tp { mViewport.setColor(RGBA(mRed->mSlider.mFactor, mGreen->mSlider.mFactor, mBlue->mSlider.mFactor, 1.f)); } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - - canvas.rect(this->mArea, this->getColor("Background"), this->getValue("Rounding")); + void drawBody(Canvas& canvas) override { + canvas.rect(this->mArea, mBackgroundColor, mRounding); mSplitView.draw(canvas); mViewport.draw(canvas); mOptions.draw(canvas); } + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("Sketch3DGui"); + + mBackgroundColor = wm.getColor("Background", "Background"); + mRounding = wm.getNumber("Rounding", "Rounding"); + + mSplitView.updateConfigCache(wm); + mOptions.updateConfigCache(wm); + mViewport.updateConfigCache(wm); + } + private: Sketch3DWidget mViewport; SplitView mSplitView; @@ -179,5 +177,8 @@ namespace tp { NamedSliderWidget* mRed = nullptr; NamedSliderWidget* mGreen = nullptr; NamedSliderWidget* mBlue = nullptr; + + RGBA mBackgroundColor; + halnf mRounding = 0; }; } \ No newline at end of file diff --git a/Widgets/CMakeLists.txt b/Widgets/CMakeLists.txt index 5047dae..dc1b591 100644 --- a/Widgets/CMakeLists.txt +++ b/Widgets/CMakeLists.txt @@ -10,7 +10,12 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui) ### -------------------------- Applications -------------------------- ### -add_executable(ExampleGui examples/Entry.cpp) -target_link_libraries(ExampleGui ${PROJECT_NAME} ${GLEW_LIB}) -target_include_directories(ExampleGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR}) +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/Entry.cpp b/Widgets/examples/ChatGUI.cpp similarity index 51% rename from Widgets/examples/Entry.cpp rename to Widgets/examples/ChatGUI.cpp index c7fc1d1..8c7783e 100644 --- a/Widgets/examples/Entry.cpp +++ b/Widgets/examples/ChatGUI.cpp @@ -1,5 +1,5 @@ -#include "ExampleGUI.hpp" +#include "ChatGUI.hpp" #include "GraphicApplication.hpp" @@ -9,23 +9,22 @@ class ExampleGUI : public Application { public: ExampleGUI() = default; - void processFrame(EventHandler* eventHandler) override { - auto rec = RectF( { 0, 0 }, mWindow->getSize() ); + void processFrame(EventHandler* eventHandler) override { + auto rec = RectF({ 0, 0 }, mWindow->getSize()); + + mGui.updateConfigCache(mWidgetManager); + mGui.proc(*eventHandler, rec, rec); } - void drawFrame(Canvas* canvas) override { - mGui.draw(*canvas); - } + void drawFrame(Canvas* canvas) override { mGui.draw(*canvas); } private: + WidgetManager mWidgetManager; ComplexWidget mGui; }; int main() { - GlobalGUIConfig mConfig; - gGlobalGUIConfig = &mConfig; - { ExampleGUI gui; gui.run(); diff --git a/Widgets/examples/ExampleGUI.hpp b/Widgets/examples/ChatGUI.hpp similarity index 63% rename from Widgets/examples/ExampleGUI.hpp rename to Widgets/examples/ChatGUI.hpp index 474151e..8ac8d0e 100644 --- a/Widgets/examples/ExampleGUI.hpp +++ b/Widgets/examples/ChatGUI.hpp @@ -7,15 +7,7 @@ namespace tp { template class UserWidget : public Widget { public: - UserWidget() { - this->createConfig("User"); - this->addColor("Base", "Base"); - this->addValue("Size", "FontSize"); - this->addValue("Padding", "Padding"); - this->addColor("ColUser", "Front"); - this->addColor("Accent", "Accent"); - this->addValue("Rounding", "Rounding"); - } + UserWidget() = default; void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { this->mArea = aArea; @@ -28,34 +20,40 @@ namespace tp { void draw(Canvas& canvas) override { if (!this->mVisible) return; - if (mIsHover) canvas.rect(this->mArea, this->getColor("Accent"), this->getValue("Rounding")); - else canvas.rect(this->mArea, this->getColor("Base"), this->getValue("Rounding")); + if (mIsHover) canvas.rect(this->mArea, mAccentColor, mRounding); + else canvas.rect(this->mArea, mBaseColor, mRounding); - const auto padding = this->getValue("Padding"); - const auto size = this->getValue("Size"); - const auto colUser = this->getColor("ColUser"); + canvas.text(mUser.c_str(), this->mArea, mFontSize, Canvas::CC, mPadding, mUserColor); + } - canvas.text(mUser.c_str(), this->mArea, size, Canvas::CC, padding, colUser); + public: + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("UserWidget"); + + mBaseColor = wm.getColor("Base", "Base"); + mFontSize = wm.getNumber("Size", "FontSize"); + mPadding = wm.getNumber("Padding", "Padding"); + mUserColor = wm.getColor("ColUser", "Front"); + mAccentColor = wm.getColor("Accent", "Accent"); + mRounding = wm.getNumber("Rounding", "Rounding"); } public: std::string mUser = "UserName"; bool mIsHover = false; + + RGBA mBaseColor; + RGBA mUserColor; + RGBA mAccentColor; + halnf mPadding = 0; + halnf mFontSize = 0; + halnf mRounding = 0; }; template class MessageWidget : public Widget { public: - MessageWidget() { - this->createConfig("Message"); - this->addColor("Base", "Base"); - this->addValue("Size", "FontSize"); - this->addValue("SizeUser", "FontSizeDim"); - this->addValue("Padding", "Padding"); - this->addColor("ColUser", "Front"); - this->addColor("Col", "FrontDim"); - this->addValue("Rounding", "Rounding"); - } + MessageWidget() = default; void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { this->mArea = aArea; @@ -67,14 +65,7 @@ namespace tp { void draw(Canvas& canvas) override { if (!this->mVisible) return; - - if (mIsHover) canvas.rect(this->mArea, this->getColor("Base"), this->getValue("Rounding")); - - const auto padding = this->getValue("Padding"); - const auto size = this->getValue("Size"); - const auto sizeUser = this->getValue("SizeUser"); - const auto col = this->getColor("Col"); - const auto colUser = this->getColor("ColUser"); + if (mIsHover) canvas.rect(this->mArea, mBaseColor, mRounding); auto userName = this->mArea; userName.w = 25; @@ -83,22 +74,40 @@ namespace tp { content.y = userName.y + userName.w; content.w = this->mArea.w - userName.w; - canvas.text(mContent.c_str(), content, size, Canvas::LC, padding, col); - canvas.text(mUser.c_str(), userName, sizeUser, Canvas::LC, padding, colUser); + canvas.text(mContent.c_str(), content, mFontSize, Canvas::LC, mPadding, mUserColorDim); + canvas.text(mUser.c_str(), userName, mFontSizeDim, Canvas::LC, mPadding, mUserColor); + } + + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("MessageWidget"); + + mBaseColor = wm.getColor("Base", "Base"); + mFontSize = wm.getNumber("Size", "FontSize"); + mFontSizeDim = wm.getNumber("SizeUser", "FontSizeDim"); + mPadding = wm.getNumber("Padding", "Padding"); + mUserColor = wm.getColor("UserColor", "Front"); + mUserColorDim = wm.getColor("UserColorDim", "FrontDim"); + mRounding = wm.getNumber("Rounding", "Rounding"); } public: std::string mContent = "Message Content"; std::string mUser = "UserName"; bool mIsHover = false; + + RGBA mBaseColor; + RGBA mUserColor; + RGBA mUserColorDim; + halnf mPadding = 0; + halnf mFontSize = 0; + halnf mFontSizeDim = 0; + halnf mRounding = 0; }; template class LoginWidget : public Widget { public: explicit LoginWidget() { - this->createConfig("Login"); - this->addColor("Back", "Background"); mPass.mId = "pass"; mUser.mId = "user"; mButton.mLabel.mLabel = "Login"; @@ -120,26 +129,36 @@ namespace tp { } void draw(Canvas& canvas) override { - canvas.rect(this->mArea, this->getColor("Back")); + canvas.rect(this->mArea, mBGColor); mButton.draw(canvas); mUser.draw(canvas); mPass.draw(canvas); } + public: + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("LoginWidget"); + + mBGColor = wm.getColor("Back", "Base"); + + mUser.updateConfigCache(wm); + mPass.updateConfigCache(wm); + mButton.updateConfigCache(wm); + } + public: TextInputWidget mUser; TextInputWidget mPass; ButtonWidget mButton; bool mLogged = false; + + RGBA mBGColor; }; template class ActiveChatWidget : public Widget { public: ActiveChatWidget() { - this->createConfig("ActiveChat"); - this->addColor("Back", "Background"); - this->addValue("Padding", "Padding"); mSend.mLabel.mLabel = "Send"; mMessage.mId = "Message"; } @@ -152,16 +171,16 @@ namespace tp { auto input = this->mArea; input.y = history.w + 10; - input.w = 40 - this->getValue("Padding"); - input.x += this->getValue("Padding"); - input.z -= this->getValue("Padding"); + input.w = 40 - mPadding; + input.x += mPadding; + input.z -= mPadding; auto inputMessage = input; inputMessage.z -= 100; auto inputSend = input; - inputSend.x = inputMessage.x + inputMessage.z + this->getValue("Padding"); - inputSend.z = 100 - this->getValue("Padding") * 2; + inputSend.x = inputMessage.x + inputMessage.z + mPadding; + inputSend.z = 100 - mPadding * 2; mSend.proc(events, this->mArea, inputSend); mMessage.proc(events, this->mArea, inputMessage); @@ -174,27 +193,41 @@ namespace tp { } void draw(Canvas& canvas) override { - canvas.rect(this->mArea, this->getColor("Back")); + canvas.rect(this->mArea, mBGColor); mHistoryView.draw(canvas); mMessage.draw(canvas); mSend.draw(canvas); } + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("ActiveChat"); + + mBGColor = wm.getColor("Back", "Background"); + mPadding = wm.getNumber("Padding", "Padding"); + + mHistoryView.updateConfigCache(wm); + mMessage.updateConfigCache(wm); + mSend.updateConfigCache(wm); + + for (auto message : mMessages) { + message->updateConfigCache(wm); + } + } + public: Buffer> mMessages; ScrollableWindow mHistoryView; TextInputWidget mMessage; ButtonWidget mSend; + + RGBA mBGColor; + halnf mPadding = 0; }; template class ChattingWidget : public Widget { public: ChattingWidget() { - this->createConfig("Chatting"); - this->addColor("Back", "Background"); - this->addValue("Padding", "Padding"); - // todo : fetch code mUsers.append(UserWidget()); mUsers.append(UserWidget()); @@ -225,34 +258,44 @@ namespace tp { this->mArea = aArea; mSplitView.proc(events, aArea, aArea); - - const auto padding = this->getValue("Padding"); mSideView.proc(events, this->mArea, mSplitView.getSecond()); - mActive.proc(events, aArea, mSplitView.getFirst()); } void draw(Canvas& canvas) override { - canvas.rect(this->mArea, this->getColor("Back")); + canvas.rect(this->mArea, mBGColor); mSplitView.draw(canvas); mSideView.draw(canvas); mActive.draw(canvas); } + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("ChattingWidget"); + + mBGColor = wm.getColor("Back", "Background"); + + mSideView.updateConfigCache(wm); + mActive.updateConfigCache(wm); + mSplitView.updateConfigCache(wm); + + for (auto user : mUsers) { + user->updateConfigCache(wm); + } + } + public: Buffer> mUsers; ScrollableWindow mSideView; ActiveChatWidget mActive; SplitView mSplitView; + + RGBA mBGColor; }; template class ComplexWidget : public Widget { public: - ComplexWidget() { - this->createConfig("chat"); - this->addColor("Back", "Background"); - } + ComplexWidget() = default; void proc(const Events& events, const RectF& areaParent, const RectF& aArea) override { this->mArea = aArea; @@ -268,14 +311,25 @@ namespace tp { } void draw(Canvas& canvas) override { - canvas.rect(this->mArea, this->getColor("Back")); + canvas.rect(this->mArea, mBGColor); if (mLogged) mChatting.draw(canvas); else mLogin.draw(canvas); } + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("ChatGui"); + + mBGColor = wm.getColor("Back", "Background"); + + mLogin.updateConfigCache(wm); + mChatting.updateConfigCache(wm); + } + private: bool mLogged = false; LoginWidget mLogin; ChattingWidget mChatting; + + RGBA mBGColor; }; } \ No newline at end of file diff --git a/Widgets/examples/SimpleGUI.cpp b/Widgets/examples/SimpleGUI.cpp new file mode 100644 index 0000000..142bbf7 --- /dev/null +++ b/Widgets/examples/SimpleGUI.cpp @@ -0,0 +1,44 @@ + +#include "ChatGUI.hpp" + +#include "GraphicApplication.hpp" + +using namespace tp; + +class SimpleGUI : public Application { +public: + SimpleGUI() { + mGui.mContents.append(&mButton); + mGui.mContents.append(&mSlider); + mGui.mContents.append(&mLabel); + } + + void processFrame(EventHandler* eventHandler) override { + + mGui.updateConfigCache(mWidgetManager); + + mSlider.updateConfigCache(mWidgetManager); + mLabel.updateConfigCache(mWidgetManager); + mButton.updateConfigCache(mWidgetManager); + + const auto rec = RectF({ 0, 0 }, mWindow->getSize()); + mGui.proc(*eventHandler, rec, rec); + } + + void drawFrame(Canvas* canvas) override { mGui.draw(*canvas); } + +private: + WidgetManager mWidgetManager; + ScrollableWindow mGui; + + ButtonWidget mButton; + LabelWidget mLabel; + SliderWidget mSlider; +}; + +int main() { + { + SimpleGUI gui; + gui.run(); + } +} diff --git a/Widgets/private/WidgetConfig.cpp b/Widgets/private/WidgetConfig.cpp index 8984b72..5a2cf39 100644 --- a/Widgets/private/WidgetConfig.cpp +++ b/Widgets/private/WidgetConfig.cpp @@ -3,6 +3,4 @@ #include "Graphics.hpp" -namespace tp { - GlobalGUIConfig* gGlobalGUIConfig = nullptr; -} \ No newline at end of file +namespace tp {} \ No newline at end of file diff --git a/Widgets/public/ButtonWidget.hpp b/Widgets/public/ButtonWidget.hpp index 8df41bc..003cdec 100644 --- a/Widgets/public/ButtonWidget.hpp +++ b/Widgets/public/ButtonWidget.hpp @@ -7,40 +7,15 @@ namespace tp { template class ButtonWidget : public Widget { public: - ButtonWidget() { - this->mArea = { 0, 0, 100, 100 }; - this->createConfig("Button"); - this->addColor("Pressed", "Action"); - this->addColor("Hovered", "Interaction"); - this->addColor("Default", "Accent"); - this->addValue("Rounding", "Rounding"); - } + ButtonWidget() { this->mArea = { 0, 0, 100, 100 }; } ButtonWidget(const std::string& label, const tp::RectF& aArea) { this->mArea = aArea; this->mLabel.mLabel = label; - - this->createConfig("Button"); - this->addColor("Pressed", "Action"); - this->addColor("Hovered", "Interaction"); - this->addColor("Default", "Accent"); - this->addValue("Rounding", "Rounding"); } - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; - - mIsHover = false; - - if (!areaParent.isOverlap(aArea)) { - mIsReleased = false; - mIsPressed = false; - return; - } - - mIsHover = aArea.isInside(events.getPointer()); + void procBody(const Events& events) { + mIsHover = this->mArea.isInside(events.getPointer()); if (events.isPressed(InputID::MOUSE1) && mIsHover) { mIsPressed = true; @@ -53,26 +28,46 @@ namespace tp { if (!mIsHover) mIsPressed = false; - mLabel.proc(events, aArea, aArea); + mLabel.proc(events, this->mArea, this->mArea); } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - + void drawBody(Canvas& canvas) override { if (mIsPressed) { - canvas.rect(this->mArea, this->getColor("Pressed"), this->getValue("Rounding")); + canvas.rect(this->mArea, pressedColor, rounding); } else if (mIsHover) { - canvas.rect(this->mArea, this->getColor("Hovered"), this->getValue("Rounding")); + canvas.rect(this->mArea, hoveredColor, rounding); } else { - canvas.rect(this->mArea, this->getColor("Default"), this->getValue("Rounding")); + canvas.rect(this->mArea, accentColor, rounding); } mLabel.draw(canvas); } + public: + void updateConfigCache(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"); + + // mPressEvent = wm.getEventState("Activate", { { InputID::MOUSE1, InputState::PRESSED } }); + + mLabel.updateConfigCache(wm); + } + public: LabelWidget mLabel; + bool mIsHover = false; bool mIsPressed = false; bool mIsReleased = false; + + RGBA pressedColor; + RGBA hoveredColor; + RGBA accentColor; + halnf rounding = 0; + + InputState mPressEvent; }; } \ No newline at end of file diff --git a/Widgets/public/LabelWidget.hpp b/Widgets/public/LabelWidget.hpp index 945436e..fcdb7f4 100644 --- a/Widgets/public/LabelWidget.hpp +++ b/Widgets/public/LabelWidget.hpp @@ -6,33 +6,26 @@ namespace tp { template class LabelWidget : public Widget { public: - LabelWidget() { - this->createConfig("Label"); - this->addValue("Size", "FontSize"); - this->addValue("Padding", "Padding"); - this->addColor("Default", "Front"); + LabelWidget() = default; + + void drawBody(Canvas& canvas) override { + canvas.text(mLabel.c_str(), this->mArea, fontSize, Canvas::CC, padding, fontColor); } - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; - } + public: + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("Label"); - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - - canvas.text( - mLabel.c_str(), - this->mArea, - this->getValue("Size"), - Canvas::CC, - this->getValue("Padding"), - this->getColor("Default") - ); + 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/ScrollableWidget.hpp b/Widgets/public/ScrollableWidget.hpp index d955825..44841f8 100644 --- a/Widgets/public/ScrollableWidget.hpp +++ b/Widgets/public/ScrollableWidget.hpp @@ -8,17 +8,7 @@ namespace tp { template class ScrollBarWidget : public Widget { public: - ScrollBarWidget() { - this->createConfig("ScrollBar"); - this->addColor("Default", "Base"); - this->addColor("Handle", "Accent"); - this->addColor("Hovered", "Interaction"); - this->addColor("Scrolling", "Action"); - this->addValue("Padding", "Padding"); - this->addValue("HandleSize", 20.f); - this->addValue("MinSize", 20.f); - this->addValue("Rounding", "Rounding"); - } + ScrollBarWidget() = default; // takes whole area void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { @@ -79,28 +69,22 @@ namespace tp { if (mSizeFraction > 1.f) return; // if (!areaParent.isOverlap(getHandle())) return; - tp::RGBA col = this->getColor("Handle"); + tp::RGBA col = mHandleColor; if (mIsScrolling) { - col = this->getColor("Scrolling"); + col = mScrollingColor; } else if (mHovered) { - col = this->getColor("Hovered"); + col = mHoveredColor; } - canvas.rect(area, this->getColor("Default"), this->getValue("Rounding")); + canvas.rect(area, mDefaultColor, mRounding); - canvas.rect(getHandleHandle(), col, this->getValue("Rounding")); + canvas.rect(getHandleHandle(), col, mRounding); } RectF getHandleHandle() const { - auto minSize = this->getValue("MinSize"); - if (mIsScrolling) { - minSize = this->getValue("MinSize") * 2; - } else if (mHovered) { - minSize = this->getValue("MinSize") * 2; - } auto area = getHandle(); - auto sliderSize = tp::clamp(area.w * mSizeFraction, minSize, area.w); + 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 }; } @@ -109,14 +93,28 @@ namespace tp { if (mSizeFraction > 1.f) { return this->mArea; } - return { this->mArea.x, this->mArea.y, this->mArea.z - this->getValue("HandleSize"), this->mArea.w }; + return { this->mArea.x, this->mArea.y, this->mArea.z - mHandleSize, this->mArea.w }; } RectF getHandle() const { - return { this->mArea.x + this->mArea.z - this->getValue("HandleSize") + this->getValue("Padding"), - this->mArea.y + this->getValue("Padding"), - this->getValue("HandleSize") - this->getValue("Padding") * 2, - this->mArea.w - this->getValue("Padding") * 2 }; + return { this->mArea.x + this->mArea.z - mHandleSize + mPadding, + this->mArea.y + mPadding, + mHandleSize - mPadding * 2, + this->mArea.w - mPadding * 2 }; + } + + public: + void updateConfigCache(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: @@ -126,29 +124,29 @@ namespace tp { 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->createConfig("ScrollableWindow"); - this->addColor("Default", "Base"); - this->addValue("Padding", "Padding"); - } - + ScrollableWindow() = default; ~ScrollableWindow() = default; // takes whole area - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; - + void procBody(const Events& events) override { updateContents(); updateContentSize(); - const auto padding = this->getValue("Padding"); + const auto padding = mPadding; mScroller.mSizeFraction = this->mArea.w / mContentSize; mScroller.proc(events, this->mArea, this->mArea); @@ -168,9 +166,7 @@ namespace tp { } } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - + void drawBody(Canvas& canvas) override { mScroller.draw(canvas); canvas.pushClamp(this->mArea); @@ -180,16 +176,29 @@ namespace tp { canvas.popClamp(); } + public: + void updateConfigCache(WidgetManager& wm) override { + wm.setActiveId("ScrollableWidget"); + + mDefaultColor = wm.getColor("Default", "Base"); + mPadding = wm.getNumber("Padding", "Padding"); + + mScroller.updateConfigCache(wm); + + for (auto item : mContents) { + item->updateConfigCache(wm); + } + } + private: void updateContents() { if (mContents.size()) { - const auto padding = this->getValue("Padding"); - const halnf offset = mContents.first()->mArea.y + padding; + const halnf offset = mContents.first()->mArea.y + mPadding; halnf start = 0; for (auto widget : mContents) { widget->mArea.y = start; - start += widget->mArea.w + padding; + start += widget->mArea.w + mPadding; } for (auto widget : mContents) { @@ -201,17 +210,15 @@ namespace tp { void updateContentSize() { mContentSize = 0; if (mContents.size()) { - const auto padding = this->getValue("Padding"); mContentSize = mContents.last()->mArea.y - mContents.first()->mArea.y; mContentSize += mContents.last()->mArea.w; - mContentSize += 2 * padding; + mContentSize += 2 * mPadding; } } void setOffset(const halnf offset) { if (!mContents.size()) return; - const auto padding = this->getValue("Padding"); - auto newOffset = offset - mContents.first()->mArea.y + padding; + auto newOffset = offset - mContents.first()->mArea.y + mPadding; for (auto widget : mContents) { widget->mArea.y += newOffset; } @@ -219,7 +226,11 @@ namespace tp { public: halnf mContentSize = 0; + Buffer*> mContents; ScrollBarWidget mScroller; + + RGBA mDefaultColor; + halnf mPadding = 0; }; } \ No newline at end of file diff --git a/Widgets/public/SliderWidget.hpp b/Widgets/public/SliderWidget.hpp index 098d44e..aa068a8 100644 --- a/Widgets/public/SliderWidget.hpp +++ b/Widgets/public/SliderWidget.hpp @@ -7,23 +7,9 @@ namespace tp { template class SliderWidget : public Widget { public: - SliderWidget() { - this->createConfig("SliderWidget"); - this->addColor("Default", "Base"); - this->addColor("Handle", "Accent"); - this->addColor("Hovered", "Interaction"); - this->addColor("Scrolling", "Action"); - this->addValue("Padding", "Padding"); - this->addValue("HandleSize", 20.f); - this->addValue("MinSize", 20.f); - this->addValue("Rounding", "Rounding"); - } - - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; + SliderWidget() = default; + void procBody(const Events& events) override { if (events.isPressed(InputID::MOUSE1) && this->mArea.isInside(events.getPointer())) { mIsSliding = true; } else if (events.isReleased(InputID::MOUSE1)) { @@ -31,44 +17,50 @@ namespace tp { } if (mIsSliding) { - const auto handleSize = this->getValue("HandleSize"); mFactor = (events.getPointer().x - this->mArea.x - handleSize / 2.f) / (this->mArea.z - handleSize); } mFactor = tp::clamp(mFactor, 0.f, 1.f); } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - canvas.rect(this->mArea, this->getColor("Default"), this->getValue("Rounding")); - canvas.rect(getHandle(), this->getColor("Handle"), this->getValue("Rounding")); + void drawBody(Canvas& canvas) override { + canvas.rect(this->mArea, defaultColor, rounding); + canvas.rect(getHandle(), handleColor, rounding); } RectF getHandle() const { - const auto handle = this->getValue("HandleSize"); - const auto halfHandle = handle / 2.f; - const auto left = this->mArea.x + (this->mArea.z - handle) * mFactor; - return { left, this->mArea.y, handle, this->mArea.w }; + const auto left = this->mArea.x + (this->mArea.z - handleSize) * mFactor; + return { left, this->mArea.y, handleSize, this->mArea.w }; + } + + public: + void updateConfigCache(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: - NamedSliderWidget(const char* name = "Value") { + explicit NamedSliderWidget(const char* name = "Value") { mLabel.mLabel = name; this->mArea = { 0, 0, 100, 30 }; } - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; - + void procBody(const Events& events) override { const auto widthFirst = this->mArea.z * mFactor; const auto widthSecond = this->mArea.z * (1.f - mFactor); @@ -83,12 +75,17 @@ namespace tp { mSlider.proc(events, this->mArea, rec); } - void draw(Canvas& canvas) override { - if (!this->mVisible) return; + void drawBody(Canvas& canvas) override { mSlider.draw(canvas); mLabel.draw(canvas); } + virtual void updateConfigCache(WidgetManager& wm) { + wm.setActiveId("NamedSlider"); + mSlider.updateConfigCache(wm); + mLabel.updateConfigCache(wm); + } + public: SliderWidget mSlider; LabelWidget mLabel; diff --git a/Widgets/public/SplitViewWidget.hpp b/Widgets/public/SplitViewWidget.hpp index 2ee1ad8..bca050c 100644 --- a/Widgets/public/SplitViewWidget.hpp +++ b/Widgets/public/SplitViewWidget.hpp @@ -6,24 +6,9 @@ namespace tp { template class SplitView : public Widget { public: - SplitView() { - this->createConfig("SplitView"); - this->addColor("Handle", "Accent"); - this->addColor("Hovered", "Interaction"); - this->addColor("Resizing", "Action"); - this->addValue("Min", 200.f); - this->addValue("HandleSize", 7.f); - } - - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - - if (!this->mVisible) { - mResizeInProcess = false; - return; - } + SplitView() = default; + void procBody(const Events& events) override { mIsHover = getHandle().isInside(events.getPointer()); if (events.isPressed(InputID::MOUSE1) && mIsHover) { @@ -38,45 +23,55 @@ namespace tp { mFactor += diff / this->mArea.z; } - mFactor = tp::clamp(mFactor, this->getValue("Min") / this->mArea.z, 1 - this->getValue("Min") / this->mArea.z); + mFactor = tp::clamp(mFactor, mMinSize / this->mArea.z, 1 - mMinSize / this->mArea.z); - if (this->getValue("Min") * 2.f > this->mArea.z) { + if (mMinSize * 2.f > this->mArea.z) { mFactor = 0.5f; } } // takes whole area - void draw(Canvas& canvas) override { - if (!this->mVisible) return; - - if (mResizeInProcess) canvas.rect(getHandle(), this->getColor("Resizing")); - else if (mIsHover) canvas.rect(getHandle(), this->getColor("Hovered")); - else canvas.rect(getHandle(), this->getColor("Handle")); + void drawBody(Canvas& canvas) override { + if (mResizeInProcess) canvas.rect(getHandle(), mResizingColor); + else if (mIsHover) canvas.rect(getHandle(), mHoveredColor); + else canvas.rect(getHandle(), mHandleColor); } RectF getFirst() const { - return { - this->mArea.x, this->mArea.y, mFactor * this->mArea.z - this->getValue("HandleSize") / 2.f, this->mArea.w - }; + return { this->mArea.x, this->mArea.y, mFactor * this->mArea.z - mHandleSize / 2.f, this->mArea.w }; } RectF getSecond() const { - return { this->mArea.x + mFactor * this->mArea.z + this->getValue("HandleSize") / 2.f, + return { this->mArea.x + mFactor * this->mArea.z + mHandleSize / 2.f, this->mArea.y, - (1.f - mFactor) * this->mArea.z - this->getValue("HandleSize") / 2.f, + (1.f - mFactor) * this->mArea.z - mHandleSize / 2.f, this->mArea.w }; } RectF getHandle() const { - return { this->mArea.x + mFactor * this->mArea.z - this->getValue("HandleSize") / 2.f, - this->mArea.y, - this->getValue("HandleSize"), - this->mArea.w }; + return { this->mArea.x + mFactor * this->mArea.z - mHandleSize / 2.f, this->mArea.y, mHandleSize, this->mArea.w }; + } + + public: + void updateConfigCache(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); } public: halnf mFactor = 0.7f; bool mResizeInProcess = false; bool mIsHover = false; + + RGBA mHandleColor; + RGBA mHoveredColor; + RGBA mResizingColor; + halnf mMinSize = 0; + halnf mHandleSize = 0; }; } \ No newline at end of file diff --git a/Widgets/public/TextInputWidget.hpp b/Widgets/public/TextInputWidget.hpp index 11089cb..e4f2da4 100644 --- a/Widgets/public/TextInputWidget.hpp +++ b/Widgets/public/TextInputWidget.hpp @@ -9,28 +9,13 @@ namespace tp { template class TextInputWidget : public Widget { public: - TextInputWidget() { - this->createConfig("TextInput"); - this->addColor("Accent", "Accent"); - this->addColor("Base", "Base"); - this->addValue("Rounding", "Rounding"); - this->addColor("Hovered", "Interaction"); - this->addValue("Padding", "Padding"); - } - - void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) override { - this->mArea = aArea; - this->mVisible = areaParent.isOverlap(aArea); - if (!this->mVisible) return; - } - - void draw(Canvas& canvas) override { - if (!this->mVisible) return; + TextInputWidget() = default; + void drawBody(Canvas& canvas) override { nChanged = false; - const auto col = this->getColor("Accent"); - const auto colSel = this->getColor("Hovered"); + 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 }; @@ -38,8 +23,8 @@ namespace tp { 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, this->getValue("Rounding") * 1.5f); - ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { this->getValue("Padding"), this->getValue("Padding") }); + ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, mRounding * 1.5f); + ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { mPadding, mPadding }); // ImGui::PushID((int) alni(this)); ImGui::Begin( @@ -65,11 +50,29 @@ namespace tp { ImGui::PopStyleVar(3); } + public: + void updateConfigCache(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/WidgetBase.hpp b/Widgets/public/WidgetBase.hpp index 3fcd190..6554a25 100644 --- a/Widgets/public/WidgetBase.hpp +++ b/Widgets/public/WidgetBase.hpp @@ -1,46 +1,14 @@ #pragma once -#include "WidgetConfig.hpp" +#include "EventHandler.hpp" +#include "WidgetManager.hpp" namespace tp { template class Widget { public: - Widget() { - this->mArea = { 0, 0, 100, 100 }; - } - - [[nodiscard]] const RGBA& getColor(const std::string& name) const { - const auto& node = cfg->values.get(name); - if (node.type == WidgetConfig::Node::REF) { - return globalCfg->configs.get(node.refGroup).values.get(node.refName).color; - } - return cfg->values.get(name).color; - } - - [[nodiscard]] halnf getValue(const std::string& name) const { - const auto& node = cfg->values.get(name); - if (node.type == WidgetConfig::Node::REF) { - return globalCfg->configs.get(node.refGroup).values.get(node.refName).value; - } - return cfg->values.get(name).value; - } - - void addColor(const std::string& name, const RGBA& val) { cfg->values.put(name, WidgetConfig::Node(val)); } - void addValue(const std::string& name, halnf val) { cfg->values.put(name, WidgetConfig::Node(val)); } - - void addColor(const std::string& name, const std::string& presetName) { - cfg->values.put(name, WidgetConfig::Node(presetName)); - } - void addValue(const std::string& name, const std::string& presetName) { - cfg->values.put(name, WidgetConfig::Node(presetName)); - } - - void createConfig(const std::string& name) { - globalCfg->configs.put(name, {}); - cfg = &globalCfg->configs.get(name); - } + Widget() { this->mArea = { 0, 0, 100, 100 }; } virtual void proc(const Events& events, const tp::RectF& areaParent, const tp::RectF& aArea) { mVisible = areaParent.isOverlap(aArea); @@ -49,18 +17,27 @@ namespace tp { } this->mArea = aArea; + this->mAreaParent = areaParent; + + procBody(events); } virtual void draw(Canvas& canvas) { if (!mVisible) { return; } + + drawBody(canvas); } + virtual void procBody(const Events& events) {} + virtual void drawBody(Canvas& canvas) {} + + virtual void updateConfigCache(WidgetManager& wm) {} + public: - GlobalGUIConfig* globalCfg = gGlobalGUIConfig; - WidgetConfig* cfg = nullptr; RectF mArea; + RectF mAreaParent; bool mVisible = false; }; } \ No newline at end of file diff --git a/Widgets/public/WidgetConfig.hpp b/Widgets/public/WidgetConfig.hpp deleted file mode 100644 index 3455c48..0000000 --- a/Widgets/public/WidgetConfig.hpp +++ /dev/null @@ -1,73 +0,0 @@ -#pragma once - -#include "Animations.hpp" -#include "Map.hpp" -#include "Rect.hpp" - -#include "InputCodes.hpp" - -namespace tp { - - struct WidgetConfig { - struct Node { - enum Type { NONE, VAL, COL, REF }; - - halnf value = 0.f; - RGBA color = {}; - - Type type = NONE; - - std::string refGroup; - std::string refName; - - Node() = default; - - explicit Node(halnf val) { - type = VAL; - value = val; - } - - explicit Node(const RGBA& val) { - type = COL; - color = val; - } - - explicit Node(const std::string& val) { - refGroup = "Presets"; - refName = val; - type = REF; - } - }; - - Map values; - }; - - struct GlobalGUIConfig { - GlobalGUIConfig() { - configs.put("Presets", {}); - auto& presets = configs.get("Presets"); - - presets.values.put("FontSize", WidgetConfig::Node(15.f)); - presets.values.put("FontSizeDim", WidgetConfig::Node(12.f)); - presets.values.put("Rounding", WidgetConfig::Node(5.f)); - presets.values.put("Padding", WidgetConfig::Node(5.f)); - presets.values.put("HandleSize", WidgetConfig::Node(5.f)); - - presets.values.put("Background", WidgetConfig::Node(RGBA{ 0.03f, 0.03f, 0.03f, 1.f })); - presets.values.put("Base", WidgetConfig::Node(RGBA{ 0.07f, 0.07f, 0.07f, 1.f })); - presets.values.put("Accent", WidgetConfig::Node(RGBA{ 0.13f, 0.13f, 0.13f, 1.f })); - presets.values.put("Interaction", WidgetConfig::Node(RGBA{ 0.33f, 0.33f, 0.3f, 1.f })); - presets.values.put("Action", WidgetConfig::Node(RGBA{ 0.44f, 0.44f, 0.4f, 1.f })); - presets.values.put("Front", WidgetConfig::Node(RGBA{ 1.f, 1.f, 1.f, 1.f })); - presets.values.put("FrontDim", WidgetConfig::Node(RGBA{ 0.7f, 0.7f, 0.7f, 1.f })); - } - - Map configs; - - ~GlobalGUIConfig() { - configs.removeAll(); - } - }; - - extern GlobalGUIConfig* gGlobalGUIConfig; -} \ No newline at end of file diff --git a/Widgets/public/WidgetManager.hpp b/Widgets/public/WidgetManager.hpp new file mode 100644 index 0000000..8ef875a --- /dev/null +++ b/Widgets/public/WidgetManager.hpp @@ -0,0 +1,144 @@ +#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