Refactor of layout manager to add support for all menus (dirty unstable)

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.

.gitmodules

@@ -22,9 +22,3 @@
 [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 OpenImageDenoise)
+set(BINDINGS_LIBS glfw Imgui)
 
 ### ---------------------- 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 "../RasterRender/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "../3DScene/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

3DEditor/private/Editor.cpp

@@ -24,10 +24,7 @@ Editor::Editor() {
 void Editor::renderViewport() {
 	switch (mRenderType) {
 		case RenderType::RASTER:
-			mRasterRenderer.beginRender(mScene, mScene.mRenderSettings.size);
-			mRasterRenderer.renderDefault(mScene);
-			if (mActive) mRasterRenderer.renderOutline(mScene.mCamera, *mActive);
-			mRasterRenderer.endRender();
+			mRasterRenderer.render(mScene, mScene.mRenderSettings.size);
 			break;
 
 		case RenderType::PATH_TRACER:
@@ -57,7 +54,6 @@ uint4 Editor::getViewportTexID() {
 
 void Editor::loadDefaults() {
 	mScene.load("rsc/scene/script.lua");
-	mResetCamera = mScene.mCamera;
 }
 
 void Editor::setViewportSize(const Vec2F& size) {
@@ -77,7 +73,6 @@ Editor::~Editor() {
 }
 
 void Editor::renderPathFrame() {
-	mScene.updateCache();
 	mPathRenderer.render(mScene, mPathTracerBuffers, mScene.mRenderSettings);
 	sendBuffersToGPU();
 }
@@ -121,20 +116,5 @@ void Editor::navigationZoom(halnf factor) {
 }
 
 void Editor::navigationReset() {
-	mScene.mCamera = mResetCamera;
-	// mScene.mCamera.lookAtPoint({ 0, 0, 0 }, { 1, 5, 1 }, { 0, 0, 1 });
+	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,10 +28,6 @@ namespace tp {
 		void navigationZoom(halnf factor);
 		void navigationReset();
 
-		void selectObject(const Vec2F& screenPos);
-		Object* getActiveObject();
-
-		Scene* getScene();
 
 	private:
 		void sendBuffersToGPU();
@@ -40,8 +36,6 @@ namespace tp {
 	private:
 		Scene mScene;
 
-		Camera mResetCamera;
-
 		RenderType mRenderType = RenderType::RASTER;
 
 		RasterRender mRasterRenderer;
@@ -49,7 +43,5 @@ namespace tp {
 
 		RayTracer::OutputBuffers mPathTracerBuffers;
 		uint4 mPathRenderTexture = 0;
-
-		Object* mActive = nullptr;
 	};
 }

3DEditor/public/EditorWidget.hpp

@@ -2,7 +2,7 @@
 #include "DockWidget.hpp"
 
 #include "Editor.hpp"
-#include "FloatingWidget.hpp"
+#include "MenuWidgets.hpp"
 
 namespace tp {
 
@@ -40,11 +40,11 @@ namespace tp {
 			mViewport(canvas, editor) {
 			mEditor = editor;
 
-			mPanel.setText("Controls");
-			mPanel.addToMenu(&mNavigationMenu);
-			mPanel.addToMenu(&mRenderMenu);
+			// mPanel.setText("Controls");
+			//mPanel.addToMenu(&mNavigationMenu);
+			//mPanel.addToMenu(&mRenderMenu);
 
-			dockWidget(&mPanel, DockLayout::RIGHT);
+			dockWidget(&mNavigationMenu, DockLayout::RIGHT);
 			setCenterWidget(&mViewport);
 
 			// Render
@@ -66,13 +66,11 @@ namespace tp {
 				mNavigationOrbit.setText("Orbit");
 				mNavigationZoom.setText("Zoom");
 				mNavigationReset.setText("Reset");
-				mNavigationSelect.setText("Select");
 
 				mNavigationMenu.addToMenu(&mNavigationPan);
 				mNavigationMenu.addToMenu(&mNavigationOrbit);
 				mNavigationMenu.addToMenu(&mNavigationZoom);
 				mNavigationMenu.addToMenu(&mNavigationReset);
-				mNavigationMenu.addToMenu(&mNavigationSelect);
 
 				mNavigationMenu.setText("Navigation");
 			}
@@ -87,25 +85,16 @@ namespace tp {
 			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 process(const EventHandler& events) override {
 			DockWidget::process(events);
 
-			if (auto obj = mEditor->getActiveObject()) { // dummy rotate active object
-				auto rotator = obj->mTopology.Basis.rotatorDir({1, 1, 1}, 0.1);
-				obj->mTopology.Basis = rotator * obj->mTopology.Basis;
-			}
-
-			mEditor->getScene()->updateCache();
-
-			const auto& activeArea = mViewport.getArea();
-
 			auto pointer = events.getPointer();
 			auto pointerPrev = events.getPointerPrev();
-			auto pointerRelative = (((pointer - activeArea.pos) / activeArea.size) - 0.5f) * 2;
+
+			const auto& activeArea = mViewport.getArea();
 
 			if (activeArea.isInside(pointer) && events.isDown(InputID::MOUSE1)) {
 				switch (mNavigationType) {
@@ -113,13 +102,13 @@ namespace tp {
 
 					case PAN:
 						{
+							auto pointerRelative = (((pointer - activeArea.pos) / activeArea.size) - 0.5f) * 2;
 							auto prevPointerRelative = (((pointerPrev - activeArea.pos) / activeArea.size) - 0.5f) * 2;
 							mEditor->navigationPan(prevPointerRelative, pointerRelative);
 						}
 						break;
 
 					case ZOOM: mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); break;
-					case SELECT: mEditor->selectObject(pointerRelative * -1); break;
 				}
 			}
 		}
@@ -131,23 +120,22 @@ namespace tp {
 
 		ViewportWidget mViewport;
 
-		FloatingMenu mPanel;
+		FloatingScrollableMenu mPanel;
 
 		// Controls
-		FloatingMenu mRenderMenu;
+		FloatingScrollableMenu mRenderMenu;
 		ButtonWidget mRenderPathTracer;
 		ButtonWidget mRenderRaster;
 		ButtonWidget mRenderDeNoise;
 
 		// Navigation
-		enum NavigationType { SELECT, ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
+		enum NavigationType { ORBIT, PAN, ZOOM } mNavigationType = ORBIT;
 
-		FloatingMenu mNavigationMenu;
+		FloatingScrollableMenu mNavigationMenu;
 		ButtonWidget mNavigationPan;
 		ButtonWidget mNavigationOrbit;
 		ButtonWidget mNavigationZoom;
 		ButtonWidget mNavigationReset;
-		ButtonWidget mNavigationSelect;
 
 		RGBA mBaseColor;
 	};

3DEditor/rsc/scene/script.lua

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

3DEditor/rsc/shaders/default.vert

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

3DScene/private/LuaFormat.cpp

@@ -7,61 +7,6 @@ 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) {
@@ -108,8 +53,23 @@ int readRenderSettings(lua_State* L, tp::RenderSettings& settings) {
 }
 
 // Function to read a Lua table representing a light
-int tp::Scene::readLight(lua_State* L, tp::PointLight* light) {
-	light->pos = getVec3(L, "pos");
+int readLight(lua_State* L, tp::PointLight* light) {
+	lua_getfield(L, -1, "pos"); // Get the "pos" field from the light table
+	if (!lua_istable(L, -1)) {
+		printf("Light is missing the 'pos' table.\n");
+		return 0; // Error
+	}
+	for (int i = 0; i < 3; i++) {
+		lua_rawgeti(L, -1, i + 1); // Index is 1-based in Lua
+		if (!lua_isnumber(L, -1)) {
+			printf("Light 'pos' field is not a number at index %d.\n", i);
+			lua_pop(L, 2); // Pop both the number and the 'pos' table
+			return 0;      // Error
+		}
+		light->pos[i] = lua_tonumber(L, -1);
+		lua_pop(L, 1); // Pop the number
+	}
+	lua_pop(L, 1); // Pop the 'pos' table
 
 	lua_getfield(L, -1, "intensity"); // Get the "intensity" field from the light table
 	if (!lua_isnumber(L, -1)) {
@@ -161,29 +121,66 @@ bool tp::Scene::loadLuaFormat(const std::string& scenePath) {
 	}
 
 	// --- camera
-	{
-		lua_getglobal(L, "Camera");
-		if (!lua_istable(L, -1)) {
-			printf("Camera is not a table.\n");
+
+	// Access Camera table
+	lua_getglobal(L, "Camera");
+	if (!lua_istable(L, -1)) {
+		printf("Camera is not a table.\n");
+		lua_close(L);
+		return false;
+	}
+
+	// Verify you are inside the "Camera" table
+	int cameraTableIndex = lua_gettop(L); // Get the index of the "Camera" table
+
+	// Access the "pos" field and validate it
+	lua_getfield(L, cameraTableIndex, "pos");
+	if (!lua_istable(L, -1) || lua_rawlen(L, -1) != 3) {
+		printf("Invalid 'pos' field in Camera table.\n");
+		lua_close(L);
+		return false;
+	}
+
+	// Read the values from the table
+	float pos[3];
+	for (int i = 0; i < 3; i++) {
+		lua_rawgeti(L, -1, i + 1);
+		if (lua_isnumber(L, -1)) {
+			pos[i] = lua_tonumber(L, -1);
+		} else {
+			printf("Invalid 'pos' field value at index %d.\n", i + 1);
 			lua_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

@@ -49,38 +49,3 @@ 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,13 +2,5 @@
 #include "Scene.hpp"
 
 bool tp::Scene::load(const std::string& 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;
+	return loadLuaFormat(scenePath);
 }

3DScene/public/Scene.hpp

@@ -6,8 +6,6 @@
 
 #include <string>
 
-struct lua_State;
-
 namespace tp {
 	struct RenderSettings {
 		uhalni depth = 2;
@@ -44,22 +42,7 @@ 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;
 
@@ -68,23 +51,11 @@ 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;
 	};
 }

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -8,20 +8,13 @@ set(CMAKE_CXX_STANDARD 20)
 
 project(ModulesRoot)
 
-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)
+include(CMakeOptions.txt)
 
 add_subdirectory(Modules)
 add_subdirectory(Containers)
 add_subdirectory(Math)
 # add_subdirectory(Language)
+add_subdirectory(Externals)
 add_subdirectory(Connection)
 add_subdirectory(Graphics)
 add_subdirectory(DataAnalysis)

CMakeOptions.txt

@@ -1,6 +1,8 @@
 option(MODULES_MEMORY_DEBUG "Debug memory" OFF)
 option(MODULES_MEMORY_DEBUG_STACK_TRACE "Record stack info on memory debug" OFF)
 
+set(WINDOWS_LIBRARIES "../../ModulesWindowsLibraries" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl")
+
 if (MODULES_MEMORY_DEBUG)
     add_compile_definitions(MEM_DEBUG)
 endif ()

Containers/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(Containers)
 
-include(GoogleTest)
-
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp")
 file(GLOB HEADERS "./public/*.hpp")
@@ -18,7 +16,6 @@ file(GLOB TEST_SOURCES
         ./tests/ListTest.cpp
         ./tests/MapTest.cpp
         ./tests/TreeTest.cpp
-        ./tests/RingBufferByte.cpp
         ./tests/Tests.cpp
 )
 
@@ -27,10 +24,5 @@ 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})

Containers/private/linear_ring.cpp

@@ -1,65 +0,0 @@
-#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/Buffer2D.hpp

@@ -58,7 +58,6 @@ 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++) {

Containers/public/LinearRingBuffer.hpp

@@ -1,54 +0,0 @@
-
-#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/RingBufferByte.hpp

@@ -1,127 +0,0 @@
-#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

@@ -1,9 +0,0 @@
-
-#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/RingBufferByte.cpp

@@ -1,69 +0,0 @@
-
-#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/benchLinearRingBuffer.cpp

@@ -1,188 +0,0 @@
-#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

@@ -1,188 +0,0 @@
-#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,8 +10,6 @@
 
 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);
@@ -30,9 +28,7 @@ void loadImage(Buffer<halnf>& output, const char* name) {
 void loadNN(FCNN& nn) {
 	ArchiverLocalConnection<true> archiver;
 
-	if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
-		archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
-	}
+	archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
 
 	if (archiver.connection.getConnectionStatus().isOpened()) {
 		archiver % nn;
@@ -60,7 +56,7 @@ void executeCmd(const char* imageName) {
 }
 
 int main(int argc, char** argv) {
-	const char* imageName = "tmp2.png";
+	const char* imageName = "digit.png";
 
 	if (argc == 2) {
 		imageName = argv[1];

DataAnalysis/applications/NumRecTraining.cpp

@@ -1,4 +1,3 @@
-#include <filesystem>
 #include "FCNN.hpp"
 #include "LocalConnection.hpp"
 
@@ -72,9 +71,7 @@ struct NumberRec {
 		{
 			ArchiverLocalConnection<true> archiver;
 
-			if (std::filesystem::exists(std::filesystem::path("NumRec.wb"))) {
-				archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
-			}
+			archiver.connection.connect(LocalConnection::Location("NumRec.wb"), LocalConnection::Type(true));
 
 			if (archiver.connection.getConnectionStatus().isOpened()) {
 				archiver % nn;
@@ -218,7 +215,7 @@ int main() {
 
 	auto batchSize = trainRange.idxDiff() / numBatches;
 
-	for (auto epoch : IterRange(10)) {
+	for (auto epoch : IterRange(1)) {
 		printf("Epoch %i\n", epoch.index());
 
 		for (auto batchIdx : IterRange(trainRange.idxDiff() / batchSize)) {
@@ -244,5 +241,5 @@ int main() {
 		// app.displayImage(i);
 	}
 
-	printf("\n\nIncorrect - %i out of %i error percentage (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
+	printf("\n\nIncorrect - %i out of %i (%f)\n\n", errors, testRange.idxDiff(), (halnf) errors / (halnf) testRange.idxDiff());
 }

Externals/CMakeLists.txt

@@ -1,5 +1,42 @@
 # 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)
@@ -53,6 +90,8 @@ project(ImageIO)
 add_library(${PROJECT_NAME} INTERFACE)
 target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
 
-add_subdirectory(lalr)
 
-add_subdirectory(googletest)
+#set(OIDN_DEVICE_CPU ON)
+#set(OIDN_STATIC_LIB ON)
+#add_subdirectory(oidn)
+find_package(OpenImageDenoise REQUIRED)

Externals/benchmark

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

Externals/googletest

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

Externals/lalr

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

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 "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
 

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", "rsc/Font.ttf") == -1) {
+	if (nvgCreateFont(mContext->vg, "default", "Font.ttf") == -1) {
 		ASSERT(!"Cant create NVG font")
 	}
 }
@@ -82,19 +82,6 @@ void Canvas::frame(RectF rec, const RGBA& col, halnf round) {
 	// 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;
 
@@ -222,195 +209,3 @@ 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

@@ -36,7 +36,7 @@ DebugGUI::DebugGUI(Window* window) {
 	ImGui_ImplOpenGL3_Init("#version 330");
 
 	ImGuiIO& io = ImGui::GetIO();
-	io.Fonts->AddFontFromFileTTF("rsc/Font.ttf", 20.f);
+	io.Fonts->AddFontFromFileTTF("Font.ttf", 20.f);
 
 	io.ConfigInputTrickleEventQueue = false;
 

Graphics/private/Window.cpp

@@ -43,7 +43,6 @@ Window::Window(Vec2F size, const char* title) {
 	// Initialize GLEW
 	if (glewInit() != GLEW_OK) {
 		printf("Failed to initialize GLEW\n");
-		exit(1);
 		return;
 	}
 
@@ -67,9 +66,7 @@ Window* Window::createWindow(Vec2F size, const char* title) {
 	}
 	count--;
 
-	#ifdef ENV_OS_LINUX
-		glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
-	#endif
+	glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
 	// glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR);
 
 	// Initialize GLFW

Graphics/public/EventHandler.hpp

@@ -87,6 +87,7 @@ namespace tp {
 		[[nodiscard]] halnf getPointerPressure() const;
 
 		void setEnableKeyEvents(bool);
+		[[nodiscard]] bool isKeyEventsEnabled() const { return mEnableKeyEvents; }
 
 	private:
 		void processEventUnguarded();

Graphics/public/Graphics.hpp

@@ -55,27 +55,17 @@ 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();
-		[[nodiscard]] const RectF& getClampedArea() const;
+		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);

LICENSE

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

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 = (mTarget - mPos).normalize();
+	Vec3F f = (mPos - mTarget).normalize();
 	mUp = f * (aUp.normalize() * f);
 }
 
@@ -117,20 +117,16 @@ 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/public/Camera.hpp

@@ -18,7 +18,6 @@ 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/Mat.hpp

@@ -465,15 +465,8 @@ namespace tp {
 		}
 
 		// Matrix Properties
-		MVec toGlobal(const MVec &in) const { return i * in.x + j * in.y; }
+		MVec transform(const MVec& in) const { return MVec(i.x * in.x + i.y * in.y, j.x * in.y + j.y * in.x); }
 
-		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;
@@ -502,8 +495,8 @@ namespace tp {
 	};
 
 	template <typename Type>
-	using Mat3 = Mat<Type, 3, 3>;
-	using Mat3F = Mat3<halnf>;
+	using mat3 = Mat<Type, 3, 3>;
+	using mat3f = mat3<halnf>;
 
 	template <typename Type>
 	class Mat<Type, 3, 3> {
@@ -654,22 +647,22 @@ namespace tp {
 
 		Mat inv() { return cofactors() /= det(); }
 
-		Mat rotatorX(alnf angle) const {
+		Mat rotatorX(alnf angle) {
 			alnf cosA = (alnf) cos(angle);
 			alnf sinA = (alnf) sin(angle);
 			return { { 1, 0, 0 }, { 0, cosA, -sinA }, { 0, sinA, cosA } };
 		}
 
-		Mat rotatorY(alnf angle) const {
+		Mat rotatorY(alnf angle) {
 			alnf cosA = (alnf) cos(angle);
 			alnf sinA = (alnf) sin(angle);
 			return { { cosA, 0, sinA }, { 0, 1, 0 }, { -sinA, 0, cosA } };
 		}
 
-		static Mat rotatorZ(alnf angle) {
-			Type cosA = (Type) cos(angle);
-			Type sinA = (Type) sin(angle);
-			return { vec{ cosA, -sinA, 0 }, vec{ sinA, cosA, 0 }, vec{ 0, 0, 1 } };
+		Mat rotatorZ(alnf angle) {
+			alnf cosA = (alnf) cos(angle);
+			alnf sinA = (alnf) sin(angle);
+			return { { cosA, -sinA, 0 }, { sinA, cosA, 0 }, { 0, 0, 1 } };
 		}
 
 		static Mat rotatorDir(vec dir, alnf angle) {
@@ -714,14 +707,4 @@ 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;
-	}
 }

Math/public/Rect.hpp

@@ -70,29 +70,6 @@ namespace tp {
 			return *this;
 		}
 
-		Rect<Type>& adjust(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) {
-			x += left;
-			y += bottom;
-			size.x += -left + right;
-			size.y += -bottom + top;
-			return *this;
-		}
-
-		Rect<Type> adjusted(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) const {
-			return Rect<Type>(*this).adjust(left, bottom, right, top);
-		}
-
-		[[nodiscard]] halnf left() const { return x; }
-		[[nodiscard]] halnf bottom() { return y; }
-		[[nodiscard]] halnf top() { return y + size.y; }
-		[[nodiscard]] halnf right() { return x + size.x; }
-
-		static Rect fromPoints(const Vec2<Type>& p1, const Vec2<Type>& p2) {
-			tp::Vec2F min = {tp::min(p1.x, p2.x), tp::min(p1.y, p2.y)};
-			tp::Vec2F max = {tp::max(p1.x, p2.x), tp::max(p1.y, p2.y)};
-			return { min, max - min };
-		}
-
 		bool operator==(const Rect<Type>& rect) const { return (pos == rect.pos && size == rect.size); }
 
 		bool isEnclosedIn(const Rect<Type>& rect, bool aParent = false) const {
@@ -207,23 +184,13 @@ namespace tp {
 		}
 
 		void expand(const Vec2<Type>& point) {
-			if (point.x < x) {
-				size.x += x - point.x;
-				x = point.x;
-			}
+			pos.x = min(point.x, pos.x);
+			pos.y = min(point.y, pos.y);
 
-			if (point.y < y) {
-				size.y += y - point.y;
-				y = point.y;
-			}
-
-			if (point.x > x + size.x) {
-				size.x = point.x - x;
-			}
-
-			if (point.y > y + size.y) {
-				size.y = point.y - y;
-			}
+			auto p = pos + size;
+			p.x = max(point.x, p.x);
+			p.y = max(point.y, p.y);
+			size = p - pos;
 		}
 
 		void expand(const Rect<Type>& rect) {

Math/public/Topology.hpp

@@ -30,7 +30,7 @@ namespace tp {
 
 	struct Topology {
 		Vec3F Origin = { 0, 0, 0 };
-		Mat3F Basis = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } };
+		mat3f Basis = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } };
 
 		Buffer<Vec3F> Points;
 		Buffer<Vec3F> Normals;

Math/public/Vec.hpp

@@ -110,13 +110,6 @@ namespace tp {
 			return *this;
 		}
 
-		Vec& operator=(Type val) {
-			for (ualni i = 0; i < tSize; i++) {
-				get(i) = val;
-			}
-			return *this;
-		}
-
 		void assign(Type val) {
 			for (ualni i = 0; i < tSize; i++) {
 				get(i) = val;
@@ -583,14 +576,4 @@ namespace tp {
 
 	using Vec4F = Vec4<halnf>;
 	using Vec4I = Vec4<halni>;
-
-	template <typename Type>
-	Vec<Type, 4> toVec4(const Vec<Type, 3>& in) {
-		Vec<Type, 4> out;
-		out[0] = in[0];
-		out[1] = in[1];
-		out[2] = in[2];
-		out[3] = 0;
-		return out;
-	}
 }

RasterRender/private/FrameBuffer.cpp

@@ -102,7 +102,7 @@ void RenderBuffer::setViewport(const RectF& viewport) {
 
 void RenderBuffer::clear() {
 	AssertGL(glClearColor(mClearCol.r, mClearCol.g, mClearCol.b, mClearCol.a));
-	AssertGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT));
+	AssertGL(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
 }
 
 void RenderBuffer::endDraw() {

RasterRender/private/Render.cpp

@@ -3,42 +3,26 @@
 
 using namespace tp;
 
-RasterRender::RasterRender() {
+RasterRender::RasterRender() :
+	mRenderBuffer({ 100, 100 })
+{
 	mDefaultShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/default.frag", true);
-	mSolidShader.load("rsc/shaders/default.vert", nullptr, "rsc/shaders/solid.frag", true);
 }
 
 RasterRender::~RasterRender() {}
 
-void RasterRender::resize(const Vec2<tp::ualni>& size) {
-	auto sizeF = Vec2F(size.x, size.y);
-	mRenderBuffer.resize(sizeF);
-	mTempBuffer.resize(sizeF);
-}
-
 uint4 RasterRender::getRenderBufferID() { return mRenderBuffer.texId(); }
 
 Vec2F RasterRender::getBufferSize() { return mRenderBuffer.getSize(); }
 
-void RasterRender::bindCameraShaderAttributes(const Mat4F& cameraMat) {
-	static auto camera = (GLint) mDefaultShader.getu("Camera");
-	glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]);
-}
+void RasterRender::render(const Scene& geometry, const Vec2<ualni>& size) {
 
-void RasterRender::bindObjectShaderAttributes(const Object& object) {
-	static auto origin = (GLint) mDefaultShader.getu("Origin");
-	static auto basis = (GLint) mDefaultShader.getu("Basis");
+	for (auto object : geometry.mObjects) {
+		if (!object->mGUPBuffers) {
+			object->mGUPBuffers = new ObjectBuffers(&object.data());
+		}
+	}
 
-	Mat4F basisMat = toMat4(object.mTopology.Basis);
-	Vec4F originPoint = toVec4(object.mTopology.Origin);
-
-	basisMat = basisMat.transpose();
-
-	glUniform4fv(origin, 1, &originPoint[0]);
-	glUniformMatrix4fv(basis, 1, false, &basisMat[0][0]);
-}
-
-void RasterRender::renderDefault(const Scene& geometry) {
 	mRenderBuffer.mClearCol = { 0.0f, 0.0f, 0.0f, 0.f };
 
 	mRenderBuffer.beginDraw();
@@ -53,21 +37,24 @@ void RasterRender::renderDefault(const Scene& geometry) {
 	// glPolygonMode(GL_FRONT, GL_LINE);
 	// glPolygonMode(GL_BACK, GL_LINE);
 
-	// auto rotator = Mat3F::rotatorZ(alnf(0.001));
-
-	bindCameraShaderAttributes(cameraMat);
-
 	for (auto object : geometry.mObjects) {
-		// object->mTopology.Origin += 0.01;
-		// object->mTopology.Basis = rotator * object->mTopology.Basis;
 
-		bindObjectShaderAttributes(object.data());
+		static auto origin = (GLint) mDefaultShader.getu("Origin");
+		static auto basis = (GLint) mDefaultShader.getu("Basis");
+		static auto camera = (GLint) mDefaultShader.getu("Camera");
+
+		Mat4F basisMat;
+		Vec4F originPoint;
+
+		glUniform4fv(origin, 1, &originPoint[0]);
+		glUniformMatrix4fv(basis, 1, false, &basisMat[0][0]);
+		glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]);
+
 		object->mGUPBuffers->drawCall();
 	}
 
 	mDefaultShader.unbind();
 
-	glDisable(GL_DEPTH_TEST);
 
 	// glPolygonMode(GL_FRONT, GL_FILL);
 	// glPolygonMode(GL_BACK, GL_FILL);
@@ -75,37 +62,4 @@ void RasterRender::renderDefault(const Scene& geometry) {
 	mRenderBuffer.endDraw();
 }
 
-void RasterRender::renderOutline(const Camera& camera, const Object& object) {
-	mRenderBuffer.beginDraw();
-
-	// glEnable(GL_STENCIL_TEST);
-
-	mSolidShader.bind();
-
-	bindCameraShaderAttributes(camera.calculateTransformationMatrix());
-	bindObjectShaderAttributes(object);
-
-	object.mGUPBuffers->drawCall();
-
-	mSolidShader.unbind();
-
-	// glDisable(GL_STENCIL_TEST);
-
-	mRenderBuffer.endDraw();
-}
-
-void RasterRender::beginRender(const Scene& geometry, const Vec2<tp::ualni>& size) {
-	resize(size);
-
-	for (auto object : geometry.mObjects) {
-		if (!object->mGUPBuffers) {
-			object->mGUPBuffers = new ObjectBuffers(&object.data());
-		}
-	}
-}
-
-void RasterRender::endRender() {
-	// pass
-}
-
 RenderBuffer* RasterRender::getRenderBuffer() { return &mRenderBuffer; }

RasterRender/public/FrameBuffer.hpp

@@ -7,7 +7,7 @@
 namespace tp {
 	class RenderBuffer {
 	public:
-		explicit RenderBuffer(const Vec2F& size = { 10, 10 });
+		explicit RenderBuffer(const Vec2F& size);
 		RenderBuffer(const Vec2F& size, tp::uint1 samples);
 		~RenderBuffer();
 

RasterRender/public/RasterRender.hpp

@@ -12,27 +12,13 @@ namespace tp {
 		RasterRender();
 		~RasterRender();
 
-		void beginRender(const Scene& geometry, const Vec2<ualni>& size);
-		void endRender();
-
-		void renderDefault(const Scene& geometry);
-		void renderOutline(const Camera& camera, const Object& object);
-
-		void resize(const Vec2<ualni>& size);
-
+		void render(const Scene& geometry, const Vec2<ualni>& size);
 		uint4 getRenderBufferID();
 		RenderBuffer* getRenderBuffer();
 		Vec2F getBufferSize();
 
-	private:
-		void bindObjectShaderAttributes(const Object& object);
-		void bindCameraShaderAttributes(const Mat4F& cameraMat);
-
 	private:
 		RenderBuffer mRenderBuffer;
-		RenderBuffer mTempBuffer;
-
 		RenderShader mDefaultShader;
-		RenderShader mSolidShader;
 	};
 }

RasterRender/rsc/shaders/default.vert

@@ -1,13 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 Point;
-
-uniform vec4 Origin;
-uniform mat4 Basis;
-uniform mat4 Camera;
-
-void main() {
-    // vec4 transformed = vec4(Point.xyz, 1.0);
-    vec4 transformed = (Basis * vec4(Point.xyz, 1.0)) + Origin;
-    gl_Position = Camera * transformed;
-}

RasterRender/rsc/shaders/solid.frag

@@ -1,7 +0,0 @@
-#version 330 core
-
-out vec4 FragColor;
-
-void main() {
-    FragColor = vec4(1, 0, 0, 1.f);
-}

RayTracer/private/RayTracer.cpp

@@ -43,8 +43,6 @@ normal = n1 * barycentric.x + n2 * barycentric.y + n3 * barycentric.z;
 
 using namespace tp;
 
-
-// TODO : de-duplicate in Scene?
 void RayTracer::castRay(const Ray& ray, RayCastData& out, alnf farVal) {
 	out.hit = false;
 	out.obj = nullptr;

RayTracer/public/RayTracer.hpp

@@ -30,6 +30,14 @@ namespace tp {
 		void render(const Scene& scene, OutputBuffers& out, const RenderSettings& settings);
 
 	private:
+		struct RayCastData {
+			const Object* obj = nullptr;
+			TrigCache* trig = nullptr;
+			Vec3F hitPos = { 0, 0, 0 };
+			bool hit = false;
+			bool inv = false;
+		};
+
 		struct LightData {
 			halnf intensity = 0;
 		};

Sketch3D/CMakeLists.txt

@@ -19,4 +19,4 @@ add_executable(Sketch3DApp ./applications/Entry.cpp)
 target_link_libraries(Sketch3DApp ${PROJECT_NAME})
 
 file(COPY "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc")
+file(COPY "applications/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

Sketch3D/applications/Entry.cpp

@@ -2,22 +2,19 @@
 #include "WidgetApplication.hpp"
 
 #include "Sketch3D.hpp"
-#include "SketchGUI.hpp"
+#include "Sketch3DWidget.hpp"
 
 using namespace tp;
 
 class Sketch3DApplication : public WidgetApplication {
 public:
-	Sketch3DApplication() {
+	Sketch3DApplication() :
+		mGui(*mGraphics->getCanvas(), { 1920, 1080 }) {
 		setRoot(&mGui);
-
-		mGui.createRenderWidget(mGraphics->getCanvas(), { 2560, 1440 });
-		mGui.setProject(&mSketch);
 	}
 
 private:
-	SketchGUI mGui;
-	Project mSketch;
+	Sketch3DGUI mGui;
 };
 
 void runApp() {

Sketch3D/private/Sketch3D.cpp

@@ -283,14 +283,6 @@ PencilBrush::~PencilBrush() {
 	if (mStroke) delete mStroke;
 }
 
-void PencilBrush::finish(Project* proj) {
-	if (mStroke) {
-		ensureReady(mStroke, &proj->mCamera);
-		proj->mLayers[proj->mActiveLayer]->strokes.pushBack(mStroke);
-		mStroke = nullptr;
-	}
-}
-
 Layer::~Layer() {
 	for (auto str : strokes) {
 		delete str.data();
@@ -324,20 +316,6 @@ void Project::sample(halnf pressure, halnf cameraRatio, Vec2F relativeCameraPos)
 	}
 }
 
-void Project::setPencil() {
-	if (auto idx = mBrushes.presents(mActiveBrush)) {
-		mBrushes.getSlotVal(idx)->finish(this);
-	}
-	mActiveBrush = "pencil";
-}
-
-void Project::setEraser() {
-	if (auto idx = mBrushes.presents(mActiveBrush)) {
-		mBrushes.getSlotVal(idx)->finish(this);
-	}
-	mActiveBrush = "eraser";
-}
-
 Project::~Project() {
 	for (auto brush : mBrushes) {
 		delete brush->val;

Sketch3D/private/SketchGUI.cpp

@@ -1,184 +0,0 @@
-#include "SketchGUI.hpp"
-#include "SimpleLayouts.hpp"
-
-using namespace tp;
-
-SketchRenderWidget::SketchRenderWidget(Canvas& canvas, Vec2F renderResolution) :
-	mRenderer(renderResolution) {
-	mImage = canvas.createImageFromTextId(mRenderer.getBuff()->texId(), mRenderer.getBuff()->getSize());
-	mCanvas = &canvas;
-
-	setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
-
-	setDebug("render", {});
-}
-
-SketchRenderWidget::~SketchRenderWidget() { mCanvas->deleteImageHandle(mImage); }
-
-void SketchRenderWidget::draw(Canvas& canvas) {
-	auto area = getArea().relative();
-	if (mProject) {
-		mRenderer.renderToTexture(mProject, area.size);
-		canvas.drawImage(area, &mImage, 0, 1, 12);
-	}
-}
-
-void SketchRenderWidget::setProject(Project* project) { mProject = project; }
-
-void SketchViewportWidget::setProject(Project* project) {
-	mProject = project;
-	mProject->mBackgroundColor = { 0.13f, 0.13f, 0.13f, 0.8f };
-}
-
-void SketchViewportWidget::setColor(const RGBA& color) {
-	((PencilBrush*) mProject->mBrushes.get("pencil"))->mCol = color;
-}
-
-void SketchViewportWidget::setRenderWidget(SketchRenderWidget* widget) { addChild(widget); }
-
-void SketchViewportWidget::process(const EventHandler& events) {
-	if (!mProject) return;
-
-	auto area = getArea().relative();
-	Vec2F pointer = events.getPointer();
-	auto crs = events.getPointer();
-
-	if (!area.isInside(events.getPointer())) return;
-
-	crs.x /= area.z;
-	crs.y /= area.w;
-	crs = (crs - 0.5) * 2;
-
-	if (events.isPressed(InputID::MOUSE1)) {
-		mAction = true;
-		lockFocus();
-
-	} else if (events.isReleased(InputID::MOUSE1)) {
-		mAction = false;
-		freeFocus();
-	}
-
-	mProject->mCamera.setRatio(area.w / area.z);
-
-	if (mAction) {
-		Vec2F relativePos = ((pointer / area.size) - 0.5f) * 2.f;
-		Vec2F relativePosPrev = ((mActionPosAbsolutePrev / area.size) - 0.5f) * 2.f;
-		Vec2F relativeDelta = relativePos - relativePosPrev;
-
-		if (events.isDown(InputID::LEFT_SHIFT)) {
-			mProject->mCamera.move(relativePos, relativePosPrev);
-		} else if (events.isDown(InputID::LEFT_ALT)) {
-			mProject->mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI));
-		} else if (events.isDown(InputID::LEFT_CONTROL)) {
-			halnf factor = pointer.y / mActionPosAbsolutePrev.y;
-			mProject->mCamera.zoom(factor);
-		} else {
-			mProject->sample(events.getPointerPressure(), area.w / area.z, crs);
-		}
-
-	} else {
-		mProject->sample(0, area.w / area.z, crs);
-	}
-
-	mActionPosAbsolutePrev = pointer;
-}
-
-SketchViewportWidget::SketchViewportWidget() {
-	setLayout(new ToolBarLayout(this));
-
-	setDebug("viewport", {});
-}
-
-void SketchViewportWidget::setToolbarWidget(Widget* widget) {
-	addChild(widget);
-	widget->bringToFront();
-}
-
-ToolbarWidget::ToolbarWidget() {
-	setDirection(false);
-	setDebug("toolbar", {});
-
-	addToToolbar(&mFileHover);
-	addToToolbar(&mPencilHover);
-	addToToolbar(&mViewHover);
-
-	mFileHover.setText("File");
-	mViewHover.setText("View");
-	mPencilHover.setText("Brush");
-}
-
-void ToolbarWidget::addToToolbar(Widget* button) {
-	button->getLayout()->setMinSize({60, 30});
-	getContainer()->addChild(button);
-}
-
-SketchGUI::SketchGUI() :
-	DockWidget() {
-
-	setCenterWidget(&mViewport);
-	dockWidget(&mPanel, DockLayout::RIGHT);
-	toggleWidgetVisibility(DockLayout::RIGHT);
-
-	mPanel.addToMenu(&mControls);
-	mPanel.setText("Controls");
-	mPanel.setArea({ 110, 110, 300, 500 });
-
-	mControls.setText("Tools");
-	mControls.addToMenu(&mSelectPencil);
-	mControls.addToMenu(&mSelectEraser);
-	mControls.setArea({ 0, 0, 300, 400 });
-
-	// brush
-	{
-		auto popup = mToolbar.mPencilHover.getPopup();
-		popup->addChild(&mColorPicker);
-		popup->addChild(&mBrushSizeSlider);
-
-		mColorPicker.setArea({10, 10, 300, 300});
-	}
-
-	// view
-	{
-		auto popup = mToolbar.mViewHover.getPopup();
-		popup->addChild(&mToggleSidePanel);
-
-		mToggleSidePanel.setText("Toggle Panel");
-		mToggleSidePanel.setAction([this](){
-			toggleWidgetVisibility(getSide(&mPanel));
-		});
-	}
-
-	mSelectPencil.setAction([this](){ mProject->setPencil(); });
-	mSelectPencil.setText("Pencil");
-
-	mSelectEraser.setAction([this](){ mProject->setEraser(); });
-	mSelectEraser.setText("Eraser TODO");
-}
-
-void SketchGUI::createRenderWidget(Canvas* canvas, const Vec2F& renderResolution) {
-	mRenderWidget = new SketchRenderWidget(*canvas, renderResolution);
-
-	mViewport.setRenderWidget(mRenderWidget);
-	mViewport.setToolbarWidget(&mToolbar);
-}
-
-void SketchGUI::setProject(Project* project) {
-	mProject = project;
-	mViewport.setProject(project);
-	if (mRenderWidget) mRenderWidget->setProject(project);
-}
-
-SketchGUI::~SketchGUI() { delete mRenderWidget; }
-
-void SketchGUI::process(const EventHandler& events) {
-	DockWidget::process(events);
-
-	if (!mProject) return;
-
-	auto pencil = dynamic_cast<PencilBrush*>(mProject->mBrushes.get("pencil"));
-
-	pencil->mCol = mColorPicker.mColorWheel.color;
-	pencil->mSize = mBrushSizeSlider.val() * 0.2f + 0.001f;
-}
-
-void SketchGUI::draw(Canvas& canvas) { canvas.rect(getArea().relative(), mBackgroundColor, mRounding); }

Sketch3D/public/Sketch3D.hpp

@@ -97,9 +97,6 @@ namespace tp {
 		Project();
 		~Project();
 
-		void setPencil();
-		void setEraser();
-
 		// pos from -1 to 1 (left ot right bottom to top)
 		void sample(halnf pressure, halnf cameraRatio, Vec2F relativeCameraPos);
 
@@ -119,7 +116,6 @@ namespace tp {
 		std::string mType = "equal";
 		Brush() = default;
 		virtual void sample(Project* proj, Vec2F crs, halnf pressure) {}
-		virtual void finish(Project* proj) {}
 		virtual void draw(Renderer* render, const Camera* camera) {}
 		virtual ~Brush() = default;
 	};
@@ -129,9 +125,8 @@ namespace tp {
 		PencilBrush();
 		~PencilBrush() override;
 
-		void finish(Project* proj) override;
-		void sample(Project* proj, Vec2F crs, halnf pressure) override;
-		void draw(Renderer* render, const Camera* camera) override;
+		virtual void sample(Project* proj, Vec2F crs, halnf pressure) override;
+		virtual void draw(Renderer* render, const Camera* camera) override;
 
 	private:
 		void ensureReady(Stroke* stroke, const Camera* cam, bool debug = false) const;

Sketch3D/public/Sketch3DWidget.hpp

@@ -0,0 +1,169 @@
+#pragma once
+
+#include "Sketch3D.hpp"
+#include "Widget.hpp"
+#include "DockWidget.hpp"
+#include "MenuWidgets.hpp"
+
+namespace tp {
+
+	class Sketch3DWidget : public Widget {
+	public:
+		Sketch3DWidget(Canvas& canvas, Vec2F renderResolution) :
+			mRenderer(renderResolution) {
+			mImage = canvas.createImageFromTextId(mRenderer.getBuff()->texId(), mRenderer.getBuff()->getSize());
+			mCanvas = &canvas;
+
+			mProject.mBackgroundColor = { 0.13f, 0.13f, 0.13f, 1.f };
+		}
+
+		~Sketch3DWidget() { mCanvas->deleteImageHandle(mImage); }
+
+		void process(const EventHandler& events) override {
+			auto area = getArea().relative();
+
+			Vec2F pointer = events.getPointer();
+			auto crs = events.getPointer();
+
+			if (!area.isInside(events.getPointer())) {
+				return;
+			}
+
+			crs.x /= area.z;
+			crs.y /= area.w;
+			crs = (crs - 0.5) * 2;
+
+			if (events.isPressed(InputID::MOUSE1)) {
+				mAction = true;
+			} else if (events.isReleased(InputID::MOUSE1)) {
+				mAction = false;
+			}
+
+			Vec2F relativePos = ((pointer / area.size) - 0.5f) * 2.f;
+			Vec2F relativePosPrev = ((mActionPosAbsolutePrev / area.size) - 0.5f) * 2.f;
+			Vec2F relativeDelta = relativePos - relativePosPrev;
+
+			mProject.mCamera.setRatio(area.w / area.z);
+
+			switch (mMode) {
+				case Mode::MOVE:
+					{
+						if (mAction) mProject.mCamera.move(relativePos, relativePosPrev);
+						break;
+					}
+				case Mode::ZOOM:
+					{
+						halnf factor = pointer.y / mActionPosAbsolutePrev.y;
+						if (mAction) mProject.mCamera.zoom(factor);
+						break;
+					}
+				case Mode::ROTATE:
+					{
+						if (mAction) mProject.mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI));
+						break;
+					}
+				case Mode::DRAW:
+					{
+						mProject.sample(events.getPointerPressure(), area.w / area.z, crs);
+						break;
+					}
+				default: break;
+			}
+
+			mActionPosAbsolutePrev = pointer;
+		}
+
+		void draw(Canvas& canvas) override {
+			auto area = getArea().relative();
+			mRenderer.renderToTexture(&mProject, area.size);
+			canvas.drawImage(area, &mImage, 0, 1, 12);
+		}
+
+		void setColor(const RGBA& color) { ((PencilBrush*) mProject.mBrushes.get("pencil"))->mCol = color; }
+
+		[[nodiscard]] bool processesEvents() const override { return true; }
+
+	public:
+		enum class Mode { MOVE, ROTATE, ZOOM, DRAW, NONE } mMode = Mode::NONE;
+
+		Vec2F mActionPosAbsolutePrev = { 0, 0 };
+		bool mAction = false;
+
+	private:
+		Renderer mRenderer;
+		Project mProject;
+		Canvas::ImageHandle mImage;
+		Canvas* mCanvas = nullptr;
+	};
+
+	class Sketch3DGUI : public DockWidget {
+	public:
+		explicit Sketch3DGUI(Canvas& canvas, Vec2F renderResolution) :
+			DockWidget(),
+			mViewport(canvas, renderResolution) {
+
+			mControls.addToMenu(&mDrawButton);
+			mControls.addToMenu(&mMoveButton);
+			mControls.addToMenu(&mRotateButton);
+			mControls.addToMenu(&mZoomButton);
+
+			mColorPicker.addToMenu(&mRed);
+			mColorPicker.addToMenu(&mGreen);
+			mColorPicker.addToMenu(&mBlue);
+
+			setCenterWidget(&mViewport);
+
+			mPanel.addToMenu(&mControls);
+			mPanel.addToMenu(&mColorPicker);
+
+			//  addChild(&mPanel);
+			dockWidget(&mPanel, DockLayout::RIGHT);
+
+			mDrawButton.setAction([this]() { mViewport.mMode = Sketch3DWidget::Mode::DRAW; });
+			mMoveButton.setAction([this]() { mViewport.mMode = Sketch3DWidget::Mode::MOVE; });
+			mRotateButton.setAction([this]() { mViewport.mMode = Sketch3DWidget::Mode::ROTATE; });
+			mZoomButton.setAction([this]() { mViewport.mMode = Sketch3DWidget::Mode::ZOOM; });
+
+			mDrawButton.setText("Draw");
+			mMoveButton.setText("Pan");
+			mRotateButton.setText("Orbit");
+			mZoomButton.setText("Zoom");
+
+			mPanel.setText("Controls");
+			mControls.setText("Tools");
+			mColorPicker.setText("Color");
+
+			mPanel.setArea({110, 110, 300, 500 });
+			mControls.setArea({0, 0, 300, 400 });
+			mColorPicker.setArea({0, 0, 300, 300 });
+
+		}
+
+		void process(const EventHandler& events) override {
+			DockWidget::process(events);
+
+			mViewport.setColor(RGBA(mRed.val(), mGreen.val(), mBlue.val(), 1.f));
+		}
+
+		void draw(Canvas& canvas) override { canvas.rect(getArea().relative(), mBackgroundColor, mRounding); }
+
+	private:
+		Sketch3DWidget mViewport;
+
+		FloatingScrollableMenu mPanel;
+
+		FloatingScrollableMenu mControls;
+		ButtonWidget mDrawButton;
+		ButtonWidget mMoveButton;
+		ButtonWidget mRotateButton;
+		ButtonWidget mZoomButton;
+
+		FloatingScrollableMenu mColorPicker;
+		SliderWidget mRed;
+		SliderWidget mGreen;
+		SliderWidget mBlue;
+
+		RGBA mBackgroundColor;
+		halnf mRounding = 0;
+	};
+}

Sketch3D/public/SketchGUI.hpp

@@ -1,95 +0,0 @@
-#pragma once
-
-#include "Sketch3D.hpp"
-#include "Widget.hpp"
-#include "DockWidget.hpp"
-#include "FloatingWidget.hpp"
-#include "ColorPickerWidget.hpp"
-
-namespace tp {
-
-	class SketchRenderWidget : public Widget {
-	public:
-		SketchRenderWidget(Canvas& canvas, Vec2F renderResolution);
-		~SketchRenderWidget() override;
-
-		void draw(Canvas& canvas) override;
-		void setProject(Project* project);
-
-	private:
-		Renderer mRenderer;
-		Project* mProject = nullptr;
-		Canvas::ImageHandle mImage;
-		Canvas* mCanvas = nullptr;
-	};
-
-	class SketchViewportWidget : public Widget {
-	public:
-		SketchViewportWidget();
-
-		void setProject(Project* project);
-		void setColor(const RGBA& color);
-
-		void setRenderWidget(SketchRenderWidget* widget);
-		void setToolbarWidget(Widget* widget);
-
-		void process(const EventHandler& events) override;
-		[[nodiscard]] bool processesEvents() const override { return true; }
-
-	private:
-		Project* mProject = nullptr;
-
-	public:
-		Vec2F mActionPosAbsolutePrev = { 0, 0 };
-		bool mAction = false;
-	};
-
-
-	class ToolbarWidget : public ScrollableWidget {
-	public:
-		ToolbarWidget();
-
-	private:
-		void addToToolbar(Widget* button);
-
-	public:
-		HoverPopupTriggerWidget mFileHover;
-		HoverPopupTriggerWidget mPencilHover;
-		HoverPopupTriggerWidget mViewHover;
-	};
-
-	class SketchGUI : public DockWidget {
-	public:
-		SketchGUI();
-		void createRenderWidget(Canvas* canvas, const Vec2F& renderResolution);
-		void setProject(Project* project);
-		~SketchGUI() override;
-
-		void process(const EventHandler& events) override;
-		void draw(Canvas& canvas) override;
-
-	private:
-		Project* mProject = nullptr;
-
-		SketchViewportWidget mViewport;
-		ToolbarWidget mToolbar;
-
-		SketchRenderWidget* mRenderWidget = nullptr;
-
-		FloatingMenu mPanel;
-
-		RGBPickerWidget mColorPicker;
-
-		ButtonWidget mToggleSidePanel;
-
-		ButtonWidget mSelectPencil;
-		ButtonWidget mSelectEraser;
-
-		SliderWidget mBrushSizeSlider;
-
-		FloatingMenu mControls;
-
-		RGBA mBackgroundColor;
-		halnf mRounding = 0;
-	};
-}

Widgets/CMakeLists.txt

@@ -14,4 +14,4 @@ add_executable(WidgetsExample examples/Example.cpp)
 target_link_libraries(WidgetsExample ${PROJECT_NAME} ${GLEW_LIB})
 target_include_directories(WidgetsExample PUBLIC ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
 
-file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/rsc")
+file(COPY "examples/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

Widgets/examples/Example.cpp

@@ -2,9 +2,8 @@
 #include "WidgetApplication.hpp"
 
 #include "RootWidget.hpp"
-#include "FloatingWidget.hpp"
+#include "MenuWidgets.hpp"
 #include "DockWidget.hpp"
-#include "ColorPickerWidget.hpp"
 
 #include "ScrollableLayout.hpp"
 
@@ -14,15 +13,15 @@ using namespace tp;
 class Example : public WidgetApplication {
 public:
 	Example() {
-		exampleColorPicker();
+		exampleNestedMenus();
 	}
 
 	void exampleAll() {
 		static DockWidget dock;
 		static LabelWidget centralWidget;
-		static FloatingMenu menus[4];
-		static FloatingMenu nestedMenus[4];
-		static FloatingMenu buttons[10];
+		static FloatingScrollableMenu menus[4];
+		static FloatingScrollableMenu nestedMenus[4];
+		static FloatingScrollableMenu buttons[10];
 
 		dock.setCenterWidget(&centralWidget);
 
@@ -37,13 +36,28 @@ public:
 		setRoot(&dock);
 	}
 
-	void exampleColorPicker() {
+	void exampleCollapsingMenus() {
 		static DockWidget dock;
-		static RGBPickerWidget colorPicker;
+		static CollapsingMenuWidget mainMenu;
+		static CollapsingMenuWidget menus[3];
+		static ButtonWidget buttons[5];
 
-		dock.dockWidget(&colorPicker, DockLayout::RIGHT);
+		for (auto& menu : menus) {
+			mainMenu.getContainer()->addChild(&menu);
+		}
 
-		setRoot(&dock);
+		menus[0].getContainer()->addChild(&buttons[0]);
+		menus[0].getContainer()->addChild(&buttons[1]);
+		menus[0].getContainer()->addChild(&buttons[2]);
+
+		menus[1].getContainer()->addChild(&buttons[3]);
+		menus[1].getContainer()->addChild(&buttons[4]);
+
+		// dock.addChild(&menus[0]);
+
+		setRoot(&menus[0]);
+
+		// RootWidget::setWidgetArea(mainMenu, { 333, 333, 522, 522 });
 	}
 
 	void exampleBasic() {
@@ -63,7 +77,7 @@ public:
 		static ScrollableWidget widget;
 		static ButtonWidget buttons[10];
 
-		widget.setDirection(false);
+		// widget.setDirection(false);
 
 		setRoot(&widget);
 
@@ -110,8 +124,8 @@ public:
 
 	void exampleNestedMenus() {
 		static DockWidget dock;
-		static FloatingMenu menu1;
-		static FloatingMenu menu2;
+		static FloatingScrollableMenu menu1;
+		static FloatingScrollableMenu menu2;
 		static ButtonWidget buttons[15];
 
 		setRoot(&dock);
@@ -183,8 +197,8 @@ public:
 
 	void exampleDock() {
 		static DockWidget dock;
-		static FloatingMenu menu1;
-		static FloatingMenu menu2;
+		static FloatingScrollableMenu menu1;
+		static FloatingScrollableMenu menu2;
 		static ButtonWidget buttons[15];
 		
 		setRoot(&dock);

Widgets/private/Layout.cpp

@@ -29,7 +29,11 @@ const Vec2<SizePolicy>& WidgetLayout::getSizePolicy() const { return mSizePolicy
 
 void WidgetLayout::setSizePolicy(SizePolicy x, SizePolicy y) { mSizePolicy = { x, y }; }
 
+WidgetLayout* WidgetLayout::lay(Widget* w) { return w->getLayout(); }
+
 RangeF WidgetLayout::pickRange(const RangeF& current, const RangeF& children, const RangeF& parent, bool vertical) const {
+	return current;
+
 	RangeF out;
 
 	switch (mSizePolicy[vertical]) {
@@ -44,10 +48,16 @@ RangeF WidgetLayout::pickRange(const RangeF& current, const RangeF& children, co
 
 void WidgetLayout::clampMinMaxSize() {
 	auto current = getArea();
-	current.size.clamp(mMinSize, mMaxSize);
+	auto minContent = minContentArea();
+	minContent.size.clamp(mMinSize, mMaxSize);
+	current.clamp(minContent);
 	setArea(current);
 }
 
+void WidgetLayout::pickMinimalRect(bool dir) {
+	setArea(minContentArea());
+}
+
 RangeF WidgetLayout::clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool vertical) const {
 	auto out = current;
 
@@ -84,13 +94,17 @@ RectF WidgetLayout::getChildrenEnclosure() const {
 	return out;
 }
 
-RectF WidgetLayout::getAvailableChildArea() const {
+RectF WidgetLayout::availableChildArea() const {
 	return getArea().relative();
 }
 
+RectF WidgetLayout::minContentArea() const {
+	return getChildrenEnclosure();
+}
+
 RectF WidgetLayout::getParentEnclosure() const {
 	DEBUG_ASSERT(parent())
 	if (!parent()) return { { 0, 0 }, mMaxSize };
-	auto out = parent()->getLayout()->getAvailableChildArea();
+	auto out = parent()->getLayout()->availableChildArea();
 	return out;
 }

Widgets/private/RootWidget.cpp

@@ -2,7 +2,7 @@
 #include "RootWidget.hpp"
 
 #include "BasicLayout.hpp"
-#include "SimpleLayouts.hpp"
+#include "OverlayLayout.hpp"
 
 #include <algorithm>
 
@@ -58,7 +58,9 @@ void RootWidget::processFrame(EventHandler* events, const RectF& screenArea) {
 	updateAreaCache(&mRoot, false);
 
 	// trigger some widgets by moise pointer
-  mUpdateManager.handleFocusChanges(&mRoot, *events);
+	auto prevFocus = mUpdateManager.getFocusWidget();
+	auto newFocus = mUpdateManager.findFocusWidget(&mRoot, *events);
+  mUpdateManager.handleFocusChanges(newFocus, prevFocus);
 
 	// check triggered widgets for removal
 	mUpdateManager.clean();

Widgets/private/Widget.cpp

@@ -5,7 +5,8 @@
 using namespace tp;
 
 Widget::Widget() {
-	mArea.setTargetRect({ 100, 100, 10, 10 });
+	mArea.setTargetRect({ 100, 100, 50, 50 });
+
 	setLayout(WidgetManagerInterface::defaultLayout(this));
 	mArea.endAnimation();
 

Widgets/private/layouts/BasicLayout.cpp

@@ -26,20 +26,7 @@ void BasicLayout::pickRect(bool vertical) {
 	setArea(newArea);
 }
 
-void BasicLayout::clampRect() {
-	DEBUG_ASSERT(0)
-
-	auto current = getArea();
-	auto children = getChildrenEnclosure();
-	auto parent = getParentEnclosure();
-
-	auto rangeX = clampRange(current.getRangeX(), children.getRangeX(), parent.getRangeX(), false);
-	auto rangeY = clampRange(current.getRangeY(), children.getRangeY(), parent.getRangeY(), true);
-
-	setArea(RectF(rangeX, rangeY));
-}
-
-void BasicLayout::updateLayout(bool vertical) {
+void BasicLayout::arrangeChildren(bool vertical) {
 	if (children().empty()) return;
 
 	if (vertical) {
@@ -57,61 +44,64 @@ void BasicLayout::updateLayout(bool vertical) {
 	}
 }
 
+halnf BasicLayout::shrinkLayoutSize(WidgetLayout* widget, halnf diff, bool vertical) {
+	auto area = widget->getArea();
+	auto prevSize = area.size[vertical];
+	area.size[vertical] += diff;
+	widget->setArea(area);
+	//widget->clampMinMaxSize();
+	return widget->getArea().size[vertical] - prevSize;
+}
 
-halnf BasicLayout::changeChildSize(tp::Widget* widget, halnf diff, bool vertical) {
-	auto prevSize = widget->getLayout()->getArea().size[vertical];
-	{
-		auto area = widget->getLayout()->getArea();
-		area.size[vertical] += diff;
-		widget->setAreaCache(area);
-
-		widget->getLayout()->clampMinMaxSize();
-	}
-	auto newSize = widget->getLayout()->getArea().size[vertical];
-	return newSize - prevSize;
+bool BasicLayout::canChange(Widget* widget, bool vertical) {
+	return widget->getLayout()->getSizePolicy()[vertical] == SizePolicy::Expanding;
 }
 
 void BasicLayout::adjustLayout(bool vertical) {
-	std::vector<std::pair<Widget*, bool>> contributors;
-	Vec2F contentSize = { 0, 0 };
-	Vec2F availableSize = getArea().size;
 
-	for (auto child : children()) {
-		child->getLayout()->pickRect(vertical);
+	std::vector<std::pair<WidgetLayout*, bool>> contributors;
+	halnf contentSize = 0;
 
-		if (child->getLayout()->getSizePolicy()[vertical] == SizePolicy::Expanding) {
-			contributors.emplace_back( child, true );
-
-			auto area = child->getLayout()->getArea();
-			area.size[vertical] = 0;
-			child->setAreaCache(area);
-			child->getLayout()->clampMinMaxSize();
+	// find contributors
+	for (Widget* child : children()) {
+		if (canChange(child, vertical)) {
+			contributors.emplace_back( lay(child), true );
 		}
-
-		contentSize += child->getLayout()->getArea().size;
 	}
 
-	availableSize -= mLayoutGap * ((halnf) children().size() - 1) + mLayoutMargin * 2;
+	// let each child to chose desired rect
+	for (Widget* child : children()) {
+		if (canChange(child, vertical)) {
+			lay(child)->pickMinimalRect(vertical);
+		} else {
+			lay(child)->pickRect(vertical);
+		}
+	}
 
-	auto diff = availableSize - contentSize;
+	// calculate content size
+	for (Widget* child : children()) {
+		contentSize += lay(child)->getArea().size[vertical];
+	}
+
+	halnf availableSize = getArea().size[vertical] - (mLayoutGap * ((halnf) children().size() - 1) + mLayoutMargin * 2);
+
+	if (availableSize < 0) return;
+
+	halnf totalQuota = availableSize - contentSize;
 
 	// expand or contract as much as possible
-	while (!contributors.empty() && (diff[vertical] != 0)) {
-		auto quota = diff / (halnf) contributors.size();
+	while (!contributors.empty() && (totalQuota != 0)) {
+		halnf quotaPerContributor = totalQuota / (halnf) contributors.size();
 
 		for (auto& contributor : contributors) {
-			if (!contributor.second) continue;
-
-			// contributor.first->endAnimations();
-			auto contribution = changeChildSize(contributor.first, quota[vertical], vertical);
-
+			halnf contribution = shrinkLayoutSize(contributor.first, quotaPerContributor, vertical);
 			if (contribution == 0) {
 				contributor.second = false;
 			}
-
-			diff[vertical] -= contribution;
+			totalQuota -= contribution;
 		}
 
+		// remove useless contributors
 		contributors.erase(
 			std::remove_if(contributors.begin(), contributors.end(), [](auto node) { return !node.second; }),
 			contributors.end()
@@ -120,30 +110,31 @@ void BasicLayout::adjustLayout(bool vertical) {
 
 	// set opposite direction size
 	for (auto child : children()) {
-		// if (child->getLayout()->getSizePolicy()[!vertical] != SizePolicy::Minimal) {
-			auto area = child->getLayout()->getArea();
-			area.size[!vertical] = getArea().size[!vertical] - mLayoutMargin * 2;
-			child->setAreaCache(area);
-		// }
+		RectF area = lay(child)->getArea();
+		area.size[!vertical] = getArea().size[!vertical] - mLayoutMargin * 2;
+		child->setAreaCache(area);
 	}
 
 	// set pos
 	halnf iterPos = mLayoutMargin;
 	for (auto child : children()) {
-		auto area = child->getLayout()->getArea();
+		RectF area = lay(child)->getArea();
 
 		area.pos[vertical] = iterPos;
 		area.pos[!vertical] = mLayoutMargin;
 
 		iterPos += area.size[vertical] + mLayoutGap;
-		child->setAreaCache(area);
-
-		// child->updateAnimations();
-		// child->triggerWidgetUpdate("layout changed");
+		lay(child)->setArea(area);
 	}
 }
 
-RectF BasicLayout::getAvailableChildArea() const {
-	auto out = WidgetLayout::getAvailableChildArea();
+RectF BasicLayout::availableChildArea() const {
+	auto out = WidgetLayout::availableChildArea();
 	return out.shrinkFromCenter(mLayoutMargin, true);
 }
+
+RectF BasicLayout::minContentArea() const {
+	auto out = WidgetLayout::getChildrenEnclosure();
+	out.shrinkFromCenter(-mLayoutMargin, true);
+	return out;
+}

Widgets/private/layouts/DockLayout.cpp

@@ -188,7 +188,7 @@ auto DockLayout::getSideFromWidget(Widget* widget) -> Side {
 	return DockLayout::NONE;
 }
 
-void DockLayout::updateLayout(bool vertical) {
+void DockLayout::arrangeChildren(bool vertical) {
 	for (auto child : children()) {
 		child->getLayout()->pickRect(vertical);
 	}

Widgets/private/layouts/OverlayLayout.cpp

@@ -0,0 +1,29 @@
+
+#include "OverlayLayout.hpp"
+#include "Widget.hpp"
+
+
+using namespace tp;
+
+void OverlayLayout::arrangeChildren(bool vertical) {
+	if (vertical) return;
+
+	if (children().empty()) return;
+
+	for (auto child : children()) {
+		child->getLayout()->setArea(getArea().relative());
+	}
+
+	/*
+if (children().empty()) return;
+
+auto first = children().front();
+
+first->getLayout()->setArea(getArea().relative());
+
+for (auto child : children()) {
+	if (child == first) continue;
+	child->getLayout()->setArea(getArea().relative());
+}
+	 */
+}

Widgets/private/layouts/ScrollableLayout.cpp

@@ -5,7 +5,7 @@
 
 using namespace tp;
 
-void ScrollableLayout::updateLayout(bool vertical) {
+void ScrollableLayout::arrangeChildren(bool vertical) {
 	if (vertical) return;
 
 	// TODO : make better interface to get scroller and content widget
@@ -44,7 +44,7 @@ void ScrollableLayout::updateWidgetRects(const RectF& area, Widget* content, Scr
 	content->getLayout()->setArea(contentArea);
 }
 
-RectF ScrollableLayout::getAvailableChildArea() const {
+RectF ScrollableLayout::availableChildArea() const {
 	auto out = getArea();
 	// dont constrain on scroll axis
 	out.pos = -FLT_MAX / 4;

Widgets/private/layouts/SimpleLayouts.cpp

@@ -1,32 +0,0 @@
-
-#include "SimpleLayouts.hpp"
-#include "Widget.hpp"
-
-
-using namespace tp;
-
-void OverlayLayout::updateLayout(bool vertical) {
-	if (vertical) return;
-
-	if (children().empty()) return;
-
-	for (auto child : children()) {
-		child->getLayout()->setArea(getArea().relative());
-	}
-}
-
-void ToolBarLayout::updateLayout(bool vertical) {
-	if (vertical) return;
-
-	if (children().size() != 2) return;
-
-	auto toolbar = children().back();
-	auto content = children().front();
-
-	auto factor = mToolBarHeight / getArea().w;
-
-	auto area = getArea().relative();
-
-	toolbar->getLayout()->setArea(area.splitByFactorVT(factor));
-	content->getLayout()->setArea(area);
-}

Widgets/private/managers/DebugManager.cpp

@@ -113,14 +113,17 @@ void DebugManager::recursiveDraw(Canvas& canvas, Widget* active, const Vec2F& po
 		canvas.text((active->mDebug.id + ":" + std::to_string(depthOrder)).c_str(), area, 22, Canvas::Align::LC, 2, color);
 	}
 
+	if (active == mRootWidget->mUpdateManager.mFocusLockWidget) {
+		canvas.frame(area, { 0, 1, 0, 1 });
+	}
+
 	if (active->mFlags.get(Widget::IN_FOCUS)) {
 		if (active->isUpdate()) {
 			canvas.circle(pos + active->mDebug.pLocal, 5, active->mDebug.col);
 			canvas.circle(active->mDebug.pGlobal, 15, active->mDebug.col);
 		}
 
-		RGBA color = { 1, 0, 0, 0.3f };
-		canvas.debugCross(area, color);
+		canvas.debugCross(area, { 0, 1, 0, 1 });
 	}
 
 	int orderIdx = 0;

Widgets/private/managers/LayoutManager.cpp

@@ -3,6 +3,7 @@
 
 #include "DockLayout.hpp"
 #include "ScrollableLayout.hpp"
+#include "BasicLayout.hpp"
 
 #include <algorithm>
 
@@ -36,7 +37,7 @@ void LayoutManager::findDependencies(Widget* root) {
 		if (!widget->isUpdate()) continue;
 
 		for (auto child : widget->mChildren) {
-			// if (!child->isUpdate()) continue;
+			if (!child->isUpdate()) continue;
 
 			mDepGraph.insert({ child, {} });
 
@@ -78,7 +79,7 @@ void LayoutManager::adjustLayouts() {
 	});
 
 	for (auto& [iter, _] : mLayOrder) {
-		iter->getLayout()->updateLayout(mVertical);
+		iter->getLayout()->arrangeChildren(mVertical);
 	}
 }
 
@@ -92,10 +93,13 @@ static int sizePolicyDep[3][3] = {
 int LayoutManager::getLayoutOrder(WidgetLayout* parent, WidgetLayout* child) const {
 	if (!parent || !child) return 0;
 
+	return 1;
+	
 	auto policyParent = parent->getSizePolicy()[mVertical];
 	auto policyChild = parent->getSizePolicy()[mVertical];
 
-	if (dynamic_cast<DockLayout*>(parent)) return -1;
+	// if (dynamic_cast<DockLayout*>(parent)) return -1;
+	// if (dynamic_cast<BasicLayout*>(parent)) return -1;
 	// if (dynamic_cast<ScrollableLayout*>(parent)) return -1;
 
 	return sizePolicyDep[int(policyParent)][int(policyChild)];

Widgets/private/managers/UpdateManager.cpp

@@ -69,14 +69,11 @@ void UpdateManager::getWidgetPath(Widget* widget, std::vector<Widget*>& out) {
 	}
 }
 
-void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
-	auto prevFocus = mInFocusWidget;
-
+Widget* UpdateManager::findFocusWidget(Widget* root, EventHandler& events) {
 	events.setCursorOrigin({ 0, 0 });
 
 	mInFocusWidget = nullptr;
-
-	findFocusWidget(root, &mInFocusWidget, events.getPointer());
+	findMouseFocusWidget(root, &mInFocusWidget, events.getPointer());
 
 	if (mFocusLockWidget) {
 		bool hasLockedWidget = false;
@@ -91,13 +88,17 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 		}
 	}
 
-	// if (mInFocusWidget == prevFocus) return;
-	if (mInFocusWidget) scheduleUpdate(mInFocusWidget, "focus entered");
+	return mInFocusWidget;
+}
 
-	if (!mInFocusWidget && !prevFocus) return;
+void UpdateManager::handleFocusChanges(Widget* active, Widget* prevActive) {
+	// if (mInFocusWidget == prevFocus) return;
+	if (active) scheduleUpdate(active, "focus entered");
+
+	if (!active && !prevActive) return;
 
 	std::vector<Widget*> path2;
-	getWidgetPath(mInFocusWidget, path2);
+	getWidgetPath(active, path2);
 	size_t propLen2 = path2.size();
 	for (auto i = 0; i < path2.size(); i++) {
 		if (!path2[i]->propagateEventsToChildren()) {
@@ -107,7 +108,7 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 	}
 
 	std::vector<Widget*> path1;
-	getWidgetPath(prevFocus, path1);
+	getWidgetPath(prevActive, path1);
 	size_t propLen1 = path1.size();
 	for (auto i = 0; i < path1.size(); i++) {
 		if (!path1[i]->propagateEventsToChildren()) {
@@ -118,7 +119,7 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 
 	int mostCommonIdx = 0;
 	if (!(path1.empty() || path2.empty())) {
-		while (mostCommonIdx < min(path1.size(), path2.size()) && path1[mostCommonIdx] == path2[mostCommonIdx]) {
+		while (path1[mostCommonIdx] == path2[mostCommonIdx] && mostCommonIdx < min(path1.size(), path2.size())) {
 			mostCommonIdx++;
 		}
 	}
@@ -135,7 +136,7 @@ void UpdateManager::handleFocusChanges(Widget* root, EventHandler& events) {
 	}
 }
 
-void UpdateManager::findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer) {
+void UpdateManager::findMouseFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer) {
 	if (!iter->mArea.getTargetRect().isInside(pointer) || !iter->mFlags.get(Widget::ENABLED)) return;
 
 	if (iter->processesEvents()) {
@@ -143,7 +144,7 @@ void UpdateManager::findFocusWidget(Widget* iter, Widget** focus, const Vec2F& p
 	}
 
 	for (auto child = iter->mDepthOrder.lastNode(); child; child = child->prev) {
-		findFocusWidget(child->data, focus, pointer - iter->mArea.getTargetRect().pos);
+		findMouseFocusWidget(child->data, focus, pointer - iter->mArea.getTargetRect().pos);
 	}
 }
 
@@ -215,6 +216,6 @@ void UpdateManager::lockFocus(tp::Widget* widget) {
 }
 
 void UpdateManager::freeFocus(tp::Widget* widget) {
-	// DEBUG_ASSERT(mFocusLockWidget == widget)
+	DEBUG_ASSERT(mFocusLockWidget == widget)
 	mFocusLockWidget = nullptr;
 }

Widgets/private/widgets/ColorPickerWidget.cpp

@@ -1,22 +0,0 @@
-#include "ColorPickerWidget.hpp"
-
-using namespace tp;
-
-void RGBPickerWidget::process(const EventHandler& events) {
-	if (events.isPressed(InputID::MOUSE1)) {
-		mColorWheel.fromPoint(getArea().relative(), events.getPointer());
-		lockFocus();
-	}
-
-	if (events.isReleased(InputID::MOUSE1)) {
-		freeFocus();
-	}
-
-	if (events.getPointerDelta().length() > EPSILON && events.isDown(InputID::MOUSE1)) {
-		mColorWheel.fromPoint(getArea().relative(), events.getPointer());
-	}
-}
-
-void RGBPickerWidget::draw(Canvas& canvas) {
-	canvas.colorWheel(getArea().relative(), mColorWheel);
-}

Widgets/private/widgets/DockWidget.cpp

@@ -46,8 +46,6 @@ void DockWidget::toggleWidgetVisibility(DockLayout::Side side) {
 		widget->bringToBack();
 
 		layout()->toggleWidgetVisibility(side);
-
-		widget->triggerWidgetUpdate("dock visibility changed");
 	}
 }
 

Widgets/private/widgets/FloatingWidget.cpp

@@ -47,30 +47,3 @@ FloatingLayout* FloatingWidget::layout() { return dynamic_cast<FloatingLayout*>(
 const FloatingLayout* FloatingWidget::layout() const {
 	return dynamic_cast<const FloatingLayout*>(Widget::getLayout());
 }
-
-FloatingMenu::FloatingMenu() : FloatingWidget() {
-	setDebug("float menu", { 0.0, 0.9, 0.1, 0.7 });
-
-	// addChild(&mMenuLayout);
-
-	addChild(&mHeader);
-	addChild(&mBodyLayout);
-
-	mHeader.setText("Menu");
-
-	mHeader.setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
-	mBodyLayout.setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
-
-	mBodyLayout.setLayout(new ScrollableLayout(&mBodyLayout));
-	mBodyLayout.addChild(&mScrollBar);
-	mBodyLayout.addChild(&mContentWidget);
-
-	mContentWidget.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal);
-
-	// getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
-	// mBodyLayout.getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
-}
-
-void FloatingMenu::setText(const std::string& text) {
-	mHeader.setText(text);
-}

Widgets/private/widgets/MenuWidgets.cpp

@@ -0,0 +1,58 @@
+#include "MenuWidgets.hpp"
+
+#include "ScrollableLayout.hpp"
+
+using namespace tp;
+
+CollapsingMenuWidget::CollapsingMenuWidget() {
+	setDebug("Collapsing Menu", {1});
+
+	setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
+
+	addChild(&mHeader);
+	addChild(&mContent);
+}
+
+void CollapsingMenuWidget::process(const EventHandler& events) {
+	mHover = mHeader.getArea().isInside(events.getPointer());
+
+	if (events.isPressed(InputID::MOUSE1) && mHover) setCollapsed(!mContent.getEnabled());
+}
+
+void CollapsingMenuWidget::setCollapsed(bool collapsed) {
+	mContent.setEnabled(collapsed);
+}
+
+void CollapsingMenuWidget::draw(Canvas& canvas) {
+	canvas.rect(getArea().relative(), colorBG, rounding);
+	if (mHover) {
+		canvas.rect(mHeader.getArea(), colorHover, rounding);
+	}
+}
+
+FloatingScrollableMenu::FloatingScrollableMenu() : FloatingWidget() {
+	setDebug("float menu", { 0.0, 0.9, 0.1, 0.7 });
+
+	// addChild(&mMenuLayout);
+
+	addChild(&mHeader);
+	addChild(&mBodyLayout);
+
+	mHeader.setText("Menu");
+
+	mHeader.setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
+	mBodyLayout.setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
+
+	mBodyLayout.setLayout(new ScrollableLayout(&mBodyLayout));
+	mBodyLayout.addChild(&mScrollBar);
+	mBodyLayout.addChild(&mContentWidget);
+
+	mContentWidget.setSizePolicy(SizePolicy::Minimal, SizePolicy::Minimal);
+
+	// getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
+	// mBodyLayout.getLayout()->setLayoutPolicy(LayoutPolicy::Vertical);
+}
+
+void FloatingScrollableMenu::setText(const std::string& text) {
+	mHeader.setText(text);
+}

Widgets/private/widgets/ScrollableWidget.cpp

@@ -7,9 +7,10 @@ using namespace tp;
 void ScrollableBarWidget::process(const EventHandler& events) {
 	// all content is visible no need to process anything
 	if (mSizeFactor >= 1) {
+		if (mScrolling) freeFocus();
+
 		mScrolling = false;
 		mPosFactor = mSizeFactor / 2.f;
-		freeFocus();
 		return;
 	}
 

Widgets/private/widgets/SimpleWidgets.cpp

@@ -107,7 +107,7 @@ void SliderWidget::process(const EventHandler& events) {
 }
 
 void SliderWidget::draw(Canvas& canvas) {
-	canvas.rect(getArea().relative(), mColorBG, mRounding);
+	canvas.rect(getRelativeArea(), mColorBG, mRounding);
 
 	switch (mState) {
 		case IDLE: canvas.rect(getHandleArea(), mColorIdle, mRounding); break;
@@ -128,47 +128,3 @@ RectF SliderWidget::getHandleArea() const {
 
 	return area;
 }
-
-void PopupWidget::open(Widget* parent, const RectF& at) {
-	mParentArea = parent->getArea().relative();
-	mParentArea.pos = at.pos * -1;
-	mParentArea.shrinkFromCenter(-10, true);
-
-	setArea(at);
-	parent->openPopup(this);
-}
-
-void PopupWidget::process(const EventHandler& events) {
-	bool insideParent = mParentArea.isInside(events.getPointer());
-	bool insideMenu = getArea().relative().isInside(events.getPointer());
-
-	if (!(insideMenu || insideParent)) {
-		closePopup(this);
-	}
-}
-
-void PopupWidget::draw(Canvas& canvas) {
-	canvas.rect(getArea().relative(), col, rounding);
-}
-
-void HoverPopupTriggerWidget::mouseEnter() {
-	auto area = getArea().relative();
-	auto size = Vec2F(300, 400);
-
-	if (mDirection == Right) {
-		auto popupArea = RectF{ area.p4() + Vec2F{ gap, 0.f }, size };
-		mPopup.open(this, popupArea);
-	} else {
-		auto popupArea = RectF{ area.p2() + Vec2F{ 0.f, gap }, size };
-		mPopup.open(this, popupArea);
-	}
-}
-
-PopupWidget* HoverPopupTriggerWidget::getPopup() {
-	return &mPopup;
-}
-
-void HoverPopupTriggerWidget::draw(Canvas& canvas) {
-	canvas.rect(getArea().relative(), col, rounding);
-	LabelWidget::draw(canvas);
-}

Widgets/public/Layout.hpp

@@ -26,11 +26,20 @@ namespace tp {
 		explicit WidgetLayout(Widget* widget) { mWidget = widget; }
 		virtual ~WidgetLayout() = default;
 
-		virtual void updateLayout(bool vertical) {}
-
+	public:
+		// picks own position and size
+		// modifies only own area
 		virtual void pickRect(bool vertical) {}
-		virtual void clampRect() {}
-		[[nodiscard]] virtual RectF getAvailableChildArea() const;
+
+		// arranges all children layouts inside itself
+		// modifies children areas
+		virtual void arrangeChildren(bool vertical) {}
+
+		// area that any child can have
+		[[nodiscard]] virtual RectF availableChildArea() const;
+
+		// minimal size base on the content of the layout
+		[[nodiscard]] virtual RectF minContentArea() const;
 
 	public:
 		const Vec2F& getMinSize();
@@ -39,6 +48,8 @@ namespace tp {
 		[[nodiscard]] const Vec2<SizePolicy>& getSizePolicy() const;
 		void setSizePolicy(SizePolicy x, SizePolicy y);
 
+		static WidgetLayout* lay(Widget* w);
+
 	public:
 		[[nodiscard]] const RectF& getArea() const;
 		[[nodiscard]] RectF getAnimatedArea() const;
@@ -49,6 +60,7 @@ namespace tp {
 
 	public:
 		void clampMinMaxSize();
+		void pickMinimalRect(bool dir);
 
 		[[nodiscard]] RangeF pickRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const;
 		[[nodiscard]] RangeF clampRange(const RangeF& current, const RangeF& child, const RangeF& parent, bool v) const;

Widgets/public/Widget.hpp

@@ -31,6 +31,8 @@ namespace tp {
 
 		using DFSAction = std::function<void(Widget*)>;
 
+	protected:
+
 		enum Flags : int1 {
 			ENABLED = 0,
 			NEEDS_UPDATE,

Widgets/public/WidgetApplication.hpp

@@ -10,7 +10,6 @@ namespace tp {
 		WidgetApplication() = default;
 
 		void setRoot(Widget* widget);
-		virtual void debugUI();
 
 	private:
 		void processFrame(EventHandler* eventHandler, halnf deltaTime) override;
@@ -18,6 +17,8 @@ namespace tp {
 		void drawFrame(Canvas* canvas) override;
 		bool forceNewFrame() override ;
 
+	private:
+		void debugUI();
 
 	private:
 		halnf mDebugSplitFactor = 0.7;

Widgets/public/layouts/BasicLayout.hpp

@@ -10,17 +10,21 @@ namespace tp {
 	public:
 		explicit BasicLayout(Widget* widget) : WidgetLayout(widget) {}
 
-		void updateLayout(bool vertical) override;
+		void arrangeChildren(bool vertical) override;
 
 		void pickRect(bool vertical) override;
-		void clampRect() override;
-		[[nodiscard]] RectF getAvailableChildArea() const override;
+
+		[[nodiscard]] RectF availableChildArea() const override;
+		[[nodiscard]] RectF minContentArea() const override;
 
 		void setLayoutPolicy(LayoutPolicy layout) { mLayoutPolicy = layout; }
 
+	private:
+		static bool canChange(Widget*, bool);
+
 	private:
 		void adjustLayout(bool vertical);
-		static halnf changeChildSize(Widget*, halnf diff, bool vertical);
+		static halnf shrinkLayoutSize(WidgetLayout* widget, halnf diff, bool vertical);
 
 	private:
 		LayoutPolicy mLayoutPolicy = LayoutPolicy::Vertical;

Widgets/public/layouts/DockLayout.hpp

@@ -43,8 +43,7 @@ namespace tp {
 
 	public:
 		void pickRect(bool vertical) override {}
-		void clampRect() override {};
-		void updateLayout(bool vertical) override;
+		void arrangeChildren(bool vertical) override;
 		void adjustChildrenRect();
 
 	public:

Widgets/public/layouts/OverlayLayout.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Layout.hpp"
+
+namespace tp {
+
+	class OverlayLayout : public WidgetLayout {
+		friend class DebugManager;
+
+	public:
+		explicit OverlayLayout(Widget* widget) : WidgetLayout(widget) {}
+
+		void arrangeChildren(bool vertical) override;
+
+		void pickRect(bool vertical) override {}
+	};
+}

Widgets/public/layouts/ScrollableLayout.hpp

@@ -12,8 +12,8 @@ namespace tp {
 			setSizePolicy(SizePolicy::Expanding, SizePolicy::Expanding);
 		}
 
-		void updateLayout(bool vertical) override;
-		[[nodiscard]] RectF getAvailableChildArea() const override;
+		void arrangeChildren(bool vertical) override;
+		[[nodiscard]] RectF availableChildArea() const override;
 
 	private:
 		void updateWidgetRects(const RectF& area, Widget* content, ScrollableBarWidget* scroller) const;

Widgets/public/layouts/SimpleLayouts.hpp

@@ -1,33 +0,0 @@
-#pragma once
-
-#include "Layout.hpp"
-
-namespace tp {
-
-	class OverlayLayout : public WidgetLayout {
-		friend class DebugManager;
-
-	public:
-		explicit OverlayLayout(Widget* widget) : WidgetLayout(widget) {}
-
-		void updateLayout(bool vertical) override;
-
-		void pickRect(bool vertical) override {}
-		void clampRect() override {}
-	};
-
-	class ToolBarLayout : public WidgetLayout {
-		friend class DebugManager;
-
-	public:
-		explicit ToolBarLayout(Widget* widget) : WidgetLayout(widget) {}
-
-		void updateLayout(bool vertical) override;
-
-		void pickRect(bool vertical) override {}
-		void clampRect() override {}
-
-	private:
-		halnf mToolBarHeight = 55;
-	};
-}

Widgets/public/mangers/DebugManager.hpp

@@ -87,7 +87,7 @@ namespace tp {
 		bool mDebug = false;
 		bool mDebugStopProcessing = false;
 		bool mDebugRedrawAlways = false;
-		bool mDetailed = false;
+		bool mDetailed = true;
 
 		std::set<Widget*> mProcBreakpoints;
 		std::set<Widget*> mLayBreakpoints;

Widgets/public/mangers/UpdateManager.hpp

@@ -25,13 +25,16 @@ namespace tp {
 		void clean();
 
 		void updateTreeToProcess(Widget* root);
-		void handleFocusChanges(Widget* root, EventHandler& events);
+		void handleFocusChanges(Widget* active, Widget* prevActive);
+		Widget* findFocusWidget(Widget* root, EventHandler& events);
 
-		void findFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer);
+		void findMouseFocusWidget(Widget* iter, Widget** focus, const Vec2F& pointer);
 		static void getWidgetPath(Widget* widget, std::vector<Widget*>& out);
 		void processActiveTree(Widget* iter, EventHandler& events, Vec2F pos);
 		void processFocusItems(EventHandler& events);
 
+		Widget* getFocusWidget() { return mInFocusWidget; }
+
 	private:
 		static void procWidget(Widget* widget, EventHandler& events, bool withEvents = false);
 

Widgets/public/widgets/ColorPickerWidget.hpp

@@ -1,18 +0,0 @@
-#pragma once
-
-#include "Widget.hpp"
-
-namespace tp {
-	class RGBPickerWidget : public Widget {
-	public:
-		RGBPickerWidget() = default;
-
-		void process(const EventHandler& events) override;
-		void draw(Canvas& canvas) override;
-
-		[[nodiscard]] bool processesEvents() const override { return true; }
-
-	public:
-		Canvas::ColorWheel mColorWheel;
-	};
-}

Widgets/public/widgets/DockWidget.hpp

@@ -17,8 +17,6 @@ namespace tp {
 		void drawSide(DockLayout::Side side, Canvas& canvas);
 
 	public:
-		DockLayout::Side getSide(Widget* widget) { return layout()->getSideFromWidget(widget); }
-
 		void setCenterWidget(Widget* widget);
 
 		void dockWidget(Widget* widget, DockLayout::Side side);

Widgets/public/widgets/FloatingWidget.hpp

@@ -13,10 +13,8 @@ namespace tp {
 		}
 
 		void process(const EventHandler& events) override;
-
 		void draw(Canvas& canvas) override;
 
-
 		[[nodiscard]] bool needsNextFrame() const override;
 
 		[[nodiscard]] bool propagateEventsToChildren() const override;
@@ -28,35 +26,4 @@ namespace tp {
 		FloatingLayout* layout();
 		[[nodiscard]] const FloatingLayout* layout() const;
 	};
-
-	class FloatingMenu : public FloatingWidget {
-	public:
-		FloatingMenu();
-
-	public:
-		void addToMenu(Widget* widget) {
-			widget->setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
-			mContentWidget.addChild(widget);
-		}
-
-		const List<Widget*>& getContent() {
-			return mContentWidget.getChildren();
-		}
-
-		void clearChildren() {
-			mContentWidget.clear();
-		}
-
-		void setText(const std::string& text);
-
-	private:
-		// VerticalLayout mMenuLayout;
-		Widget mBodyLayout;
-		Widget mContentWidget;
-		ScrollableBarWidget mScrollBar;
-
-		LabelWidget mHeader;
-
-		// ButtonWidget mTestButton;
-	};
 }

Widgets/public/widgets/MenuWidgets.hpp

@@ -0,0 +1,60 @@
+#pragma once
+
+#include "FloatingWidget.hpp"
+
+namespace tp {
+	class CollapsingMenuWidget : public Widget {
+	public:
+		CollapsingMenuWidget();
+
+		void process(const EventHandler& events) override;
+		void draw(Canvas& canvas) override;
+		[[nodiscard]] bool processesEvents() const override { return true; }
+
+	public:
+		void setCollapsed(bool val);
+		LabelWidget* getHeader() { return &mHeader; }
+		Widget* getContainer() { return &mContent; }
+
+	private:
+		bool mHover = false;
+		LabelWidget mHeader;
+		Widget mContent;
+
+	private:
+		halnf rounding = 5;
+		RGBA colorHover = RGBA(0.7);
+		RGBA colorBG = RGBA(0.3);
+	};
+
+	class FloatingScrollableMenu : public FloatingWidget {
+	public:
+		FloatingScrollableMenu();
+
+	public:
+		void addToMenu(Widget* widget) {
+			widget->setSizePolicy(SizePolicy::Expanding, SizePolicy::Minimal);
+			mContentWidget.addChild(widget);
+		}
+
+		const List<Widget*>& getContent() {
+			return mContentWidget.getChildren();
+		}
+
+		void clearChildren() {
+			mContentWidget.clear();
+		}
+
+		void setText(const std::string& text);
+
+	private:
+		// VerticalLayout mMenuLayout;
+		Widget mBodyLayout;
+		Widget mContentWidget;
+		ScrollableBarWidget mScrollBar;
+
+		LabelWidget mHeader;
+
+		// ButtonWidget mTestButton;
+	};
+}

Widgets/public/widgets/SimpleWidgets.hpp

@@ -86,55 +86,9 @@ namespace tp {
 		halnf mHandleSize = 20;
 		halnf mRounding = 5;
 
-		RGBA mColorActive = { 0.99f, 0.99f, 0.99f, 1.f };
-		RGBA mColorHovered = { 0.9f, 0.9f, 0.9f, 1.f };
-		RGBA mColorIdle = { 0.8f, 0.8f, 0.8f, 1.f };
-		RGBA mColorBG = { 0.3f, 0.3f, 0.3f, 1.0f };
-	};
-
-	class PopupWidget : public Widget {
-	public:
-		PopupWidget() = default;
-
-	public:
-		void process(const EventHandler& events) override;
-		void draw(Canvas& canvas) override;
-
-		void open(Widget* parent, const RectF& at);
-		[[nodiscard]] bool processesEvents() const override { return true; }
-
-	private:
-		RectF mParentArea {};
-		RGBA col = RGBA(0.03f, 0.03f, 0.03f, 0.9f);
-		halnf rounding = 5;
-		halnf borders = 2;
-	};
-
-	class HoverPopupTriggerWidget : public LabelWidget {
-	public:
-		enum ExpandDirection {
-			Right,
-			Bottom,
-		};
-
-	public:
-		HoverPopupTriggerWidget() = default;
-
-		[[nodiscard]] bool processesEvents() const override { return true; }
-		void mouseEnter() override;
-
-		void draw(Canvas& canvas) override;
-
-		PopupWidget* getPopup();
-		void setDirection(ExpandDirection dir) { mDirection = dir; }
-
-	private:
-		PopupWidget mPopup;
-
-	private:
-		ExpandDirection mDirection = Bottom;
-		RGBA col = RGBA(0.03f, 0.03f, 0.03f, 0.07f);
-		halnf rounding = 5;
-		halnf gap = 7;
+		RGBA mColorActive = { 0.5f, 0.5f, 0.5f, 1.f };
+		RGBA mColorHovered = { 0.3f, 0.3f, 0.3f, 1.f };
+		RGBA mColorIdle = { 0.2f, 0.2f, 0.2f, 1.f };
+		RGBA mColorBG = { 0.08f, 0.08f, 0.08f, 1.0f };
 	};
 }

cmake/FindGLEW.cmake

@@ -1,10 +0,0 @@
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	set(CMAKE_PREFIX_PATH  "${WINDOWS_LIBRARIES}/glew-2.1.0")
-	
-	find_package(GLEW REQUIRED)
-	set(GLEW_LIB ${GLEW_STATIC_LIBRARY_RELEASE} opengl32.lib CACHE STRING "Path to PortAudio includes")
-
-else()
-	find_package(GLEW REQUIRED)
-	set(GLEW_LIB ${GLEW_LIBRARIES} GL CACHE STRING "Path to PortAudio includes")
-endif()

cmake/FindOIDN.cmake

@@ -1,21 +0,0 @@
-#set(OIDN_DEVICE_CPU ON)
-#set(OIDN_STATIC_LIB ON)
-#add_subdirectory(oidn)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  set(CMAKE_PREFIX_PATH  "${WINDOWS_LIBRARIES}/oidn-2.3.0.x64.windows")
-endif()
-
-find_package(OpenImageDenoise REQUIRED)
-
-
-
-set(TARGETS_LIST OpenImageDenoise)
-
-foreach(TARGET ${TARGETS_LIST})
-  if(TARGET ${TARGET})
-    message("Found ${TARGET}.")
-  else()
-    message(ERROR "Not Found ${TARGET}.")
-  endif()
-endforeach()

cmake/FindPortAudio.cmake

@@ -1,16 +0,0 @@
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  # relative paths
-  set(RELATIVE_INCLUDE_DIR  "${WINDOWS_LIBRARIES}/portaudio/include")
-  set(RELATIVE_LIB  "${WINDOWS_LIBRARIES}/portaudio_build/Debug/portaudio.lib")
-
-  # Convert to absolute paths
-  get_filename_component(ABSOLUTE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_INCLUDE_DIR}" ABSOLUTE)
-  get_filename_component(ABSOLUTE_LIB "${CMAKE_CURRENT_SOURCE_DIR}/${RELATIVE_LIB}" ABSOLUTE)
-
-  # Set absolute paths with respect to the parent scope
-  set(PORTAUDIO_INCLUDE_DIR "${ABSOLUTE_INCLUDE_DIR}" CACHE STRING "Path to PortAudio includes")
-  set(PORTAUDIO_LIB "${ABSOLUTE_LIB}" CACHE STRING "Path to PortAudio library")
-
-else()
-  set(PORTAUDIO_LIB portaudio CACHE STRING "Path to PortAudio library")
-endif()