cmake hassle

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

.back/WidBack/CMakeLists.txt

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

.gitmodules

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

3DEditor/CMakeLists.txt

@@ -2,7 +2,7 @@ project(3DEditor)
 
 ### ---------------------- Externals  ---------------------  ###
 set(BINDINGS_INCLUDE ../Externals/glfw/include ../Externals)
-set(BINDINGS_LIBS glfw Imgui 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 "rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "../Graphics/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
+file(COPY "rsc/Font.ttf" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")
-file(COPY "../3DScene/rsc" DESTINATION "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/")

3DEditor/applications/Entry.cpp

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

3DEditor/private/Denoise.cpp

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

3DEditor/private/Editor.cpp

@@ -24,10 +24,7 @@ Editor::Editor() {
 void Editor::renderViewport() {
 	switch (mRenderType) {
 		case RenderType::RASTER:
-			mRasterRenderer.beginRender(mScene, mScene.mRenderSettings.size);
+			mRasterRenderer.render(mScene, mScene.mRenderSettings.size);
-			mRasterRenderer.renderDefault(mScene);
-			if (mActive) mRasterRenderer.renderOutline(mScene.mCamera, *mActive);
-			mRasterRenderer.endRender();
 			break;
 
 		case RenderType::PATH_TRACER:
@@ -57,12 +54,9 @@ uint4 Editor::getViewportTexID() {
 
 void Editor::loadDefaults() {
 	mScene.load("rsc/scene/script.lua");
-	mResetCamera = mScene.mCamera;
 }
 
 void Editor::setViewportSize(const Vec2F& size) {
-	if (size.x <= 0 || size.y <= 0) return;
-
 	// TODO remove
 	// mScene.mCamera.rotate(0.01f, 0.0);
 
@@ -77,7 +71,6 @@ Editor::~Editor() {
 }
 
 void Editor::renderPathFrame() {
-	mScene.updateCache();
 	mPathRenderer.render(mScene, mPathTracerBuffers, mScene.mRenderSettings);
 	sendBuffersToGPU();
 }
@@ -121,20 +114,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

@@ -1,8 +1,6 @@
-#include "Widget.hpp"
+#include "Widgets.hpp"
-#include "DockWidget.hpp"
 
 #include "Editor.hpp"
-#include "FloatingWidget.hpp"
 
 namespace tp {
 
@@ -14,17 +12,15 @@ namespace tp {
 			mCanvas = canvas;
 		}
 
-		~ViewportWidget() override { mCanvas->deleteImageHandle(mImage); }
+		~ViewportWidget() { mCanvas->deleteImageHandle(mImage); }
 
-		void process(const EventHandler& events) override {
+		void eventProcess(const Events& events) override { mEditor->setViewportSize(this->mArea.size); }
-			mEditor->setViewportSize(getAreaT().size);
-		}
 
-		void draw(Canvas& canvas) override {
+		void eventDraw(Canvas& canvas) override {
 			mEditor->renderViewport();
 
 			canvas.updateTextureID(mImage, mEditor->getViewportTexID());
-			canvas.drawImage(getArea().relative(), &mImage, PI);
+			canvas.drawImage(this->mArea, &mImage, PI);
 		}
 
 	public:
@@ -34,120 +30,110 @@ namespace tp {
 		Canvas::ImageHandle mImage;
 	};
 
-	class EditorWidget : public DockWidget {
+	class EditorWidget : public WorkspaceWidget {
 	public:
 		EditorWidget(Canvas* canvas, Editor* editor) :
 			mViewport(canvas, editor) {
 			mEditor = editor;
 
-			mPanel.setText("Controls");
+			mDockSpace.addSideWidget(&mNavigationMenu, DockSpaceWidget::RIGHT);
-			mPanel.addToMenu(&mNavigationMenu);
+			mDockSpace.addSideWidget(&mRenderMenu, DockSpaceWidget::LEFT);
-			mPanel.addToMenu(&mRenderMenu);
+			mDockSpace.setCenterWidget(&mViewport);
-
-			dockWidget(&mPanel, DockLayout::RIGHT);
-			setCenterWidget(&mViewport);
 
 			// Render
 			{
-				mRenderPathTracer.setText("Render with Path Tracer");
+				mRenderPathTracer.setLabel("Render with Path Tracer");
-				mRenderRaster.setText("Render with Raster");
+				mRenderRaster.setLabel("Render with Raster");
-				mRenderDeNoise.setText("Denoise (IntelOpenImage)");
+				mRenderDeNoise.setLabel("Denoise (IntelOpenImage)");
 
-				mRenderMenu.addToMenu(&mRenderPathTracer);
+				mRenderMenu.addWidgetToMenu(&mRenderPathTracer);
-				mRenderMenu.addToMenu(&mRenderRaster);
+				mRenderMenu.addWidgetToMenu(&mRenderRaster);
-				mRenderMenu.addToMenu(&mRenderDeNoise);
+				mRenderMenu.addWidgetToMenu(&mRenderDeNoise);
 
-				mRenderMenu.setText("Render");
+				mRenderMenu.setLabel("Render");
 			}
 
 			// Navigation
 			{
-				mNavigationPan.setText("Pan");
+				mNavigationPan.setLabel("Pan");
-				mNavigationOrbit.setText("Orbit");
+				mNavigationOrbit.setLabel("Orbit");
-				mNavigationZoom.setText("Zoom");
+				mNavigationZoom.setLabel("Zoom");
-				mNavigationReset.setText("Reset");
+				mNavigationReset.setLabel("Reset");
-				mNavigationSelect.setText("Select");
 
-				mNavigationMenu.addToMenu(&mNavigationPan);
+				mNavigationMenu.addWidgetToMenu(&mNavigationPan);
-				mNavigationMenu.addToMenu(&mNavigationOrbit);
+				mNavigationMenu.addWidgetToMenu(&mNavigationOrbit);
-				mNavigationMenu.addToMenu(&mNavigationZoom);
+				mNavigationMenu.addWidgetToMenu(&mNavigationZoom);
-				mNavigationMenu.addToMenu(&mNavigationReset);
+				mNavigationMenu.addWidgetToMenu(&mNavigationReset);
-				mNavigationMenu.addToMenu(&mNavigationSelect);
 
-				mNavigationMenu.setText("Navigation");
+				mNavigationMenu.setLabel("Navigation");
 			}
 
-			mRenderPathTracer.setAction([this]() {
+			mRenderPathTracer.mCallback = [this]() {
 				mEditor->renderPathFrame();
 				mEditor->setRenderType(Editor::RenderType::PATH_TRACER);
-			});
+			};
 
-			mRenderRaster.setAction( [this]() { mEditor->setRenderType(Editor::RenderType::RASTER); });
+			mRenderRaster.mCallback = [this]() { mEditor->setRenderType(Editor::RenderType::RASTER); };
-			mRenderDeNoise.setAction( [this]() { mEditor->denoisePathRenderBuffers(); });
+			mRenderDeNoise.mCallback = [this]() { mEditor->denoisePathRenderBuffers(); };
-			mNavigationOrbit.setAction( [this]() { mNavigationType = ORBIT; });
+			mNavigationOrbit.mCallback = [this]() { mNavigationType = ORBIT; };
-			mNavigationPan.setAction( [this]() { mNavigationType = PAN; });
+			mNavigationPan.mCallback = [this]() { mNavigationType = PAN; };
-			mNavigationZoom.setAction( [this](){ mNavigationType = ZOOM; });
+			mNavigationZoom.mCallback = [this](){ mNavigationType = ZOOM; };
-			mNavigationSelect.setAction( [this](){ mNavigationType = SELECT; });
+			mNavigationReset.mCallback = [this]() { mEditor->navigationReset(); };
-			mNavigationReset.setAction( [this]() { mEditor->navigationReset(); });
 		}
 
-		void process(const EventHandler& events) override {
+		void eventProcess(const Events& events) override {
-			DockWidget::process(events);
+			// navigation
+			{
+				const auto& activeArea = mViewport.mArea;
+				if (this->isHolding() && activeArea.isInside(events.getPointer())) {
+					switch (mNavigationType) {
+						case ORBIT: mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3); break;
 
-			if (auto obj = mEditor->getActiveObject()) { // dummy rotate active object
+						case PAN:
-				auto rotator = obj->mTopology.Basis.rotatorDir({1, 1, 1}, 0.1);
+							{
-				obj->mTopology.Basis = rotator * obj->mTopology.Basis;
+								auto pointer = (((events.getPointer() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-			}
+								auto prevPointer = (((events.getPointerPrev() - activeArea.pos) / activeArea.size) - 0.5f) * 2;
+								mEditor->navigationPan(prevPointer, pointer);
+							}
+							break;
 
-			mEditor->getScene()->updateCache();
+						case ZOOM: mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); break;
-
+					}
-			const auto& activeArea = mViewport.getArea();
-
-			auto pointer = events.getPointer();
-			auto pointerPrev = events.getPointerPrev();
-			auto pointerRelative = (((pointer - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-
-			if (activeArea.isInside(pointer) && events.isDown(InputID::MOUSE1)) {
-				switch (mNavigationType) {
-					case ORBIT: mEditor->navigationOrbit(events.getPointerDelta() / activeArea.size * 3); break;
-
-					case PAN:
-						{
-							auto prevPointerRelative = (((pointerPrev - activeArea.pos) / activeArea.size) - 0.5f) * 2;
-							mEditor->navigationPan(prevPointerRelative, pointerRelative);
-						}
-						break;
-
-					case ZOOM: mEditor->navigationZoom(1 + (events.getPointerDelta().y / activeArea.size.y)); break;
-					case SELECT: mEditor->selectObject(pointerRelative * -1); break;
 				}
 			}
+
+			WorkspaceWidget::eventProcess(events);
 		}
 
-		void draw(Canvas& canvas) override { canvas.rect(getArea().relative(), mBaseColor); }
+		void eventDraw(Canvas& canvas) override { canvas.rect(this->mArea, mBaseColor); }
+
+		void eventUpdateConfiguration(WidgetManager& wm) override {
+			wm.setActiveId("3DEditor");
+			mBaseColor = wm.getColor("Base", "Base");
+		}
 
 	public:
 		Editor* mEditor = nullptr;
 
-		ViewportWidget mViewport;
+		// SplitView mSplitView;
 
-		FloatingMenu mPanel;
+		ViewportWidget mViewport;
+		// ScrollableWindow mSettingsWidget;
 
 		// Controls
-		FloatingMenu mRenderMenu;
+		FloatingWidget 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;
+		FloatingWidget 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 },
+	pos = { 0.5, 4.5, 0.2 },
-	target = { 0, 0, 0 },
+	size_x = 600,
-	up = { 0, 0, 1 },
+	size_y = 800,
-	size = { 600, 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) {
+int readLight(lua_State* L, tp::PointLight* light) {
-	light->pos = getVec3(L, "pos");
+	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");
+	// Access Camera table
-		if (!lua_istable(L, -1)) {
+	lua_getglobal(L, "Camera");
-			printf("Camera is not a table.\n");
+	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

@@ -48,39 +48,4 @@ 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 {
+	return loadLuaFormat(scenePath);
-		auto res = loadLuaFormat(scenePath);
-		if (!res) throw IOError("Failed loading lua script");
-	} catch (const IOError& err) {
-		printf("Failed loading scene : %s\n", err.description.c_str());
-		return false;
-	}
-
-	return true;
 }

3DScene/public/Scene.hpp

@@ -6,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,14 @@ set(CMAKE_CXX_STANDARD 20)
 
 project(ModulesRoot)
 
-include(cmake/ModulesOptions.txt)
+include(CMakeOptions.cmake)
-
+include(Externals/CMakeExternals.cmake)
-set(WINDOWS_LIBRARIES "../moduleswindowsl" CACHE STRING "Svn repository with windows libraries https://svn.riouxsvn.com/moduleswindowsl")
-
-include(cmake/FindGLEW.cmake)
-include(cmake/FindOIDN.cmake)
-include(cmake/FindPortAudio.cmake)
-
-add_subdirectory(Externals)
 
 add_subdirectory(Modules)
 add_subdirectory(Containers)
 add_subdirectory(Math)
 # add_subdirectory(Language)
+# add_subdirectory(Externals)
 add_subdirectory(Connection)
 add_subdirectory(Graphics)
 add_subdirectory(DataAnalysis)

CMakeOptions.cmake

@@ -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})
+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/Buffer.hpp

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

Containers/public/Buffer2D.hpp

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

Containers/public/IntervalTree.hpp

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

Containers/public/LinearRingBuffer.hpp

@@ -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/List.hpp

@@ -159,10 +159,15 @@ namespace tp {
 		}
 
 		[[nodiscard]] Node* find(const TypeArg data) const {
-			for (Node* found = mFirst; found; found = found->next) {
+			Node* found = mFirst;
-				if (data == found->data) return found;
+			for (alni i = 0; data != found->data; i++) {
+				if (i == length()) return nullptr;
+				if (!found->next) {
+					return nullptr;
+				}
+				found = found->next;
 			}
-			return nullptr;
+			return found;
 		}
 
 		[[nodiscard]] inline const Type& operator[](Index idx) const {
@@ -288,9 +293,9 @@ namespace tp {
 			while (iter) {
 				tmp = iter;
 				iter = iter->next;
-				swapV(tmp->next, tmp->prev);
+				swap(tmp->next, tmp->prev);
 			}
-			swapV(mFirst, mLast);
+			swap(mFirst, mLast);
 		}
 
 		void detachAll() {

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/AVLTreeProfiling.cpp

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

Containers/tests/BufferTest.cpp

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

Containers/tests/IntervalTreeTests.cpp

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

Containers/tests/MapTest.cpp

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

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/TreeTest.cpp

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

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);
@@ -20,7 +18,7 @@ void loadImage(Buffer<halnf>& output, const char* name) {
 
 	output.reserve(x * y);
 
-	for (auto i : IterRange(output.size())) {
+	for (auto i : Range(output.size())) {
 		output[i] = loadedImage[i * 4] / 255.f;
 	}
 
@@ -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"
 
@@ -53,7 +52,7 @@ bool loadDataset(Dataset& out, const std::string& location) {
 	out.labels.reserve(out.length);
 	out.images.reserve(out.length);
 
-	for (auto i : IterRange(out.length)) {
+	for (auto i : Range(out.length)) {
 		auto& image = out.images[i];
 		image.reserve(sizeX * sizeY);
 		dataset.readBytes((LocalConnection::Byte*) image.getBuff(), sizeX * sizeY);
@@ -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;
@@ -92,7 +89,7 @@ struct NumberRec {
 		}
 
 		mTestcases.reserve(dataset.images.size());
-		for (auto i : IterRange(dataset.images.size())) {
+		for (auto i : Range(dataset.images.size())) {
 			auto& image = dataset.images[i];
 			auto label = dataset.labels[i];
 
@@ -100,13 +97,13 @@ struct NumberRec {
 
 			testcase.output.reserve(10);
 
-			for (auto dig : IterRange(10)) {
+			for (auto dig : Range(10)) {
 				testcase.output[dig] = label == dig ? 1 : 0;
 			}
 
 			testcase.input.reserve(image.size());
 
-			for (auto pxl : IterRange(image.size())) {
+			for (auto pxl : Range(image.size())) {
 				testcase.input[pxl] = (halnf) image[pxl] / 255.f;
 			}
 		}
@@ -140,7 +137,7 @@ struct NumberRec {
 
 	static halni getMaxIdx(const Buffer<halnf>& in) {
 		halni out = 0;
-		for (auto i : IterRange(in.size())) {
+		for (auto i : Range(in.size())) {
 			if (in[i] > in[out]) {
 				out = i;
 			}
@@ -168,15 +165,15 @@ struct NumberRec {
 	void displayImage(ualni idx) {
 		auto& testcase = mTestcases[idx];
 		printf("Image : %i\n", int(getMaxIdx(testcase.output)));
-		for (auto i : IterRange(28)) {
+		for (auto i : Range(28)) {
-			for (auto j : IterRange(28)) {
+			for (auto j : Range(28)) {
 				printf("%c", char(testcase.input[j * 28 + i] * 255));
 			}
 			printf("\n");
 		}
 	}
 
-	halnf test(const IterRange<halni>& range) {
+	halnf test(const Range<halni>& range) {
 		halnf avgCost = 0;
 		for (auto i : range) {
 			avgCost += eval(i);
@@ -185,7 +182,7 @@ struct NumberRec {
 		return avgCost;
 	}
 
-	void trainStep(const IterRange<halni>& range) {
+	void trainStep(const Range<halni>& range) {
 		nn.clearGrad();
 		for (auto i : range) {
 			nn.evaluate(mTestcases[i].input, output);
@@ -213,19 +210,18 @@ int main() {
 	NumberRec app;
 
 	auto numBatches = 10;
-	auto trainRange = IterRange(0, 50000);
+	auto trainRange = Range(0, 50000);
-	auto testRange = IterRange(50000, 70000);
+	auto testRange = Range(50000, 70000);
 
 	auto batchSize = trainRange.idxDiff() / numBatches;
 
-	for (auto epoch : IterRange(10)) {
+	for (auto epoch : Range(1)) {
 		printf("Epoch %i\n", epoch.index());
 
-		for (auto batchIdx : IterRange(trainRange.idxDiff() / batchSize)) {
+		for (auto batchIdx : Range(trainRange.idxDiff() / batchSize)) {
 			printf(" - Batch :%i \n", batchIdx.index());
 
-			auto batchRange =
+			auto batchRange = Range(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1));
-				IterRange(trainRange.idxBegin() + batchSize * batchIdx, trainRange.idxBegin() + batchSize * (batchIdx + 1));
 
 			app.trainStep(batchRange);
 
@@ -244,5 +240,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());
 }

DataAnalysis/private/FCNN.cpp

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

DataAnalysis/tests/Tests.cpp

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

Externals/CMakeExternals.cmake

@@ -0,0 +1,44 @@
+# 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}")
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/Externals")
+
+set(IMGUI_SRC_DIR "${CMAKE_SOURCE_DIR}/Externals/imgui")
+
+set(OpenGL_GL_PREFERENCE LEGACY)
+#set(OIDN_DEVICE_CPU ON)
+#set(OIDN_STATIC_LIB ON)
+#add_subdirectory(oidn)
+
+find_package(OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
+find_package(PortAudio REQUIRED)
+find_package(OpenImageDenoise REQUIRED)
+find_package(ImGui REQUIRED)
+find_package(Lua REQUIRED)
+find_package(glfw3 REQUIRED)
+
+#add_subdirectory(unittest-cpp)
+add_subdirectory(Externals/lalr)
+target_compile_options(UnitTest++ PUBLIC -Wno-error)
+
+
+#add_subdirectory(Externals/glfw)
+
+
+project(Nanovg)
+set(${PROJECT_NAME}_SOURCES
+        Externals/nanovg/src/nanovg.c
+)
+
+add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
+target_include_directories(${PROJECT_NAME} PUBLIC ./Externals/nanovg/src/ ./Externals/nanovg/obsolete/)
+
+project(ImageIO)
+add_library(${PROJECT_NAME} INTERFACE)
+target_include_directories(${PROJECT_NAME} INTERFACE ./Externals/imageIO/)

Externals/CMakeLists.txt

@@ -1,58 +0,0 @@
-# find_package(ALSA REQUIRED)
-
-add_subdirectory(glfw)
-
-project(Imgui)
-set(${PROJECT_NAME}_SOURCES
-        imgui/imgui.cpp
-        imgui/imgui_draw.cpp
-        imgui/imgui_tables.cpp
-        imgui/imgui_widgets.cpp
-        imgui/imgui_demo.cpp
-
-        imgui/backends/imgui_impl_glfw.cpp
-        imgui/backends/imgui_impl_opengl3.cpp
-
-        implot/implot.cpp
-        implot/implot_items.cpp
-)
-
-add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
-include_directories(${PROJECT_NAME} ./glfw/include)
-target_include_directories(${PROJECT_NAME} PUBLIC ./imgui/ ./imgui/backends/ ./implot/)
-
-project(Nanovg)
-set(${PROJECT_NAME}_SOURCES
-        nanovg/src/nanovg.c
-)
-
-add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
-target_include_directories(${PROJECT_NAME} PUBLIC ./nanovg/src/ ./nanovg/obsolete/)
-
-project(Lua)
-
-# Add the Lua source files
-#file(GLOB ${PROJECT_NAME}_SOURCES "./lua/luaone.c")
-# list(FILTER ${PROJECT_NAME}_SOURCES EXCLUDE REGEX "./lua/lua.c$")
-
-# Create the Lua library
-add_library(${PROJECT_NAME} STATIC "lua/onelua.c")
-
-target_compile_definitions(${PROJECT_NAME} PUBLIC MAKE_LIB)
-
-# Include directories for Lua headers
-target_include_directories(${PROJECT_NAME} PUBLIC "./lua")
-
-# Set compilation options, e.g., for compilation with C99
-set_target_properties(${PROJECT_NAME} PROPERTIES
-        C_STANDARD 99
-        C_STANDARD_REQUIRED ON
-)
-
-project(ImageIO)
-add_library(${PROJECT_NAME} INTERFACE)
-target_include_directories(${PROJECT_NAME} INTERFACE ./imageIO/)
-
-add_subdirectory(lalr)
-
-add_subdirectory(googletest)

Externals/FindImGui.cmake

@@ -0,0 +1,25 @@
+project(ImGui)
+
+
+set(${PROJECT_NAME}_SOURCES
+        ${IMGUI_SRC_DIR}/imgui.cpp
+        ${IMGUI_SRC_DIR}/imgui_draw.cpp
+        ${IMGUI_SRC_DIR}/imgui_tables.cpp
+        ${IMGUI_SRC_DIR}/imgui_widgets.cpp
+        ${IMGUI_SRC_DIR}/imgui_demo.cpp
+
+        ${IMGUI_SRC_DIR}/backends/imgui_impl_glfw.cpp
+        ${IMGUI_SRC_DIR}/backends/imgui_impl_opengl3.cpp
+)
+
+set(${PROJECT_NAME}_INCLUDES
+        ${IMGUI_SRC_DIR}
+        ${IMGUI_SRC_DIR}/backends/
+)
+
+add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_INCLUDES})
+
+#include_directories(${PROJECT_NAME} ././glfw/include)
+
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})

Externals/FindPortAudio.cmake

@@ -0,0 +1,35 @@
+# - Find PortAudio includes and libraries
+#
+#   PORTAUDIO_FOUND        - True if PORTAUDIO_INCLUDE_DIR & PORTAUDIO_LIBRARY
+#                            are found
+#   PORTAUDIO_LIBRARIES    - Set when PORTAUDIO_LIBRARY is found
+#   PORTAUDIO_INCLUDE_DIRS - Set when PORTAUDIO_INCLUDE_DIR is found
+#
+#   PORTAUDIO_INCLUDE_DIR - where to find portaudio.h, etc.
+#   PORTAUDIO_LIBRARY     - the portaudio library
+#
+
+find_path(PORTAUDIO_INCLUDE_DIR
+        NAMES portaudio.h
+        DOC "The PortAudio include directory"
+)
+
+find_library(PORTAUDIO_LIBRARY
+        NAMES portaudio
+        DOC "The PortAudio library"
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PortAudio
+        REQUIRED_VARS PORTAUDIO_LIBRARY PORTAUDIO_INCLUDE_DIR
+)
+
+# Create an imported target for PortAudio
+add_library(PortAudio::PortAudio UNKNOWN IMPORTED)
+set_target_properties(PortAudio::PortAudio PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${PORTAUDIO_INCLUDE_DIR}"
+        IMPORTED_LOCATION "${PORTAUDIO_LIBRARY}"
+)
+
+# Provide the information to the user
+mark_as_advanced(PORTAUDIO_INCLUDE_DIR PORTAUDIO_LIBRARY)

Externals/benchmark

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

Externals/glfw

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

Externals/googletest

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

Externals/implot

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

Externals/lalr

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

Externals/lua

@@ -1 +0,0 @@
-Subproject commit 6baee9ef9d5657ab582c8a4b9f885ec58ed502d0

Graphics/CMakeLists.txt

@@ -1,23 +1,19 @@
 project(Graphics)
 
 ### ---------------------- Externals  ---------------------  ###
-set(BINDINGS_INCLUDE ../Externals/glfw/include ${GLEW_INCLUDE_DIR})
+set(EXTERNAL_TARGETS glfw GLEW::glew OpenGL::GL ImGui::ImGui Nanovg)
-set(BINDINGS_LIBS glfw Imgui Nanovg ${GLEW_LIB})
 
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp")
 file(GLOB HEADERS "./public/*.hpp")
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 target_include_directories(${PROJECT_NAME} PUBLIC ./public/)
-target_include_directories(${PROJECT_NAME} PRIVATE ${BINDINGS_INCLUDE})
 target_link_libraries(${PROJECT_NAME} PUBLIC Math)
-target_link_libraries(${PROJECT_NAME} PRIVATE ${BINDINGS_LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${EXTERNAL_TARGETS})
 
 ### -------------------------- Examples  --------------------------  ###
 add_executable(Example${PROJECT_NAME} ./examples/Example.cpp)
-target_link_libraries(Example${PROJECT_NAME} ${PROJECT_NAME} ${BINDINGS_LIBS})
+target_link_libraries(Example${PROJECT_NAME} ${PROJECT_NAME} ${EXTERNAL_TARGETS})
-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/examples/Example.cpp

@@ -11,7 +11,7 @@ class ExampleApplication : public Application {
 public:
 	ExampleApplication() = default;
 
-	void processFrame(EventHandler* eventHandler, halnf) override {
+	void processFrame(EventHandler* eventHandler) override { 
 		// example
 	}
 
@@ -20,11 +20,10 @@ public:
 
 		ImGui::ShowDemoWindow();
 
-		drawDebug();
+		ImGui::Text("Frames processed per second: %f", this->mFramesProcessedPerSecond);
+		ImGui::Text("Frames drawn per second: %f", this->mFramesDrawnPerSecond);
 	}
 
-	bool forceNewFrame() override { return false; }
-
 	virtual ~ExampleApplication() = default;
 };
 

Graphics/private/Canvas.cpp

@@ -27,7 +27,7 @@ Canvas::Canvas(Window* window) {
 
 	mContext->vg = nvgCreateGL3(NVG_ANTIALIAS | NVG_STENCIL_STROKES);
 
-	if (nvgCreateFont(mContext->vg, "default", "rsc/Font.ttf") == -1) {
+	if (nvgCreateFont(mContext->vg, "default", "Font.ttf") == -1) {
 		ASSERT(!"Cant create NVG font")
 	}
 }
@@ -37,9 +37,7 @@ Canvas::~Canvas() {
 	delete mContext;
 }
 
-void Canvas::rect(RectF rec, const RGBA& col, halnf round) {
+void Canvas::rect(const RectF& rec, const RGBA& col, halnf round) {
-	rec.pos += mOrigin;
-
 	nvgBeginPath(mContext->vg);
 
 	if (round == 0) {
@@ -52,52 +50,7 @@ void Canvas::rect(RectF rec, const RGBA& col, halnf round) {
 	nvgFill(mContext->vg);
 }
 
-void Canvas::debugCross(RectF rec, const RGBA& col) {
+void Canvas::circle(const Vec2F& pos, halnf size, const RGBA& col) {
-	nvgBeginPath(mContext->vg);
-
-	nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y);
-	nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y);
-
-	nvgMoveTo(mContext->vg, rec.p2().x, rec.p2().y);
-	nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y);
-
-	nvgStrokeWidth(mContext->vg, 2);
-	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
-	nvgStroke(mContext->vg);
-	// nvgFill(mContext->vg);
-}
-
-void Canvas::frame(RectF rec, const RGBA& col, halnf round) {
-	nvgBeginPath(mContext->vg);
-
-	nvgMoveTo(mContext->vg, rec.p1().x, rec.p1().y);
-	nvgLineTo(mContext->vg, rec.p2().x, rec.p2().y);
-	nvgLineTo(mContext->vg, rec.p3().x, rec.p3().y);
-	nvgLineTo(mContext->vg, rec.p4().x, rec.p4().y);
-	nvgLineTo(mContext->vg, rec.p1().x, rec.p1().y);
-
-	nvgStrokeWidth(mContext->vg, 2);
-	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
-	nvgStroke(mContext->vg);
-	// nvgFill(mContext->vg);
-}
-
-void Canvas::line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness) {
-	start += mOrigin;
-	end += mOrigin;
-
-	nvgBeginPath(mContext->vg);
-	nvgFillColor(mContext->vg, { col.r, col.g, col.b, col.a});
-	nvgMoveTo(mContext->vg, start.x, start.y);
-	nvgLineTo(mContext->vg, end.x, end.y);
-	nvgStrokeWidth(mContext->vg, thickness);
-	nvgStrokeColor(mContext->vg, { col.r, col.g, col.b, col.a });
-	nvgStroke(mContext->vg);
-}
-
-void Canvas::circle(Vec2F pos, halnf size, const RGBA& col) {
-	pos += mOrigin;
-
 	nvgBeginPath(mContext->vg);
 	nvgCircle(mContext->vg, pos.x, pos.y, size);
 
@@ -105,10 +58,6 @@ void Canvas::circle(Vec2F pos, halnf size, const RGBA& col) {
 	nvgFill(mContext->vg);
 }
 
-void Canvas::setOrigin(const Vec2F& origin) {
-	mOrigin = origin;
-}
-
 void Canvas::pushClamp(const RectF& rec) {
 	RectF intersection = rec;
 	if (mScissors.size()) {
@@ -130,16 +79,10 @@ void Canvas::popClamp() {
 	}
 }
 
-const RectF& Canvas::getClampedArea() const {
-	return mScissors.last();
-}
-
 void Canvas::text(
 	const char* string, const RectF& aRec, halnf size, Align align, halnf marging, const RGBA& col
 ) {
-
 	RectF rec = { aRec.x + marging, aRec.y + marging, aRec.z - marging * 2, aRec.w - marging * 2 };
-	rec.pos += mOrigin;
 
 	pushClamp(rec);
 
@@ -178,9 +121,7 @@ void Canvas::text(
 	popClamp();
 }
 
-void Canvas::drawImage(RectF rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) {
+void Canvas::drawImage(const RectF& rec, ImageHandle* image, halnf angle, halnf alpha, halnf rounding) {
-	rec.pos += mOrigin;
-
 	auto imgPaint = nvgImagePattern(mContext->vg, rec.x, rec.y, rec.z, rec.w, angle, image->id, alpha);
 	nvgBeginPath(mContext->vg);
 	nvgRoundedRect(mContext->vg, rec.x, rec.y, rec.z, rec.w, rounding);
@@ -222,195 +163,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

@@ -9,8 +9,6 @@
 #include <imgui_impl_opengl3.h>
 #include <imgui_internal.h>
 
-#include "implot.h"
-
 namespace tp {
 	class DebugGUI::Context {
 	public:
@@ -36,17 +34,13 @@ 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;
 
 	// appearance
 	io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
 
-	ImPlot::CreateContext();
-
-	return;
-
 	auto& colors = ImGui::GetStyle().Colors;
 	colors[ImGuiCol_WindowBg] = ImVec4{ 0.1f, 0.105f, 0.11f, 1.0f };
 
@@ -79,13 +73,10 @@ DebugGUI::DebugGUI(Window* window) {
 }
 
 DebugGUI::~DebugGUI() {
-	ImPlot::DestroyContext();
-
 	ImGui_ImplOpenGL3_Shutdown();
 	ImGui_ImplGlfw_Shutdown();
 	ImGui::DestroyContext();
 
-
 	delete mContext;
 }
 

Graphics/private/EventHandler.cpp

@@ -42,38 +42,18 @@ bool transitionsReduce[4][4] = {
 	{ true, true, true, true },
 };
 
-void EventHandler::processAllEvent() {
-	mMutex.lock();
-
-	mPointerPrev = mPointer;
-
-	while (mEventQueue.size()) {
-		processEventUnguarded();
-	}
-	mMutex.unlock();
-}
-
 void EventHandler::processEvent() {
 	mMutex.lock();
 
-	mPointerPrev = mPointer;
-
 	if (!mEventQueue.size()) {
 		mMutex.unlock();
 		return;
 	}
 
-	processEventUnguarded();
+	auto lastEvent = &mEventQueue.last();
 
-	mMutex.unlock();
+	const auto& eventData = lastEvent->second;
-}
+	const auto& inputId = lastEvent->first;
-
-void EventHandler::processEventUnguarded() {
-
-	auto firstEvent = &mEventQueue.first();
-
-	const auto& eventData = firstEvent->second;
-	const auto& inputId = firstEvent->first;
 
 	switch (eventData.type) {
 		case InputEvent::Type::MOUSE_POS:
@@ -91,6 +71,8 @@ void EventHandler::processEventUnguarded() {
 
 				mInputStates[(int) inputId].mCurrentState = transitions[currentState][reportedEvent];
 
+				// printf("%i - %i \n", reportedEvent, mInputStates[(int) InputID::MOUSE1].mCurrentState);
+
 				if (transitionsReduce[currentState][reportedEvent]) {
 					mEventQueue.popFront();
 				}
@@ -116,33 +98,25 @@ void EventHandler::processEventUnguarded() {
 	}
 
 	mPointerPressure = mInputStates[(int) InputID::MOUSE1].mCurrentState != InputState::State::NONE;
+
+	mMutex.unlock();
 }
 
-void EventHandler::setCursorOrigin(const Vec2F& origin) {
+const Vec2F& EventHandler::getPointer() const { return mPointer; }
-	mPointerOrigin = origin;
-}
 
-Vec2F EventHandler::getPointer() const { return mPointer - mPointerOrigin; }
+const Vec2F& EventHandler::getPointerPrev() const { return mPointerPrev; }
-
-Vec2F EventHandler::getPointerPrev() const { return mPointerPrev - mPointerOrigin; }
 
 bool EventHandler::isPressed(InputID id) const {
-	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED;
 }
 
 bool EventHandler::isReleased(InputID id) const {
-	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::RELEASED;
 }
 
-halnf EventHandler::getPointerPressure() const {
+halnf EventHandler::getPointerPressure() const { return mPointerPressure; }
-	if (!mEnableKeyEvents) return 0;
-	return mPointerPressure;
-}
 
 bool EventHandler::isDown(InputID id) const {
-	if (!mEnableKeyEvents) return false;
 	return mInputStates[(int) id].mCurrentState == InputState::State::PRESSED ||
 				 mInputStates[(int) id].mCurrentState == InputState::State::HOLD;
 }
@@ -150,7 +124,3 @@ bool EventHandler::isDown(InputID id) const {
 halnf EventHandler::getScrollY() const { return mScrollDelta.y; }
 
 Vec2F EventHandler::getPointerDelta() const { return mPointer - mPointerPrev; }
-
-void EventHandler::setEnableKeyEvents(bool enable) {
-	mEnableKeyEvents = enable;
-}

Graphics/private/GraphicApplication.cpp

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

Graphics/private/Window.cpp

@@ -29,8 +29,6 @@ Window::Window(Vec2F size, const char* title) {
 	// glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
 	// glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
 
-	mSize = size;
-
 	// Create a window and OpenGL context
 	mContext->window = glfwCreateWindow((int) size.x, (int) size.y, title, nullptr, nullptr);
 	if (!mContext->window) {
@@ -43,7 +41,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 +64,7 @@ Window* Window::createWindow(Vec2F size, const char* title) {
 	}
 	count--;
 
-	#ifdef ENV_OS_LINUX
+	// glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
-		glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11);
-	#endif
 	// glfwInitHint(GLFW_WAYLAND_LIBDECOR, GLFW_WAYLAND_DISABLE_LIBDECOR);
 
 	// Initialize GLFW
@@ -95,9 +90,9 @@ void Window::destroyWindow(Window* window) {
 
 bool Window::shouldClose() const { return glfwWindowShouldClose(mContext->window); }
 
-void Window::processEvents(bool wait) {
+void Window::processEvents() {
-	if (wait) glfwWaitEvents();
+	// glfwPollEvents();
-	else glfwPollEvents();
+	glfwWaitEvents();
 	checkAxisUpdates();
 }
 
@@ -171,12 +166,12 @@ static void mouseButtonCallback(GLFWwindow* window, int button, int action, int
 	auto id = (InputID) ((int) InputID::MOUSE1 + button);
 
 	if (action == GLFW_PRESS) {
-		// printf("mouse\n");
+		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} }
-		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::PRESS, {} });
+		);
 	} else if (action == GLFW_RELEASE) {
 		eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::RELEASE, {} });
+		// eventHandler->postEvent(id, { InputEvent::Type::BUTTON_ACTION, InputEvent::ButtonAction::NONE, {} });
 	}
-
 }
 
 static void scrollCallback(GLFWwindow* window, double xOffset, double yOffset) {

Graphics/public/EventHandler.hpp

@@ -71,12 +71,9 @@ namespace tp {
 	public: // User interface
 		bool isEvents();
 		void processEvent();
-		void processAllEvent();
 
-		void setCursorOrigin(const Vec2F& origin);
+		[[nodiscard]] const Vec2F& getPointer() const;
-
+		[[nodiscard]] const Vec2F& getPointerPrev() const;
-		[[nodiscard]] Vec2F getPointer() const;
-		[[nodiscard]] Vec2F getPointerPrev() const;
 		[[nodiscard]] Vec2F getPointerDelta() const;
 
 		[[nodiscard]] bool isPressed(InputID id) const;
@@ -86,11 +83,6 @@ namespace tp {
 
 		[[nodiscard]] halnf getPointerPressure() const;
 
-		void setEnableKeyEvents(bool);
-
-	private:
-		void processEventUnguarded();
-
 	private:
 		std::mutex mMutex = {};
 
@@ -98,8 +90,6 @@ namespace tp {
 		List<std::pair<InputID, InputEvent>> mEventQueue;
 
 		// input states
-		Vec2F mPointerOrigin = { 0, 0 };
-
 		Vec2F mPointer;
 		Vec2F mPointerPrev;
 		Vec2F mScrollDelta;
@@ -109,8 +99,6 @@ namespace tp {
 		InputState mInputStates[(int) InputID::LAST_KEY_CODE]{};
 
 		Timer mTimerEvent = Timer(1000);
-
-		bool mEnableKeyEvents = true;
 	};
 
 }

Graphics/public/GraphicApplication.hpp

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

Graphics/public/Graphics.hpp

@@ -55,38 +55,21 @@ 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;
+		void rect(const RectF& rec, const RGBA& col, halnf round = 0);
-
+		void circle(const Vec2F& pos, halnf size, const RGBA& col);
-		void debugCross(RectF rec, const RGBA& col);
-		void rect(RectF rec, const RGBA& col, halnf round = 0);
-		void frame(RectF rec, const RGBA& col, halnf round = 0);
-		void circle(Vec2F pos, halnf size, const RGBA& col);
 		void text(const char*, const RectF&, halnf size, Align, halnf padding, const RGBA&);
-		void colorWheel(const RectF& rec, const ColorWheel& colorWheel);
-		void line(Vec2F start, Vec2F end, const RGBA& col, halnf thickness);
 
 		ImageHandle createImageFromTextId(ualni id, Vec2F size);
 		void updateTextureID(ImageHandle handle, ualni id);
 
 		void deleteImageHandle(ImageHandle image);
-		void drawImage(RectF rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f);
+		void drawImage(const RectF& rec, ImageHandle* image, halnf angle = 0, halnf alpha = 1.f, halnf rounding = 0.f);
 
 	private:
 		Buffer<RectF> mScissors;
 		bool mIsClamping = false;
-		Vec2F mOrigin = { 0, 0 };
 	};
 
 	class Graphics {

Graphics/public/Window.hpp

@@ -17,7 +17,7 @@ namespace tp {
 
 	public:
 		void draw();
-		void processEvents(bool wait = true);
+		void processEvents();
 
 		void setEventHandler(EventHandler* eventHandler);
 		[[nodiscard]] EventHandler* getEventHandler();

LICENSE

@@ -1,37 +1,339 @@
-SOFTWARE LICENSE AGREEMENT
+                    GNU GENERAL PUBLIC LICENSE
-This Software License Agreement ("Agreement") is made and entered into as of 2024-11-24 ("Effective Date") by Ilya Shurupov.
+                       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:
+  When we speak of free software, we are referring to freedom, not
-The term "Software" refers to the Modules, including any updates, modifications, or associated documentation provided by Licensor.
+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:
+  To protect your rights, we need to make restrictions that forbid
-Subject to the terms and conditions of this Agreement, Licensor hereby grants to Licensee a no license to use the Software.
+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:
+  For example, if you distribute copies of such a program, whether
-No modifications or derivative works are allowed.
+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:
+  We protect your rights with two steps: (1) copyright the software, and
-Commercial use is not allowed.
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
 
-5. Attribution:
+  Also, for each author's protection and ours, we want to make certain
-No attribution is required.
+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:
+  Finally, any free program is threatened constantly by software
-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.
+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 precise terms and conditions for copying, distribution and
-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.
+modification follow.
 
-8. Termination:
+                    GNU GENERAL PUBLIC LICENSE
-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.
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-9. Governing Law:
+  0. This License applies to any program or other work which contains
-This Agreement shall be governed by and construed in accordance with the laws of .
+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

@@ -1,8 +1,7 @@
 project(LibraryViewer)
 
 ### ---------------------- Externals  ---------------------  ###
-set(BINDINGS_INCLUDE ../Externals/glfw/include ${GLEW_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR})
+set(EXTERNAL_TARGETS glfw Imgui GLEW::glew OpenGL::GL PortAudio::PortAudio)
-set(BINDINGS_LIBS glfw Imgui ${GLEW_LIB} ${ALSA_LIBRARY} ${PORTAUDIO_LIB})
 
 ### ---------------------- Static Library  ---------------------  ###
 file(GLOB SOURCES "./private/*.cpp" "./private/*/*.cpp")
@@ -10,12 +9,13 @@ file(GLOB HEADERS "./public/*.hpp" "./public/*/*.hpp" "./applications/*.hpp")
 
 add_library(${PROJECT_NAME} STATIC ${SOURCES} ${HEADERS})
 
-target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ${BINDINGS_INCLUDE} ./ext/)
+target_include_directories(${PROJECT_NAME} PUBLIC ./public/ ./ext/)
+
 target_link_libraries(${PROJECT_NAME} PUBLIC Graphics Connection Widgets)
-target_link_libraries(${PROJECT_NAME} PUBLIC ${BINDINGS_LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${EXTERNAL_TARGETS})
 
 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)

LibraryViewer/applications/Entry.cpp

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

LibraryViewer/private/Library.cpp

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

LibraryViewer/public/GUI.hpp

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

Math/private/Camera.cpp

@@ -88,7 +88,7 @@ void Camera::lookAtPoint(const Vec3F& aTarget, const Vec3F& aPos, Vec3F aUp) {
 	}
 	mPos = aPos;
 	mTarget = aTarget;
-	Vec3F f = (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/private/Topology.cpp

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

Math/public/Camera.hpp

@@ -18,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/Color.hpp

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

Math/public/Mat.hpp

@@ -221,7 +221,7 @@ namespace tp {
 			static_assert(tNRows == tNColoumns);
 			for (halni i = 0; i < tNColoumns; i++) {
 				for (halni j = i + 1; j < tNColoumns; j++) {
-					swapV((*this)[i][j], (*this)[j][i]);
+					swap((*this)[i][j], (*this)[j][i]);
 				}
 			}
 			return *this;
@@ -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;
@@ -486,7 +479,7 @@ namespace tp {
 		Mat operator*(const Mat& in) { return transform(in); }
 
 		Mat& transpose() {
-			swapV(j.x, i.y);
+			swap(j.x, i.y);
 			return *this;
 		}
 
@@ -502,8 +495,8 @@ namespace tp {
 	};
 
 	template <typename Type>
-	using Mat3 = Mat<Type, 3, 3>;
+	using mat3 = Mat<Type, 3, 3>;
-	using Mat3F = Mat3<halnf>;
+	using mat3f = mat3<halnf>;
 
 	template <typename Type>
 	class Mat<Type, 3, 3> {
@@ -642,9 +635,9 @@ namespace tp {
 		}
 
 		Mat& transpose() {
-			swapV(I.y, J.x);
+			swap(I.y, J.x);
-			swapV(I.z, K.x);
+			swap(I.z, K.x);
-			swapV(J.z, K.y);
+			swap(J.z, K.y);
 			return *this;
 		}
 
@@ -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) {
+		Mat rotatorZ(alnf angle) {
-			Type cosA = (Type) cos(angle);
+			alnf cosA = (alnf) cos(angle);
-			Type sinA = (Type) sin(angle);
+			alnf sinA = (alnf) sin(angle);
-			return { vec{ cosA, -sinA, 0 }, vec{ sinA, cosA, 0 }, vec{ 0, 0, 1 } };
+			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/Range.hpp

@@ -1,39 +0,0 @@
-
-#pragma once
-
-#include "Common.hpp"
-
-namespace tp {
-	template <typename Type>
-	class Range {
-	public:
-		Range() = default;
-		Range(Type v1, Type v2) : start(v1), end(v2) {}
-
-		Type mid() const { return (start + end) / 2.f; }
-		Type size() const { return (end - start); }
-
-		void resizeFromCenter(Type newSize) {
-			const auto middle = mid();
-			const auto len = newSize / 2;
-			start = middle - len;
-			end = middle + len;
-		}
-
-		void clamp(const Range& inside, const Range& outside) {
-			start = tp::clamp(start, outside.start, inside.start);
-			end = tp::clamp(end, inside.end, outside.end);
-		}
-
-		void clamp(const Range& outside) {
-			start = tp::clamp(start, outside.start, outside.end);
-			end = tp::clamp(end, outside.start, outside.end);
-		}
-
-	public:
-		Type start{};
-		Type end{};
-	};
-
-	using RangeF = Range<halnf>;
-}

Math/public/Rect.hpp

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Vec.hpp"
-#include "Range.hpp"
 
 #include "Intersections.hpp"
 
@@ -36,11 +35,6 @@ namespace tp {
 			this->size = size;
 		}
 
-		Rect(const Range<Type>& rx, const Range<Type>& ry) {
-			this->pos = { rx.start, ry.start };
-			this->size = { rx.size(), ry.size() };
-		}
-
 		Rect(Type aPosX, Type posy, Type aSizeX, Type aSizeY) {
 			pos.assign(aPosX, posy);
 			size.assign(aSizeX, aSizeY);
@@ -70,30 +64,7 @@ namespace tp {
 			return *this;
 		}
 
-		Rect<Type>& adjust(tp::halnf left, tp::halnf bottom, tp::halnf right, tp::halnf top) {
+		bool operator==(Rect<Type>& rect) const { return (pos == rect.pos && size == rect.size); }
-			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 {
 			if (aParent) {
@@ -120,10 +91,6 @@ namespace tp {
 			}
 		}
 
-		Rect relative() const {
-			return { { 0, 0 }, size };
-		}
-
 		// argument isInside
 		bool isInside(const Vec2<Type>& p) const { return isInside(p.x, p.y); }
 
@@ -135,17 +102,12 @@ namespace tp {
 
 		void invertY(Type scr_y) { pos.y = scr_y - pos.y - size.y; }
 
-		Rect& move(Vec2<Type> delta) {
-			move(delta.x, delta.y);
-			return *this;
-		}
-
 		void move(Type dx, Type dy) {
 			pos.x += dx;
 			pos.y += dy;
 		}
 
-		Rect<Type>& shrinkFromCenter(tp::halnf fac, bool add = false) {
+		Rect<Type>& scaleFromCenter(tp::halnf fac, bool add = false) {
 			if (add) {
 				pos += fac;
 				size -= fac * 2;
@@ -157,18 +119,15 @@ namespace tp {
 			return *this;
 		}
 
-		Range<Type> getRangeX() const { return { x, x + z }; }
-		Range<Type> getRangeY() const { return { y, y + w }; }
-
 		// pos
-		Vec2<Type> p1() const { return pos; }
+		Vec2<Type> p1() { return pos; }
-
-		Vec2<Type> p2() const { return { pos.x, pos.y + size.y }; }
 
 		// pos + size
-		Vec2<Type> p3() const { return pos + size; }
+		Vec2<Type> p3() { return pos + size; }
 
-		Vec2<Type> p4() const { return { pos.x + size.x, pos.y }; }
+		Vec2<Type> p2() { return { pos.x, pos.y + size.y }; }
+
+		Vec2<Type> p4() { return { pos.x + size.x, pos.y }; }
 
 		inline bool isAbove(const Rect<Type>& rect) const { return (pos.y + size.y < rect.pos.y); }
 
@@ -206,31 +165,6 @@ namespace tp {
 			return { pos + val, size - val * 2 };
 		}
 
-		void expand(const Vec2<Type>& point) {
-			if (point.x < x) {
-				size.x += x - point.x;
-				x = point.x;
-			}
-
-			if (point.y < y) {
-				size.y += y - point.y;
-				y = point.y;
-			}
-
-			if (point.x > x + size.x) {
-				size.x = point.x - x;
-			}
-
-			if (point.y > y + size.y) {
-				size.y = point.y - y;
-			}
-		}
-
-		void expand(const Rect<Type>& rect) {
-			expand(rect.pos);
-			expand(rect.pos + rect.size);
-		}
-
 		// if only one point isInside
 		bool clampOutside(Vec2<Type>& v1, Vec2<Type>& v2) {
 			bool const in1 = isInside(v1);
@@ -290,23 +224,23 @@ namespace tp {
 			return out;
 		}
 
-		Vec2<Type> center() const { return pos + size / 2.f; }
+		Vec2<Type> center() { return pos + size / 2.f; }
 
 		// splits by Factor Horizontally returning Left rect
-		Rect<Type> splitByFactorHL(halnf factor) const {
+		Rect<Type> splitByFactorHL(halnf factor) {
 			return { x, y, size.x * factor, size.y };
 		}
 
-		Rect<Type> splitByFactorHR(halnf factor) const {
+		Rect<Type> splitByFactorHR(halnf factor) {
 			const auto abs = size.x * factor;
 			return { x + abs, y, size.x - abs, size.y };
 		}
 
-		Rect<Type> splitByFactorVT(halnf factor) const {
+		Rect<Type> splitByFactorVT(halnf factor) {
 			return { x, y, size.x, size.y * factor };
 		}
 
-		Rect<Type> splitByFactorVB(halnf factor) const {
+		Rect<Type> splitByFactorVB(halnf factor) {
 			const auto abs = size.y * factor;
 			return { x, y + abs, size.x, size.y - abs };
 		}
@@ -334,10 +268,6 @@ namespace tp {
 				Type z;
 				Type w;
 			};
-			struct {
-				Type width;
-				Type height;
-			};
 		};
 	};
 }

Math/public/SpringAnimations.hpp

@@ -1,155 +0,0 @@
-#pragma once
-
-#include "Color.hpp"
-#include "Rect.hpp"
-#include "Timing.hpp"
-
-namespace tp {
-	class SpringValue {
-	public:
-		SpringValue() = default;
-
-		void updateCurrentPosition() {
-			const auto deltaTime = halnf(gCurrentTime - mPrevTime);
-			const auto deltaPos = mTargetPosition - mCurrentPosition;
-
-			auto deltaVelocity = deltaPos * mSpringStiffness;
-			deltaVelocity -= mVelocity * (mVelocityDamping);
-
-			mVelocity += deltaVelocity;
-			mCurrentPosition += mVelocity * deltaTime;
-			mPrevTime = gCurrentTime;
-		}
-
-		void setTargetPosition(halnf pos) {
-			mTargetPosition = pos;
-			if (mVelocity == 0) mPrevTime = gCurrentTime;
-		}
-
-		[[nodiscard]] halnf getCurrentPos() const { return mCurrentPosition; }
-		[[nodiscard]] halnf getTargetPos() const { return mTargetPosition; }
-		[[nodiscard]] halnf getVelocity() const { return mVelocity; }
-		[[nodiscard]] halnf getDeltaPos() const { return mTargetPosition - mCurrentPosition; }
-
-		void endAnimation() {
-			mCurrentPosition = mTargetPosition;
-			mVelocity = 0;
-		}
-
-	private:
-		time_ms mPrevTime = 0;
-
-		halnf mTargetPosition = 0;
-		halnf mCurrentPosition = 0;
-
-		halnf mVelocity = 0;
-
-		halnf mSpringStiffness = 0.0041;
-		halnf mVelocityDamping = 0.25f;
-	};
-
-	class SpringVec {
-	public:
-		SpringVec() = default;
-
-		void updateCurrentPosition() {
-			mPosX.updateCurrentPosition();
-			mPosY.updateCurrentPosition();
-		}
-
-		void setTargetPosition(Vec2F pos) {
-			mPosX.setTargetPosition(pos.x);
-			mPosY.setTargetPosition(pos.y);
-		}
-
-		[[nodiscard]] Vec2F getCurrentPos() const {
-			return { mPosX.getCurrentPos(), mPosY.getCurrentPos() };
-		}
-
-		[[nodiscard]] Vec2F getTargetPos() const {
-			return { mPosX.getTargetPos(), mPosY.getTargetPos() };
-		}
-
-		[[nodiscard]] Vec2F getVelocity() const {
-			return { mPosX.getVelocity(), mPosY.getVelocity() };
-		}
-
-		[[nodiscard]] bool checkAnimationShouldEnd() const {
-			halnf velocityEpsilon = 0.0001f;
-			halnf positionEpsilon = 1;
-
-			const auto vel = abs(mPosY.getVelocity()) > velocityEpsilon || abs(mPosX.getVelocity()) > velocityEpsilon;
-			const auto pos = abs(mPosY.getDeltaPos()) > positionEpsilon || abs(mPosX.getDeltaPos()) > positionEpsilon;
-
-			return !(pos || vel);
-		}
-
-		void endAnimation() {
-			mPosX.endAnimation();
-			mPosY.endAnimation();
-		}
-
-	private:
-		SpringValue mPosY;
-		SpringValue mPosX;
-	};
-
-	class SpringRect {
-	public:
-		SpringRect() = default;
-
-		[[nodiscard]] RectF getTargetRect() const {
-			const auto start = mStartPos.getTargetPos();
-			const auto end = mEndPos.getTargetPos();
-			return { start, end - start };
-		}
-
-		[[nodiscard]] RectF getCurrentRect() const {
-			const auto start = mStartPos.getCurrentPos();
-			const auto end = mEndPos.getCurrentPos();
-			return { start, end - start };
-		}
-
-		[[nodiscard]] RGBA getCurrentColor() const {
-			const auto start = mStartPos.getCurrentPos();
-			const auto end = mEndPos.getCurrentPos();
-			return { start.x, start.y, end.x, end.y };
-		}
-
-		void setTargetRect(const RectF& rect) {
-			mStartPos.setTargetPosition(rect.p1());
-			mEndPos.setTargetPosition(rect.p3());
-		}
-
-		void setTargetColor(const RGBA& color) {
-			mStartPos.setTargetPosition({ color.r, color.g });
-			mEndPos.setTargetPosition({ color.b, color.a });
-		}
-
-		SpringVec& getStart() {
-			return mStartPos;
-		}
-
-		SpringVec& getEnd() {
-			return mEndPos;
-		}
-
-		void updateCurrentRect() {
-			mStartPos.updateCurrentPosition();
-			mEndPos.updateCurrentPosition();
-		}
-
-		[[nodiscard]] bool shouldEndTransition() const {
-			return mStartPos.checkAnimationShouldEnd() && mEndPos.checkAnimationShouldEnd();
-		}
-
-		void endAnimation() {
-			mStartPos.endAnimation();
-			mEndPos.endAnimation();
-		}
-
-	private:
-		SpringVec mStartPos;
-		SpringVec mEndPos;
-	};
-}

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;
@@ -233,8 +226,8 @@ namespace tp {
 		Type y;
 
 		Vec() :
-			x{},
+			x(0),
-			y{} {}
+			y(0) {}
 
 		// Initialization
 		template <typename TypeIn>
@@ -367,8 +360,6 @@ namespace tp {
 		Vec normal() { return { -y, x }; }
 
 		[[nodiscard]] alnf length2() const { return (x * x + y * y); }
-		[[nodiscard]] halnf max() const { return tp::max(x, y); }
-		[[nodiscard]] halnf min() const { return tp::min(x, y); }
 
 		[[nodiscard]] alnf length() const {
 			Type const tmp = (Type) (x * x + y * y);
@@ -583,14 +574,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;
-	}
 }

Modules/private/Timing.cpp

@@ -17,10 +17,6 @@ namespace tp {
 		return gCurrentTime;
 	}
 
-	void updateGlobalTime() {
-		get_time();
-	}
-
 	void sleep(time_ms mDuration) { THREAD_SLEEP(mDuration); }
 
 	Timer::Timer() {

Modules/public/Assert.hpp

@@ -33,12 +33,9 @@ namespace tp {
 		__builtin_debugtrap(); \
 	}
 #elif defined(ENV_OS_LINUX)
-
-#include <csignal>
-
 #define DEBUG_BREAK(expr) \
 	if (expr) {             \
-		raise(SIGTRAP);       \
+		__builtin_trap();     \
 	}
 #else
 #define DEBUG_BREAK(expr) ()

Modules/public/Common.hpp

@@ -85,7 +85,7 @@ namespace tp {
 	}
 
 	template <typename T>
-	inline void swapV(T& t1, T& t2) {
+	inline void swap(T& t1, T& t2) {
 		const T tmp = t1;
 		t1 = t2;
 		t2 = tmp;

Modules/public/Timing.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <functional>
 #include "Environment.hpp"
 
 namespace tp {
@@ -35,7 +34,6 @@ namespace tp {
 
 	void sleep(time_ms duration);
 	time_ms get_time();
-	void updateGlobalTime();
 
 	struct FpsCounter {
 		halni frames = 0;
@@ -57,19 +55,4 @@ namespace tp {
 			}
 		}
 	};
-
-	struct TimerWrapper {
-		explicit TimerWrapper(const std::function<void()>& arg) {
-			codeSnippet = arg;
-		}
-
-		time_ms exec() {
-			Timer timer;
-			codeSnippet();
-			return timer.timePassed();
-		}
-
-	private:
-		std::function<void()> codeSnippet;
-	};
 }

Modules/public/Utils.hpp

@@ -34,19 +34,19 @@ namespace tp {
 			}
 		}
 
-		[[nodiscard]] bool get(int1 idx) const { return mFlags & (1l << idx); }
+		bool get(int1 idx) { return mFlags & (1l << idx); }
 
 		void set(int1 idx, bool val) {
 			if (val) {
-				mFlags |= (1 << idx);
+				mFlags |= (1l << idx);
 			} else {
-				mFlags &= ~(1 << idx);
+				mFlags &= ~(1l << idx);
 			}
 		}
 	};
 
 	template <typename tType = ualni>
-	class IterRange {
+	class Range {
 	public:
 		class Iterator {
 		public:
@@ -71,13 +71,13 @@ namespace tp {
 		tType mBegin{};
 		tType mEnd{};
 
-		IterRange() = default;
+		Range() = default;
 
-		explicit IterRange(tType pEndIndex) :
+		explicit Range(tType pEndIndex) :
 			mBegin(0),
 			mEnd(pEndIndex) {}
 
-		IterRange(tType pStartIndex, tType pEndIndex) :
+		Range(tType pStartIndex, tType pEndIndex) :
 			mBegin(pStartIndex),
 			mEnd(pEndIndex) {}
 

Modules/tests/Test.cpp

@@ -241,23 +241,4 @@ SUITE(BaseModule) {
 	}
 }
 
-SUITE(BitFields) {
-	TEST(Basic) {
-		Bits<ualni> bits;
-
-		for (auto i = 0; i < 8; i ++) {
-			bits.set((int1) i, true);
-			CHECK(bits.get(i));
-		}
-
-		bits.set(1, false);
-		CHECK(!bits.get(1));
-
-		bits.set(3, false);
-		CHECK(!bits.get(3));
-
-		bits.set(4, false);
-		CHECK(!bits.get(4));
-	}
-}
 int main() { return UnitTest::RunAllTests(); }

Objects/applications/GUI.cpp

@@ -697,13 +697,13 @@ obj::ObjectsGUI::ViewStackNode obj::ObjectsGUI::listView(obj::ListObject* obj) {
 					}
 
 					if (childo.node()->prev && ImGui::Selectable("Move Up")) {
-						tp::swapV(childo.node()->prev->data, childo.data());
+						tp::swap(childo.node()->prev->data, childo.data());
 						ImGui::EndPopup();
 						break;
 					}
 
 					if (childo.node()->next && ImGui::Selectable("Move Down")) {
-						tp::swapV(childo.node()->next->data, childo.data());
+						tp::swap(childo.node()->next->data, childo.data());
 						ImGui::EndPopup();
 						break;
 					}

Objects/applications/GUIEntry.cpp

@@ -10,7 +10,7 @@ class SimpleGUI : public Application {
 public:
 	SimpleGUI() { gui.cd(objects_api::create<DictObject>(), "root"); }
 
-	void processFrame(EventHandler* eventHandler, halnf delta) override {}
+	void processFrame(EventHandler* eventHandler) override {}
 
 	void drawFrame(Canvas* canvas) override {
 		canvas->rect({ { 0, 0 }, mWindow->getSize() }, RGBA(0.f, 0.f, 0.f, 1.f), 0);

Objects/private/compiler/Functions.cpp

@@ -410,14 +410,14 @@ alni instSize(const Instruction& inst) {
 }
 
 void writeConst(ByteCode& out, alni& idx, uint2 data) {
-	for (auto byte : IterRange(sizeof(uint2))) {
+	for (auto byte : Range(sizeof(uint2))) {
 		out.mInstructions[idx] = OpCode((int1) (data >> byte * 8));
 		idx++;
 	}
 }
 
 void writeParam(ByteCode& out, alni& idx, const int1* data, alni size) {
-	for (auto byte : IterRange(size)) {
+	for (auto byte : Range(size)) {
 		out.mInstructions[idx] = OpCode(data[byte]);
 		idx++;
 	}

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) {
+void RasterRender::render(const Scene& geometry, const Vec2<ualni>& size) {
-	static auto camera = (GLint) mDefaultShader.getu("Camera");
-	glUniformMatrix4fv(camera, 1, true, &cameraMat[0][0]);
-}
 
-void RasterRender::bindObjectShaderAttributes(const Object& object) {
+	for (auto object : geometry.mObjects) {
-	static auto origin = (GLint) mDefaultShader.getu("Origin");
+		if (!object->mGUPBuffers) {
-	static auto basis = (GLint) mDefaultShader.getu("Basis");
+			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 render(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);
-
 		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;
@@ -81,7 +79,7 @@ void RayTracer::cycle(const RayCastData& castData, LightData& out, uhalni depth)
 		const auto delta1 = castData.trig->mEdgeP1P2.unitV();
 		const auto delta2 = normal.cross(delta1);
 
-		for (auto idx : IterRange(mSettings.spray)) {
+		for (auto idx : Range(mSettings.spray)) {
 			RayCastData materialCastData;
 			LightData lightData;
 

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

@@ -1,23 +1,30 @@
 
-#include "WidgetApplication.hpp"
+#include "GraphicApplication.hpp"
 
 #include "Sketch3D.hpp"
-#include "SketchGUI.hpp"
+#include "Sketch3DWidget.hpp"
 
 using namespace tp;
 
-class Sketch3DApplication : public WidgetApplication {
+class Sketch3DApplication : public Application {
 public:
-	Sketch3DApplication() {
+	Sketch3DApplication() :
-		setRoot(&mGui);
+		mGui(*mGraphics->getCanvas(), { 1920, 1080 }) {}
 
-		mGui.createRenderWidget(mGraphics->getCanvas(), { 2560, 1440 });
+	void processFrame(EventHandler* eventHandler) override {
-		mGui.setProject(&mSketch);
+		auto rec = RectF({ 0, 0 }, mWindow->getSize());
+
+		mGui.setVisible(true);
+		mGui.setArea(rec);
+		mGui.updateConfigWrapper(mWidgetManager);
+		mGui.procWrapper(*eventHandler, rec);
 	}
 
+	void drawFrame(Canvas* canvas) override { mGui.drawWrapper(*canvas); }
+
 private:
-	SketchGUI mGui;
+	WidgetManager mWidgetManager;
-	Project mSketch;
+	Sketch3DGUI mGui;
 };
 
 void runApp() {
@@ -25,4 +32,4 @@ void runApp() {
 	app.run();
 }
 
-int main() { runApp(); }
+int main() { runApp(); }

Sketch3D/private/Sketch3D.cpp

@@ -35,16 +35,16 @@ const RGBA& Stroke::getColor() const { return mColor; }
 void Stroke::updateGpuBuffers() { mGPUHandles.sendDataToGPU(&mPoints); }
 
 void Stroke::denoisePos(halni passes) {
-	for (auto pass : IterRange(passes)) {
+	for (auto pass : Range(passes)) {
-		for (auto pi : IterRange(mPoints.size() - 2)) {
+		for (auto pi : Range(mPoints.size() - 2)) {
 			mPoints[pi + 1].pos = (mPoints[pi + 1].pos + mPoints[pi].pos + mPoints[pi + 2].pos) / 3.f;
 		}
 	}
 }
 
 void Stroke::denoiseThickness(halni passes) {
-	for (auto pass : IterRange(passes)) {
+	for (auto pass : Range(passes)) {
-		for (auto pi : IterRange(mPoints.size() - 2)) {
+		for (auto pi : Range(mPoints.size() - 2)) {
 			mPoints[pi + 1].thickness = (mPoints[pi].thickness + mPoints[pi + 2].thickness) / 2.f;
 		}
 	}
@@ -57,7 +57,7 @@ void Stroke::compress(halnf factor) {
 
 	List<StrokePoint> passed_poits;
 
-	for (auto idx : IterRange(mPoints.size())) {
+	for (auto idx : Range(mPoints.size())) {
 		passed_poits.pushBack(mPoints[idx]);
 	}
 
@@ -100,14 +100,14 @@ void Stroke::subdiv(halnf precision, const Camera* cam, halni passes) {
 	}
 
 	List<StrokePoint> new_points;
-	for (auto idx : IterRange(mPoints.size())) {
+	for (auto idx : Range(mPoints.size())) {
 		new_points.pushBack(mPoints[idx]);
 	}
 
 	auto viewmat = cam->calculateViewMatrix();
 	auto projmat = cam->calculateProjectionMatrix();
 
-	for (auto i : IterRange(passes)) {
+	for (auto i : Range(passes)) {
 
 		auto n_points = new_points.length();
 
@@ -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;
+		virtual void sample(Project* proj, Vec2F crs, halnf pressure) override;
-		void sample(Project* proj, Vec2F crs, halnf pressure) override;
+		virtual void draw(Renderer* render, const Camera* camera) override;
-		void draw(Renderer* render, const Camera* camera) override;
 
 	private:
 		void ensureReady(Stroke* stroke, const Camera* cam, bool debug = false) const;