tmp

This revision adds a complex test to the 'TestInterpreter.cpp' file to test functionalities such as classes, variable initializations, loops, conditionals and methods in the interpreter. The token parser has also been updated with a reset method in the 'parser.cpp' file for cleaning up any previous state before parsing a new script. This ensures the parser starts fresh for each new parse request. It also improves the debugging process in 'function.cpp' by printing the description of parser errors. Few completed tasks are removed from the TODO list.

.back/WidBack/CMakeLists.txt

@@ -0,0 +1,21 @@
+project(Widgets)
+
+### ---------------------- Static Library  ---------------------  ###
+file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")
+file(GLOB HEADERS "./public/*.hpp")
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
+target_include_directories(${PROJECT_NAME} PUBLIC ./public/)
+target_link_libraries(${PROJECT_NAME} PUBLIC Math Graphics Imgui)
+
+### -------------------------- Applications  --------------------------  ###
+
+add_executable(SimpleGui examples/SimpleGUI.cpp)
+target_link_libraries(SimpleGui ${PROJECT_NAME} ${GLEW_LIB})
+target_include_directories(SimpleGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
+
+add_executable(ChatGui examples/ChatGUI.cpp)
+target_link_libraries(ChatGui ${PROJECT_NAME} ${GLEW_LIB})
+target_include_directories(ChatGui PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
+
+file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

.back/WidBack/examples/ChatGUI.cpp

@@ -9,7 +9,7 @@ class ExampleGUI : public Application {
 public:
 	ExampleGUI() = default;
 
-	void processFrame(EventHandler* eventHandler) override {
+	void processFrame(EventHandler* eventHandler, halnf delta) override {
 		auto rec = RectF({ 0, 0 }, mWindow->getSize());
 
 		mGui.updateConfigWrapper(mWidgetManager);
@@ -23,7 +23,7 @@ public:
 
 private:
 	WidgetManager mWidgetManager;
-	ComplexWidget<EventHandler, Canvas> mGui;
+	ComplexWidget mGui;
 };
 
 int main() {

.back/WidBack/examples/ChatGUI.hpp

@@ -4,8 +4,7 @@
 
 namespace tp {
 
-	template <typename Events, typename Canvas>
+	class UserWidget : public Widget {
-	class UserWidget : public Widget<Events, Canvas> {
 	public:
 		UserWidget() = default;
 
@@ -39,8 +38,7 @@ namespace tp {
 		halnf mRounding = 0;
 	};
 
-	template <typename Events, typename Canvas>
+	class MessageWidget : public Widget {
-	class MessageWidget : public Widget<Events, Canvas> {
 	public:
 		MessageWidget() = default;
 
@@ -84,8 +82,7 @@ namespace tp {
 		halnf mRounding = 0;
 	};
 
-	template <typename Events, typename Canvas>
+	class LoginWidget : public Widget {
-	class LoginWidget : public Widget<Events, Canvas> {
 	public:
 		explicit LoginWidget() {
 			mPass.mId = "pass";
@@ -120,16 +117,15 @@ namespace tp {
 		}
 
 	public:
-		TextInputWidget<Events, Canvas> mUser;
+		TextInputWidget mUser;
-		TextInputWidget<Events, Canvas> mPass;
+		TextInputWidget mPass;
-		ButtonWidget<Events, Canvas> mButton;
+		ButtonWidget mButton;
 		bool mLogged = false;
 
 		RGBA mBGColor;
 	};
 
-	template <typename Events, typename Canvas>
+	class ActiveChatWidget : public Widget {
-	class ActiveChatWidget : public Widget<Events, Canvas> {
 	public:
 		ActiveChatWidget() {
 			mSend.mLabel.mLabel = "Send";
@@ -172,23 +168,22 @@ namespace tp {
 		}
 
 	public:
-		Buffer<MessageWidget<Events, Canvas>> mMessages;
+		Buffer<MessageWidget> mMessages;
-		ScrollableWindow<Events, Canvas> mHistoryView;
+		ScrollableWindow mHistoryView;
-		TextInputWidget<Events, Canvas> mMessage;
+		TextInputWidget mMessage;
-		ButtonWidget<Events, Canvas> mSend;
+		ButtonWidget mSend;
 
 		RGBA mBGColor;
 		halnf mPadding = 0;
 	};
 
-	template <typename Events, typename Canvas>
+	class ChattingWidget : public DockWidget {
-	class ChattingWidget : public Widget<Events, Canvas> {
 	public:
 		ChattingWidget() {
 			// todo :  fetch code
-			mUsers.append(UserWidget<Events, Canvas>());
+			mUsers.append(UserWidget());
-			mUsers.append(UserWidget<Events, Canvas>());
+			mUsers.append(UserWidget());
-			mUsers.append(UserWidget<Events, Canvas>());
+			mUsers.append(UserWidget());
 
 			mUsers[0].mArea = { 0, 0, 100, 100 };
 			mUsers[1].mArea = { 0, 0, 100, 100 };
@@ -198,9 +193,9 @@ namespace tp {
 				mSideView.addWidget(&message.data());
 			}
 
-			mActive.mMessages.append(MessageWidget<Events, Canvas>());
+			mActive.mMessages.append(MessageWidget());
-			mActive.mMessages.append(MessageWidget<Events, Canvas>());
+			mActive.mMessages.append(MessageWidget());
-			mActive.mMessages.append(MessageWidget<Events, Canvas>());
+			mActive.mMessages.append(MessageWidget());
 
 			mActive.mMessages[0].mArea = { 0, 0, 100, 50 };
 			mActive.mMessages[1].mArea = { 0, 0, 100, 50 };
@@ -210,35 +205,24 @@ namespace tp {
 				mActive.mHistoryView.addWidget(&message.data());
 			}
 
-			this->mChildWidgets.pushBack(&mSideView);
+			addSideWidget(&mSideView, DockWidget::RIGHT);
-			this->mChildWidgets.pushBack(&mActive);
+			setCenterWidget(&mActive);
-			this->mChildWidgets.pushBack(&mSplitView);
 		}
 
-		void eventProcess(const Events& events) override {
-			mSplitView.setArea(this->mArea);
-			mSideView.setArea(mSplitView.getSecond());
-			mActive.setArea(mSplitView.getFirst());
-		}
-
-		void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, mBGColor); }
-
 		void eventUpdateConfiguration(WidgetManager& wm) override {
 			wm.setActiveId("ChattingWidget");
 			mBGColor = wm.getColor("Back", "Background");
 		}
 
 	public:
-		Buffer<UserWidget<Events, Canvas>> mUsers;
+		Buffer<UserWidget> mUsers;
-		ScrollableWindow<Events, Canvas> mSideView;
+		ScrollableWindow mSideView;
-		ActiveChatWidget<Events, Canvas> mActive;
+		ActiveChatWidget mActive;
-		SplitView<Events, Canvas> mSplitView;
 
 		RGBA mBGColor;
 	};
 
-	template <typename Events, typename Canvas>
+	class ComplexWidget : public Widget {
-	class ComplexWidget : public Widget<Events, Canvas> {
 	public:
 		ComplexWidget() {
 			this->mChildWidgets.pushBack(&mLogin);
@@ -264,8 +248,8 @@ namespace tp {
 
 	private:
 		bool mLogged = false;
-		LoginWidget<Events, Canvas> mLogin;
+		LoginWidget mLogin;
-		ChattingWidget<Events, Canvas> mChatting;
+		ChattingWidget mChatting;
 
 		RGBA mBGColor;
 	};

.back/WidBack/examples/SimpleGUI.cpp

@@ -9,10 +9,10 @@ using namespace tp;
 class SimpleGUI : public Application {
 public:
 	SimpleGUI() {
-
+		// mGui.mPreview = true;
 	}
 
-	void processFrame(EventHandler* eventHandler) override {
+	void processFrame(EventHandler* eventHandler, halnf) override {
 		const auto rec = RectF({ 0, 0 }, mWindow->getSize());
 
 		mGui.setArea(rec);
@@ -28,7 +28,8 @@ public:
 private:
 	WidgetManager mWidgetManager;
 
-	SimpleWidget2<EventHandler, Canvas> mGui;
+	// DockSpaceWidget mGui;
+	SimpleWidget3 mGui;
 };
 
 int main() {

.back/WidBack/examples/SimpleGUI.hpp

@@ -0,0 +1,69 @@
+#include "Widgets.hpp"
+
+namespace tp {
+
+	class SimpleWidget : public CollapsableMenu {
+	public:
+		SimpleWidget() {
+			this->addWidgetToMenu(&mSlider);
+
+			this->addWidgetToMenu(&mInMenuButton1);
+			this->addWidgetToMenu(&mInMenuButton2);
+
+			this->addWidgetToMenu(&mLabel);
+
+			mInMenuButton1.mLabel.mLabel = "Button1";
+
+			mInMenuButton1.mCallback = []() {
+				printf("asd\n");
+			};
+
+			mInMenuButton2.mLabel.mLabel = "Button2";
+		}
+
+	private:
+		ButtonWidget mInMenuButton1;
+		ButtonWidget mInMenuButton2;
+
+		LabelWidget mLabel;
+		NamedSliderWidget mSlider;
+	};
+
+	class SimpleWidget3 : public WorkspaceWidget  {
+	public:
+		SimpleWidget3() {
+
+			mDockSpace.addSideWidget(&mButtons[0], DockWidget::BOTTOM);
+			mDockSpace.addSideWidget(&mButtons[1], DockWidget::RIGHT);
+
+			mDockSpace.removeSideWidget(DockWidget::BOTTOM);
+
+			mDockSpace.addSideWidget(&mButtons[0], DockWidget::TOP);
+			mDockSpace.addSideWidget(&mButtons[2], DockWidget::LEFT);
+
+			mDockSpace.removeSideWidget(DockWidget::TOP);
+
+			mDockSpace.addSideWidget(&mButtons[0], DockWidget::BOTTOM);
+
+			mDockSpace.addSideWidget(&mButtons[3], DockWidget::TOP);
+			mDockSpace.setCenterWidget(&mButtons[4]);
+
+			/*
+			mButtons[4].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::BOTTOM); };
+			mButtons[0].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::TOP); };
+			mButtons[2].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::RIGHT); };
+			mButtons[3].mCallback = [&]() { mDockSpace.toggleHiddenState(DockSpaceWidget::LEFT); };
+			*/
+
+			mButtons[0].addWidgetToMenu(&mWidget);
+			mButtons[1].addWidgetToMenu(&mWidget2);
+		}
+
+	private:
+		FloatingWidget mButtons[5];
+
+		SimpleWidget mWidget;
+		SimpleWidget mWidget2;
+		SimpleWidget mWidget3;
+	};
+}

.back/WidBack/private/ButtonWidget.cpp

@@ -0,0 +1,46 @@
+
+#include "ButtonWidget.hpp"
+
+using namespace tp;
+
+ButtonWidget::ButtonWidget() {
+	this->setArea({ 0, 0, 100, 30 });
+	this->mChildWidgets.pushBack(&mLabel);
+}
+
+ButtonWidget::ButtonWidget(const std::string& label, const tp::RectF& aArea) {
+	this->setArea(aArea);
+	mLabel.mLabel = label;
+	this->mChildWidgets.pushBack(&mLabel);
+}
+
+bool ButtonWidget::isFired() { return this->isReleased(); }
+
+void ButtonWidget::eventProcess(const Events&) {
+	mLabel.setArea(this->mArea);
+
+	if (isFired()) {
+		mCallback();
+	}
+}
+
+void ButtonWidget::eventDraw(Canvas& canvas) {
+	if (this->isHolding()) {
+		canvas.rect(this->mArea, pressedColor, rounding);
+	} else if (this->isFocus()) {
+		canvas.rect(this->mArea, hoveredColor, rounding);
+	} else {
+		canvas.rect(this->mArea, accentColor, rounding);
+	}
+}
+
+void ButtonWidget::setLabel(const std::string& string) { mLabel.mLabel = string; }
+
+void ButtonWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("Button");
+
+	pressedColor = wm.getColor("Pressed", "Action");
+	hoveredColor = wm.getColor("Hovered", "Interaction");
+	accentColor = wm.getColor("Default", "Accent");
+	rounding = wm.getNumber("Rounding", "Rounding");
+}

.back/WidBack/private/CollapsableMenu.cpp

@@ -0,0 +1,96 @@
+
+#include "CollapsableMenu.hpp"
+
+using namespace tp;
+
+CollapsableMenu::CollapsableMenu() {
+	this->mChildWidgets.pushBack(&mHeader);
+	this->mChildWidgets.pushBack(&mBody);
+}
+
+void CollapsableMenu::eventProcess(const Events&) {
+	if (mHeader.isReleased()) {
+		toggleCollapsed();
+	}
+
+	updateGeometry();
+}
+
+void CollapsableMenu::eventDraw(Canvas& canvas) {
+	if (mBorders) {
+		canvas.rect(this->mArea, mBorderColor, rounding);
+		canvas.rect(this->mArea.shrink(mBorderSize), mMenuColor, rounding);
+	} else {
+		canvas.rect(this->mArea, mMenuColor, rounding);
+	}
+}
+
+void CollapsableMenu::addWidgetToMenu(Widget* widget) {
+	mBody.addWidget(widget);
+
+	EventHandler ev;
+	mBody.procWrapper(ev, this->mArea);
+	updateGeometry();
+}
+
+void CollapsableMenu::setLabel(const std::string& string) { mHeader.mLabel = string; }
+
+void CollapsableMenu::toggleCollapsed() { setCollapsed(!getCollapsed()); }
+
+void CollapsableMenu::setCollapsed(bool collapsed) {
+	if (mLocked) return;
+	if (collapsed && !mCollapsed) mPrevHeight = this->mArea.size.y;
+	if (!collapsed && mCollapsed) this->mArea.size.y = mPrevHeight;
+	mCollapsed = collapsed;
+}
+
+bool CollapsableMenu::getCollapsed() const { return mCollapsed; }
+
+void CollapsableMenu::updateGeometry() {
+	mHeader.setArea(getHeaderRect());
+
+	mBody.mEnable = !mCollapsed;
+
+	if (mCollapsed) {
+		this->mArea.size.y = headerHeight;
+	} else {
+		if (mAdjustHeight) {
+			this->mArea.size.y = headerHeight + getBodyRect().size.y + mPadding * 2;
+		}
+
+		mBody.setArea(getBodyRect());
+	}
+}
+
+RectF CollapsableMenu::getHeaderRect() {
+	RectF out = { this->mArea.pos, { this->mArea.size.x, headerHeight } };
+	if (mBorders) out = out.shrink(mPadding);
+	return out;
+}
+
+RectF CollapsableMenu::getBodyRect() {
+	RectF out = { Vec2F{ this->mArea.pos.x, this->mArea.pos.y + headerHeight },
+								Vec2F{ this->mArea.size.x, this->mArea.size.y - headerHeight - mPadding } };
+
+	out.size.y -= mBorderSize * 2;
+
+	if (mAdjustHeight) out.size.y = mBody.getContentSize();
+
+	if (mBody.getContentSize() && mBorders) {
+		out = out.shrink(mPadding);
+		out.size.y += mPadding * 2 + 1;
+	}
+
+	return out;
+}
+
+void CollapsableMenu::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("CollapsableMenu");
+
+	headerHeight = wm.getNumber("HeaderHeight", 35);
+	mMenuColor = wm.getColor("MenuColor", RGBA(0, 0, 0, 1.f));
+	rounding = wm.getNumber("Rounding", "Rounding");
+	mBorderColor = wm.getColor("BorderColor", RGBA(0.16, 0.16, 0.16, 1.f));
+	mBorderSize = wm.getNumber("BorderSize", 2.f);
+	mPadding = wm.getNumber("Padding", "Padding");
+}

.back/WidBack/private/FloatSpaceWidget.cpp

@@ -0,0 +1,47 @@
+#include "FloatingLayoutWidget.hpp"
+
+using namespace tp;
+
+FloatingLayoutWidget::FloatingLayoutWidget()  = default;
+
+void FloatingLayoutWidget::eventProcess(const tp::Events& events) {
+	updateActiveWindow(events);
+}
+
+void FloatingLayoutWidget::updateActiveWindow(const tp::Events& events) {
+	mIsPassThrough = true;
+	for (auto childNode = this->mChildWidgets.firstNode(); childNode; childNode = childNode->next) {
+		auto child = childNode->data;
+		if (child->mArea.isInside(events.getPointer())) {
+			mIsPassThrough = false;
+		}
+	}
+
+	if (events.isPressed(InputID::MOUSE1)) {
+
+		Widget* activeChild = nullptr;
+
+		for (auto childNode = this->mChildWidgets.firstNode(); childNode; childNode = childNode->next) {
+			auto child = childNode->data;
+
+			if (child->mArea.isInside(events.getPointer())) {
+
+				mChildWidgets.detach(childNode);
+				mChildWidgets.pushFront(childNode);
+
+				child->mHandlesEvents = true;
+				activeChild = child;
+				break;
+			}
+		}
+
+		if (activeChild) {
+			for (auto child : this->mChildWidgets) {
+				if (activeChild != child.data() && !child->mIsDocked) child->mHandlesEvents = false;
+			}
+		}
+
+	}
+}
+
+bool FloatingLayoutWidget::handlesEvent() const { return !mIsPassThrough; }

.back/WidBack/private/FloatingWidget.cpp

@@ -0,0 +1,89 @@
+
+#include "FloatingWidget.hpp"
+
+using namespace tp;
+
+FloatingWidget::FloatingWidget() {
+	this->mArea = { 0, 0, 300, 300 };
+	this->mAdjustHeight = false;
+}
+
+void FloatingWidget::eventProcess(const Events& events) {
+	mActionStartRelativePos = events.getPointerPrev() - this->mArea.pos;
+
+	checkFloating(events);
+	if (mResizable) checkResizing(events);
+
+	CollapsableMenu::eventProcess(events);
+}
+
+void FloatingWidget::eventDraw(Canvas& canvas) {
+	CollapsableMenu::eventDraw(canvas);
+
+	if (!this->getCollapsed() && mResizable) {
+		auto rect = getResizeHandle();
+		canvas.rect(rect, mResizeHandleColor, 0);
+		canvas.circle(rect.pos - this->mBorderSize, rect.w, this->mMenuColor);
+	}
+}
+
+void FloatingWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	CollapsableMenu::eventUpdateConfiguration(wm);
+
+	wm.setActiveId("FloatingWidget");
+
+	mResizeHandleSize = wm.getNumber("ResizeHandleSize", 15);
+	mResizeHandleColor = wm.getColor("ResizeHandleColor", RGBA(0.16, 0.16, 0.16, 1.f));
+}
+
+void FloatingWidget::checkFloating(const Events& events) {
+	mDropped = false;
+
+	if (this->mHeader.isHolding() && events.getPointerDelta().length2() > 4) {
+		mFloating = true;
+	}
+
+	if (mFloating && this->mHeader.isReleased()) {
+		mFloating = false;
+		this->mHeader.clearEvents();
+		mDropped = true;
+	}
+
+	if (mFloating) {
+		auto relativePos = events.getPointer() - this->mArea.pos;
+		this->mArea.pos += relativePos - mActionStartRelativePos;
+	}
+}
+
+void FloatingWidget::checkResizing(const Events& events) {
+	if (this->getCollapsed()) return;
+
+	if (events.isPressed(InputID::MOUSE1) && getResizeHandle().isInside(events.getPointer())) {
+		mResizing = true;
+	}
+
+	if (events.isReleased(InputID::MOUSE1)) {
+		mResizing = false;
+	}
+
+	if (mResizing) {
+		auto relativePos = events.getPointer() - this->mArea.pos;
+		this->mArea.size += relativePos - mActionStartRelativePos;
+	}
+
+	if (!this->mCollapsed) {
+		this->mArea.size.clamp(mMinSize, { FLT_MAX, FLT_MAX });
+	}
+}
+
+RectF FloatingWidget::getResizeHandle() {
+	auto size = Vec2F(mResizeHandleSize);
+	auto pos = this->mArea.pos + this->mArea.size - size;
+	return { pos, size };
+}
+
+bool FloatingWidget::isFloating() const { return mFloating; }
+
+void FloatingWidget::stopFloating() {
+	mFloating = false;
+}

.back/WidBack/private/GridLayoutWidget.cpp

@@ -0,0 +1,328 @@
+#include "GridLayoutWidget.hpp"
+
+using namespace tp;
+
+DockWidget::DockWidget() {
+	mSideWidgets[0].side = LEFT;
+	mSideWidgets[1].side = TOP;
+	mSideWidgets[2].side = RIGHT;
+	mSideWidgets[3].side = BOTTOM;
+}
+
+void DockWidget::addSideWidget(Widget* widget, Side side) {
+	if (sideExists(side)) return;
+
+	auto& sideWidget = mSideWidgets[side];
+	sideWidget.widget = widget;
+	for (auto& order : mSideWidgets) {
+		if (order.order == -1) {
+			order.order = side;
+			break;
+		}
+	}
+
+	sideWidget.hidden = false;
+
+	mChildWidgets.pushBack(widget);
+	widget->mIsDocked = true;
+}
+
+void DockWidget::removeSideWidget(Side side) {
+	if (!sideExists(side)) return;
+
+	bool removed = false;
+	for (ualni i = 0; i < 3; i++) {
+		if (mSideWidgets[i].order == side) {
+			removed = true;
+		}
+		if (removed) {
+			swapV(mSideWidgets[i].order, mSideWidgets[i + 1].order);
+		}
+	}
+	mSideWidgets[3].order = -1;
+
+	auto widget = mSideWidgets[side].widget;
+	widget->mIsDocked = false;
+	mChildWidgets.removeNode(mChildWidgets.find(widget));
+
+	mSideWidgets[side].widget = nullptr;
+}
+
+void DockWidget::setCenterWidget(Widget* widget) {
+	mChildWidgets.removeNode(mChildWidgets.find(mCenterWidget));
+	mCenterWidget = widget;
+	mChildWidgets.pushBack(mCenterWidget);
+}
+
+void DockWidget::toggleHiddenState(DockWidget::Side side) {
+	if (!sideExists(side)) return;
+	mSideWidgets[side].hidden = !mSideWidgets[side].hidden;
+}
+
+void DockWidget::eventProcess(const tp::Events& events) {
+	calculateSideAreas();
+	calculateResizeHandles();
+	// calculateHeaderAreas();
+
+	handlePreview(events);
+	handleResizeEvents(events);
+
+	updateChildSideWidgets();
+}
+
+void DockWidget::eventDraw(Canvas& canvas) {
+	canvas.rect(this->mArea, mBackgroundColor, 0);
+
+	for (auto& sideWidget : mSideWidgets) {
+		if (!isSideVisible(sideWidget.side)) continue;
+		auto& handle = sideWidget.resizeHandle;
+		if (handle.active) {
+			canvas.rect(handle.area.shrink(mPadding / 1.5f), mResizeHandleColorActive, 0);
+		} else if (handle.hover) {
+			canvas.rect(handle.area.shrink(mPadding / 1.5f), mResizeHandleColorHovered, 0);
+		}
+	}
+
+	for (auto& sideWidget : mSideWidgets) {
+		if (!isSideVisible(sideWidget.side)) continue;
+		canvas.rect(sideWidget.headerArea, mResizeHandleColorActive, 0);
+	}
+}
+
+void DockWidget::eventDrawOver(Canvas& canvas) {
+	if (!mPreview) return;
+
+	if (mPreviewSide != NONE) canvas.rect(mPreviewArea.shrink(mPadding * 2), mPreviewColor, mRounding);
+
+	for (auto& sideWidget : mSideWidgets) {
+		if (sideWidget.widget) continue;
+		canvas.rect(sideWidget.previewHandleArea, mPreviewColor, mRounding);
+	}
+}
+
+void DockWidget::calculateSideAreas() {
+	auto startArea = this->mArea;
+	for (auto& sideWidget : mSideWidgets) {
+		const auto side = sideWidget.order;
+
+		if (side == -1) break;
+		if (!isSideVisible(Side(side))) continue;
+
+		bool vertical = side == TOP || side == BOTTOM;
+		bool opposite = side == BOTTOM || side == RIGHT;
+
+		auto& sideSize = mSideWidgets[side].absoluteSize;
+
+		auto factor = sideSize / startArea.size[vertical];
+		if (opposite) factor = factor * -1 + 1;
+		auto& area = mSideWidgets[side].area;
+
+		if (!vertical) {
+			const auto first = startArea.splitByFactorHL(factor);
+			const auto second = startArea.splitByFactorHR(factor);
+			area = side == LEFT ? first : second;
+			startArea = side == LEFT ? second : first;
+		} else {
+			const auto first = startArea.splitByFactorVT(factor);
+			const auto second = startArea.splitByFactorVB(factor);
+			area = side == TOP ? first : second;
+			startArea = side == TOP ? second : first;
+		}
+
+		area = area.shrink(mPadding);
+	}
+
+	mCenterArea = startArea.shrink(mPadding);
+}
+
+void DockWidget::calculateResizeHandles() {
+	RectF rec;
+
+	if (isSideVisible(LEFT)) {
+		auto& side = mSideWidgets[LEFT];
+		rec = { side.area.p4(), { mPadding * 2, side.area.size.y } };
+		side.resizeHandle = { rec, 0, mCenterArea.p3().x };
+	}
+	if (isSideVisible(RIGHT)) {
+		auto& side = mSideWidgets[RIGHT];
+		rec = { side.area.p1(), { mPadding * 2, side.area.size.y } };
+		rec.x -= mPadding * 2;
+		side.resizeHandle = { rec, 0, (this->mArea.p3() - mCenterArea.p1()).x };
+	}
+	if (isSideVisible(TOP)) {
+		auto& side = mSideWidgets[TOP];
+		rec = { side.area.p2(), { side.area.size.x, mPadding * 2 } };
+		side.resizeHandle = { rec, 0, mCenterArea.p2().y };
+	}
+	if (isSideVisible(BOTTOM)) {
+		auto& side = mSideWidgets[BOTTOM];
+		rec = { side.area.p1(), { side.area.size.x, mPadding * 2 } };
+		rec.y -= mPadding * 2;
+		side.resizeHandle = { rec, 0, (this->mArea.p3() - mCenterArea.p1()).y };
+	}
+}
+
+void DockWidget::handleResizeEvents(const Events& events) {
+	for (auto& sideWidget : mSideWidgets) {
+		auto& sideSize = sideWidget.absoluteSize;
+		auto& resizeHandle = sideWidget.resizeHandle;
+		if (resizeHandle.end < mSideSizePadding * 2) {
+			sideSize = resizeHandle.end / 2.f;
+		} else {
+			sideSize = clamp(sideSize, resizeHandle.start + mSideSizePadding, resizeHandle.end - mSideSizePadding);
+		}
+	}
+
+	for (auto& sideWidget : mSideWidgets) {
+		sideWidget.resizeHandle.hover = false;
+		if (sideWidget.resizeHandle.area.isInside(events.getPointerPrev())) {
+			sideWidget.resizeHandle.hover = true;
+		}
+	}
+
+	for (auto& sideWidget : mSideWidgets) {
+		sideWidget.resizeHandle.active = false;
+	}
+
+	if (mPreview) return;
+
+	auto resizeSideWidget = [&events](SideWidgetData& sideWidget, Vec2F deltaVec) {
+		halnf delta = deltaVec[(sideWidget.side == TOP || sideWidget.side == BOTTOM)];
+		if (sideWidget.side == BOTTOM || sideWidget.side == RIGHT) delta *= -1;
+		sideWidget.absoluteSize += delta;
+		sideWidget.resizeHandle.active = true;
+	};
+
+	if (events.isDown(InputID::MOUSE1)) {
+		for (auto& sideWidget : mSideWidgets) {
+			if (sideWidget.resizeHandle.area.isInside(events.getPointerPrev())) {
+				resizeSideWidget(sideWidget, events.getPointerDelta());
+			}
+		}
+	}
+
+	if (events.isDown(InputID::LEFT_ALT)) {
+		const auto pointer = events.getPointerPrev();
+		if (!mCenterArea.isInside(pointer)) return;
+
+		if (events.isPressed(InputID::MOUSE1)) {
+			for (auto i : { 0, 1 }) {
+				const auto step = mCenterArea.size[i] / 3.f;
+				const auto rec1 = mCenterArea.pos[i];
+				const auto pos = pointer[i];
+				if (pos > rec1 && pos < rec1 + step) resizeType[i] = 0;
+				if (pos > rec1 + step && pos < rec1 + step * 2) resizeType[i] = 1;
+				if (pos > rec1 + step * 2) resizeType[i] = 2;
+			}
+		} else if (events.isDown(InputID::MOUSE1)) {
+			const auto deltaVec = events.getPointerDelta();
+
+			if (resizeType[0] == 0) resizeSideWidget(mSideWidgets[LEFT], deltaVec);
+			if (resizeType[1] == 0) resizeSideWidget(mSideWidgets[TOP], deltaVec);
+			if (resizeType[0] == 2) resizeSideWidget(mSideWidgets[RIGHT], deltaVec);
+			if (resizeType[1] == 2) resizeSideWidget(mSideWidgets[BOTTOM], deltaVec);
+		}
+	}
+}
+
+void DockWidget::updateChildSideWidgets() {
+	// Update Child Widgets
+	{
+		for (ualni i = 0; i < 4; i++) {
+			if (!sideExists(Side(i))) continue;
+			auto widget = mSideWidgets[i].widget;
+
+			if (!isSideVisible(Side(i))) {
+				widget->mEnable = false;
+			} else {
+				widget->setArea(mSideWidgets[i].area);
+				widget->mEnable = true;
+			}
+		}
+
+		if (mCenterWidget) mCenterWidget->setArea(mCenterArea);
+	}
+
+	// update depth order
+	/*
+		if (mChildWidgets.size() > 1) {
+			for (auto sideChild : mSideWidgets) {
+				if (!sideChild) continue;
+
+		for (auto childNode = mChildWidgets.firstNode(); childNode; childNode = childNode->next) {
+			if (childNode->data == sideChild) {
+				mChildWidgets.detach(childNode);
+				mChildWidgets.pushBack(childNode);
+				break;
+			}
+		}
+	}
+	}
+	*/
+}
+
+void DockWidget::calculateHeaderAreas() {
+	for (ualni i = 0; i < 4; i++) {
+		if (!isSideVisible(Side(i))) continue;
+		auto& area = mSideWidgets[i].area;
+		const auto factor = mHeaderSize / area.size.y;
+		mSideWidgets[i].headerArea = area.splitByFactorVT(factor);
+		area = area.splitByFactorVB(factor);
+
+		mSideWidgets[i].headerArea.size.y -= mPadding;
+	}
+}
+
+bool DockWidget::isSideVisible(DockWidget::Side side) {
+	return sideExists(side) && !mSideWidgets[side].hidden;
+}
+
+bool DockWidget::sideExists(DockWidget::Side side) { return mSideWidgets[side].widget; }
+
+ualni DockWidget::getVisibleSidesSize() {
+	ualni out = 0;
+	for (ualni i = 0; i < 4; i++) {
+		if (isSideVisible(Side(i))) out++;
+	}
+	return out;
+}
+
+DockWidget::Side DockWidget::getPreviewSide() { return mPreviewSide; }
+
+void DockWidget::handlePreview(const Events& events) {
+	if (!mPreview) {
+		mPreviewSide = NONE;
+		return;
+	}
+
+	const halnf factor = 0.3;
+	const halnf handleFactor = 0.1;
+
+	const auto handleSize = min(mCenterArea.size.x, mCenterArea.size.y) * handleFactor;
+
+	for (auto& sideWidget : mSideWidgets) {
+		if (sideWidget.widget) continue;
+
+		switch (sideWidget.side) {
+			case TOP: sideWidget.area = mCenterArea.splitByFactorVT(factor); break;
+			case BOTTOM: sideWidget.area = mCenterArea.splitByFactorVB(1 - factor); break;
+			case LEFT: sideWidget.area = mCenterArea.splitByFactorHL(factor); break;
+			case RIGHT: sideWidget.area = mCenterArea.splitByFactorHR(1 - factor); break;
+			default: break;
+		}
+
+		sideWidget.area = sideWidget.area.shrink(mPadding * 2);
+		sideWidget.previewHandleArea = sideWidget.area.getSizedFromCenter({ handleSize, handleSize });
+	}
+
+	mPreviewArea = {};
+	mPreviewSide = NONE;
+	for (auto& sideWidget : mSideWidgets) {
+		if (sideWidget.widget) continue;
+		
+		if (sideWidget.previewHandleArea.isInside(events.getPointer())) {
+			mPreviewArea = sideWidget.area;
+			mPreviewSide = sideWidget.side;
+		}
+	}
+}

.back/WidBack/private/LabelWidget.cpp

@@ -0,0 +1,17 @@
+#include "LabelWidget.hpp"
+
+using namespace tp;
+
+LabelWidget::LabelWidget() { this->mArea = { 0, 0, 100, 30 }; }
+
+void LabelWidget::eventDraw(Canvas& canvas) {
+	canvas.text(mLabel.c_str(), this->mArea, fontSize, Canvas::LC, padding, fontColor);
+}
+
+void LabelWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("Label");
+
+	fontSize = wm.getNumber("Size", "FontSize");
+	padding = wm.getNumber("Padding", "Padding");
+	fontColor = wm.getColor("Default", "Front");
+}

.back/WidBack/private/ScrollableWidget.cpp

@@ -0,0 +1,179 @@
+#include "ScrollableWidget.hpp"
+#include "../../WidgetsNew/public/widgets/ScrollableWidget.hpp"
+
+using namespace tp;
+
+ScrollBarWidget::ScrollBarWidget() = default;
+
+void ScrollBarWidget::eventProcess(const Events& events) {
+	auto area = getHandle();
+	mHovered = getHandleHandle().isInside(events.getPointer());
+
+	if (mSizeFraction > 1.f) {
+		mPositionFraction = 0;
+		return;
+	}
+
+	if (events.getScrollY() != 0 && mArea.isInside(events.getPointer())) {
+		auto offset = events.getScrollY() < 0 ? 1.0f : -1.0f;
+		mPositionFraction += mSizeFraction * offset * 0.3f;
+		mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction);
+	}
+
+	if (events.isPressed(InputID::MOUSE1) && area.isInside(events.getPointer())) {
+		mIsScrolling = true;
+	} else if (events.isReleased(InputID::MOUSE1)) {
+		mIsScrolling = false;
+	}
+
+	if (mIsScrolling) {
+		tp::halnf pos = events.getPointer().y;
+		pos = (pos - area.y - mSizeFraction * area.w / 2.f) / area.w;
+		mPositionFraction = tp::clamp(pos, 0.f, 1.f - mSizeFraction);
+	}
+
+	mPositionFraction = tp::clamp(mPositionFraction, 0.f, 1.f - mSizeFraction);
+}
+
+void ScrollBarWidget::eventDraw(Canvas& canvas) {
+	auto area = getHandle();
+
+	if (mSizeFraction > 1.f) return;
+	// if (!areaParent.isOverlap(getHandle())) return;
+
+	tp::RGBA col = mHandleColor;
+
+	if (mIsScrolling) {
+		col = mScrollingColor;
+	} else if (mHovered) {
+		col = mHoveredColor;
+	}
+
+	canvas.rect(area, mDefaultColor, mRounding);
+	canvas.rect(getHandleHandle(), col, mRounding);
+}
+
+RectF ScrollBarWidget::getHandleHandle() const {
+	auto area = getHandle();
+	auto sliderSize = tp::clamp(area.w * mSizeFraction, mMinSize * 2, area.w);
+	auto diffSize = sliderSize - area.w * mSizeFraction;
+	return { area.x, area.y + (area.w - diffSize) * mPositionFraction, area.z, sliderSize };
+}
+
+RectF ScrollBarWidget::getViewport() const {
+	if (mSizeFraction > 1.f) {
+		return this->mArea;
+	}
+	return { this->mArea.x, this->mArea.y, this->mArea.z - mHandleSize, this->mArea.w };
+}
+
+RectF ScrollBarWidget::getHandle() const {
+	return { this->mArea.x + this->mArea.z - mHandleSize + mPadding,
+					 this->mArea.y + mPadding,
+					 mHandleSize - mPadding * 2,
+					 this->mArea.w - mPadding * 2 };
+}
+
+void ScrollBarWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("Scrollbar");
+
+	mDefaultColor = wm.getColor("Default", "Base");
+	mHandleColor = wm.getColor("Handle", "Accent");
+	mHoveredColor = wm.getColor("Hovered", "Interaction");
+	mScrollingColor = wm.getColor("Scrolling", "Action");
+	mPadding = wm.getNumber("Padding", "Padding");
+	mHandleSize = wm.getNumber("HandleSize", 20.f);
+	mMinSize = wm.getNumber("MinSize", 20.f);
+	mRounding = wm.getNumber("Rounding", "Rounding");
+}
+
+ScrollableWindow::ScrollableWindow() {
+	this->mChildWidgets.pushBack(&mScroller);
+	this->mChildWidgets.pushBack(&mContentWidget);
+}
+
+ScrollableWindow::~ScrollableWindow() = default;
+
+void ScrollableWindow::eventProcess(const Events& events) {
+	List<Widget*>& content = mContentWidget.mChildWidgets;
+
+	// to account all changed geometry of child widgets
+	for (auto widget : content) {
+		widget->procWrapper(events, mContentWidget.mVisibleArea);
+	}
+
+	updateContents(content);
+	updateContentSize(content);
+
+	const auto padding = mPadding;
+
+	mScroller.mSizeFraction = mContentWidget.mArea.w / mContentSize;
+	mScroller.setArea(this->mArea);
+	mContentWidget.setArea(mScroller.getViewport());
+
+	if (mScroller.mSizeFraction > 1.f) {
+		setOffset(content, 0);
+	} else {
+		setOffset(content, (-mScroller.mPositionFraction) * mContentSize);
+	}
+
+	for (auto widget : content) {
+		widget->setArea({ mContentWidget.mArea.x + padding,
+											mContentWidget.mArea.y + widget->mArea.y,
+											mScroller.getViewport().z - padding * 2,
+											widget->mArea.w });
+	}
+}
+
+void ScrollableWindow::addWidget(Widget* widget) {
+	mContentWidget.mChildWidgets.pushBack(widget);
+
+	List<Widget*>& content = mContentWidget.mChildWidgets;
+	updateContents(content);
+	updateContentSize(content);
+}
+
+void ScrollableWindow::clearContent() { mContentWidget.mChildWidgets.removeAll(); }
+List<Widget*>& ScrollableWindow::getContent() { return mContentWidget.mChildWidgets; }
+
+void ScrollableWindow::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("ScrollableWidget");
+	mPadding = wm.getNumber("Padding", "Padding");
+}
+
+[[nodiscard]] halnf ScrollableWindow::getContentSize() const { return mContentSize; }
+
+void ScrollableWindow::updateContents(List<Widget*>& contentWidgets) {
+	if (!contentWidgets.size()) {
+		return;
+	}
+
+	const halnf offset = contentWidgets.first()->mArea.y + mPadding;
+
+	halnf start = 0;
+	for (auto widget : contentWidgets) {
+		widget->mArea.y = start;
+		start += widget->mArea.w + mPadding;
+	}
+
+	for (auto widget : contentWidgets) {
+		widget->mArea.y += offset;
+	}
+}
+
+void ScrollableWindow::updateContentSize(List<Widget*>& contentWidgets) {
+	mContentSize = 0;
+	if (contentWidgets.size()) {
+		mContentSize = contentWidgets.last()->mArea.y - contentWidgets.first()->mArea.y;
+		mContentSize += contentWidgets.last()->mArea.w;
+		mContentSize += 2 * mPadding;
+	}
+}
+
+void ScrollableWindow::setOffset(List<Widget*>& contentWidgets, const halnf offset) {
+	if (!contentWidgets.size()) return;
+	auto newOffset = offset - contentWidgets.first()->mArea.y + mPadding;
+	for (auto widget : contentWidgets) {
+		widget->mArea.y += newOffset;
+	}
+}

.back/WidBack/private/SliderWidget.cpp

@@ -0,0 +1,62 @@
+#include "SliderWidget.hpp"
+
+using namespace tp;
+
+SliderWidget::SliderWidget() = default;
+
+void SliderWidget::eventProcess(const Events& events) {
+	if (this->isPressed()) {
+		mIsSliding = true;
+	} else if (events.isReleased(InputID::MOUSE1)) {
+		mIsSliding = false;
+	}
+
+	if (mIsSliding) {
+		mFactor = (events.getPointer().x - this->mArea.x - handleSize / 2.f) / (this->mArea.z - handleSize);
+	}
+
+	mFactor = tp::clamp(mFactor, 0.f, 1.f);
+}
+
+void SliderWidget::eventDraw(Canvas& canvas) {
+	canvas.rect(this->mArea, handleColor, rounding);
+	canvas.rect(this->mArea.shrink(borderSize), defaultColor, rounding);
+	canvas.rect(getHandle(), handleColor, rounding);
+}
+
+RectF SliderWidget::getHandle() const {
+	const auto left = this->mArea.x + (this->mArea.z - handleSize) * mFactor;
+	return { left, this->mArea.y, handleSize, this->mArea.w };
+}
+
+void SliderWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("Slider");
+	defaultColor = wm.getColor("Default", "Base");
+	handleColor = wm.getColor("Handle", RGBA(0.3f, 0.3f, 0.3f, 1.f));
+	borderSize = wm.getNumber("BorderSize", 2);
+	handleSize = wm.getNumber("HandleSize", 15.f);
+	rounding = wm.getNumber("Rounding", "Rounding");
+}
+
+NamedSliderWidget::NamedSliderWidget(const char* name) {
+	mLabel.mLabel = name;
+	this->mArea = { 0, 0, 100, 30 };
+
+	this->mChildWidgets.pushBack(&mSlider);
+	this->mChildWidgets.pushBack(&mLabel);
+}
+
+void NamedSliderWidget::eventProcess(const Events& events) {
+	const auto widthFirst = this->mArea.z * mFactor;
+	const auto widthSecond = this->mArea.z * (1.f - mFactor);
+
+	RectF rec = this->mArea;
+	rec.size.x = widthFirst;
+
+	mLabel.setArea(rec);
+
+	rec.pos.x += widthFirst;
+	rec.size.x = widthSecond;
+
+	mSlider.setArea(rec);
+}

.back/WidBack/private/TextInputWidget.cpp

@@ -0,0 +1,57 @@
+#include "TextInputWidget.hpp"
+
+#include "imgui.h"
+#include "imgui_internal.h"
+
+using namespace tp;
+
+TextInputWidget::TextInputWidget() = default;
+
+void TextInputWidget::eventDraw(Canvas&) {
+	nChanged = false;
+
+	const auto col = mAccentColor;
+	const auto colSel = mHoveredColor;
+
+	ImGui::GetStyle().Colors[ImGuiCol_FrameBg] = { col.r, col.g, col.b, col.a };
+	ImGui::GetStyle().Colors[ImGuiCol_TextSelectedBg] = { colSel.r, colSel.g, colSel.b, colSel.a };
+
+	ImGui::SetNextWindowPos({ this->mArea.x, this->mArea.y });
+	ImGui::SetNextWindowSize({ this->mArea.z, this->mArea.w });
+	ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 0, 0 });
+	ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, mRounding * 1.5f);
+	ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { mPadding, mPadding });
+
+	// ImGui::PushID((int) alni(this));
+	ImGui::Begin(
+		mId.c_str(),
+		0,
+		ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground |
+			ImGuiWindowFlags_NoResize
+	);
+
+	if (mMultiline) {
+		if (ImGui::InputTextMultiline("input", mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w })) {
+			mValue = mBuff;
+			nChanged = true;
+		}
+	} else {
+		if (ImGui::InputTextEx("input", mId.c_str(), mBuff, mMaxBufferSize, { this->mArea.z, this->mArea.w }, 0)) {
+			mValue = mBuff;
+			nChanged = true;
+		}
+	}
+
+	ImGui::End();
+	ImGui::PopStyleVar(3);
+}
+
+void TextInputWidget::eventUpdateConfiguration(WidgetManager& wm) {
+	wm.setActiveId("TextInput");
+
+	mAccentColor = wm.getColor("Accent", "Accent");
+	mBaseColor = wm.getColor("Base", "Base");
+	mRounding = wm.getNumber("Rounding", "Rounding");
+	mHoveredColor = wm.getColor("Hovered", "Accent");
+	mPadding = wm.getNumber("Padding", "Padding");
+}

.back/WidBack/private/WidgetBase.cpp

@@ -0,0 +1,140 @@
+#include "WidgetBase.hpp"
+
+using namespace tp;
+
+Widget::Widget() { mArea = { 0, 0, 100, 100 }; }
+
+Widget::~Widget() = default;
+
+void Widget::procWrapper(const Events& events, const RectF& parentArea) {
+	if (!mEnable) return;
+
+	checkVisibility(events, parentArea);
+
+	if (!mVisible) return;
+
+	checkFocus(events);
+
+	checkClicked(events);
+
+	if (mHandlesEvents) {
+
+		for (auto child : mChildWidgets) {
+			child->procWrapper(events, mVisibleArea);
+		}
+
+		eventProcess(events);
+	}
+}
+
+void Widget::drawWrapper(Canvas& canvas) {
+	if (!mEnable || !mVisible) return;
+
+	eventDraw(canvas);
+
+	// draw child widgets
+	canvas.pushClamp(this->mArea);
+	for (auto child = mChildWidgets.lastNode(); child; child = child->prev) {
+		child->data->drawWrapper(canvas);
+	}
+	canvas.popClamp();
+
+	eventDrawOver(canvas);
+}
+
+void Widget::updateConfigWrapper(WidgetManager& wm) {
+	wm.setActiveId("Global");
+
+	eventUpdateConfiguration(wm);
+
+	for (auto child : mChildWidgets) {
+		child->updateConfigWrapper(wm);
+	}
+}
+
+void Widget::eventProcess(const Events& events) {}
+void Widget::eventDraw(Canvas& canvas) {}
+void Widget::eventDrawOver(Canvas& canvas) {}
+void Widget::eventUpdateConfiguration(WidgetManager& wm) {}
+
+void Widget::eventVisible(const Events& events) {}
+void Widget::eventNotVisible(const Events& events) {}
+
+void Widget::eventFocusEnter(const Events& events) {}
+void Widget::eventFocusLeave(const Events& events) {}
+
+void Widget::eventPressed(const Events& events) {}
+void Widget::eventReleased(const Events& events) {}
+
+void Widget::checkVisibility(const Events& events, const RectF& parentArea) {
+	const bool currentVisibility = parentArea.isOverlap(getArea());
+
+	parentArea.calcIntersection(mArea, mVisibleArea);
+
+	if (currentVisibility != mVisible) {
+		if (currentVisibility) eventVisible(events);
+		else eventNotVisible(events);
+	}
+
+	mVisible = currentVisibility;
+
+	if (!mVisible) {
+		mHolding = false;
+		mPressed = false;
+		mReleased = false;
+	}
+}
+
+void Widget::checkFocus(const Events& events) {
+	const bool currentFocus = mVisibleArea.isInside(events.getPointerPrev());
+
+	if (currentFocus != mInFocus) {
+		if (currentFocus) eventFocusEnter(events);
+		else eventFocusLeave(events);
+	}
+
+	mInFocus = currentFocus;
+
+	if (!mInFocus) {
+		mHolding = false;
+		mPressed = false;
+		mReleased = false;
+	}
+}
+
+void Widget::checkClicked(const Events& events) {
+	mPressed = false;
+	mReleased = false;
+
+	if (!mInFocus) return;
+
+	if (mHolding) {
+		if (events.isReleased(InputID::MOUSE1)) {
+			eventReleased(events);
+			mReleased = true;
+			mHolding = false;
+		}
+	} else {
+		if (events.isPressed(InputID::MOUSE1) && mVisibleArea.isInside(events.getPointer())) {
+			eventPressed(events);
+			mHolding = true;
+			mPressed = true;
+		}
+	}
+}
+
+void Widget::setEnable(bool enable) { mEnable = enable; }
+void Widget::setVisible(bool visible) { mVisible = visible; }
+void Widget::setArea(const RectF& area) { mArea = area; }
+
+const RectF& Widget::getArea() const { return mArea; }
+bool Widget::isFocus() const { return mInFocus; }
+bool Widget::isPressed() const { return mPressed; }
+bool Widget::isReleased() const { return mReleased; }
+bool Widget::isHolding() const { return mHolding; }
+
+void Widget::clearEvents() {
+	mReleased = false;
+	mPressed = false;
+	mHolding = false;
+}

.back/WidBack/private/WidgetManager.cpp

@@ -0,0 +1,74 @@
+#include "WidgetManager.hpp"
+
+using namespace tp;
+
+WidgetManager::WidgetManager() { initGlobalParameters(); }
+WidgetManager::~WidgetManager() { mConfigurations.removeAll(); }
+
+const RGBA& WidgetManager::getColor(const std::string& parameterId, const RGBA& defaultValue) {
+	WidgetConfig& config = getWidgetConfig(mActiveId);
+	Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue));
+	return parameter.color;
+}
+
+const RGBA& WidgetManager::getColor(const std::string& parameterId, const char* globalRef) {
+	WidgetConfig& config = getWidgetConfig(mActiveId);
+	Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::COL));
+	return parameter.color;
+}
+
+halnf WidgetManager::getNumber(const std::string& parameterId, halnf defaultValue) {
+	WidgetConfig& config = getWidgetConfig(mActiveId);
+	Parameter& parameter = getParameter(config, parameterId, Parameter(defaultValue));
+	return parameter.value;
+}
+
+halnf WidgetManager::getNumber(const std::string& parameterId, const char* globalRef) {
+	WidgetConfig& config = getWidgetConfig(mActiveId);
+	Parameter& parameter = getParameter(config, parameterId, Parameter(globalRef, Parameter::VAL));
+	return parameter.value;
+}
+
+void WidgetManager::setActiveId(const std::string& id) { mActiveId = id; }
+
+WidgetConfig& WidgetManager::getWidgetConfig(const std::string& id) {
+	auto idx = mConfigurations.presents(id);
+	if (idx) return mConfigurations.getSlotVal(idx);
+	mConfigurations.put(id, {});
+	return mConfigurations.get(id);
+}
+
+WidgetManager::Parameter& WidgetManager::getParameter(WidgetConfig& config, const std::string& id, const Parameter& defaultValue) {
+	auto idx = config.mParameters.presents(id);
+
+	if (!idx) {
+		config.mParameters.put(id, defaultValue);
+	}
+
+	Parameter& parameter = config.mParameters.get(id);
+
+	if (parameter.globalReference) {
+		return mGlobalConfig.mParameters.get(parameter.globalId);
+	} else {
+		return parameter;
+	}
+}
+
+void WidgetManager::initGlobalParameters() {
+	auto& params = mGlobalConfig.mParameters;
+
+	params.put("FontSize", Parameter(15.f));
+
+	params.put("FontSizeDim", Parameter(12.f));
+	params.put("Rounding", Parameter(5.f));
+	params.put("Padding", Parameter(5.f));
+	params.put("HandleSize", Parameter(5.f));
+
+	params.put("Background", Parameter(RGBA{ 0.03f, 0.03f, 0.03f, 1.f }));
+	params.put("Base", Parameter(RGBA{ 0.07f, 0.07f, 0.07f, 1.f }));
+	params.put("Accent", Parameter(RGBA{ 0.13f, 0.13f, 0.13f, 1.f }));
+	params.put("Interaction", Parameter(RGBA{ 0.33f, 0.33f, 0.3f, 1.f }));
+	params.put("Action", Parameter(RGBA{ 0.44f, 0.44f, 0.4f, 1.f }));
+	params.put("Front", Parameter(RGBA{ 1.f, 1.f, 1.f, 1.f }));
+	params.put("FrontDim", Parameter(RGBA{ 0.7f, 0.7f, 0.7f, 1.f }));
+}

.back/WidBack/private/WorkspaceWidget.cpp

@@ -0,0 +1,73 @@
+#include "WorkspaceWidget.hpp"
+
+using namespace tp;
+
+WorkspaceWidget::WorkspaceWidget() {
+	this->mChildWidgets.pushBack(&mFloatingLayer);
+	this->mChildWidgets.pushBack(&mDockSpace);
+}
+
+void WorkspaceWidget::eventProcess(const Events& events) {
+	mDockSpace.setArea(this->mArea);
+	mFloatingLayer.setArea(this->mArea);
+
+	mDockSpace.mPreview = false;
+	mDockSpace.mHandlesEvents = !mFloatingLayer.handlesEvent();
+
+	for (auto floatingChild : mFloatingLayer.mChildWidgets) {
+		auto widget = dynamic_cast<FloatingWidget*>(floatingChild.data());
+		if (!widget) continue;
+
+		if (widget->mDropped) {
+			auto side = mDockSpace.getPreviewSide();
+			if (side != DockWidget::NONE) {
+				mFloatingLayer.mChildWidgets.removeNode(mFloatingLayer.mChildWidgets.find(widget));
+				widget->setCollapsed(false);
+				widget->stopFloating();
+				mDockSpace.addSideWidget(widget, side);
+			}
+		}
+
+		if (widget->isFloating()) {
+			mDockSpace.mHandlesEvents = true;
+			mDockSpace.mPreview = true;
+		}
+	}
+
+	for (auto& dockedChild : mDockSpace.mSideWidgets) {
+		auto widget = dynamic_cast<FloatingWidget*>(dockedChild.widget);
+		if (!widget) continue;
+
+		if (widget->isFloating()) {
+			mDockSpace.removeSideWidget(dockedChild.side);
+			mFloatingLayer.mChildWidgets.pushBack(widget);
+			widget->mArea.pos = events.getPointer() - 20;
+			widget->mArea.size = mDefaultFloatSize;
+
+			widget->mResizable = true;
+			// widget->mBorders = true;
+		}
+	}
+
+	// toggle hide state
+	if (events.isDown(InputID::LEFT_ALT)) {
+		if (events.isPressed(InputID::N1)) {
+			mDockSpace.toggleHiddenState(DockWidget::LEFT);
+		} else if (events.isPressed(InputID::N2)) {
+			mDockSpace.toggleHiddenState(DockWidget::TOP);
+		} else if (events.isPressed(InputID::N3)) {
+			mDockSpace.toggleHiddenState(DockWidget::RIGHT);
+		} else if (events.isPressed(InputID::N4)) {
+			mDockSpace.toggleHiddenState(DockWidget::BOTTOM);
+		}
+	}
+
+	for (auto& dockedChild : mDockSpace.mSideWidgets) {
+		auto widget = dynamic_cast<FloatingWidget*>(dockedChild.widget);
+		if (!widget) continue;
+
+		widget->setCollapsed(false);
+		widget->mResizable = false;
+		// widget->mBorders = false;
+	}
+}

.back/WidBack/public/ButtonWidget.hpp

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "LabelWidget.hpp"
+
+#include <functional>
+
+namespace tp {
+
+	class ButtonWidget : public Widget {
+	public:
+		// enum State { NONE, ANTICIPATION, ACTIVATED, CONFIRMED };
+
+	public:
+		ButtonWidget();
+		ButtonWidget(const std::string& label, const tp::RectF& aArea);
+		bool isFired();
+		void eventProcess(const Events&) override;
+		void eventDraw(Canvas& canvas) override;
+		void setLabel(const std::string& string);
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	public:
+		LabelWidget mLabel;
+		// State mStat = NONE;
+
+		RGBA pressedColor;
+		RGBA hoveredColor;
+		RGBA accentColor;
+		halnf rounding = 0;
+
+		std::function<void()> mCallback = [](){};
+	};
+}

.back/WidBack/public/CollapsableMenu.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include "ScrollableWidget.hpp"
+#include "ButtonWidget.hpp"
+
+namespace tp {
+
+	class CollapsableMenu : public Widget {
+	public:
+		CollapsableMenu();
+		void eventProcess(const Events&) override;
+		void eventDraw(Canvas& canvas) override;
+
+	public:
+		void addWidgetToMenu(Widget* widget);
+		void setLabel(const std::string& string);
+
+		void toggleCollapsed();
+		void setCollapsed(bool collapsed);
+		[[nodiscard]] bool getCollapsed() const;
+		void updateGeometry();
+
+	private:
+		RectF getHeaderRect();
+		RectF getBodyRect();
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	protected:
+		ScrollableWindow mBody;
+		LabelWidget mHeader;
+
+		RGBA mMenuColor;
+		RGBA mBorderColor;
+
+		halnf headerHeight = 30;
+		halnf rounding = 0;
+		halnf mBorderSize = 0;
+		halnf mPadding = 0;
+
+		halnf mPrevHeight = 200;
+
+		bool mCollapsed = true;
+		bool mLocked = false;
+		bool mAdjustHeight = true;
+
+	public:
+		bool mBorders = true;
+	};
+}

.back/WidBack/public/FloatingLayoutWidget.hpp

@@ -0,0 +1,18 @@
+#include "FloatingWidget.hpp"
+
+namespace tp {
+	class FloatingLayoutWidget : public Widget {
+	public:
+		FloatingLayoutWidget();
+
+		void eventProcess(const Events& events) override;
+
+		[[nodiscard]] bool handlesEvent() const;
+
+	private:
+		void updateActiveWindow(const tp::Events& events);
+
+	private:
+		bool mIsPassThrough = false;
+	};
+}

.back/WidBack/public/FloatingWidget.hpp

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "CollapsableMenu.hpp"
+
+namespace tp {
+	class FloatingWidget : public CollapsableMenu {
+	public:
+		FloatingWidget();
+
+		void eventProcess(const Events& events) override;
+		void eventDraw(Canvas& canvas) override;
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+		[[nodiscard]] bool isFloating() const;
+		void stopFloating();
+
+	private:
+		void checkFloating(const Events& events);
+		void checkResizing(const Events& events);
+		RectF getResizeHandle();
+
+	private:
+		Vec2F mMinSize = { 70, 70 };
+
+		halnf mResizeHandleSize = 10;
+		RGBA mResizeHandleColor = {};
+
+		bool mFloating = false;
+		bool mResizing = false;
+
+		Vec2F mActionStartRelativePos = {};
+
+	public:
+		bool mResizable = true;
+
+		bool mDropped = false;
+	};
+}

.back/WidBack/public/GridLayoutWidget.hpp

@@ -0,0 +1,88 @@
+#include "WidgetBase.hpp"
+
+namespace tp {
+	class DockWidget : public Widget {
+	public:
+		enum Side { LEFT, TOP, RIGHT, BOTTOM, NONE  };
+
+	private:
+		struct ResizeHandle {
+			RectF area{ 0, 0, 0, 0 };
+			halnf start{ 0 };
+			halnf end{ 0 };
+			bool active = false;
+			bool hover = false;
+		};
+
+		struct SideWidgetData {
+			Widget* widget = nullptr;
+			bool hidden = false;
+			halnf absoluteSize = 200;
+			alni order = -1;
+
+			Side side = { TOP };
+
+			RectF area = {};
+			RectF headerArea = {};
+			RectF previewHandleArea = {};
+
+			ResizeHandle resizeHandle;
+		};
+
+	public:
+		DockWidget();
+
+		void eventProcess(const Events& events) override;
+		void eventDraw(Canvas& canvas) override;
+		void eventDrawOver(Canvas& canvas) override;
+
+		void addSideWidget(Widget* widget, Side side);
+		void removeSideWidget(Side side);
+
+		void toggleHiddenState(Side side);
+
+		void setCenterWidget(Widget* widget);
+
+		Side getPreviewSide();
+
+	private:
+		void calculateSideAreas();
+		void calculateResizeHandles();
+		void handleResizeEvents(const Events& events);
+		void updateChildSideWidgets();
+
+		void calculateHeaderAreas();
+
+		bool isSideVisible(Side side);
+		bool sideExists(DockWidget::Side side);
+		ualni getVisibleSidesSize();
+		void handlePreview(const Events& events);
+
+	private:
+		RectF mPreviewArea = {};
+		Side mPreviewSide = NONE;
+		int resizeType[2] = { 0, 0 };
+
+	public:
+		SideWidgetData mSideWidgets[4];
+
+	private:
+		Widget* mCenterWidget = nullptr;
+		RectF mCenterArea {};
+
+		// Parameters
+		halnf mSideSizePadding = 150.f;
+		halnf mPadding = 4;
+		halnf mHeaderSize = 27;
+		halnf mRounding = 10;
+		Vec2F mPreviewHandleSize = { 50, 50 };
+
+		RGBA mResizeHandleColorHovered = RGBA(0.3, 0.3, 0.3, 1);
+		RGBA mResizeHandleColorActive = RGBA(0.6, 0.6, 0.6, 1);
+		RGBA mBackgroundColor = RGBA(0, 0, 0, 1);
+		RGBA mPreviewColor = RGBA(0.6, 0.6, 0.6, 1);
+
+	public:
+		bool mPreview = false;
+	};
+}

.back/WidBack/public/LabelWidget.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "WidgetBase.hpp"
+
+namespace tp {
+
+	class LabelWidget : public Widget {
+	public:
+		LabelWidget();
+
+		void eventDraw(Canvas& canvas) override;
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	public:
+		std::string mLabel = "Label";
+
+		halnf fontSize = 10;
+		halnf padding = 0;
+		RGBA fontColor = { 1, 1, 1, 1 };
+	};
+}

.back/WidBack/public/ScrollableWidget.hpp

@@ -0,0 +1,71 @@
+#pragma once
+
+#include "WidgetBase.hpp"
+#include "Buffer.hpp"
+
+namespace tp {
+
+	class ScrollBarWidget : public Widget {
+	public:
+		ScrollBarWidget();
+
+		// takes whole area
+		void eventProcess(const Events& events) override;
+		void eventDraw(Canvas& canvas) override;
+
+		RectF getHandleHandle() const;
+		RectF getViewport() const;
+		RectF getHandle() const;
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	public:
+		bool mIsScrolling = false;
+		halnf mSizeFraction = 1.f;
+		halnf mPositionFraction = 0.f;
+		bool mHovered = false;
+
+		RGBA mDefaultColor;
+		RGBA mHandleColor;
+		RGBA mHoveredColor;
+		RGBA mScrollingColor;
+		halnf mPadding = 0;
+		halnf mHandleSize = 10;
+		halnf mMinSize = 10;
+		halnf mRounding = 10;
+	};
+
+	class ScrollableWindow : public Widget {
+	public:
+		ScrollableWindow();
+
+		virtual ~ScrollableWindow();
+
+		// takes whole area
+		void eventProcess(const Events& events) override;
+
+		void addWidget(Widget* widget);
+		void clearContent();
+		List<Widget*>& getContent();
+
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+		[[nodiscard]] halnf getContentSize() const;
+
+	private:
+		void updateContents(List<Widget*>& contentWidgets);
+
+		// ready content size
+		void updateContentSize(List<Widget*>& contentWidgets);
+		void setOffset(List<Widget*>& contentWidgets, const halnf offset);
+
+	private:
+		Widget mContentWidget;
+		ScrollBarWidget mScroller;
+
+		halnf mContentSize = 0;
+
+		halnf mPadding = 0;
+	};
+}

.back/WidBack/public/SliderWidget.hpp

@@ -0,0 +1,41 @@
+#pragma once
+
+#include "LabelWidget.hpp"
+
+namespace tp {
+
+	class SliderWidget : public Widget {
+	public:
+		SliderWidget();
+
+		void eventProcess(const Events& events) override;
+		void eventDraw(Canvas& canvas) override;
+
+		RectF getHandle() const;
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	public:
+		halnf mFactor = 0.f;
+		bool mIsSliding = false;
+
+		RGBA defaultColor;
+		RGBA handleColor;
+		halnf handleSize = 0;
+		halnf rounding = 0;
+		halnf borderSize = 2;
+	};
+
+	class NamedSliderWidget : public Widget {
+	public:
+		explicit NamedSliderWidget(const char* name = "Value");
+		void eventProcess(const Events& events) override;
+
+	public:
+		SliderWidget mSlider;
+		LabelWidget mLabel;
+
+		halnf mFactor = 0.5f;
+	};
+}

.back/WidBack/public/TextInputWidget.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "WidgetBase.hpp"
+
+namespace tp {
+	class TextInputWidget : public Widget {
+	public:
+		TextInputWidget();
+
+		void eventDraw(Canvas&) override;
+
+	public:
+		void eventUpdateConfiguration(WidgetManager& wm) override;
+
+	public:
+		enum { mMaxBufferSize = 512 };
+		char mBuff[mMaxBufferSize] = "";
+		bool nChanged = false;
+		std::string mValue;
+		std::string mId = "id";
+		bool mMultiline = false;
+
+		RGBA mAccentColor;
+		RGBA mHoveredColor;
+		RGBA mBaseColor;
+		halnf mRounding = 0;
+		halnf mPadding = 0;
+	};
+}

.back/WidBack/public/WidgetBase.hpp

@@ -0,0 +1,78 @@
+#pragma once
+
+#include "Graphics.hpp"
+
+#include "EventHandler.hpp"
+#include "WidgetManager.hpp"
+#include "List.hpp"
+
+namespace tp {
+
+	using Events = EventHandler;
+
+	class Widget {
+	public:
+		Widget();
+		virtual ~Widget();
+
+		void procWrapper(const Events& events, const RectF& parentArea);
+		void drawWrapper(Canvas& canvas);
+		void updateConfigWrapper(WidgetManager& wm);
+
+		virtual void eventProcess(const Events& events);
+
+		// draws before child widgets
+		virtual void eventDraw(Canvas& canvas);
+
+		// draws overlay after child widgets
+		virtual void eventDrawOver(Canvas& canvas);
+
+		virtual void eventUpdateConfiguration(WidgetManager& wm);
+
+		virtual void eventVisible(const Events& events);
+		virtual void eventNotVisible(const Events& events);
+
+		virtual void eventFocusEnter(const Events& events);
+		virtual void eventFocusLeave(const Events& events);
+
+		virtual void eventPressed(const Events& events);
+		virtual void eventReleased(const Events& events);
+
+	public:
+		void setEnable(bool enable);
+		void setVisible(bool visible);
+		void setArea(const RectF& area);
+
+		[[nodiscard]] const RectF& getArea() const;
+		[[nodiscard]] bool isFocus() const;
+		[[nodiscard]] bool isPressed() const;
+		[[nodiscard]] bool isReleased() const;
+		[[nodiscard]] bool isHolding() const;
+
+		void clearEvents();
+
+	private:
+		void checkVisibility(const Events& events, const RectF& parentArea);
+		void checkFocus(const Events& events);
+		void checkClicked(const Events& events);
+
+	public:
+		RectF mArea;
+		RectF mVisibleArea;
+
+		List<Widget*> mChildWidgets;
+
+		bool mVisible = false;
+		bool mEnable = true;
+		bool mHandlesEvents = true;
+		bool mInFocus = false;
+
+		bool mHolding = false;
+		bool mPressed = false;
+		bool mReleased = false;
+
+
+		// docking
+		bool mIsDocked = false;
+	};
+}

.back/WidBack/public/WidgetManager.hpp

@@ -0,0 +1,89 @@
+#pragma once
+
+#include "Animations.hpp"
+#include "Map.hpp"
+#include "Rect.hpp"
+
+#include "InputCodes.hpp"
+#include "Buffer.hpp"
+
+namespace tp {
+
+	struct WidgetConfig {
+
+		struct Shortcut {
+			struct Condition {
+				std::string name;
+				std::string state;
+			};
+
+			std::string callbackName;
+
+			Shortcut() = default;
+			Shortcut(const InitialierList<Condition>&) {}
+		};
+
+		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<std::string, Parameter> mParameters;
+		Buffer<Shortcut> mShortcuts;
+	};
+
+	class WidgetManager {
+	public:
+		using Parameter = WidgetConfig::Parameter;
+
+	public:
+		WidgetManager();
+		~WidgetManager();
+
+		const RGBA& getColor(const std::string& parameterId, const RGBA& defaultValue);
+		const RGBA& getColor(const std::string& parameterId, const char* globalRef);
+
+		halnf getNumber(const std::string& parameterId, halnf defaultValue);
+		halnf getNumber(const std::string& parameterId, const char* globalRef);
+
+		void setActiveId(const std::string& id);
+		
+	private:
+		WidgetConfig& getWidgetConfig(const std::string& id);
+		Parameter& getParameter(WidgetConfig& config, const std::string& id, const Parameter& defaultValue);
+
+		void initGlobalParameters();
+
+	private:
+		Map<std::string, WidgetConfig> mConfigurations;
+		WidgetConfig mGlobalConfig;
+
+		RGBA mErrorColor = { 0, 0, 0, 1 };
+		halnf mErrorNumber = 0;
+
+		std::string mActiveId;
+	};
+}

.back/WidBack/public/Widgets.hpp

@@ -1,11 +1,13 @@
 #pragma once
 
+#include "Animations.hpp"
 #include "ButtonWidget.hpp"
 #include "LabelWidget.hpp"
 #include "ScrollableWidget.hpp"
-#include "SplitViewWidget.hpp"
 #include "TextInputWidget.hpp"
 #include "SliderWidget.hpp"
 #include "CollapsableMenu.hpp"
 #include "FloatingWidget.hpp"
-#include "Animations.hpp"
+#include "FloatingLayoutWidget.hpp"
+#include "GridLayoutWidget.hpp"
+#include "WorkspaceWidget.hpp"

.back/WidBack/public/WorkspaceWidget.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Widgets.hpp"
+
+namespace tp {
+	class WorkspaceWidget : public Widget {
+	public:
+		WorkspaceWidget();
+
+		void eventProcess(const Events& events) override;
+
+	protected:
+		DockWidget mDockSpace;
+		FloatingLayoutWidget mFloatingLayer;
+
+		// Parameters
+		Vec2F mDefaultFloatSize = { 200, 200 };
+	};
+}

.gitmodules

@@ -19,3 +19,12 @@
 [submodule "Externals/asio"]
 	path = Externals/asio
 	url = https://github.com/elushaX/asio.git
+[submodule "Externals/implot"]
+	path = Externals/implot
+	url = https://github.com/epezent/implot.git
+[submodule "Externals/googletest"]
+	path = Externals/googletest
+	url = https://github.com/google/googletest.git
+[submodule "Externals/benchmark"]
+	path = Externals/benchmark
+	url = https://github.com/google/benchmark.git

3DEditor/CMakeLists.txt

@@ -2,7 +2,7 @@ project(3DEditor)
 
 ### ---------------------- Externals  ---------------------  ###
 set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals)
-set(BINDINGS_LIBS glfw Imgui)
+set(BINDINGS_LIBS glfw Imgui OpenImageDenoise)
 
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")
@@ -13,12 +13,12 @@ add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/)
 target_link_libraries(${PROJECT_NAME} PUBLIC Widgets RasterRender RayTracer)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${BINDINGS_LIBS})
-target_link_libraries(${PROJECT_NAME} PRIVATE OpenImageDenoise)
 
 ### -------------------------- Applications  --------------------------  ###
 file(GLOB APP_SOURCES "./applications/*.cpp")
 add_executable(3DEditorApp ${APP_SOURCES})
 target_link_libraries(3DEditorApp ${PROJECT_NAME})
 
-file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "../RasterRender/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "../3DScene/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

3DEditor/applications/Entry.cpp

@@ -1,39 +1,28 @@
 
 #include "EditorWidget.hpp"
 
-#include "GraphicApplication.hpp"
+#include "WidgetApplication.hpp"
+#include "RootWidget.hpp"
 
 using namespace tp;
 
-
+class EditorGUI : public WidgetApplication {
-class EditorGUI : public Application {
 public:
 	EditorGUI() {
 		auto canvas = this->mGraphics->getCanvas();
-		mGui = new EditorWidget<EventHandler, Canvas>(canvas, &mEditor);
+		mGui = new EditorWidget(canvas, &mEditor);
 
 		mEditor.loadDefaults();
 
+		setRoot(mGui);
 		// mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 3, 3, 2 }, { 0, 0, 1 });
 	}
 
 	~EditorGUI() override { delete mGui; }
 
-	void processFrame(EventHandler* eventHandler) override {
-		auto rec = RectF({ 0, 0 }, mWindow->getSize());
-
-		mGui->setArea(rec);
-		mGui->setVisible(true);
-		mGui->updateConfigWrapper(mWidgetManager);
-		mGui->procWrapper(*eventHandler, rec);
-	}
-
-	void drawFrame(Canvas* canvas) override { mGui->drawWrapper(*canvas); }
-
 private:
 	Editor mEditor;
-	WidgetManager mWidgetManager;
+	EditorWidget* mGui;
-	EditorWidget<EventHandler, Canvas>* mGui;
 };
 
 int main() {

3DEditor/private/Denoise.cpp

@@ -37,4 +37,4 @@ void Editor::denoise() {
 	if (device.getError(errorMessage) != oidn::Error::None) {
 		std::cerr << "Error: " << errorMessage << std::endl;
 	}
-}
+}

3DEditor/private/Editor.cpp

@@ -24,7 +24,10 @@ Editor::Editor() {
 void Editor::renderViewport() {
 	switch (mRenderType) {
 		case RenderType::RASTER:
-			mRasterRenderer.render(mScene, mScene.mRenderSettings.size);
+			mRasterRenderer.beginRender(mScene, mScene.mRenderSettings.size);
+			mRasterRenderer.renderDefault(mScene);
+			if (mActive) mRasterRenderer.renderOutline(mScene.mCamera, *mActive);
+			mRasterRenderer.endRender();
 			break;
 
 		case RenderType::PATH_TRACER:
@@ -54,9 +57,12 @@ uint4 Editor::getViewportTexID() {
 
 void Editor::loadDefaults() {
 	mScene.load("rsc/scene/script.lua");
+	mResetCamera = mScene.mCamera;
 }
 
 void Editor::setViewportSize(const Vec2F& size) {
+	if (size.x <= 0 || size.y <= 0) return;
+
 	// TODO remove
 	// mScene.mCamera.rotate(0.01f, 0.0);
 
@@ -71,6 +77,7 @@ Editor::~Editor() {
 }
 
 void Editor::renderPathFrame() {
+	mScene.updateCache();
 	mPathRenderer.render(mScene, mPathTracerBuffers, mScene.mRenderSettings);
 	sendBuffersToGPU();
 }
@@ -114,5 +121,20 @@ void Editor::navigationZoom(halnf factor) {
 }
 
 void Editor::navigationReset() {
-	mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 });
+	mScene.mCamera = mResetCamera;
-}
+	// mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 });
+}
+
+void Editor::selectObject(const Vec2F& screenPos) {
+	mScene.updateCache();
+
+	auto dir = (mScene.mCamera.project(screenPos) - mScene.mCamera.getPos()).normalize();
+	Ray ray = Ray( dir, mScene.mCamera.getPos() );
+
+	auto rayCastData = mScene.castRay(ray, 1000);
+	mActive = rayCastData.obj;
+}
+
+Object* Editor::getActiveObject() { return mActive; }
+
+Scene* Editor::getScene() { return &mScene; }

3DEditor/public/Editor.hpp

@@ -28,6 +28,10 @@ namespace tp {
 		void navigationZoom(halnf factor);
 		void navigationReset();
 
+		void selectObject(const Vec2F& screenPos);
+		Object* getActiveObject();
+
+		Scene* getScene();
 
 	private:
 		void sendBuffersToGPU();
@@ -36,6 +40,8 @@ namespace tp {
 	private:
 		Scene mScene;
 
+		Camera mResetCamera;
+
 		RenderType mRenderType = RenderType::RASTER;
 
 		RasterRender mRasterRenderer;
@@ -43,5 +49,7 @@ namespace tp {
 
 		RayTracer::OutputBuffers mPathTracerBuffers;
 		uint4 mPathRenderTexture = 0;
+
+		Object* mActive = nullptr;
 	};
 }

3DEditor/public/EditorWidget.hpp

@@ -1,11 +1,12 @@
-#include "Widgets.hpp"
+#include "Widget.hpp"
+#include "DockWidget.hpp"
 
 #include "Editor.hpp"
+#include "FloatingWidget.hpp"
 
 namespace tp {
 
-	template <typename Events, typename Canvas>
+	class ViewportWidget : public Widget {
-	class ViewportWidget : public Widget<Events, Canvas> {
 	public:
 		explicit ViewportWidget(Canvas* canvas, Editor* editor) {
 			mEditor = editor;
@@ -13,17 +14,17 @@ namespace tp {
 			mCanvas = canvas;
 		}
 
-		~ViewportWidget() { mCanvas->deleteImageHandle(mImage); }
+		~ViewportWidget() override { mCanvas->deleteImageHandle(mImage); }
 
-		void eventProcess(const Events& events) override {
+		void process(const EventHandler& events) override {
-			mEditor->setViewportSize(this->mArea.size);
+			mEditor->setViewportSize(getAreaT().size);
 		}
 
-		void eventDraw(Canvas& canvas) override {
+		void draw(Canvas& canvas) override {
 			mEditor->renderViewport();
 
 			canvas.updateTextureID(mImage, mEditor->getViewportTexID());
-			canvas.drawImage(this->mArea, &mImage, PI);
+			canvas.drawImage(getArea().relative(), &mImage, PI);
 		}
 
 	public:
@@ -33,147 +34,120 @@ namespace tp {
 		Canvas::ImageHandle mImage;
 	};
 
-	template <typename Events, typename Canvas>
+	class EditorWidget : public DockWidget {
-	class EditorWidget : public Widget<Events, Canvas> {
 	public:
 		EditorWidget(Canvas* canvas, Editor* editor) :
-			mViewport(canvas, editor)
+			mViewport(canvas, editor) {
-		{
 			mEditor = editor;
 
-			this->mChildWidgets.pushBack(&mViewport);
+			mPanel.setText("Controls");
-			this->mChildWidgets.pushBack(&mSplitView);
+			mPanel.addToMenu(&mNavigationMenu);
-			this->mChildWidgets.pushBack(&mSettingsWidget);
+			mPanel.addToMenu(&mRenderMenu);
+
+			dockWidget(&mPanel, DockLayout::RIGHT);
+			setCenterWidget(&mViewport);
 
 			// Render
 			{
-				mRenderPathTracer.setLabel("Render with Path Tracer");
+				mRenderPathTracer.setText("Render with Path Tracer");
-				mRenderRaster.setLabel("Render with Raster");
+				mRenderRaster.setText("Render with Raster");
-				mRenderDeNoise.setLabel("Denoise (IntelOpenImage)");
+				mRenderDeNoise.setText("Denoise (IntelOpenImage)");
 
-				mRenderMenu.addWidgetToMenu(&mRenderPathTracer);
+				mRenderMenu.addToMenu(&mRenderPathTracer);
-				mRenderMenu.addWidgetToMenu(&mRenderRaster);
+				mRenderMenu.addToMenu(&mRenderRaster);
-				mRenderMenu.addWidgetToMenu(&mRenderDeNoise);
+				mRenderMenu.addToMenu(&mRenderDeNoise);
 
-				mRenderMenu.setLabel("Render");
+				mRenderMenu.setText("Render");
 			}
 
 			// Navigation
 			{
-				mNavigationPan.setLabel("Pan");
+				mNavigationPan.setText("Pan");
-				mNavigationOrbit.setLabel("Orbit");
+				mNavigationOrbit.setText("Orbit");
-				mNavigationZoom.setLabel("Zoom");
+				mNavigationZoom.setText("Zoom");
-				mNavigationReset.setLabel("Reset");
+				mNavigationReset.setText("Reset");
+				mNavigationSelect.setText("Select");
 
-				mNavigationMenu.addWidgetToMenu(&mNavigationPan);
+				mNavigationMenu.addToMenu(&mNavigationPan);
-				mNavigationMenu.addWidgetToMenu(&mNavigationOrbit);
+				mNavigationMenu.addToMenu(&mNavigationOrbit);
-				mNavigationMenu.addWidgetToMenu(&mNavigationZoom);
+				mNavigationMenu.addToMenu(&mNavigationZoom);
-				mNavigationMenu.addWidgetToMenu(&mNavigationReset);
+				mNavigationMenu.addToMenu(&mNavigationReset);
+				mNavigationMenu.addToMenu(&mNavigationSelect);
 
-				mNavigationMenu.setLabel("Navigation");
+				mNavigationMenu.setText("Navigation");
 			}
 
-			mSettingsWidget.addWidget(&mRenderMenu);
+			mRenderPathTracer.setAction([this]() {
-			mSettingsWidget.addWidget(&mNavigationMenu);
+				mEditor->renderPathFrame();
+				mEditor->setRenderType(Editor::RenderType::PATH_TRACER);
+			});
+
+			mRenderRaster.setAction( [this]() { mEditor->setRenderType(Editor::RenderType::RASTER); });
+			mRenderDeNoise.setAction( [this]() { mEditor->denoisePathRenderBuffers(); });
+			mNavigationOrbit.setAction( [this]() { mNavigationType = ORBIT; });
+			mNavigationPan.setAction( [this]() { mNavigationType = PAN; });
+			mNavigationZoom.setAction( [this](){ mNavigationType = ZOOM; });
+			mNavigationSelect.setAction( [this](){ mNavigationType = SELECT; });
+			mNavigationReset.setAction( [this]() { mEditor->navigationReset(); });
 		}
 
-		void eventProcess(const Events& events) override {
+		void process(const EventHandler& events) override {
-			mSplitView.setArea(this->mArea);
+			DockWidget::process(events);
 
-			mViewport.setArea(mSplitView.getFirst());
+			if (auto obj = mEditor->getActiveObject()) { // dummy rotate active object
-			mViewport.mEnable = mSplitView.getFirstEnabled();
+				auto rotator = obj->mTopology.Basis.rotatorDir({1, 1, 1}, 0.1);
-
+				obj->mTopology.Basis = rotator * obj->mTopology.Basis;
-			mSettingsWidget.setArea(mSplitView.getSecond());
-			mSettingsWidget.mEnable = mSplitView.getSecondEnabled();
-
-			// render settings
-			{
-				if (mRenderPathTracer.isFired()) {
-					mEditor->renderPathFrame();
-					mEditor->setRenderType(Editor::RenderType::PATH_TRACER);
-				}
-
-				if (mRenderRaster.isFired()) {
-					mEditor->setRenderType(Editor::RenderType::RASTER);
-				}
-
-				if (mRenderDeNoise.isFired()) {
-					mEditor->denoisePathRenderBuffers();
-				}
 			}
 
-			// navigation
+			mEditor->getScene()->updateCache();
-			{
-				if (mNavigationOrbit.isFired()) {
-					mNavigationType = ORBIT;
-				}
 
-				if (mNavigationPan.isFired()) {
+			const auto& activeArea = mViewport.getArea();
-					mNavigationType = PAN;
-				}
 
-				if (mNavigationZoom.isFired()) {
+			auto pointer = events.getPointer();
-					mNavigationType = ZOOM;
+			auto pointerPrev = events.getPointerPrev();
-				}
+			auto pointerRelative = (((pointer - activeArea.pos) / activeArea.size) - 0.5f) * 2;
 
-				if (mNavigationReset.isFired()) {
+			if (activeArea.isInside(pointer) && events.isDown(InputID::MOUSE1)) {
-					mEditor->navigationReset();
+				switch (mNavigationType) {
-				}
+					case ORBIT: mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3); break;
 
-				const auto& activeArea = mViewport.mArea;
+					case PAN:
-				if (this->isHolding() &&  activeArea.isInside(events.getPointer())) {
+						{
-					switch (mNavigationType) {
+							auto prevPointerRelative = (((pointerPrev - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-						case ORBIT:
+							mEditor->navigationPan(prevPointerRelative, pointerRelative);
-							mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3);
+						}
-							break;
+						break;
 
-						case PAN:
+					case ZOOM: mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); break;
-							{
+					case SELECT: mEditor->selectObject(pointerRelative * -1); break;
-								auto pointer = (((events.getPointer() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-								auto prevPointer = (((events.getPointerPrev() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-								mEditor->navigationPan(prevPointer, pointer);
-							}
-							break;
-
-						case ZOOM:
-							mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y));
-							break;
-					}
 				}
 			}
 		}
 
-		void eventDraw(Canvas& canvas) override {
+		void draw(Canvas& canvas) override { canvas.rect(getArea().relative(), mBaseColor); }
-			canvas.rect(this->mArea, mBaseColor);
-		}
-
-		void eventUpdateConfiguration(WidgetManager& wm) override {
-			wm.setActiveId("3DEditor");
-			mBaseColor = wm.getColor("Base", "Base");
-		}
 
 	public:
 		Editor* mEditor = nullptr;
 
-		SplitView<Events, Canvas> mSplitView;
+		ViewportWidget mViewport;
 
-		ViewportWidget<Events, Canvas> mViewport;
+		FloatingMenu mPanel;
-		ScrollableWindow<Events, Canvas> mSettingsWidget;
 
 		// Controls
-		CollapsableMenu<Events, Canvas> mRenderMenu;
+		FloatingMenu mRenderMenu;
-		ButtonWidget<Events, Canvas> mRenderPathTracer;
+		ButtonWidget mRenderPathTracer;
-		ButtonWidget<Events, Canvas> mRenderRaster;
+		ButtonWidget mRenderRaster;
-		ButtonWidget<Events, Canvas> mRenderDeNoise;
+		ButtonWidget mRenderDeNoise;
 
 		// Navigation
-		enum NavigationType { ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
+		enum NavigationType { SELECT, ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
 
-		CollapsableMenu<Events, Canvas> mNavigationMenu;
+		FloatingMenu mNavigationMenu;
-		ButtonWidget<Events, Canvas> mNavigationPan;
+		ButtonWidget mNavigationPan;
-		ButtonWidget<Events, Canvas> mNavigationOrbit;
+		ButtonWidget mNavigationOrbit;
-		ButtonWidget<Events, Canvas> mNavigationZoom;
+		ButtonWidget mNavigationZoom;
-		ButtonWidget<Events, Canvas> mNavigationReset;
+		ButtonWidget mNavigationReset;
+		ButtonWidget mNavigationSelect;
 
 		RGBA mBaseColor;
 	};

3DEditor/rsc/shaders/default.frag

@@ -1,39 +0,0 @@
-#version 330 core
-
-in vec2 FragPos;
-in vec2 screenSize;
-
-out vec4 FragColor;
-
-void drawDepth() {
-    FragColor = vec4(gl_FragCoord.z, gl_FragCoord.z, gl_FragCoord.z, 1.f);
-}
-
-void drawPoints()
-{
-    // Define the point size
-    float pointSize = 15.0;
-
-    // Get the current fragment position in screen coordinates
-    vec2 fragCoord = gl_FragCoord.xy;
-
-    // Calculate the distance from the fragment to the vertex position
-    float dist = length(fragCoord - FragPos);
-
-    // If the distance is within the point size, draw the point
-    if (true || dist < pointSize)
-    {
-        FragColor = vec4(1.0, 0.0, 0.0, 1.0); // Red color for the point
-    }
-    else
-    {
-        FragColor = vec4(1.0, 1.0, 1.0, 1.0);
-    }
-
-    FragColor = vec4(FragPos.x, FragPos.y, 0, 1);
-}
-
-void main() {
-    drawPoints();
-    // drawDepth();
-}

3DEditor/rsc/shaders/default.vert

@@ -1,17 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 Point;
-
-uniform vec2 ScreenSize;
-uniform vec4 Origin;
-uniform mat4 Basis;
-uniform mat4 Camera;
-
-out vec2 FragPos;
-out vec2 screenSize;
-
-void main() {
-    gl_Position = Camera * vec4(Point.xyz, 1.0);
-    FragPos = gl_Position.xy;
-    screenSize = ScreenSize;
-}

3DScene/private/LuaFormat.cpp

@@ -7,6 +7,61 @@ extern "C" {
 }
 
 #include <filesystem>
+#include <utility>
+
+tp::Vec3F tp::Scene::getVec3(lua_State* state, const char* name) {
+	int stackSize = lua_gettop(state);
+
+	// Access the "pos" field and validate it
+	lua_getfield(state, -1, name);
+	if (!lua_istable(state, -1) || lua_rawlen(state, -1) != 3) {
+		throw IOError(std::string("Invalid vec3 named ") + name);
+	}
+
+	// Read the values from the table
+	float pos[3];
+	for (int i = 0; i < 3; i++) {
+		lua_rawgeti(state, -1, i + 1);
+		if (lua_isnumber(state, -1)) {
+			pos[i] = lua_tonumber(state, -1);
+		} else {
+			throw IOError("vec3 values must be numbers");
+		}
+		lua_pop(state, 1); // pop number
+	}
+	lua_pop(state, 1); // pop vec3
+
+	ASSERT(stackSize == lua_gettop(state))
+
+	return { pos[0], pos[1], pos[2] };
+}
+
+tp::Vec2F tp::Scene::getVec2(lua_State* state, const char* name) {
+	int stackSize = lua_gettop(state);
+
+	// Access the "pos" field and validate it
+	lua_getfield(state, -1, name);
+	if (!lua_istable(state, -1) || lua_rawlen(state, -1) != 2) {
+		throw IOError(std::string("Invalid vec2 named ") + name);
+	}
+
+	// Read the values from the table
+	float pos[2];
+	for (int i = 0; i < 2; i++) {
+		lua_rawgeti(state, -1, i + 1);
+		if (lua_isnumber(state, -1)) {
+			pos[i] = lua_tonumber(state, -1);
+		} else {
+			throw IOError("vec3 values must be numbers");
+		}
+		lua_pop(state, 1); // pop number
+	}
+	lua_pop(state, 1); // pop vec3
+
+	ASSERT(stackSize == lua_gettop(state))
+
+	return { pos[0], pos[1] };
+}
 
 // Function to read a Lua table representing RenderSettings
 int readRenderSettings(lua_State* L, tp::RenderSettings& settings) {
@@ -53,23 +108,8 @@ int readRenderSettings(lua_State* L, tp::RenderSettings& settings) {
 }
 
 // Function to read a Lua table representing a light
-int readLight(lua_State* L, tp::PointLight* light) {
+int tp::Scene::readLight(lua_State* L, tp::PointLight* light) {
-	lua_getfield(L, -1, "pos"); // Get the "pos" field from the light table
+	light->pos = getVec3(L, "pos");
-	if (!lua_istable(L, -1)) {
-		printf("Light is missing the 'pos' table.\n");
-		return 0; // Error
-	}
-	for (int i = 0; i < 3; i++) {
-		lua_rawgeti(L, -1, i + 1); // Index is 1-based in Lua
-		if (!lua_isnumber(L, -1)) {
-			printf("Light 'pos' field is not a number at index %d.\n", i);
-			lua_pop(L, 2); // Pop both the number and the 'pos' table
-			return 0;      // Error
-		}
-		light->pos[i] = lua_tonumber(L, -1);
-		lua_pop(L, 1); // Pop the number
-	}
-	lua_pop(L, 1); // Pop the 'pos' table
 
 	lua_getfield(L, -1, "intensity"); // Get the "intensity" field from the light table
 	if (!lua_isnumber(L, -1)) {
@@ -121,66 +161,29 @@ bool tp::Scene::loadLuaFormat(const std::string& scenePath) {
 	}
 
 	// --- camera
-
+	{
-	// Access Camera table
+		lua_getglobal(L, "Camera");
-	lua_getglobal(L, "Camera");
+		if (!lua_istable(L, -1)) {
-	if (!lua_istable(L, -1)) {
+			printf("Camera is not a table.\n");
-		printf("Camera is not a table.\n");
-		lua_close(L);
-		return false;
-	}
-
-	// Verify you are inside the "Camera" table
-	int cameraTableIndex = lua_gettop(L); // Get the index of the "Camera" table
-
-	// Access the "pos" field and validate it
-	lua_getfield(L, cameraTableIndex, "pos");
-	if (!lua_istable(L, -1) || lua_rawlen(L, -1) != 3) {
-		printf("Invalid 'pos' field in Camera table.\n");
-		lua_close(L);
-		return false;
-	}
-
-	// Read the values from the table
-	float pos[3];
-	for (int i = 0; i < 3; i++) {
-		lua_rawgeti(L, -1, i + 1);
-		if (lua_isnumber(L, -1)) {
-			pos[i] = lua_tonumber(L, -1);
-		} else {
-			printf("Invalid 'pos' field value at index %d.\n", i + 1);
 			lua_close(L);
 			return false;
 		}
+
+		Vec3F camPos = getVec3(L, "pos");
+		Vec3F camTarget = getVec3(L, "target");
+		Vec3F camUp = getVec3(L, "up");
+		Vec2F camSize = getVec2(L, "size");
+
+		mRenderSettings.size = camSize;
+
+		mCamera.lookAtPoint(camTarget, camPos, camUp);
+		mCamera.setFOV(3.14 / 4);
+		mCamera.setFar(100);
+		mCamera.setRatio((tp::halnf) camSize.y / (tp::halnf) camSize.x);
+
 		lua_pop(L, 1);
 	}
 
-	// Access the "size_x" field and validate it
-	lua_getfield(L, cameraTableIndex, "size_x");
-	if (!lua_isnumber(L, -1)) {
-		printf("Invalid or missing 'size_x' field in Camera table.\n");
-		lua_close(L);
-		return false;
-	}
-	int size_x = lua_tointeger(L, -1);
-	lua_pop(L, 1); // Pop the 'size_x' value from the stack
-
-	// Access the "size_y" field and validate it
-	lua_getfield(L, cameraTableIndex, "size_y");
-	if (!lua_isnumber(L, -1)) {
-		printf("Invalid or missing 'size_y' field in Camera table.\n");
-		lua_close(L);
-		return false;
-	}
-	int size_y = lua_tointeger(L, -1);
-
-	mRenderSettings.size = { (tp::halnf) size_x, (tp::halnf) size_y };
-
-	mCamera.lookAtPoint({ 0, 0, 0 }, { pos[0], pos[1], pos[2] }, { 0, 0, 1 });
-	mCamera.setFOV(3.14 / 4);
-	mCamera.setFar(100);
-	mCamera.setRatio((tp::halnf) size_y / (tp::halnf) size_x);
-
 	// ---------- LIGHTS
 	{
 		lua_getglobal(L, "Lights");

3DScene/private/OBJFormat.cpp

@@ -48,4 +48,39 @@ bool tp::Scene::loadOBJFormat(const std::string& objetsPath) {
 	}
 
 	return mObjects.size();
+}
+
+const tp::RayCastData& tp::Scene::castRay(const Ray& ray, alnf farVal) {
+	auto& out = mRayCastData;
+
+	out.hit = false;
+	out.obj = nullptr;
+
+	farVal *= farVal;
+
+	for (auto obj : mObjects) {
+		for (auto trig : obj->mCache.TrigCaches) {
+			if (trig->castRay(ray)) {
+
+				auto dist = (TrigCache::getHitPos() - ray.pos).length2();
+
+				if (farVal > dist && dist > EPSILON) {
+					out.trig = &trig.data();
+					out.hitPos = TrigCache::getHitPos();
+					out.obj = &obj.data();
+					out.hit = true;
+
+					farVal = dist;
+				}
+			}
+		}
+	}
+
+	return mRayCastData;
+}
+
+void tp::Scene::updateCache() {
+	for (auto obj : mObjects) {
+		obj->mCache.updateCache();
+	}
 }

3DScene/private/Scene.cpp

@@ -2,5 +2,13 @@
 #include "Scene.hpp"
 
 bool tp::Scene::load(const std::string& scenePath) {
-	return loadLuaFormat(scenePath);
+	try {
+		auto res = loadLuaFormat(scenePath);
+		if (!res) throw IOError("Failed loading lua script");
+	} catch (const IOError& err) {
+		printf("Failed loading scene : %s\n", err.description.c_str());
+		return false;
+	}
+
+	return true;
 }

3DScene/public/Scene.hpp

@@ -6,6 +6,8 @@
 
 #include <string>
 
+struct lua_State;
+
 namespace tp {
 	struct RenderSettings {
 		uhalni depth = 2;
@@ -42,7 +44,22 @@ namespace tp {
 		halnf intensity = 1.f;
 	};
 
+	struct RayCastData {
+		Object* obj = nullptr;
+		TrigCache* trig = nullptr;
+		Vec3F hitPos = { 0, 0, 0 };
+		bool hit = false;
+		bool inv = false;
+	};
+
 	class Scene {
+		struct IOError : public std::exception {
+			explicit IOError(std::string in) :
+				description(std::move(in)) {}
+
+			std::string description;
+		};
+
 	public:
 		Scene() = default;
 
@@ -51,11 +68,23 @@ namespace tp {
 		bool loadLuaFormat(const std::string& scenePath);
 		bool loadOBJFormat(const std::string& objectsPath);
 
+		const RayCastData& castRay(const Ray& ray, alnf farVal);
+
+		void updateCache();
+
+	private:
+		Vec3F getVec3(lua_State* state, const char* name);
+		Vec2F getVec2(lua_State* state, const char* name);
+
+		int readLight(lua_State* L, tp::PointLight* light);
+
 	public:
 		Buffer<Object> mObjects;
 		Buffer<PointLight> mLights;
 		Camera mCamera;
 
 		RenderSettings mRenderSettings;
+
+		RayCastData mRayCastData;
 	};
 }

3DScene/rsc/scene/script.lua

@@ -2,9 +2,10 @@
 Meshes = "meshes.obj"
 
 Camera = {
-	pos = { 0.5, 4.5, 0.2 },
+	pos = { 0, 5, 0 },
-	size_x = 600,
+	target = { 0, 0, 0 },
-	size_y = 800,
+	up = { 0, 0, 1 },
+	size = { 600, 800 },
 }
 
 Lights = {

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -8,13 +8,20 @@ set(CMAKE_CXX_STANDARD 20)
 
 project(ModulesRoot)
 
-include(CMakeOptions.txt)
+include(cmake/ModulesOptions.txt)
+
+set(WINDOWS_LIBRARIES "../moduleswindowsl" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl")
+
+include(cmake/FindGLEW.cmake)
+include(cmake/FindOIDN.cmake)
+include(cmake/FindPortAudio.cmake)
+
+add_subdirectory(Externals)
 
 add_subdirectory(Modules)
 add_subdirectory(Containers)
 add_subdirectory(Math)
 # add_subdirectory(Language)
-add_subdirectory(Externals)
 add_subdirectory(Connection)
 add_subdirectory(Graphics)
 add_subdirectory(DataAnalysis)

Containers/CMakeLists.txt

@@ -1,5 +1,7 @@
 project(Containers)
 
+include(GoogleTest)
+
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp")
 file(GLOB HEADERS "./public/*.hpp")
@@ -16,6 +18,7 @@ file(GLOB TEST_SOURCES
         ./tests/ListTest.cpp
         ./tests/MapTest.cpp
         ./tests/TreeTest.cpp
+        ./tests/RingBufferByte.cpp
         ./tests/Tests.cpp
 )
 
@@ -24,5 +27,10 @@ target_link_libraries(Tests${PROJECT_NAME} ${PROJECT_NAME} UnitTest++)
 add_test(NAME Tests${PROJECT_NAME} COMMAND Tests${PROJECT_NAME})
 
 
+add_executable(testLinearRingBuffer ./tests/testLinearRingBuffer.cpp)
+target_link_libraries(testLinearRingBuffer ${PROJECT_NAME} gtest)
+gtest_discover_tests(testLinearRingBuffer)
+
+
 add_executable(AVLTreeSpeedTest ./tests/AVLTreeProfiling.cpp)
-target_link_libraries(AVLTreeSpeedTest ${PROJECT_NAME})
+target_link_libraries(AVLTreeSpeedTest ${PROJECT_NAME})

Containers/private/linear_ring.cpp

@@ -0,0 +1,65 @@
+#include <cstdint>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <stdexcept>
+#include <cstring>
+
+namespace lrbm {
+	static int create_memfd(const char* name) {
+		int fd = syscall(SYS_memfd_create, name, 0);
+		if (fd == -1) throw std::runtime_error("memfd_create failed");
+		return fd;
+	}
+
+	std::pair<void*, size_t> create_linear_ring(size_t size) {
+		const size_t page = sysconf(_SC_PAGESIZE);
+
+		size_t aligned = (size + page - 1) & ~(page - 1);
+
+		// Create RAM-backed file descriptor
+		int fd = create_memfd("linear_ring");
+		if (ftruncate(fd, aligned) != 0) throw std::runtime_error("ftruncate failed");
+
+		// Reserve 2× VA space
+		uint8_t* base = (uint8_t*) mmap(nullptr, aligned * 2, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+		if (base == MAP_FAILED) throw std::runtime_error("mmap reserve failed");
+
+		// First mapping
+		void* p1 = mmap(base, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0);
+		if (p1 != base) throw std::runtime_error("first mmap failed");
+
+		// Mirror mapping
+		void* p2 = mmap(base + aligned, aligned, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd, 0);
+		if (p2 != base + aligned) throw std::runtime_error("mirror mmap failed");
+
+		close(fd);
+		return { base, aligned }; // linear region [buf][buf]
+	}
+
+	void destroy_linear_ring(void* base, size_t size) { munmap(base, size); }
+
+	// void test() {
+	// 	const size_t RING_SIZE = 4096;
+	// 	uint8_t* ring = (uint8_t*) create_linear_ring(RING_SIZE);
+
+	// 	printf("Linear ring created at %p (size = %zu)\n", ring, RING_SIZE);
+
+	// 	const char* msg = "HELLO_LINEAR_RING";
+	// 	size_t msg_len = strlen(msg);
+
+	// 	size_t head = RING_SIZE - 4; // force boundary crossing
+	// 	std::memcpy(ring + head, msg, msg_len);
+
+	// 	char out[64];
+	// 	std::memcpy(out, ring + head, msg_len);
+	// 	out[msg_len] = 0;
+
+	// 	printf("Expected: %s\n", msg);
+	// 	printf("Readback: %s\n", out);
+
+	// 	if (std::strcmp(msg, out) == 0) printf("SUCCESS: Linear-address ring works!\n");
+	// 	else printf("FAILURE: Ring broken!\n");
+	// }
+}

Containers/public/Buffer.hpp

@@ -317,6 +317,13 @@ namespace tp {
 			return *this;
 		}
 
+		alni find(const tType& val) {
+			for (ualni idx = 0; idx < mLoad; idx++) {
+				if (mBuff[idx] == val) return (alni) idx;
+			}
+			return -1;
+		}
+
 		tType& append(Arg data) {
 			if (mLoad == mSize) {
 				resizeBuffer(tResizePolicy(mSize));
@@ -368,6 +375,53 @@ namespace tp {
 			}
 		}
 
+		void erase(ualni start, ualni end) {
+			DEBUG_ASSERT(end <= mLoad)
+			DEBUG_ASSERT(end >= start)
+
+			if (start == end) return;
+
+			for (ualni idx = start; idx < end; idx++) {
+				mBuff[idx].~tType();
+			}
+
+			const auto diff = (end - start);
+			for (ualni idx = end; idx < mLoad; idx++) {
+				new (&mBuff[idx - diff]) tType(mBuff[idx]);
+				mBuff[idx].~tType();
+			}
+
+			mLoad -= diff;
+			ualni prevSize = tResizePolicyDown(mSize);
+			DEBUG_ASSERT(prevSize < mSize)
+			if (prevSize > mLoad) {
+				resizeBuffer(prevSize);
+			}
+		}
+
+		template<typename tRemoveConditionFunctor>
+		void erase_if(tRemoveConditionFunctor functor) {
+			alni lastIndex = mLoad - 1;
+			alni currentIndex = 0;
+			while (currentIndex < lastIndex + 1) {
+				if (functor(mBuff[currentIndex])) {
+					new (&mBuff[currentIndex]) tType(mBuff[lastIndex]);
+					mBuff[lastIndex].~tType();
+					lastIndex--;
+				} else {
+					currentIndex++;
+				}
+			}
+
+			erase(lastIndex + 1, mLoad);
+		}
+
+		void reverse() {
+			for (ualni idx = 0; idx < mLoad / 2; idx++) {
+				swapV(mBuff[idx], mBuff[mLoad - idx - 1]);
+			}
+		}
+
 	public:
 		class IteratorPointer {
 		protected:

Containers/public/Buffer2D.hpp

@@ -58,12 +58,13 @@ namespace tp {
 		[[nodiscard]] Index2D size() const { return { mSize.x, mSize.y }; }
 
 		tType* getBuff() const { return mBuff; }
+    void setBuff(tType* data, Index2D size) { mBuff = data; mSize = size; }
 
 		void flipY() {
 			for (Index i = 0; i < mSize.x; i++) {
 				const auto lenIdx = mSize.y - 1;
 				for (Index j = 0; j < mSize.y / 2; j++) {
-					swap(get({i, j}), get({i, lenIdx - j}));
+					swapV(get({ i, j }), get({ i, lenIdx - j }));
 				}
 			}
 		}
@@ -72,7 +73,7 @@ namespace tp {
 			for (Index i = 0; i < mSize.y; i++) {
 				const auto lenIdx = mSize.x - 1;
 				for (Index j = 0; j < mSize.x / 2; j++) {
-					swap(get({i, j}), get({i, lenIdx - j}));
+					swapV(get({ i, j }), get({ i, lenIdx - j }));
 				}
 			}
 		}

Containers/public/IntervalTree.hpp

@@ -2,6 +2,8 @@
 
 #include "Tree.hpp"
 
+#include <limits>
+
 namespace tp {
 
 	template <typename tType>
@@ -31,7 +33,7 @@ namespace tp {
 
 		template <typename tTreeNodeType>
 		inline void updateNodeCache(const tTreeNodeType* node) {
-			mMax = 0;
+			mMax = std::numeric_limits<tType>::min();
 			if (node->mRight && node->mRight->key.mMax > mMax) mMax = node->mRight->key.mMax;
 			if (node->mLeft && node->mLeft->key.mMax > mMax) mMax = node->mLeft->key.mMax;
 			if (mMax < mEnd) mMax = mEnd;

Containers/public/LinearRingBuffer.hpp

@@ -0,0 +1,54 @@
+
+#include <cstddef>
+#include <cstdint>
+#include <sys/mman.h>
+
+#include "liniar_ring.hpp"
+
+class LinearRingBuffer {
+public:
+	LinearRingBuffer(size_t size, size_t history) {
+		const auto& [mem, aligned_size] = lrbm::create_linear_ring(size);
+
+		mem_ = (uint8_t*) mem;
+		memSize_ = aligned_size;
+		bufferSize_ = size;
+		historySize_ = history;
+
+		write_ptr_ = mem_;
+		read_ptr_ = mem_;
+	}
+
+	~LinearRingBuffer() { lrbm::destroy_linear_ring((void*) mem_, memSize_ * 2); }
+
+	uint8_t* write_data() { return write_ptr_; }
+	uint8_t* read_data() { return read_ptr_; }
+
+	void write_advance(size_t bytes) { write_ptr_ = advancePointer(write_ptr_, bytes); }
+	void read_advance(size_t bytes) { read_ptr_ = advancePointer(read_ptr_, bytes); }
+
+	void read_reset_with_history() {
+		const auto offset = size_t(write_ptr_ - mem_);
+
+		if (historySize_ < offset) {
+			read_ptr_ = write_ptr_ - historySize_;
+			return;
+		}
+
+		read_ptr_ = mem_ + (memSize_ + offset - historySize_);
+	}
+
+private:
+	inline uint8_t* advancePointer(const uint8_t* ptr, size_t bytes) {
+		return mem_ + (size_t(ptr - mem_) + bytes) % memSize_;
+	}
+
+	size_t bufferSize_ = 0;
+	size_t historySize_ = 0;
+	size_t memSize_ = 0;
+
+	uint8_t* mem_ = nullptr;
+
+	uint8_t* read_ptr_ = 0;
+	uint8_t* write_ptr_ = 0;
+};

Containers/public/List.hpp

@@ -110,6 +110,7 @@ namespace tp {
 		}
 
 		void attach(Node* node, Node* node_to) {
+			node->next = node->prev = nullptr;
 			if (node_to) {
 				if (node_to->next) {
 					node->next = node_to->next;
@@ -158,15 +159,10 @@ namespace tp {
 		}
 
 		[[nodiscard]] Node* find(const TypeArg data) const {
-			Node* found = mFirst;
+			for (Node* found = mFirst; found; found = found->next) {
-			for (alni i = 0; data != found->data; i++) {
+				if (data == found->data) return found;
-				if (i == length()) return nullptr;
-				if (!found->next) {
-					return nullptr;
-				}
-				found = found->next;
 			}
-			return found;
+			return nullptr;
 		}
 
 		[[nodiscard]] inline const Type& operator[](Index idx) const {
@@ -206,6 +202,7 @@ namespace tp {
 		void insert(TypeArg data, Index idx) { insert(newNode(data), idx); }
 
 		void removeNode(Node* node) {
+			if (!node) return;
 			detach(node);
 			deleteNode(node);
 		}
@@ -291,9 +288,9 @@ namespace tp {
 			while (iter) {
 				tmp = iter;
 				iter = iter->next;
-				swap(tmp->next, tmp->prev);
+				swapV(tmp->next, tmp->prev);
 			}
-			swap(mFirst, mLast);
+			swapV(mFirst, mLast);
 		}
 
 		void detachAll() {

Containers/public/RingBufferByte.hpp

@@ -0,0 +1,127 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cassert>
+#include <cstring>
+#include <stdexcept>
+#include <vector>
+
+template <bool ALLOW_BUFFER_OVERRIDE>
+class RingBufferByte {
+public:
+	explicit RingBufferByte(size_t maxCapacity) { buffer_.resize(maxCapacity); }
+
+	~RingBufferByte() = default;
+
+	void pushBack(const uint8_t* buffer, size_t size) {
+		const auto REQUIRED_SIZE = size + sizeof(size);
+		const auto DEPOSIT = static_cast<int>(freeSpace()) - static_cast<int>(REQUIRED_SIZE);
+
+		if (DEPOSIT < 0) {
+			if (ALLOW_BUFFER_OVERRIDE) {
+				freeupSpace(static_cast<size_t>(-DEPOSIT));
+			} else {
+				throw std::runtime_error("ring buffer overflow");
+			}
+		}
+
+		push(reinterpret_cast<const uint8_t*>(&size), sizeof(size));
+		push(buffer, size);
+	}
+
+	[[nodiscard]] auto frontSize() const -> size_t {
+		size_t size = 0;
+
+		if (dataSize() < sizeof(size)) {
+			throw std::runtime_error("no data in the buffer");
+		}
+
+		peek(reinterpret_cast<uint8_t*>(&size), sizeof(size));
+
+		return size;
+	}
+
+	auto popFront(uint8_t* buffer) -> size_t {
+		size_t size = 0;
+
+		if (dataSize() < sizeof(size)) {
+			return 0;
+		}
+
+		pop(reinterpret_cast<uint8_t*>(&size), sizeof(size));
+		pop(buffer, size);
+
+		return size;
+	}
+
+	void clear() {
+		end_ = 0;
+		start_ = 0;
+	}
+
+	[[nodiscard]] bool empty() const { return start_ == end_; }
+
+private:
+	void push(const uint8_t* buffer, size_t size) {
+		for (size_t simpleIdx = 0; simpleIdx < size; simpleIdx++) {
+			buffer_[end_++] = buffer == nullptr ? 0 : buffer[simpleIdx];
+
+			if (end_ == buffer_.size()) {
+				end_ = 0;
+			}
+		}
+	}
+
+	void pop(uint8_t* buffer, size_t size) {
+		for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) {
+			if (buffer != nullptr) {
+				buffer[sampleIdx] = buffer_[start_];
+			}
+
+			start_++;
+
+			if (start_ == buffer_.size()) {
+				start_ = 0;
+			}
+		}
+	}
+
+	void peek(uint8_t* buffer, size_t size) const {
+		auto iter = start_;
+		for (size_t sampleIdx = 0; sampleIdx < size; sampleIdx++) {
+			buffer[sampleIdx] = buffer_[iter++];
+
+			if (iter == buffer_.size()) {
+				iter = 0;
+			}
+		}
+	}
+
+	void freeupSpace(size_t additionalRequiredSpace) {
+		const auto CURRENT_DEPOSIT = freeSpace();
+
+		while (CURRENT_DEPOSIT + additionalRequiredSpace >= freeSpace()) {
+			popFront(nullptr);
+		}
+	}
+
+	[[nodiscard]] size_t freeSpace() const {
+		if (start_ > end_) {
+			return start_ - end_;
+		}
+
+		const auto OUT = buffer_.size() - (end_ - start_);
+		return OUT;
+	}
+
+	[[nodiscard]] size_t dataSize() const { return buffer_.size() - freeSpace(); }
+
+	[[nodiscard]] bool hasSpace(unsigned int length) const { return freeSpace() > length; }
+
+	std::vector<uint8_t> buffer_;
+
+	size_t end_ = 0;
+	size_t start_ = 0;
+};

Containers/public/liniar_ring.hpp

@@ -0,0 +1,9 @@
+
+#include <cstddef>
+#include <utility>
+
+namespace lrbm {
+	std::pair<void*, size_t> create_linear_ring(size_t size);
+	void destroy_linear_ring(void* base, size_t size);
+	void test();
+}

Containers/tests/AVLTreeProfiling.cpp

@@ -17,7 +17,7 @@ Item buff[size];
 int main() {
 	AvlTree<AvlNumericKey<alni>, alni> tree;
 
-	for (auto i : Range(size)) {
+	for (auto i : IterRange(size)) {
 		buff[i].data = i;
 	}
 

Containers/tests/BufferTest.cpp

@@ -9,7 +9,7 @@ SUITE(Buffer) {
 	TEST(Simple1) {
 		Buffer<TestClass, TestAllocator> buff;
 		CHECK(buff.size() == 0);
-		for (auto i : Range(size * 10)) {
+		for (auto i : IterRange(size * 10)) {
 			buff.append(TestClass(i));
 		}
 		CHECK(buff.size() == size * 10);
@@ -21,7 +21,7 @@ SUITE(Buffer) {
 	TEST(Simple2) {
 		Buffer<TestClass, TestAllocator> buff(size);
 		CHECK(buff.size() == size);
-		for (auto i : Range(size * 10))
+		for (auto i : IterRange(size * 10))
 			buff.append(TestClass(i));
 		CHECK(buff.size() == size + size * 10);
 		while (buff.size())

Containers/tests/IntervalTreeTests.cpp

@@ -16,9 +16,12 @@ struct Interval {
 	bool ignore = false;
 
 	void random(halnf span, halnf scale = 1.f) {
-		start = ((halnf) randomFloat()) * (span);
+		auto offset = 0;
-		end = ((halnf) randomFloat()) * (span);
+
-		if (start > end) swap(start, end);
+		start = ((halnf) randomFloat()) * (span) - offset;
+		end = ((halnf) randomFloat()) * (span) - offset;
+
+		if (start > end) swapV(start, end);
 
 		auto len = (end - start) * scale * 0.5f;
 		auto mid = (start + end) / 2.f;
@@ -96,7 +99,7 @@ SUITE(IntervalTree) {
 		};
 
 		// initialize
-		for (auto i : Range<ualni>(NUM_TEST_INTERVALS)) {
+		for (auto i : IterRange<ualni>(NUM_TEST_INTERVALS)) {
 			auto interval = Interval();
 			interval.random(SPAN);
 
@@ -111,7 +114,7 @@ SUITE(IntervalTree) {
 		test();
 
 		// remove some
-		for (auto i : Range<ualni>(NUM_TEST_INTERVALS / 2)) {
+		for (auto i : IterRange<ualni>(NUM_TEST_INTERVALS / 2)) {
 			auto idx = ualni(randomFloat() * (alnf) pool.size());
 			pool[idx].ignore = true;
 			intervalTree.remove({ pool[idx].start, pool[idx].end });
@@ -136,18 +139,18 @@ SUITE(IntervalTree) {
 			Buffer<Interval> testIntervals;
 
 			auto WOBBLE = SPAN * 0;
-			for (auto i : Range<ualni>(NUM_TEST_INTERVALS)) {
+			for (auto i : IterRange<ualni>(NUM_TEST_INTERVALS)) {
 				auto interval = Interval();
 				interval.randomSized(SPAN, SCALE, WOBBLE);
 				intervalTree.insert({ interval.start, interval.end }, i);
 				// WOBBLE -= 1.f;
 			}
 
-			for (auto i : Range(0))
+			for (auto i : IterRange(0))
 				intervalTree.insert({ (halnf) i * 0.01f, SPAN }, 0);
 
 			WOBBLE = 0;
-			for (auto i : Range<ualni>(NUM_CHECKS)) {
+			for (auto i : IterRange<ualni>(NUM_CHECKS)) {
 				auto interval = Interval();
 				interval.randomSized(SPAN, SCALE, WOBBLE);
 				testIntervals.append(interval);
@@ -197,7 +200,7 @@ SUITE(IntervalTree) {
 		};
 
 		Buffer<Stat> stats;
-		for (auto i : Range(2, 5)) {
+		for (auto i : IterRange(2, 5)) {
 			Stat stat = test(pow(10, i), 100);
 			stats.append(stat);
 		}

Containers/tests/MapTest.cpp

@@ -8,26 +8,26 @@ SUITE(HashTable) {
 	TEST(SimpleReference) {
 		tp::Map<tp::ualni, TestClass, TestAllocator> map;
 
-		for (auto i : Range(1000, 100000)) {
+		for (auto i : IterRange(1000, 100000)) {
 			map.put(i, TestClass(i));
 		}
 
-		for (auto i : Range(1000, 100000)) {
+		for (auto i : IterRange(1000, 100000)) {
 			CHECK(map.presents(i));
 			CHECK_EQUAL((tp::ualni) map.get(i).getVal(), (tp::ualni) i);
 		}
 
-		for (auto i : Range(1000, 100000)) {
+		for (auto i : IterRange(1000, 100000)) {
 			map.put(i, TestClass(i));
 		}
 
-		for (auto i : Range(1000, 2000)) {
+		for (auto i : IterRange(1000, 2000)) {
 			CHECK(map.presents(i));
 			map.remove(i);
 			CHECK(!map.presents(i));
 		}
 
-		for (auto i : Range(2000, 100000)) {
+		for (auto i : IterRange(2000, 100000)) {
 			CHECK(map.presents(i));
 			CHECK_EQUAL((tp::ualni) map.get(i).getVal(), (tp::ualni) i);
 		}
@@ -42,29 +42,29 @@ SUITE(HashTable) {
 	TEST(SimplePointer) {
 		tp::Map<tp::ualni, TestClass*, TestAllocator> map;
 
-		for (auto i : Range(1000)) {
+		for (auto i : IterRange(1000)) {
 			map.put(i, new TestClass(i));
 		}
 
-		for (auto i : Range(1000)) {
+		for (auto i : IterRange(1000)) {
 			CHECK(map.presents(i));
 			CHECK_EQUAL((tp::ualni) map.get(i)->getVal(), (tp::ualni) i);
 		}
 
-		for (auto i : Range(1000)) {
+		for (auto i : IterRange(1000)) {
 			auto del = map.get(i);
 			map.put(i, new TestClass(i));
 			delete del;
 		}
 
-		for (auto i : Range(900, 1000)) {
+		for (auto i : IterRange(900, 1000)) {
 			CHECK(map.presents(i));
 			delete map.get(i);
 			map.remove(i);
 			CHECK(!map.presents(i));
 		}
 
-		for (auto i : Range(900)) {
+		for (auto i : IterRange(900)) {
 			CHECK(map.presents(i));
 			CHECK_EQUAL((tp::ualni) map.get(i)->getVal(), (tp::ualni) i);
 		}
@@ -80,7 +80,7 @@ SUITE(HashTable) {
 	TEST(Copy) {
 		tp::Map<tp::ualni, TestClass, TestAllocator> map;
 
-		for (auto i : Range(10)) {
+		for (auto i : IterRange(10)) {
 			map.put(i, TestClass(i));
 		}
 
@@ -95,7 +95,7 @@ SUITE(HashTable) {
 	TEST(SaveLoad) {
 		tp::Map<tp::ualni, TestClass, TestAllocator> map;
 
-		for (auto i : Range(10)) {
+		for (auto i : IterRange(10)) {
 			map.put(i, TestClass(i));
 		}
 
@@ -114,7 +114,7 @@ SUITE(HashTable) {
 
 		CHECK(map.size() == 10);
 
-		for (auto i : Range(10)) {
+		for (auto i : IterRange(10)) {
 			CHECK(map.presents(i));
 			CHECK_EQUAL(map.get(i).getVal(), i);
 		}

Containers/tests/RingBufferByte.cpp

@@ -0,0 +1,69 @@
+
+#include "Tests.hpp"
+#include "RingBufferByte.hpp"
+
+SUITE(RingBufferBytes) {
+	TEST(Simple) {
+
+		using Data = std::vector<uint8_t>;
+		using DataStorage = std::vector<Data>;
+
+		constexpr auto BUFFER_SIZE = 395;
+		constexpr auto MAX_MSG_SIZE = 31;
+		constexpr auto ITERATIONS = 100000;
+
+		DataStorage pushed;
+		DataStorage popped;
+
+		RingBufferByte<true> buffer(BUFFER_SIZE);
+
+		Data randomSamples(MAX_MSG_SIZE);
+
+		for (auto idx = 0; idx < MAX_MSG_SIZE; idx++) {
+			randomSamples[idx] = (idx + 5 * 31) % 13;
+		}
+
+		const auto PUSH = [&](RingBufferByte<true>& buffer, DataStorage* storage) {
+			const Data& pushedSample = randomSamples;
+
+			buffer.pushBack(pushedSample.data(), pushedSample.size());
+
+			if (storage) {
+				storage->push_back(pushedSample);
+			}
+		};
+
+		const auto POP = [](RingBufferByte<true>& buffer, DataStorage* storage) {
+			const auto poppedSampleSize = buffer.frontSize();
+
+			Data poppedSample(poppedSampleSize);
+
+			const auto SIZE = buffer.popFront(poppedSample.data());
+
+			CHECK(poppedSample.size() == SIZE);
+
+			if (storage) {
+				storage->push_back(poppedSample);
+			}
+		};
+
+		for (auto iteration = 0; iteration < ITERATIONS; iteration++) {
+			PUSH(buffer, nullptr);
+		}
+
+		while (!buffer.empty()) {
+			POP(buffer, nullptr);
+		}
+
+		for (auto iteration = 0; iteration < ITERATIONS; iteration++) {
+			PUSH(buffer, &pushed);
+			POP(buffer, &popped);
+		}
+
+		CHECK(pushed.size() == popped.size());
+
+		for (auto idx = 0; idx < popped.size(); idx++) {
+			CHECK(pushed[idx] == popped[idx]);
+		}
+	}
+}

Containers/tests/TreeTest.cpp

@@ -37,7 +37,7 @@ SUITE(AvlTree) {
 
 		Item buff[size];
 
-		for (auto i : Range(size)) {
+		for (auto i : IterRange(size)) {
 			buff[i].data.setVal(i);
 		}
 

Containers/tests/benchLinearRingBuffer.cpp

@@ -0,0 +1,188 @@
+#include "LinearRingBuffer.hpp"
+
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <cstdint>
+#include <random>
+
+static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); }
+
+static bool check(const void* ptr, size_t n, uint8_t value) {
+	const uint8_t* p = static_cast<const uint8_t*>(ptr);
+	for (size_t i = 0; i < n; ++i) {
+		if (p[i] != value) return false;
+	}
+	return true;
+}
+
+static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) {
+	const uint8_t* p = static_cast<const uint8_t*>(ptr);
+	for (size_t i = 0; i < n; ++i) {
+		if (p[i] != value) return false;
+	}
+	return true;
+}
+
+using Data = std::vector<uint8_t>;
+using DataStorage = std::vector<Data>;
+
+typedef ::testing::Types<
+	std::integral_constant<size_t, 64>,
+	std::integral_constant<size_t, 128>,
+	std::integral_constant<size_t, 1000>,
+	std::integral_constant<size_t, 4096>,
+	std::integral_constant<size_t, 4096 * 2>>
+	BufferSizes;
+
+template <typename TypeParam>
+class LinearRingBufferTest : public ::testing::Test {
+protected:
+	LinearRingBuffer rb;
+
+	LinearRingBufferTest() :
+		historySize_(10),
+		rb(size_t(TypeParam::value), size_t(historySize_)) {}
+
+	static constexpr auto ITERATIONS = TypeParam::value * 10;
+
+	size_t messagesPushed_ = 0;
+	size_t historySize_ = 0;
+
+	auto iterations() { return ITERATIONS; }
+
+	auto historySize() { return historySize_; }
+
+	size_t randomSize() {
+		static std::random_device rnd;
+		std::uniform_int_distribution<size_t> dist(0, 1000);
+		return dist(rnd);
+	}
+
+	auto write_and_advance(size_t messageSize, DataStorage* storage) {
+		Data pushedSample(messageSize);
+
+		for (auto idx = 0; idx < messageSize; idx++) {
+			pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321;
+		}
+
+		std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size());
+		this->rb.write_advance(pushedSample.size());
+
+		if (storage) {
+			storage->push_back(pushedSample);
+		}
+	};
+
+	auto read_and_advance(size_t messageSize, DataStorage* storage) {
+		Data poppedSample(messageSize);
+
+		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
+
+		this->rb.read_advance(poppedSample.size());
+
+		if (storage) {
+			storage->push_back(poppedSample);
+		}
+	};
+
+	auto reset_with_history() { this->rb.read_reset_with_history(); };
+
+	auto read_with_history(size_t messageSize, DataStorage* storage) {
+		Data poppedSample(messageSize);
+
+		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
+
+		if (storage) {
+			storage->push_back(poppedSample);
+		}
+	};
+};
+
+TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes);
+
+TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) {
+	constexpr size_t N = TypeParam::value;
+
+	if (N % 4096 != 0) {
+		return;
+	}
+
+	auto* base = this->rb.write_data();
+
+	size_t half = N - 16;
+	fill(base, half, 0xAA);
+	fill(base + half, 32, 0xBB);
+
+	EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true);
+	EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true);
+	EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true);
+}
+
+TYPED_TEST(LinearRingBufferTest, Chase) {
+
+	DataStorage pushed;
+	DataStorage popped;
+
+	static constexpr auto MSG_SIZE = 31;
+
+	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
+		this->write_and_advance(MSG_SIZE, &pushed);
+		this->read_and_advance(MSG_SIZE, &popped);
+	}
+
+	ASSERT_EQ(pushed.size(), popped.size());
+
+	for (auto idx = 0; idx < popped.size(); idx++) {
+		ASSERT_EQ(pushed[idx], popped[idx]);
+	}
+}
+
+Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) {
+	if (historySize > prev.size()) historySize = prev.size();
+
+	std::vector<uint8_t> result;
+
+	result.reserve(historySize + current.size());
+
+	result.insert(result.end(), prev.end() - historySize, prev.end());
+	result.insert(result.end(), current.begin(), current.end());
+
+	return result;
+}
+
+TYPED_TEST(LinearRingBufferTest, History) {
+
+	DataStorage pushed;
+	DataStorage popped;
+
+	pushed.push_back(Data(this->historySize()));
+
+	static constexpr auto MAX_MSG_SIZE = 111;
+
+	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
+
+		const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE;
+
+		auto prevPushed = pushed.back();
+		pushed.clear();
+
+		this->reset_with_history();
+
+		this->write_and_advance(MSG_SIZE, &pushed);
+		auto currentPushed = pushed.back();
+
+		this->read_with_history(this->historySize() + MSG_SIZE, &popped);
+		auto poppedWithHistory = popped.back();
+		popped.clear();
+
+		auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize());
+
+		ASSERT_EQ(correctResult, poppedWithHistory);
+	}
+}
+
+int main(int argc, char** argv) {
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}

Containers/tests/testLinearRingBuffer.cpp

@@ -0,0 +1,188 @@
+#include "LinearRingBuffer.hpp"
+
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <cstdint>
+#include <random>
+
+static void fill(void* ptr, size_t n, uint8_t value) { std::memset(ptr, value, n); }
+
+static bool check(const void* ptr, size_t n, uint8_t value) {
+	const uint8_t* p = static_cast<const uint8_t*>(ptr);
+	for (size_t i = 0; i < n; ++i) {
+		if (p[i] != value) return false;
+	}
+	return true;
+}
+
+static bool expect_mem_eq(const void* ptr, size_t n, uint8_t value) {
+	const uint8_t* p = static_cast<const uint8_t*>(ptr);
+	for (size_t i = 0; i < n; ++i) {
+		if (p[i] != value) return false;
+	}
+	return true;
+}
+
+using Data = std::vector<uint8_t>;
+using DataStorage = std::vector<Data>;
+
+typedef ::testing::Types<
+	std::integral_constant<size_t, 64>,
+	std::integral_constant<size_t, 128>,
+	std::integral_constant<size_t, 1000>,
+	std::integral_constant<size_t, 4096>,
+	std::integral_constant<size_t, 4096 * 2>>
+	BufferSizes;
+
+template <typename TypeParam>
+class LinearRingBufferTest : public ::testing::Test {
+protected:
+	LinearRingBuffer rb;
+
+	LinearRingBufferTest() :
+		historySize_(10),
+		rb(size_t(TypeParam::value), size_t(historySize_)) {}
+
+	static constexpr auto ITERATIONS = TypeParam::value * 10;
+
+	size_t messagesPushed_ = 0;
+	size_t historySize_ = 0;
+
+	auto iterations() { return ITERATIONS; }
+
+	auto historySize() { return historySize_; }
+
+	size_t randomSize() {
+		static std::random_device rnd;
+		std::uniform_int_distribution<size_t> dist(0, 1000);
+		return dist(rnd);
+	}
+
+	auto write_and_advance(size_t messageSize, DataStorage* storage) {
+		Data pushedSample(messageSize);
+
+		for (auto idx = 0; idx < messageSize; idx++) {
+			pushedSample[idx] = (idx + messagesPushed_++ * 53) % 321;
+		}
+
+		std::memcpy(this->rb.write_data(), pushedSample.data(), pushedSample.size());
+		this->rb.write_advance(pushedSample.size());
+
+		if (storage) {
+			storage->push_back(pushedSample);
+		}
+	};
+
+	auto read_and_advance(size_t messageSize, DataStorage* storage) {
+		Data poppedSample(messageSize);
+
+		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
+
+		this->rb.read_advance(poppedSample.size());
+
+		if (storage) {
+			storage->push_back(poppedSample);
+		}
+	};
+
+	auto reset_with_history() { this->rb.read_reset_with_history(); };
+
+	auto read_with_history(size_t messageSize, DataStorage* storage) {
+		Data poppedSample(messageSize);
+
+		std::memcpy(poppedSample.data(), this->rb.read_data(), poppedSample.size());
+
+		if (storage) {
+			storage->push_back(poppedSample);
+		}
+	};
+};
+
+TYPED_TEST_SUITE(LinearRingBufferTest, BufferSizes);
+
+TYPED_TEST(LinearRingBufferTest, LinearWriteAcrossBoundary) {
+	constexpr size_t N = TypeParam::value;
+
+	if (N % 4096 != 0) {
+		return;
+	}
+
+	auto* base = this->rb.write_data();
+
+	size_t half = N - 16;
+	fill(base, half, 0xAA);
+	fill(base + half, 32, 0xBB);
+
+	EXPECT_EQ(expect_mem_eq(base, 16, 0xBB), true);
+	EXPECT_EQ(expect_mem_eq(base + 16, half - 16, 0xAA), true);
+	EXPECT_EQ(expect_mem_eq(base + half, 32, 0xBB), true);
+}
+
+TYPED_TEST(LinearRingBufferTest, Chase) {
+
+	DataStorage pushed;
+	DataStorage popped;
+
+	static constexpr auto MSG_SIZE = 31;
+
+	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
+		this->write_and_advance(MSG_SIZE, &pushed);
+		this->read_and_advance(MSG_SIZE, &popped);
+	}
+
+	ASSERT_EQ(pushed.size(), popped.size());
+
+	for (auto idx = 0; idx < popped.size(); idx++) {
+		ASSERT_EQ(pushed[idx], popped[idx]);
+	}
+}
+
+Data makeMessageWithHistory(const Data& prev, const Data& current, size_t historySize) {
+	if (historySize > prev.size()) historySize = prev.size();
+
+	std::vector<uint8_t> result;
+
+	result.reserve(historySize + current.size());
+
+	result.insert(result.end(), prev.end() - historySize, prev.end());
+	result.insert(result.end(), current.begin(), current.end());
+
+	return result;
+}
+
+TYPED_TEST(LinearRingBufferTest, History) {
+
+	DataStorage pushed;
+	DataStorage popped;
+
+	pushed.push_back(Data(this->historySize()));
+
+	static constexpr auto MAX_MSG_SIZE = 111;
+
+	for (auto iteration = 0; iteration < this->iterations(); iteration++) {
+
+		const auto MSG_SIZE = this->historySize() + this->randomSize() % MAX_MSG_SIZE;
+
+		auto prevPushed = pushed.back();
+		pushed.clear();
+
+		this->reset_with_history();
+
+		this->write_and_advance(MSG_SIZE, &pushed);
+		auto currentPushed = pushed.back();
+
+		this->read_with_history(this->historySize() + MSG_SIZE, &popped);
+		auto poppedWithHistory = popped.back();
+		popped.clear();
+
+		auto correctResult = makeMessageWithHistory(prevPushed, currentPushed, this->historySize());
+
+		ASSERT_EQ(correctResult, poppedWithHistory);
+	}
+}
+
+int main(int argc, char** argv) {
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}

DataAnalysis/applications/NumRecApp.cpp

@@ -10,6 +10,8 @@
 
 using namespace tp;
 
+#include <filesystem>
+
 void loadImage(Buffer<halnf>& output, const char* name) {
 	int x, y, channels_in_file;
 	unsigned char* loadedImage = stbi_load(name, &x, &y, &channels_in_file, 4);
@@ -18,7 +20,7 @@ void loadImage(Buffer<halnf>& output, const char* name) {
 
 	output.reserve(x * y);
 
-	for (auto i : Range(output.size())) {
+	for (auto i : IterRange(output.size())) {
 		output[i] = loadedImage[i * 4] / 255.f;
 	}
 
@@ -28,7 +30,9 @@ void loadImage(Buffer<halnf>& output, const char* name) {
 void loadNN(FCNN& nn) {
 	ArchiverLocalConnection<true> archiver;
 
-	archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
+	if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
+		archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
+	}
 
 	if (archiver.connection.getConnectionStatus().isOpened()) {
 		archiver % nn;
@@ -56,7 +60,7 @@ void executeCmd(const char* imageName) {
 }
 
 int main(int argc, char** argv) {
-	const char* imageName = "digit.png";
+	const char* imageName = "tmp2.png";
 
 	if (argc == 2) {
 		imageName = argv[1];

DataAnalysis/applications/NumRecTraining.cpp

@@ -1,3 +1,4 @@
+#include <filesystem>
 #include "FCNN.hpp"
 #include "LocalConnection.hpp"
 
@@ -52,7 +53,7 @@ bool loadDataset(Dataset& out, const std::string& location) {
 	out.labels.reserve(out.length);
 	out.images.reserve(out.length);
 
-	for (auto i : Range(out.length)) {
+	for (auto i : IterRange(out.length)) {
 		auto& image = out.images[i];
 		image.reserve(sizeX * sizeY);
 		dataset.readBytes((LocalConnection::Byte*) image.getBuff(), sizeX * sizeY);
@@ -71,7 +72,9 @@ struct NumberRec {
 		{
 			ArchiverLocalConnection<true> archiver;
 
-			archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
+			if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
+				archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
+			}
 
 			if (archiver.connection.getConnectionStatus().isOpened()) {
 				archiver % nn;
@@ -89,7 +92,7 @@ struct NumberRec {
 		}
 
 		mTestcases.reserve(dataset.images.size());
-		for (auto i : Range(dataset.images.size())) {
+		for (auto i : IterRange(dataset.images.size())) {
 			auto& image = dataset.images[i];
 			auto label = dataset.labels[i];
 
@@ -97,13 +100,13 @@ struct NumberRec {
 
 			testcase.output.reserve(10);
 
-			for (auto dig : Range(10)) {
+			for (auto dig : IterRange(10)) {
 				testcase.output[dig] = label == dig ? 1 : 0;
 			}
 
 			testcase.input.reserve(image.size());
 
-			for (auto pxl : Range(image.size())) {
+			for (auto pxl : IterRange(image.size())) {
 				testcase.input[pxl] = (halnf) image[pxl] / 255.f;
 			}
 		}
@@ -137,7 +140,7 @@ struct NumberRec {
 
 	static halni getMaxIdx(const Buffer<halnf>& in) {
 		halni out = 0;
-		for (auto i : Range(in.size())) {
+		for (auto i : IterRange(in.size())) {
 			if (in[i] > in[out]) {
 				out = i;
 			}
@@ -165,15 +168,15 @@ struct NumberRec {
 	void displayImage(ualni idx) {
 		auto& testcase = mTestcases[idx];
 		printf("Image : %i\n", int(getMaxIdx(testcase.output)));
-		for (auto i : Range(28)) {
+		for (auto i : IterRange(28)) {
-			for (auto j : Range(28)) {
+			for (auto j : IterRange(28)) {
 				printf("%c", char(testcase.input[j * 28 + i] * 255));
 			}
 			printf("\n");
 		}
 	}
 
-	halnf test(const Range<halni>& range) {
+	halnf test(const IterRange<halni>& range) {
 		halnf avgCost = 0;
 		for (auto i : range) {
 			avgCost += eval(i);
@@ -182,7 +185,7 @@ struct NumberRec {
 		return avgCost;
 	}
 
-	void trainStep(const Range<halni>& range) {
+	void trainStep(const IterRange<halni>& range) {
 		nn.clearGrad();
 		for (auto i : range) {
 			nn.evaluate(mTestcases[i].input, output);
@@ -210,18 +213,19 @@ int main() {
 	NumberRec app;
 
 	auto numBatches = 10;
-	auto trainRange = Range(0, 50000);
+	auto trainRange = IterRange(0, 50000);
-	auto testRange = Range(50000, 70000);
+	auto testRange = IterRange(50000, 70000);
 
 	auto batchSize = trainRange.idxDiff() / numBatches;
 
-	for (auto epoch : Range(1)) {
+	for (auto epoch : IterRange(10)) {
 		printf("Epoch %i\n", epoch.index());
 
-		for (auto batchIdx : Range(trainRange.idxDiff() / batchSize)) {
+		for (auto batchIdx : IterRange(trainRange.idxDiff() / batchSize)) {
 			printf(" - Batch :%i \n", batchIdx.index());
 
-			auto batchRange = Range(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1));
+			auto batchRange =
+				IterRange(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1));
 
 			app.trainStep(batchRange);
 
@@ -240,5 +244,5 @@ int main() {
 		// app.displayImage(i);
 	}
 
-	printf("\n\nIncorrect - %i out of %i (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
+	printf("\n\nIncorrect - %i out of %i error percentage (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
 }

DataAnalysis/private/FCNN.cpp

@@ -32,7 +32,7 @@ void FCNN::initializeRandom(const Buffer<halni>& description) {
 
 	mLayers.reserve(description.size());
 
-	for (auto i : Range<halni>(0, (halni) description.size())) {
+	for (auto i : IterRange<halni>(0, (halni) description.size())) {
 		mLayers[i].neurons.reserve(description[i]);
 		if (i == 0) {
 			continue;
@@ -50,17 +50,17 @@ void FCNN::initializeRandom(const Buffer<halni>& description) {
 void FCNN::evaluate(const Buffer<halnf>& input, Buffer<halnf>& output) {
 	ASSERT(output.size() == mLayers.last().neurons.size() && input.size() == mLayers.first().neurons.size())
 
-	for (auto idx : Range(input.size())) {
+	for (auto idx : IterRange(input.size())) {
 		mLayers.first().neurons[idx].activationValue = input[idx];
 	}
 
-	for (auto layerIdx : Range<halni>(1, (halni) mLayers.size())) {
+	for (auto layerIdx : IterRange<halni>(1, (halni) mLayers.size())) {
 		auto& layer = mLayers[layerIdx];
 		auto& layerPrev = mLayers[layerIdx - 1];
 
 		for (auto neuron : layer.neurons) {
 			neuron->activationValue = 0;
-			for (auto connectionIdx : Range(neuron->weights.size())) {
+			for (auto connectionIdx : IterRange(neuron->weights.size())) {
 				neuron->activationValue += neuron->weights[connectionIdx].val * layerPrev.neurons[connectionIdx].activationValue;
 			}
 			neuron->activationValue += neuron->bias.val;
@@ -69,26 +69,26 @@ void FCNN::evaluate(const Buffer<halnf>& input, Buffer<halnf>& output) {
 		}
 	}
 
-	for (auto idx : Range(output.size())) {
+	for (auto idx : IterRange(output.size())) {
 		output[idx] = mLayers.last().neurons[idx].activationValue;
 	}
 }
 
 halnf FCNN::calcCost(const Buffer<halnf>& output) {
 	halnf out = 0;
-	for (auto neuronIdx : Range(mLayers.last().neurons.size())) {
+	for (auto neuronIdx : IterRange(mLayers.last().neurons.size())) {
 		out += pow(output[neuronIdx] - mLayers.last().neurons[neuronIdx].activationValue, 2);
 	}
 	return out;
 }
 
 void FCNN::clearGrad() {
-	for (auto layIdx : Range<halni>(1, (halni) mLayers.size())) {
+	for (auto layIdx : IterRange<halni>(1, (halni) mLayers.size())) {
 		auto& layer = mLayers[layIdx];
 
 		for (auto neuron : layer.neurons) {
 			neuron->bias.grad = 0;
-			for (auto weightIdx : Range(neuron->weights.size())) {
+			for (auto weightIdx : IterRange(neuron->weights.size())) {
 				neuron->weights[weightIdx].grad = 0;
 			}
 		}
@@ -102,7 +102,7 @@ void FCNN::calcGrad(const Buffer<halnf>& output) {
 	auto& lastLayer = mLayers.last();
 
 	// calculate chaining cache value for each neuron in last layer
-	for (auto neuronIdx : Range(lastLayer.neurons.size())) {
+	for (auto neuronIdx : IterRange(lastLayer.neurons.size())) {
 		auto& neuron = lastLayer.neurons[neuronIdx];
 		neuron.cache = 2 * (neuron.activationValue - output[neuronIdx]);
 	}
@@ -113,7 +113,7 @@ void FCNN::calcGrad(const Buffer<halnf>& output) {
 		auto& currentLayer = mLayers[layerIdx];
 		auto& inputLayer = mLayers[layerIdx - 1];
 
-		for (auto currentNeuronIdx : Range(currentLayer.neurons.size())) {
+		for (auto currentNeuronIdx : IterRange(currentLayer.neurons.size())) {
 			auto& currentNeuron = currentLayer.neurons[currentNeuronIdx];
 
 			// calculate cache value (chaining)
@@ -131,7 +131,7 @@ void FCNN::calcGrad(const Buffer<halnf>& output) {
 			currentNeuron.bias.grad += currentNeuron.cache;
 
 			// calculate gradient for weights of current neuron
-			for (auto weightIdx : Range(currentNeuron.weights.size())) {
+			for (auto weightIdx : IterRange(currentNeuron.weights.size())) {
 				currentNeuron.weights[weightIdx].grad += inputLayer.neurons[weightIdx].activationValue * currentNeuron.cache;
 			}
 		}
@@ -142,12 +142,12 @@ void FCNN::calcGrad(const Buffer<halnf>& output) {
 
 void FCNN::applyGrad(halnf step) {
 
-	for (auto layIdx : Range<halni>(1, (halni) mLayers.size())) {
+	for (auto layIdx : IterRange<halni>(1, (halni) mLayers.size())) {
 		auto& layer = mLayers[layIdx];
 
 		for (auto neuron : layer.neurons) {
 			neuron->bias.val -= neuron->bias.grad / (halnf) mAvgCount * step;
-			for (auto weightIdx : Range(neuron->weights.size())) {
+			for (auto weightIdx : IterRange(neuron->weights.size())) {
 				neuron->weights[weightIdx].val -= (neuron->weights[weightIdx].grad / (halnf) mAvgCount) * step;
 			}
 		}

DataAnalysis/tests/Tests.cpp

@@ -31,11 +31,11 @@ SUITE(FCNN) {
 		Buffer<halnf> outputExpected(layers.last());
 		Buffer<halnf> output(layers.last());
 
-		for (auto inputVal : Range(layers.first())) {
+		for (auto inputVal : IterRange(layers.first())) {
 			input[inputVal] = inputLayer[inputVal];
 		}
 
-		for (auto outIdx : Range(layers.last())) {
+		for (auto outIdx : IterRange(layers.last())) {
 			outputExpected[outIdx] = outputLayer[outIdx];
 		}
 
@@ -44,7 +44,7 @@ SUITE(FCNN) {
 
 		halnf cost = 0;
 
-		for (auto i : Range(150)) {
+		for (auto i : IterRange(150)) {
 
 			nn.evaluate(input, output);
 		

Externals/CMakeLists.txt

@@ -1,42 +1,5 @@
 # find_package(ALSA REQUIRED)
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  message("Configuring for windows...")
-  message("Libraries path is - ${WINDOWS_LIBRARIES}")
-
-  set(CMAKE_PREFIX_PATH  "${WINDOWS_LIBRARIES}/glew-2.1.0")
-  find_package(GLEW REQUIRED)
-  set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib PARENT_SCOPE)
-
-    # Your relative paths
-    set(RELATIVE_INCLUDE_DIR  "${WINDOWS_LIBRARIES}/portaudio/include")
-    set(RELATIVE_LIB  "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib")
-
-    # Convert to absolute paths
-    get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE)
-    get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE)
-
-    # Set absolute paths with respect to the parent scope
-    set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" PARENT_SCOPE)
-    set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" PARENT_SCOPE)
-else()
-  find_package(GLEW REQUIRED)
-  set(GLEW_LIB ${GLEW_LIBRARIES} GL PARENT_SCOPE)
-
-  set(PORTAUDIO_LIB portaudio PARENT_SCOPE)
-endif()
-
-#add_subdirectory(glew/build/cmake/)
-#target_compile_definitions(glew_s PUBLIC GLEW_NO_GLU)
-
-#add_subdirectory(unittest-cpp)
-add_subdirectory(lalr)
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-else()
-  target_compile_options(UnitTest++ PUBLIC -Wno-error)
-endif()
-
-
 add_subdirectory(glfw)
 
 project(Imgui)
@@ -45,14 +8,18 @@ set(${PROJECT_NAME}_SOURCES
         imgui/imgui_draw.cpp
         imgui/imgui_tables.cpp
         imgui/imgui_widgets.cpp
+        imgui/imgui_demo.cpp
 
         imgui/backends/imgui_impl_glfw.cpp
         imgui/backends/imgui_impl_opengl3.cpp
+
+        implot/implot.cpp
+        implot/implot_items.cpp
 )
 
 add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
 include_directories(${PROJECT_NAME} ./glfw/include)
-target_include_directories(${PROJECT_NAME} PUBLIC ./imgui/ ./imgui/backends/)
+target_include_directories(${PROJECT_NAME} PUBLIC ./imgui/ ./imgui/backends/ ./implot/)
 
 project(Nanovg)
 set(${PROJECT_NAME}_SOURCES
@@ -86,8 +53,6 @@ project(ImageIO)
 add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
 
+add_subdirectory(lalr)
 
-#set(OIDN_DEVICE_CPU ON)
+add_subdirectory(googletest)
-#set(OIDN_STATIC_LIB ON)
-#add_subdirectory(oidn)
-find_package(OpenImageDenoise REQUIRED)

Externals/benchmark

@@ -0,0 +1 @@
+Subproject commit c3f86578bb2081b52cee9d51615912ca4aa52fe4

Externals/googletest

@@ -0,0 +1 @@
+Subproject commit 1b96fa13f549387b7549cc89e1a785cf143a1a50

Externals/imgui

@@ -1 +1 @@
-Subproject commit 4144d7d772a800f08693b8b13f7c81f1f22a73c4
+Subproject commit 7237d3e5c3a6b837b7b457460877cf5eea8c3745

Externals/implot

@@ -0,0 +1 @@
+Subproject commit f156599faefe316f7dd20fe6c783bf87c8bb6fd9

Externals/lalr

@@ -1 +1 @@
-Subproject commit 6d16a6bb60490a2ee4e86f689c86e647b300c7fb
+Subproject commit 498612239713a6dbbf9f26b8e412e985538a0650

Graphics/CMakeLists.txt

@@ -19,5 +19,5 @@ target_link_libraries(Example${PROJECT_NAME} ${PROJECT_NAME} ${BINDINGS_LIBS})
 target_include_directories(Example${PROJECT_NAME} PRIVATE ${BINDINGS_INCLUDE})
 
 
-file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
 

Graphics/examples/Example.cpp

@@ -1,5 +1,8 @@
 
 #include "GraphicApplication.hpp"
+#include <GL/glew.h>
+
+
 #include "imgui.h"
 
 using namespace tp;
@@ -8,15 +11,20 @@ class ExampleApplication : public Application {
 public:
 	ExampleApplication() = default;
 
-	void processFrame(EventHandler* eventHandler) override { 
+	void processFrame(EventHandler* eventHandler, halnf) override {
 		// example
 	}
 
 	virtual void drawFrame(Canvas* canvas) override {
-		ImGui::Text("Frames processed per second: %f", this->mFramesProcessedPerSecond);
+		glClear(GL_COLOR_BUFFER_BIT);
-		ImGui::Text("Frames drawn per second: %f", this->mFramesDrawnPerSecond);
+
+		ImGui::ShowDemoWindow();
+
+		drawDebug();
 	}
 
+	bool forceNewFrame() override { return false; }
+
 	virtual ~ExampleApplication() = default;
 };
 

Graphics/private/Canvas.cpp

@@ -27,7 +27,7 @@ Canvas::Canvas(Window* window) {
 
 	mContext->vg = nvgCreateGL3(NVG_ANTIALIAS | NVG_STENCIL_STROKES);
 
-	if (nvgCreateFont(mContext->vg, "default", "Font.ttf") == -1) {
+	if (nvgCreateFont(mContext->vg, "default", "rsc/Font.ttf") == -1) {
 		ASSERT(!"Cant create NVG font")
 	}
 }
@@ -37,7 +37,9 @@ Canvas::~Canvas() {
 	delete mContext;
 }
 
-void Canvas::rect(const RectF& rec, const RGBA& col, halnf round) {
+void Canvas::rect(RectF rec, const RGBA& col, halnf round) {
+	rec.pos += mOrigin;
+
 	nvgBeginPath(mContext->vg);
 
 	if (round == 0) {
@@ -50,13 +52,70 @@ void Canvas::rect(const RectF& rec, const RGBA& col, halnf round) {
 	nvgFill(mContext->vg);
 }
 
+void Canvas::debugCross(RectF rec, const RGBA& col) {
+	nvgBeginPath(mContext->vg);
+
+	nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y);
+	nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y);
+
+	nvgMoveTo(mContext->vg, rec.p2().x, rec.p2().y);
+	nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y);
+
+	nvgStrokeWidth(mContext->vg, 2);
+	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
+	nvgStroke(mContext->vg);
+	// nvgFill(mContext->vg);
+}
+
+void Canvas::frame(RectF rec, const RGBA& col, halnf round) {
+	nvgBeginPath(mContext->vg);
+
+	nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y);
+	nvgLineTo(mContext->vg, rec.p2().x, rec.p2().y);
+	nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y);
+	nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y);
+	nvgLineTo(mContext->vg, rec.p1().x, rec.p1().y);
+
+	nvgStrokeWidth(mContext->vg, 2);
+	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
+	nvgStroke(mContext->vg);
+	// nvgFill(mContext->vg);
+}
+
+void Canvas::line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness) {
+	start += mOrigin;
+	end += mOrigin;
+
+	nvgBeginPath(mContext->vg);
+	nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a});
+	nvgMoveTo(mContext->vg, start.x, start.y);
+	nvgLineTo(mContext->vg, end.x, end.y);
+	nvgStrokeWidth(mContext->vg, thickness);
+	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
+	nvgStroke(mContext->vg);
+}
+
+void Canvas::circle(Vec2F pos, halnf size, const RGBA& col) {
+	pos += mOrigin;
+
+	nvgBeginPath(mContext->vg);
+	nvgCircle(mContext->vg, pos.x, pos.y, size);
+
+	nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a });
+	nvgFill(mContext->vg);
+}
+
+void Canvas::setOrigin(const Vec2F& origin) {
+	mOrigin = origin;
+}
+
 void Canvas::pushClamp(const RectF& rec) {
 	RectF intersection = rec;
 	if (mScissors.size()) {
 		mScissors.last().calcIntersection(rec, intersection);
 	}
 	nvgScissor(mContext->vg, intersection.x, intersection.y, intersection.z, intersection.w);
-	mScissors.append(rec);
+	mScissors.append(intersection);
 }
 
 void Canvas::popClamp() {
@@ -71,10 +130,16 @@ void Canvas::popClamp() {
 	}
 }
 
+const RectF& Canvas::getClampedArea() const {
+	return mScissors.last();
+}
+
 void Canvas::text(
 	const char* string, const RectF& aRec, halnf size, Align align, halnf marging, const RGBA& col
 ) {
+
 	RectF rec = { aRec.x + marging, aRec.y + marging, aRec.z - marging * 2, aRec.w - marging * 2 };
+	rec.pos += mOrigin;
 
 	pushClamp(rec);
 
@@ -113,7 +178,9 @@ void Canvas::text(
 	popClamp();
 }
 
-void Canvas::drawImage(const RectF& rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) {
+void Canvas::drawImage(RectF rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) {
+	rec.pos += mOrigin;
+
 	auto imgPaint = nvgImagePattern(mContext->vg, rec.x, rec.y, rec.z, rec.w, angle, image->id, alpha);
 	nvgBeginPath(mContext->vg);
 	nvgRoundedRect(mContext->vg, rec.x, rec.y, rec.z, rec.w, rounding);
@@ -155,3 +222,195 @@ void Canvas::drawEnd() {
 	glViewport(0, 0, size.x, size.y);
 	nvgEndFrame(mContext->vg);
 }
+
+
+void Canvas::colorWheel(const RectF& rec, const ColorWheel& colorWheel) {
+	auto NVG = mContext->vg;
+	const auto sizeInner = 5.f;
+	const auto sizeOuter = 7.f;
+
+	float const x = rec.x + mOrigin.x;
+	float const y = rec.y + mOrigin.y;
+	float const w = rec.z;
+	float const h = rec.w;
+
+	const HSV& hsv = colorWheel.color;
+	float const hue = hsv.h / (NVG_PI * 2);
+
+	int i;
+	float r0, r1, ax, ay, bx, by, cx, cy, aeps, r;
+	NVGpaint paint;
+
+	nvgSave(mContext->vg);
+
+	cx = x + w * 0.5f;
+	cy = y + h * 0.5f;
+	r1 = (w < h ? w : h) * 0.5f - colorWheel.margin;
+	r0 = r1 - colorWheel.thickness;
+
+	aeps = 0.5f / r1;	// half a pixel arc length in radians (2pi cancels out).
+
+	for (i = 0; i < 6; i++) {
+		float a0 = (float)i / 6.0f * NVG_PI * 2.0f - aeps;
+		float a1 = (float)(i + 1.0f) / 6.0f * NVG_PI * 2.0f + aeps;
+		nvgBeginPath(NVG);
+		nvgArc(NVG, cx, cy, r0, a0, a1, NVG_CW);
+		nvgArc(NVG, cx, cy, r1, a1, a0, NVG_CCW);
+		nvgClosePath(NVG);
+		ax = cx + cosf(a0) * (r0 + r1) * 0.5f;
+		ay = cy + sinf(a0) * (r0 + r1) * 0.5f;
+		bx = cx + cosf(a1) * (r0 + r1) * 0.5f;
+		by = cy + sinf(a1) * (r0 + r1) * 0.5f;
+		paint = nvgLinearGradient(NVG, ax, ay, bx, by, nvgHSLA(a0 / (NVG_PI * 2), 1.0f, 0.55f, 255), nvgHSLA(a1 / (NVG_PI * 2), 1.0f, 0.55f, 255));
+		nvgFillPaint(NVG, paint);
+		nvgFill(NVG);
+	}
+
+	nvgBeginPath(NVG);
+	nvgCircle(NVG, cx, cy, r0 - 0.5f);
+	nvgCircle(NVG, cx, cy, r1 + 0.5f);
+	nvgStrokeColor(NVG, nvgRGBA(0, 0, 0, 64));
+	nvgStrokeWidth(NVG, 1.0f);
+	nvgStroke(NVG);
+
+	// Selector
+	nvgSave(NVG);
+	nvgTranslate(NVG, cx, cy);
+	nvgRotate(NVG, hue * NVG_PI * 2);
+
+	// Marker on
+	nvgStrokeWidth(NVG, 2.0f);
+	nvgBeginPath(NVG);
+	nvgRect(NVG, r0 - 1, -3, r1 - r0 + 2, 6);
+	nvgStrokeColor(NVG, nvgRGBA(255, 255, 255, 192));
+	nvgStroke(NVG);
+
+	paint = nvgBoxGradient(NVG, r0 - 3, -5, r1 - r0 + 6, 10, 2, 4, nvgRGBA(0, 0, 0, 128), nvgRGBA(0, 0, 0, 0));
+	nvgBeginPath(NVG);
+	nvgRect(NVG, r0 - 2 - 10, -4 - 10, r1 - r0 + 4 + 20, 8 + 20);
+	nvgRect(NVG, r0 - 2, -4, r1 - r0 + 4, 8);
+	nvgPathWinding(NVG, NVG_HOLE);
+	nvgFillPaint(NVG, paint);
+	nvgFill(NVG);
+
+	// Center triangle
+	r = r0 - 6;
+	ax = cosf(120.0f / 180.0f * NVG_PI) * r;
+	ay = sinf(120.0f / 180.0f * NVG_PI) * r;
+	bx = cosf(-120.0f / 180.0f * NVG_PI) * r;
+	by = sinf(-120.0f / 180.0f * NVG_PI) * r;
+	nvgBeginPath(NVG);
+	nvgMoveTo(NVG, r, 0);
+	nvgLineTo(NVG, ax, ay);
+	nvgLineTo(NVG, bx, by);
+	nvgClosePath(NVG);
+	paint = nvgLinearGradient(NVG, r, 0, ax, ay, nvgHSLA(hue, 1.0f, 0.5f, 255), nvgRGBA(255, 255, 255, 255));
+	nvgFillPaint(NVG, paint);
+	nvgFill(NVG);
+	paint = nvgLinearGradient(NVG, (r + ax) * 0.5f, (0 + ay) * 0.5f, bx, by, nvgRGBA(0, 0, 0, 0), nvgRGBA(0, 0, 0, 255));
+	nvgFillPaint(NVG, paint);
+	nvgFill(NVG);
+	nvgStrokeColor(NVG, nvgRGBA(0, 0, 0, 64));
+	nvgStroke(NVG);
+
+	// Select circle on triangle
+	float yt = hsv.v * hsv.s;
+	float xt = hsv.v - 0.5 * yt;
+	ay = sinf(120.0f / 180.0f * NVG_PI) * r * (-1.0f + xt * 2.0f);
+	ax = cosf(120.0f / 180.0f * NVG_PI) * r * (1.0f - yt * 3.f);
+	nvgStrokeWidth(NVG, 2.0f);
+	nvgBeginPath(NVG);
+	nvgCircle(NVG, ax, ay, sizeInner);
+	nvgStrokeColor(NVG, nvgRGBA(255, 255, 255, 192));
+	nvgStroke(NVG);
+
+	paint = nvgRadialGradient(NVG, ax, ay, 7, 9, nvgRGBA(0, 0, 0, 64), nvgRGBA(0, 0, 0, 0));
+	nvgBeginPath(NVG);
+	nvgRect(NVG, ax - 20, ay - 20, 40, 40);
+	nvgCircle(NVG, ax, ay, sizeOuter);
+	nvgPathWinding(NVG, NVG_HOLE);
+	nvgFillPaint(NVG, paint);
+	nvgFill(NVG);
+
+	nvgRestore(NVG);
+
+	nvgRestore(NVG);
+}
+
+void Canvas::ColorWheel::fromPoint(const tp::RectF& area, const tp::Vec2F& crs) {
+	auto wheel_rec = area;
+	wheel_rec.pos += margin;
+	wheel_rec.size -= margin * 2;
+
+	auto center = wheel_rec.pos + wheel_rec.size / 2.f;
+	auto edge = min(wheel_rec.size.x, wheel_rec.size.y);
+	wheel_rec.pos = center - edge / 2.f;
+	wheel_rec.size = edge;
+
+	HSV hsv = color;
+
+	auto pos = crs - center;
+
+	auto r = (crs - center).length();
+	if (r < edge / 2.f) {
+		if (r > edge / 2.f - thickness) {
+			auto angle = halnf(atan2(pos.y, pos.x));
+			angle = halnf(angle > 0 ? angle : PI * 2 + angle);
+			angle = clamp(angle, 0.f, halnf(PI * 2));
+			hsv.h = angle;
+		}
+		else {
+			pos.y *= -1;
+			pos /= (edge / 2.f) - thickness - 10;
+
+			auto angle = PI * 2 - hsv.h - PI / 2;
+			if (angle < 0) {
+				angle += PI * 2;
+			}
+
+			auto sin = halnf(::sin(-angle));
+			auto cos = halnf(::cos(-angle));
+			auto sv_pos = Vec2F{ pos.x * cos - pos.y * sin, pos.x * sin + pos.y * cos };
+
+			auto sv_angle = halnf(atan2(sv_pos.x, sv_pos.y));
+			sv_angle = halnf(sv_angle > 0 ? sv_angle : PI * 2 + sv_angle);
+			sv_angle = clamp(sv_angle, 0.f, halnf(PI * 2));
+
+			auto p1 = Vec2F(0, 1);
+			auto p2 = Vec2F(::cos(PI / 6), -::sin(PI / 6));
+			auto p3 = Vec2F{ -p2.x, p2.y };
+
+			Vec2F intersection = sv_pos;
+			if (sv_angle < PI / 3 * 2) {
+				if (intersectLines2D({ 0, 0 }, sv_pos, p1, p2, &intersection)) {
+					sv_pos = intersection;
+				}
+			}
+			else if (sv_angle < PI / 3 * 4) {
+				if (intersectLines2D({ 0, 0 }, sv_pos, p3, p2, &intersection)) {
+					sv_pos = intersection;
+				}
+			}
+			else {
+				if (intersectLines2D({ 0, 0 }, sv_pos, p1, p3, &intersection)) {
+					sv_pos = intersection;
+				}
+			}
+
+			sv_pos.y = halnf((sv_pos.y + 1 / 2.f) * 2 / 3.f * 1.0);
+			sv_pos.x = halnf(sv_pos.x * 2 / sqrt(3) * 1.0);
+			sv_pos.x = (sv_pos.x + 1.f) / 2;
+
+			sv_pos.x = clamp(sv_pos.x, 0.f, 1.f);
+			sv_pos.y = clamp(sv_pos.y, 0.f, 1.f);
+
+			auto v = sv_pos.y * 0.5f + sv_pos.x;
+			auto s = sv_pos.y / v;
+
+			hsv.v = clamp(v, 0.001f, 0.999f);
+			hsv.s = clamp(s, 0.001f, 0.999f);
+		}
+	}
+
+	color = hsv;
+}

Graphics/private/DebugGUI.cpp

@@ -9,6 +9,8 @@
 #include <imgui_impl_opengl3.h>
 #include <imgui_internal.h>
 
+#include "implot.h"
+
 namespace tp {
 	class DebugGUI::Context {
 	public:
@@ -34,19 +36,65 @@ DebugGUI::DebugGUI(Window* window) {
 	ImGui_ImplOpenGL3_Init("#version 330");
 
 	ImGuiIO& io = ImGui::GetIO();
-	io.Fonts->AddFontFromFileTTF("Font.ttf", 20.f);
+	io.Fonts->AddFontFromFileTTF("rsc/Font.ttf", 20.f);
 
 	io.ConfigInputTrickleEventQueue = false;
+
+	// appearance
+	io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+
+	ImPlot::CreateContext();
+
+	return;
+
+	auto& colors = ImGui::GetStyle().Colors;
+	colors[ImGuiCol_WindowBg] = ImVec4{ 0.1f, 0.105f, 0.11f, 1.0f };
+
+	// Headers
+	colors[ImGuiCol_Header] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f };
+	colors[ImGuiCol_HeaderHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f };
+	colors[ImGuiCol_HeaderActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+
+	// Buttons
+	colors[ImGuiCol_Button] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f };
+	colors[ImGuiCol_ButtonHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f };
+	colors[ImGuiCol_ButtonActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+
+	// Frame BG
+	colors[ImGuiCol_FrameBg] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f };
+	colors[ImGuiCol_FrameBgHovered] = ImVec4{ 0.3f, 0.305f, 0.31f, 1.0f };
+	colors[ImGuiCol_FrameBgActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+
+	// Tabs
+	colors[ImGuiCol_Tab] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+	colors[ImGuiCol_TabHovered] = ImVec4{ 0.38f, 0.3805f, 0.381f, 1.0f };
+	colors[ImGuiCol_TabActive] = ImVec4{ 0.28f, 0.2805f, 0.281f, 1.0f };
+	colors[ImGuiCol_TabUnfocused] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+	colors[ImGuiCol_TabUnfocusedActive] = ImVec4{ 0.2f, 0.205f, 0.21f, 1.0f };
+
+	// Title
+	colors[ImGuiCol_TitleBg] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+	colors[ImGuiCol_TitleBgActive] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
+	colors[ImGuiCol_TitleBgCollapsed] = ImVec4{ 0.15f, 0.1505f, 0.151f, 1.0f };
 }
 
 DebugGUI::~DebugGUI() {
+	ImPlot::DestroyContext();
+
 	ImGui_ImplOpenGL3_Shutdown();
 	ImGui_ImplGlfw_Shutdown();
 	ImGui::DestroyContext();
 
+
 	delete mContext;
 }
 
+void DebugGUI::procBegin() {
+}
+
+void DebugGUI::procEnd() {
+}
+
 void DebugGUI::drawBegin() {
 	ImGui_ImplOpenGL3_NewFrame();
 	ImGui_ImplGlfw_NewFrame();

Graphics/private/EventHandler.cpp

@@ -3,7 +3,10 @@
 
 using namespace tp;
 
-EventHandler::EventHandler() = default;
+EventHandler::EventHandler() {
+	mTimerEvent.reset();
+}
+
 EventHandler::~EventHandler() = default;
 
 void EventHandler::postEvent(InputID inputID, InputEvent inputEvent) {
@@ -16,6 +19,12 @@ bool EventHandler::isEvents() {
 	mMutex.lock();
 	auto res = mEventQueue.length();
 	mMutex.unlock();
+
+	if (mTimerEvent.isTimeout()) {
+		mTimerEvent.reset();
+		res = true;
+	}
+
 	return res;
 }
 
@@ -33,12 +42,38 @@ bool transitionsReduce[4][4] = {
 	{ true, true, true, true },
 };
 
+void EventHandler::processAllEvent() {
+	mMutex.lock();
+
+	mPointerPrev = mPointer;
+
+	while (mEventQueue.size()) {
+		processEventUnguarded();
+	}
+	mMutex.unlock();
+}
+
 void EventHandler::processEvent() {
 	mMutex.lock();
-	auto lastEvent = &mEventQueue.last();
 
-	const auto& eventData = lastEvent->second;
+	mPointerPrev = mPointer;
-	const auto& inputId = lastEvent->first;
+
+	if (!mEventQueue.size()) {
+		mMutex.unlock();
+		return;
+	}
+
+	processEventUnguarded();
+
+	mMutex.unlock();
+}
+
+void EventHandler::processEventUnguarded() {
+
+	auto firstEvent = &mEventQueue.first();
+
+	const auto& eventData = firstEvent->second;
+	const auto& inputId = firstEvent->first;
 
 	switch (eventData.type) {
 		case InputEvent::Type::MOUSE_POS:
@@ -56,8 +91,6 @@ void EventHandler::processEvent() {
 
 				mInputStates[(int) inputId].mCurrentState = transitions[currentState][reportedEvent];
 
-				// printf("%i - %i \n", reportedEvent, mInputStates[(int) InputID::A].mCurrentState);
-
 				if (transitionsReduce[currentState][reportedEvent]) {
 					mEventQueue.popFront();
 				}
@@ -65,6 +98,17 @@ void EventHandler::processEvent() {
 				break;
 			}
 
+		case InputEvent::Type::SCROLL:
+			{
+				if (mScrollDelta == Vec2F { 0, 0 }) {
+					mScrollDelta = eventData.scrollDelta;
+				} else {
+					mEventQueue.popFront();
+					mScrollDelta = 0;
+				}
+				break;
+			}
+
 		default:
 			{
 				mEventQueue.popFront();
@@ -72,29 +116,41 @@ void EventHandler::processEvent() {
 	}
 
 	mPointerPressure = mInputStates[(int) InputID::MOUSE1].mCurrentState != InputState::State::NONE;
-
-	mMutex.unlock();
 }
 
-const Vec2F& EventHandler::getPointer() const { return mPointer; }
+void EventHandler::setCursorOrigin(const Vec2F& origin) {
+	mPointerOrigin = origin;
+}
 
-const Vec2F& EventHandler::getPointerPrev() const { return mPointerPrev; }
+Vec2F EventHandler::getPointer() const { return mPointer - mPointerOrigin; }
+
+Vec2F EventHandler::getPointerPrev() const { return mPointerPrev - mPointerOrigin; }
 
 bool EventHandler::isPressed(InputID id) const {
+	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED;
 }
 
 bool EventHandler::isReleased(InputID id) const {
+	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::RELEASED;
 }
 
-halnf EventHandler::getPointerPressure() const { return mPointerPressure; }
+halnf EventHandler::getPointerPressure() const {
+	if (!mEnableKeyEvents) return 0;
+	return mPointerPressure;
+}
 
 bool EventHandler::isDown(InputID id) const {
+	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED ||
 				 mInputStates[(int) id].mCurrentState == InputState::State::HOLD;
 }
 
-halnf EventHandler::getScrollY() const { return 0; }
+halnf EventHandler::getScrollY() const { return mScrollDelta.y; }
 
 Vec2F EventHandler::getPointerDelta() const { return mPointer - mPointerPrev; }
+
+void EventHandler::setEnableKeyEvents(bool enable) {
+	mEnableKeyEvents = enable;
+}

Graphics/private/GraphicApplication.cpp

@@ -1,10 +1,12 @@
 
 #include "GraphicApplication.hpp"
 
+#include "imgui.h"
+
 using namespace tp;
 
 Application::Application() {
-	mWindow = Window::createWindow();
+	mWindow = Window::createWindow({1500, 900});
 	mGraphics = new Graphics(mWindow);
 
 	mDrawTimer.setDuration(1000.f / mDrawPerSecond);
@@ -12,7 +14,7 @@ Application::Application() {
 	mPerSecondTimer.setDuration(1000.f);
 }
 
-void Application::run() {
+void Application::runDefaultLoop() {
 	auto eventHandler = new EventHandler();
 
 	mWindow->setEventHandler(eventHandler);
@@ -25,8 +27,8 @@ void Application::run() {
 
 	// proc first frame by default
 	{
-		mWindow->processEvents();
+		mWindow->processEvents(false);
-		processFrame(eventHandler);
+		processFrame(eventHandler, 0);
 
 		mGraphics->drawBegin();
 		drawFrame(mGraphics->getCanvas());
@@ -34,17 +36,33 @@ void Application::run() {
 		mWindow->draw();
 	}
 
+	time_ms prevProcTime = get_time();
+
+	bool isForcedNewFrame = true;
+
 	while (!mWindow->shouldClose()) {
-		if (mProcTimer.isTimeout()) {
+		mWindow->processEvents(!isForcedNewFrame);
+		updateGlobalTime();
 
-			mWindow->processEvents();
+		if (mProcTimer.isTimeout() || eventHandler->isEvents() || isForcedNewFrame) {
+
+			while ((eventHandler->isEvents() || isForcedNewFrame)) {
 
-			while (eventHandler->isEvents()) {
 				eventHandler->processEvent();
-				processFrame(eventHandler);
+
+				time_ms currentTime = get_time();
+				processFrame(eventHandler, halnf(currentTime - prevProcTime));
+				prevProcTime = currentTime;
 
 				redrawNeeded = true;
 				mFramesProcessed++;
+
+				isForcedNewFrame = forceNewFrame();
+
+				if (isForcedNewFrame) {
+					// mWindow->processEvents();
+					break;
+				}
 			}
 
 			mProcTimer.wait();
@@ -82,13 +100,46 @@ void Application::run() {
 	delete eventHandler;
 }
 
-void Application::processFrame(EventHandler* eventHandler) {}
+void Application::runDebugLoop() {
+	auto eventHandler = new EventHandler();
+	mWindow->setEventHandler(eventHandler);
+
+	time_ms prevProcTime = get_time();
+
+	while (!mWindow->shouldClose()) {
+		mWindow->processEvents();
+		eventHandler->processAllEvent();
+		time_ms currentTime = get_time();
+		processFrame(eventHandler, halnf(currentTime - prevProcTime));
+		prevProcTime = currentTime;
+
+
+		mGraphics->drawBegin();
+		drawFrame(mGraphics->getCanvas());
+		mGraphics->drawEnd();
+		mWindow->draw();
+	}
+
+	delete eventHandler;
+}
+
+void Application::run() {
+	runDefaultLoop();
+	// runDebugLoop();
+}
+
+void Application::processFrame(EventHandler* eventHandler, halnf deltaTime) {}
 
 void Application::drawFrame(Canvas* canvas) {
 	// ImGui::Text("Frames processed per second: %f", mFramesProcessedPerSecond);
 	// ImGui::Text("Frames drawn per second: %f", mFramesDrawnPerSecond);
 }
 
+void Application::drawDebug() {
+	ImGui::Text("Frames processed per second: %f", this->mFramesProcessedPerSecond);
+	ImGui::Text("Frames drawn per second: %f", this->mFramesDrawnPerSecond);
+}
+
 Application::~Application() {
 	delete mGraphics;
 	Window::destroyWindow(mWindow);

Graphics/private/Window.cpp

@@ -26,7 +26,10 @@ static void scrollCallback(GLFWwindow* window, double xOffset, double yOffset);
 Window::Window(Vec2F size, const char* title) {
 	mContext = new Context();
 
-	glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
+	// glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
+	// glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
+
+	mSize = size;
 
 	// Create a window and OpenGL context
 	mContext->window = glfwCreateWindow((int) size.x, (int) size.y, title, nullptr, nullptr);
@@ -40,6 +43,7 @@ Window::Window(Vec2F size, const char* title) {
 	// Initialize GLEW
 	if (glewInit() != GLEW_OK) {
 		printf("Failed to initialize GLEW\n");
+		exit(1);
 		return;
 	}
 
@@ -63,7 +67,10 @@ Window* Window::createWindow(Vec2F size, const char* title) {
 	}
 	count--;
 
-	glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
+	#ifdef ENV_OS_LINUX
+		glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
+	#endif
+	// glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR);
 
 	// Initialize GLFW
 	if (!glfwInit()) {
@@ -88,8 +95,9 @@ void Window::destroyWindow(Window* window) {
 
 bool Window::shouldClose() const { return glfwWindowShouldClose(mContext->window); }
 
-void Window::processEvents() {
+void Window::processEvents(bool wait) {
-	glfwWaitEvents();
+	if (wait) glfwWaitEvents();
+	else glfwPollEvents();
 	checkAxisUpdates();
 }
 
@@ -119,13 +127,13 @@ void Window::checkAxisUpdates() {
 	double x, y;
 	glfwGetCursorPos(mContext->window, &x, &y);
 
-	int posX, posY;
+	// int posX, posY;
-	glfwGetWindowPos(mContext->window, &posX, &posY);
+	// glfwGetWindowPos(mContext->window, &posX, &posY);
 
 	if (mPointerPos != Vec2F{ (halnf) x, (halnf) y }) {
 		mPointerPos = { (halnf) x, (halnf) y };
 
-		auto pos = Vec2F{ (halnf) posX, (halnf) posY };
+		// auto pos = Vec2F{ (halnf) posX, (halnf) posY };
 		RectF windowRec = { { 0, 0 }, mSize };
 
 		if (windowRec.isInside(mPointerPos)) {
@@ -163,13 +171,20 @@ static void mouseButtonCallback(GLFWwindow* window, int button, int action, int
 	auto id = (InputID) ((int) InputID::MOUSE1 + button);
 
 	if (action == GLFW_PRESS) {
-		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} }
+		// printf("mouse\n");
-		);
+		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} });
 	} else if (action == GLFW_RELEASE) {
 		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::RELEASE, {} });
 	}
+
 }
 
 static void scrollCallback(GLFWwindow* window, double xOffset, double yOffset) {
-	// ignore for now
+	auto* self = static_cast<Window*>(glfwGetWindowUserPointer(window));
+	if (!self) return;
+
+	EventHandler* eventHandler = self->getEventHandler();
+	if (!eventHandler) return;
+
+	eventHandler->postEvent(InputID::SCROLL, { InputEvent::Type::SCROLL, {}, {}, { xOffset, yOffset } });
 }

Graphics/public/EventHandler.hpp

@@ -4,6 +4,7 @@
 #include "Vec.hpp"
 #include "List.hpp"
 #include "Map.hpp"
+#include "Timing.hpp"
 
 #include <mutex>
 
@@ -15,6 +16,7 @@ namespace tp {
 			BUTTON_ACTION,
 			MOUSE_DELTA,
 			MOUSE_POS,
+			SCROLL,
 		} type = Type::NONE;
 
 		enum class ButtonAction {
@@ -26,6 +28,7 @@ namespace tp {
 		} buttonAction = ButtonAction::NONE;
 
 		Vec2F mouseEvent = { 0, 0 };
+		Vec2F scrollDelta = { 0, 0 };
 	};
 
 	class InputState {
@@ -68,9 +71,12 @@ namespace tp {
 	public: // User interface
 		bool isEvents();
 		void processEvent();
+		void processAllEvent();
 
-		[[nodiscard]] const Vec2F& getPointer() const;
+		void setCursorOrigin(const Vec2F& origin);
-		[[nodiscard]] const Vec2F& getPointerPrev() const;
+
+		[[nodiscard]] Vec2F getPointer() const;
+		[[nodiscard]] Vec2F getPointerPrev() const;
 		[[nodiscard]] Vec2F getPointerDelta() const;
 
 		[[nodiscard]] bool isPressed(InputID id) const;
@@ -80,6 +86,11 @@ namespace tp {
 
 		[[nodiscard]] halnf getPointerPressure() const;
 
+		void setEnableKeyEvents(bool);
+
+	private:
+		void processEventUnguarded();
+
 	private:
 		std::mutex mMutex = {};
 
@@ -87,12 +98,19 @@ namespace tp {
 		List<std::pair<InputID, InputEvent>> mEventQueue;
 
 		// input states
+		Vec2F mPointerOrigin = { 0, 0 };
+
 		Vec2F mPointer;
 		Vec2F mPointerPrev;
+		Vec2F mScrollDelta;
 
 		halnf mPointerPressure = 0;
 
 		InputState mInputStates[(int) InputID::LAST_KEY_CODE]{};
+
+		Timer mTimerEvent = Timer(1000);
+
+		bool mEnableKeyEvents = true;
 	};
 
 }

Graphics/public/GraphicApplication.hpp

@@ -12,16 +12,24 @@ namespace tp {
 
 		void run();
 
-		virtual void processFrame(EventHandler* eventHandler);
+		virtual bool forceNewFrame() { return false; }
+
+		virtual void processFrame(EventHandler* eventHandler, halnf deltaTime);
 		virtual void drawFrame(Canvas* canvas);
 
 		virtual ~Application();
 
+		void drawDebug();
+
+	private:
+		void runDefaultLoop();
+		void runDebugLoop();
+
 	protected:
 		bool mInitialized = false;
 
-		ualni mDrawPerSecond = 60;
+		ualni mDrawPerSecond = 1160;
-		ualni mProcPerSecond = 160;
+		ualni mProcPerSecond = 1300;
 
 		Timer mDrawTimer;
 		Timer mProcTimer;

Graphics/public/Graphics.hpp

@@ -17,8 +17,8 @@ namespace tp {
 		explicit DebugGUI(Window* window);
 		~DebugGUI();
 
-		void procBegin() {}
+		void procBegin();
-		void procEnd() {}
+		void procEnd();
 
 		void drawBegin();
 		void drawEnd();
@@ -55,20 +55,38 @@ namespace tp {
 			ualni id = 0;
 		};
 
+		struct ColorWheel {
+			HSV color = { 0.13, 0.5, 1 };
+			halnf thickness = 20;
+			halnf margin = 5;
+
+			void fromPoint(const RectF& area, const Vec2F& point);
+		};
+
+		void setOrigin(const Vec2F& origin);
+
 		void pushClamp(const RectF& rec);
 		void popClamp();
-		void rect(const RectF& rec, const RGBA& col, halnf round = 0);
+		[[nodiscard]] const RectF& getClampedArea() const;
+
+		void debugCross(RectF rec, const RGBA& col);
+		void rect(RectF rec, const RGBA& col, halnf round = 0);
+		void frame(RectF rec, const RGBA& col, halnf round = 0);
+		void circle(Vec2F pos, halnf size, const RGBA& col);
 		void text(const char*, const RectF&, halnf size, Align, halnf padding, const RGBA&);
+		void colorWheel(const RectF& rec, const ColorWheel& colorWheel);
+		void line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness);
 
 		ImageHandle createImageFromTextId(ualni id, Vec2F size);
 		void updateTextureID(ImageHandle handle, ualni id);
 
 		void deleteImageHandle(ImageHandle image);
-		void drawImage(const RectF& rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f);
+		void drawImage(RectF rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f);
 
 	private:
 		Buffer<RectF> mScissors;
 		bool mIsClamping = false;
+		Vec2F mOrigin = { 0, 0 };
 	};
 
 	class Graphics {

Graphics/public/InputCodes.hpp

@@ -143,8 +143,10 @@ namespace tp {
 		MOUSE4 = 504,
 		MOUSE5 = 505,
 
-		LAST_KEY_CODE = 508,
+		SCROLL,
 
-		WINDOW_RESIZE = 1000,
+		WINDOW_RESIZE,
+
+		LAST_KEY_CODE,
 	};
 }

Graphics/public/Window.hpp

@@ -12,12 +12,12 @@ namespace tp {
 		~Window();
 
 	public:
-		static Window* createWindow(Vec2F size = { 500.f, 500.f }, const char* title = "Window");
+		static Window* createWindow(Vec2F size = { 1000.f, 700.f }, const char* title = "Window");
 		static void destroyWindow(Window* window);
 
 	public:
 		void draw();
-		void processEvents();
+		void processEvents(bool wait = true);
 
 		void setEventHandler(EventHandler* eventHandler);
 		[[nodiscard]] EventHandler* getEventHandler();

LICENSE

@@ -1,339 +1,37 @@
-                    GNU GENERAL PUBLIC LICENSE
+SOFTWARE LICENSE AGREEMENT
-                       Version 2, June 1991
+This Software License Agreement ("Agreement") is made and entered into as of 2024-11-24 ("Effective Date") by Ilya Shurupov.
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+WHEREAS, Licensor owns certain software that it desires to license to Licensee;
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
 
-                            Preamble
+WHEREAS, Licensee desires to use such software under the terms and conditions set forth herein.
 
-  The licenses for most software are designed to take away your
+NOW, THEREFORE, in consideration of the mutual promises contained herein and for other good and valuable consideration, the receipt and sufficiency of which are hereby acknowledged, the parties agree as follows:
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
+1. Definition of Software:
-price.  Our General Public Licenses are designed to make sure that you
+The term "Software" refers to the Modules, including any updates, modifications, or associated documentation provided by Licensor.
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
+2. Grant of License:
-anyone to deny you these rights or to ask you to surrender the rights.
+Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee a no license to use the Software.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
 
-  For example, if you distribute copies of such a program, whether
+3. Derivative Works:
-gratis or for a fee, you must give the recipients all the rights that
+No modifications or derivative works are allowed.
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
+4. Commercial Use:
-(2) offer you this license which gives you legal permission to copy,
+Commercial use is not allowed.
-distribute and/or modify the software.
 
-  Also, for each author's protection and ours, we want to make certain
+5. Attribution:
-that everyone understands that there is no warranty for this free
+No attribution is required.
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
 
-  Finally, any free program is threatened constantly by software
+6. Intellectual Property Rights:
-patents.  We wish to avoid the danger that redistributors of a free
+All intellectual property rights in the Software shall remain the property of Licensor. The Licensee does not acquire any rights to the Software except for the limited use rights specified in this Agreement.
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
 
-  The precise terms and conditions for copying, distribution and
+7. Warranty and Liability:
-modification follow.
+The Software is provided "as is" without warranty of any kind. Licensor shall not be liable for any damages arising out of or related to the use or inability to use the Software.
 
-                    GNU GENERAL PUBLIC LICENSE
+8. Termination:
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+This Agreement shall terminate automatically if Licensee breaches any of its terms and conditions. Upon termination, Licensee must cease all use of the Software and destroy all copies.
 
-  0. This License applies to any program or other work which contains
+9. Governing Law:
-a notice placed by the copyright holder saying it may be distributed
+This Agreement shall be governed by and construed in accordance with the laws of .
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
 
-Activities other than copying, distribution and modification are not
+https://www.binpress.com/license-generator/
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

LibraryViewer/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets)
 target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})
 
 file(COPY "library" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}")
-file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc/")
 
 ### -------------------------- Applications  --------------------------  ###
 add_executable(libView ./applications/Entry.cpp)

LibraryViewer/applications/Entry.cpp

@@ -1,10 +1,10 @@
 
 #include "GUI.hpp"
-#include "GraphicApplication.hpp"
+#include "WidgetApplication.hpp"
 
 using namespace tp;
 
-class LibraryViewer : public Application {
+class LibraryViewer : public WidgetApplication {
 public:
 	LibraryViewer() :
 		gui(&library, &player) {
@@ -12,25 +12,15 @@ public:
 		library.checkExisting();
 
 		gui.updateTracks();
+
+		setRoot(&gui);
 	}
 
-	void processFrame(EventHandler* eventHandler) override {
-		auto rec = RectF{ { 0, 0 }, mWindow->getSize() };
-
-		gui.setVisible(true);
-		gui.setArea(rec);
-		gui.updateConfigWrapper(mWidgetManager);
-		gui.procWrapper(*eventHandler, rec);
-	}
-
-	void drawFrame(Canvas* canvas) override { gui.drawWrapper(*canvas); }
-
 private:
 	Player player;
 	Library library;
 
-	tp::WidgetManager mWidgetManager;
+	LibraryWidget gui;
-	LibraryWidget<EventHandler, Canvas> gui;
 };
 
 int main() {

LibraryViewer/private/Library.cpp

@@ -1,7 +1,6 @@
 
 #include "Library.hpp"
 #include "LocalConnection.hpp"
-#include "WidgetBase.hpp"
 
 #include "picojson.h"
 #include <filesystem>

LibraryViewer/public/GUI.hpp

@@ -2,67 +2,95 @@
 
 #include "Library.hpp"
 #include "Player.hpp"
-#include "Widgets.hpp"
+#include "FloatingWidget.hpp"
+#include "DockWidget.hpp"
 
 #include "imgui.h"
 
 namespace tp {
 
-	template <typename Events, typename Canvas>
+	class TrackWidget : public Widget {
-	class TrackWidget : public Widget<Events, Canvas> {
 	public:
-		explicit TrackWidget(const Track* track = nullptr) :
+		enum State {
-			mTrack(track) {
+			IDLE,
-			this->mArea.w = 70;
+			HOVER,
-			col.mColor.setAnimTime(0);
+			SELECTED,
-			col.mColor.setNoTransition({ 0.15f, 0.15f, 0.15f, 0.f });
 		};
 
-		void eventProcess(const Events& events) override {
+		explicit TrackWidget(const Track* track = nullptr) :
-			mSelected = false;
+			mTrack(track) {
-			if (!mTrack) return;
+
-			if (this->mArea.isInside(events.getPointer())) {
+			getLayout()->setMinSize({ 70, 70 });
-				col.set({ 0.15f, 0.15f, 0.15f, 1.f });
+		};
-				mSelected = events.isReleased(InputID::MOUSE1);
+
-			} else {
+		void process(const EventHandler& events) override {
-				col.set({ 0.15f, 0.15f, 0.15f, 0.f });
+			mState = IDLE;
+
+			if (!mTrack) {
+				mState = IDLE;
+				return;
+			}
+
+			switch (mState) {
+				case HOVER:
+				case IDLE:
+					mState = getArea().relative().isInside(events.getPointer()) ? HOVER : IDLE;
+					if (events.isPressed(InputID::MOUSE1)) {
+						mState = SELECTED;
+					}
+					break;
+
+				case SELECTED:
+					break;
 			}
 		}
 
-		void eventDraw(Canvas& canvas) override {
+		void draw(Canvas& canvas) override {
 			if (!mTrack) return;
+			auto area = getArea().relative();
 
-			canvas.rect(this->mArea, col.get(), 4.f);
+			switch (mState) {
+				case IDLE: canvas.rect(area, colorIdle, rounding); break;
+				case HOVER: canvas.rect(area, colorHover, rounding); break;
+				case SELECTED: canvas.rect(area, colorSelected, rounding); break;
+			}
 
-			const RectF imageArea = {
+
-				this->mArea.x + margin, this->mArea.y + margin, this->mArea.w - margin * 2, this->mArea.w - margin * 2
+			const RectF imageArea = { area.x + margin, area.y + margin, area.w - margin * 2, area.w - margin * 2 };
+			canvas.rect(imageArea, colorImage, rounding);
+
+			const RectF textArea = {
+				area.x + area.w + margin, area.y + margin, area.z - area.w - margin * 2, area.w - margin * 2
 			};
 
-			canvas.rect(imageArea, { 0.25f, 0.25f, 0.25f, 1.f }, 4.f);
-
-			const RectF textArea = { this->mArea.x + this->mArea.w + margin,
-															 this->mArea.y + margin,
-															 this->mArea.z - this->mArea.w - margin * 2,
-															 this->mArea.w - margin * 2 };
-
 			// canvas.rect(textArea, { 0.25f, 0.25f, 0.25f, 1.f }, 4.f);
 
 			const RectF textAreaName = { textArea.x, textArea.y, textArea.z, textArea.w * 0.5f };
 			const RectF textAreaAuthor = { textArea.x, textArea.y + textArea.w * 0.5f, textArea.z, textArea.w * 0.5f };
 
-			canvas.text(mTrack->mName.c_str(), textAreaName, 15.f, Canvas::LC, 4.f, { 0.9f, 0.9f, 0.9f, 1.f });
+			canvas.text(mTrack->mName.c_str(), textAreaName, 15.f, Canvas::LC, rounding, colorNameTrack);
-			canvas.text(mTrack->mArtist.c_str(), textAreaAuthor, 12.f, Canvas::LC, 4.f, { 0.8f, 0.8f, 0.8f, 1.f });
+			canvas.text(mTrack->mArtist.c_str(), textAreaAuthor, 12.f, Canvas::LC, rounding, colorNameArtist);
 		}
 
+		[[nodiscard]] bool processesEvents() const override { return true; }
+
 	public:
-		halnf margin = 5.f;
-		AnimColor col;
 		const Track* mTrack;
-		bool mSelected = false;
+		State mState = IDLE;
+
+	private:
+		halnf margin = 5.f;
+		halnf rounding = 5.f;
+
+		RGBA colorIdle = 0;
+		RGBA colorNameTrack = { 0.9f, 0.9f, 0.9f, 1.f };
+		RGBA colorNameArtist = { 0.8f, 0.8f, 0.8f, 1.f };
+		RGBA colorImage = { 0.5, 0.5, 0.5, 1.0 };
+		RGBA colorHover = { 0.13, 0.13, 0.13, 0.9 };
+		RGBA colorSelected = { 0.43, 0.43, 0.43, 0.9 };
 	};
 
-	template <typename Events, typename Canvas>
+	class TrackInfoWidget : public Widget {
-	class TrackInfoWidget : public Widget<Events, Canvas> {
 		struct SortType {
 			std::string text;
 			bool dec = false;
@@ -76,21 +104,23 @@ namespace tp {
 			items.append({ "Date Last Played" });
 		}
 
-		void eventDraw(Canvas&) override {
+		void draw(Canvas&) override {
 			if (!mTrack) return;
 			// canvas.rect(this->mArea, { 0.13f, 0.13f, 0.13f, 1.f }, 4.f);
 			renderUI();
 		}
 
 		void renderUI() {
-			ImGui::SetNextWindowPos({ this->mArea.x, this->mArea.y });
+			// auto area = getArea();
-			ImGui::SetNextWindowSize({ this->mArea.z, this->mArea.w });
+
+			// ImGui::SetNextWindowPos({ area.x, this->mArea.y });
+			// ImGui::SetNextWindowSize({ area.z, this->mArea.w });
 
 			ImGui::Begin(
 				"InfoWindow",
-				nullptr,
+				nullptr //,
-				ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground |
+				//ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBackground |
-					ImGuiWindowFlags_NoResize
+				//	ImGuiWindowFlags_NoResize
 			);
 
 			if (mTrack) {
@@ -186,54 +216,59 @@ namespace tp {
 		int filterExisting = 0; // all existing no-existing
 	};
 
-	template <typename Events, typename Canvas>
+	class LibraryWidget : public DockWidget {
-	class LibraryWidget : public Widget<Events, Canvas> {
 	public:
 		LibraryWidget(Library* lib, Player* player) {
 			mLibrary = (lib);
 			mPlayer = (player);
 
-			updateTracks();
+			// updateTracks();
 
 			mCurrentTrackInfo.mPlayer = mPlayer;
 
-			this->mChildWidgets.pushBack(&mSplitView);
+			setCenterWidget(&mSongList);
-			this->mChildWidgets.pushBack(&mSongList);
+			dockWidget(&mCurrentTrackInfo, DockLayout::RIGHT);
-			this->mChildWidgets.pushBack(&mCurrentTrackInfo);
+
-			this->mChildWidgets.pushBack(&mCurrentTrack);
+			// this->mChildWidgets.pushBack(&mCurrentTrackInfo);
+			// this->mChildWidgets.pushBack(&mCurrentTrack);
 		}
 
 		void updateTracks() {
 			mTracks.clear();
+
+			for (auto track : mTracks) {
+				delete track.data();
+			}
+
 			for (auto track : mLibrary->mTraks) {
-				mTracks.append(TrackWidget<Events, Canvas>(&track.data()));
+				mTracks.append(new TrackWidget(&track.data()));
 			}
 		}
 
-		void eventProcess(const Events& events) override {
+		void process(const EventHandler& events) override {
 			filter();
 
-			mSplitView.setArea(this->mArea);
+			for (auto track : mSongList.getContainer()->getChildren()) {
-			mSongList.setArea(mSplitView.getFirst());
+				if (auto trackWidget = dynamic_cast<TrackWidget*>(track.data())) {
-
+					if (trackWidget->mState == TrackWidget::SELECTED) {
-			for (auto track : mSongList.getContent()) {
+						mCurrentTrackInfo.mTrack = trackWidget->mTrack;
-				auto trackWidget = (TrackWidget<Events, Canvas>*) track.data();
+					}
-				if (trackWidget->mSelected) {
-					mCurrentTrackInfo.mTrack = trackWidget->mTrack;
 				}
 			}
 
-			mCurrentTrackInfo.setArea(mSplitView.getSecond());
-
 			// mCurrentTrack.proc(events, this->mArea, mSplitView.getFirst());
+
+			DockWidget::process(events);
 		}
 
-		void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, { 0.1f, 0.1f, 0.1f, 1.f }); }
+		// void eventDraw(Canvas& canvas) override {
+			// canvas.rect(this->mArea, { 0.1f, 0.1f, 0.1f, 1.f });
+		// }
 
 		void filter() {
 			if (!mCurrentTrackInfo.isSongFilterChanged) return;
 
-			mSongList.clearContent();
+			mSongList.getContainer()->clear();
 
 			for (auto track : mTracks) {
 				if (!mCurrentTrackInfo.songFilter.PassFilter(track->mTrack->mName.c_str()) &&
@@ -255,7 +290,7 @@ namespace tp {
 						break;
 				}
 
-				mSongList.addWidget(&track.data());
+				mSongList.getContainer()->addChild(track.data());
 			}
 
 			mCurrentTrackInfo.isSongFilterChanged = false;
@@ -265,11 +300,10 @@ namespace tp {
 		Library* mLibrary = nullptr;
 		Player* mPlayer = nullptr;
 
-		Buffer<TrackWidget<Events, Canvas>> mTracks;
+		Buffer<TrackWidget*> mTracks;
 
-		SplitView<Events, Canvas> mSplitView;
+		ScrollableWidget mSongList;
-		ScrollableWindow<Events, Canvas> mSongList;
+		TrackInfoWidget mCurrentTrackInfo;
-		TrackInfoWidget<Events, Canvas> mCurrentTrackInfo;
+		TrackWidget mCurrentTrack;
-		TrackWidget<Events, Canvas> mCurrentTrack;
 	};
 }

Math/private/Camera.cpp

@@ -88,7 +88,7 @@ void Camera::lookAtPoint(const Vec3F& aTarget, const Vec3F& aPos, Vec3F aUp) {
 	}
 	mPos = aPos;
 	mTarget = aTarget;
-	Vec3F f = (mPos - mTarget).normalize();
+	Vec3F f = (mTarget - mPos).normalize();
 	mUp = f * (aUp.normalize() * f);
 }
 
@@ -117,16 +117,20 @@ void Camera::rotate(halnf angleX, halnf angleY) {
 	Vec3F wup(0, 0, 1);
 	mPos -= mTarget;
 
-	mat3f rotZ = mat3f::rotatorDir(wup, angleX);
+	Mat3F rotZ = Mat3F::rotatorDir(wup, angleX);
 	mPos = rotZ * mPos;
 	mUp = rotZ * mUp;
 
 	Vec3F f = mPos.unitV();
 	Vec3F s = mUp * f;
 
-	mPos = mat3f::rotatorDir(s, -angleY) * mPos;
+	mPos = Mat3F::rotatorDir(s, -angleY) * mPos;
 
 	mPos += mTarget;
 
 	lookAtPoint(mTarget, mPos, mUp);
 }
+
+void Camera::setPos(Vec3F pos) {
+	mPos = pos;
+}

Math/private/Topology.cpp

@@ -88,18 +88,18 @@ void TopologyCache::updateCache() {
 	}
 
 	TransformedPoints.reserve(Source->Points.size());
-	for (auto idx : Range(TransformedPoints.size())) {
+	for (auto idx : IterRange(TransformedPoints.size())) {
 		TransformedPoints[idx] = Source->Basis.transform(Source->Points[idx]);
 		TransformedPoints[idx] += Source->Origin;
 	}
 
 	TransformedNormals.reserve(Source->Normals.size());
-	for (auto idx : Range(TransformedNormals.size())) {
+	for (auto idx : IterRange(TransformedNormals.size())) {
 		TransformedNormals[idx] = Source->Basis.transform(Source->Normals[idx]);
 	}
 
 	TrigCaches.reserve(Source->Indexes.size());
-	for (auto idx : Range(TrigCaches.size())) {
+	for (auto idx : IterRange(TrigCaches.size())) {
 		TrigCaches[idx].mP1 = Source->Indexes[idx].x;
 		TrigCaches[idx].mP2 = Source->Indexes[idx].y;
 		TrigCaches[idx].mP3 = Source->Indexes[idx].z;

Math/public/Camera.hpp

@@ -18,6 +18,7 @@ namespace tp {
 		void setRatio(halnf ratio);
 		void setFOV(halnf fov);
 		void setFar(halnf far);
+		void setPos(Vec3F pos);
 
 		[[nodiscard]] const Vec3F& getPos() const;
 		[[nodiscard]] const Vec3F& getTarget() const;

Math/public/Color.hpp

@@ -79,6 +79,15 @@ namespace tp {
 
 		bool operator==(const RGBA& in) const { return r == in.r && g == in.g && b == in.b && a == in.a; }
 
+		static RGBA random() {
+			return RGBA{
+				(halnf) randomFloat(),
+				(halnf) randomFloat(),
+				(halnf) randomFloat(),
+				1.f,
+			};
+		}
+
 	public:
 		union {
 			RGB rgbs;

Math/public/Mat.hpp

@@ -221,7 +221,7 @@ namespace tp {
 			static_assert(tNRows == tNColoumns);
 			for (halni i = 0; i < tNColoumns; i++) {
 				for (halni j = i + 1; j < tNColoumns; j++) {
-					swap((*this)[i][j], (*this)[j][i]);
+					swapV((*this)[i][j], (*this)[j][i]);
 				}
 			}
 			return *this;
@@ -465,8 +465,15 @@ namespace tp {
 		}
 
 		// Matrix Properties
-		MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.y + j.y * in.x); }
+		MVec toGlobal(const MVec &in) const { return i * in.x + j * in.y; }
 
+		Mat toGlobal(const Mat &in) const { return {toGlobal(in.i), toGlobal(in.j)}; }
+
+		MVec toLocal(const MVec &in) const { return transform(in); }
+
+		MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.x + j.y * in.y); }
+
+		// ???
 		Mat transform(const Mat& in) const {
 			Mat out;
 			out.i.x = i.x * in.i.x + j.x * in.i.y;
@@ -479,7 +486,7 @@ namespace tp {
 		Mat operator*(const Mat& in) { return transform(in); }
 
 		Mat& transpose() {
-			swap(j.x, i.y);
+			swapV(j.x, i.y);
 			return *this;
 		}
 
@@ -495,8 +502,8 @@ namespace tp {
 	};
 
 	template <typename Type>
-	using mat3 = Mat<Type, 3, 3>;
+	using Mat3 = Mat<Type, 3, 3>;
-	using mat3f = mat3<halnf>;
+	using Mat3F = Mat3<halnf>;
 
 	template <typename Type>
 	class Mat<Type, 3, 3> {
@@ -635,9 +642,9 @@ namespace tp {
 		}
 
 		Mat& transpose() {
-			swap(I.y, J.x);
+			swapV(I.y, J.x);
-			swap(I.z, K.x);
+			swapV(I.z, K.x);
-			swap(J.z, K.y);
+			swapV(J.z, K.y);
 			return *this;
 		}
 
@@ -647,22 +654,22 @@ namespace tp {
 
 		Mat inv() { return cofactors() /= det(); }
 
-		Mat rotatorX(alnf angle) {
+		Mat rotatorX(alnf angle) const {
 			alnf cosA = (alnf) cos(angle);
 			alnf sinA = (alnf) sin(angle);
 			return { { 1, 0, 0 }, { 0, cosA, -sinA }, { 0, sinA, cosA } };
 		}
 
-		Mat rotatorY(alnf angle) {
+		Mat rotatorY(alnf angle) const {
 			alnf cosA = (alnf) cos(angle);
 			alnf sinA = (alnf) sin(angle);
 			return { { cosA, 0, sinA }, { 0, 1, 0 }, { -sinA, 0, cosA } };
 		}
 
-		Mat rotatorZ(alnf angle) {
+		static Mat rotatorZ(alnf angle) {
-			alnf cosA = (alnf) cos(angle);
+			Type cosA = (Type) cos(angle);
-			alnf sinA = (alnf) sin(angle);
+			Type sinA = (Type) sin(angle);
-			return { { cosA, -sinA, 0 }, { sinA, cosA, 0 }, { 0, 0, 1 } };
+			return { vec{ cosA, -sinA, 0 }, vec{ sinA, cosA, 0 }, vec{ 0, 0, 1 } };
 		}
 
 		static Mat rotatorDir(vec dir, alnf angle) {
@@ -707,4 +714,14 @@ namespace tp {
 
 		Type det() { return Type(); }
 	};
+
+	template<typename Type>
+	Mat<Type, 4, 4> toMat4(const Mat<Type, 3, 3>& in) {
+		Mat<Type, 4, 4> out;
+		out[0] = { in[0][0], in[0][1], in[0][2], 0 };
+		out[1] = { in[1][0], in[1][1], in[1][2], 0 };
+		out[2] = { in[2][0], in[2][1], in[2][2], 0 };
+		out[3] = { Type(0), Type(0), Type(0), Type(1) };
+		return out;
+	}
 }