Blunkall-Technologies/Archimedes
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make include headers only

Browse Source
This commit is contained in:
Nathan
2025-03-31 13:49:00 -05:00
parent 22350ed54d
commit 121fba5930
11 changed files with 167 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flake.nix
View File

@@ -36,7 +36,6 @@
buildPhase = ''
clang++ \
src/example_apps/MinimalApp/MinimalApp.cpp \
include/utils/App/App.cpp \
-I src -I include \
-Wall \
-o $name
@@ -73,9 +72,6 @@
$imgui/backends/imgui_impl_glfw.cpp \
$imgui/backends/imgui_impl_opengl3.cpp \
$imgui/*.cpp \
include/utils/App/App.cpp \
include/utils/Renderer/*.cpp \
include/utils/Window/*.cpp \
-DRENDERER_OPENGL \
-DWINDOW_GLFW \
-DGUIMODULE \
@@ -107,7 +103,7 @@
buildPhase = ''
clang++ \
modules/TestMenu/src/*.cpp src/App.cpp \
modules/TestMenu/src/*.cpp \
-fpic -shared \
-I src \
-Wall \
@@ -134,7 +130,6 @@
buildPhase = ''
clang++ \
modules/Print/src/*.cpp \
include/utils/App/App.cpp \
-fpic -shared \
-I src -I include \
-Wall \
@@ -161,7 +156,6 @@
buildPhase = ''
clang++ \
modules/DependsOnPrint/src/*.cpp \
include/utils/App/App.cpp \
-fpic -shared \
-I src -I include \
-Wall \
@@ -189,7 +183,6 @@
clang++ \
modules/DependsOnPrintStatic/src/*.cpp \
modules/Print/src/*.cpp \
include/utils/App/App.cpp \
-fpic -shared \
-I src -I include -I . \
-DPRINT_STATIC \
@@ -221,9 +214,7 @@
buildPhase = ''
clang++ \
modules/Window/src/*.cpp src/App.cpp \
include/utils/Window/*.cpp \
include/utils/Renderer/*.cpp \
modules/Window/src/*.cpp \
-fpic -shared \
-I src -I include \
-DRENDERER_OPENGL \
@@ -263,9 +254,6 @@
$imgui/backends/imgui_impl_glfw.cpp \
$imgui/backends/imgui_impl_opengl3.cpp \
$imgui/*.cpp \
include/utils/App/App.cpp \
include/utils/Renderer/*.cpp \
include/utils/Window/*.cpp \
-DRENDERER_OPENGL \
-DWINDOW_GLFW \
-fpic -shared \
@@ -296,7 +284,7 @@
buildPhase = ''
clang++ \
modules/TestClay/src/*.cpp src/App.cpp \
modules/TestClay/src/*.cpp \
-fpic -shared \
-I src -I include \
-DRENDERER_OPENGL \
@@ -326,7 +314,7 @@
buildPhase = ''
clang++ \
modules/MainGUI/src/*.cpp src/App.cpp \
modules/MainGUI/src/*.cpp \
-fpic -shared \
-I src -I include \
-Wall \

124
include/utils/App/App.cpp
View File

@@ -1,124 +0,0 @@
#include "App.h"
Archimedes::App* Archimedes::App::instance = nullptr;
namespace Archimedes {
App::App() {
if(instance != nullptr) {
std::cout << "App already exists\nThere can only be one!\n";
std::abort();
}
instance = this;
}
App::~App() {
for(auto it = modules.begin(); it != modules.end(); it++) {
void* handle = (*it)->getHandle();
delete *it;
if(handle)
dlclose(handle);
it = modules.erase(it);
}
}
Module* App::dynamicLoad(std::string lib) {
void* h = dlopen(lib.c_str(), RTLD_NOW);
if(!h) {
std::cout << "could not open lib at: \"" << lib.c_str() << "\"\nError: " << dlerror() << std::endl;
return nullptr;
}
Module::create_t* create = (Module::create_t*) dlsym(h, "create");
char* err = dlerror();
if(err) {
std::cout << "error finding create function in file: " << lib << std::endl;
std::cout << "dlerror(): " << err << std::endl;
return nullptr;
}
return create(h, Get());
}
std::list<Module*>::iterator App::load(Module* m, std::list<std::string> blacklist = {}) {
if(!m) {
return modules.end();
}
void* h = m->getHandle();
for(auto it = blacklist.begin(); it != blacklist.end(); it++) {
if(*it == m->getName()) {
std::cout << "Module \"" << *it << "\" is already loaded!\n";
delete m;
if(h)
dlclose(h);
return modules.end();
}
}
blacklist.push_back(m->getName());
bool skip = false;
for(auto it = m->deps.begin(); it != m->deps.end(); it++) {
for(std::string s : blacklist) {
if(it->first == s)
skip = true;
}
if(skip) {
skip = false;
continue;
} else {
if(std::holds_alternative<std::string>(it->second))
m->depsInstances[it->first] = load(std::get<std::string>(it->second), blacklist);
else
m->depsInstances[it->first] = load(std::get<Module*>(it->second), blacklist);
}
}
modules.push_back(m);
m->setSelf(--modules.end());
modules.end()++;
/*
m->setSelf(modules.end());
modules.push_back(m);
*/
return m->self;
}
std::list<Module*>::iterator App::load(std::string modulePath, std::list<std::string> blacklist = {}) {
Module* m = dynamicLoad(modulePath);
return load(m, blacklist);
}
void App::unload(std::list<Module*>::iterator it) {
Module* m = *it;
void* h = m->getHandle();
modules.erase(m->self);
delete m;
if(h)
dlclose(h);
}
void App::stopModule(std::list<Module*>::iterator it) {
toClose.push_back(*it);
}
void App::startModule(std::string lib) {
toOpen.push_back(lib);
}
}

137
include/utils/App/App.h
View File

@@ -8,20 +8,130 @@ namespace Archimedes {
class App {
protected:
static App* instance;
public:
App() {
if(instance != nullptr) {
std::cout << "App already exists\nThere can only be one!\n";
std::abort();
}
instance = this;
}
virtual ~App() {
for(auto it = modules.begin(); it != modules.end(); it++) {
void* handle = (*it)->getHandle();
delete *it;
if(handle)
dlclose(handle);
it = modules.erase(it);
}
}
static App* Get() { return instance; }
virtual void handleArgs(const int&, char*[]) = 0;
virtual void run() = 0;
virtual void stopModule(std::list<Module*>::iterator it) { toClose.push_back(*it); }
virtual void startModule(std::string lib) { toOpen.push_back(lib); }
void end() { done = true; }
private:
bool done = false;
inline static App* instance = nullptr;
protected:
std::list<Module*> modules;
std::list<Module*> toClose;
std::list<std::string> toOpen;
Module* dynamicLoad(std::string);
virtual std::list<Module*>::iterator load(std::string, std::list<std::string>);
virtual std::list<Module*>::iterator load(Module*, std::list<std::string>);
virtual Module* dynamicLoad(std::string lib) {
virtual void unload(std::list<Module*>::iterator);
void* h = dlopen(lib.c_str(), RTLD_NOW);
if(!h) {
std::cout << "could not open lib at: \"" << lib.c_str() << "\"\nError: " << dlerror() << std::endl;
return nullptr;
}
Module::create_t* create = (Module::create_t*) dlsym(h, "create");
char* err = dlerror();
if(err) {
std::cout << "error finding create function in file: " << lib << std::endl;
std::cout << "dlerror(): " << err << std::endl;
return nullptr;
}
return create(h, Get());
}
virtual std::list<Module*>::iterator load(std::string modulePath, std::list<std::string> blacklist = {}) {
Module* m = dynamicLoad(modulePath);
return load(m, blacklist);
}
virtual std::list<Module*>::iterator load(Module* m, std::list<std::string> blacklist = {}) {
if(!m) {
return modules.end();
}
void* h = m->getHandle();
for(auto it = blacklist.begin(); it != blacklist.end(); it++) {
if(*it == m->getName()) {
std::cout << "Module \"" << *it << "\" is already loaded!\n";
delete m;
if(h)
dlclose(h);
return modules.end();
}
}
blacklist.push_back(m->getName());
bool skip = false;
for(auto it = m->deps.begin(); it != m->deps.end(); it++) {
for(std::string s : blacklist) {
if(it->first == s)
skip = true;
}
if(skip) {
skip = false;
continue;
} else {
if(std::holds_alternative<std::string>(it->second))
m->depsInstances[it->first] = load(std::get<std::string>(it->second), blacklist);
else
m->depsInstances[it->first] = load(std::get<Module*>(it->second), blacklist);
}
}
modules.push_back(m);
m->setSelf(--modules.end());
modules.end()++;
return m->self;
}
virtual void unload(std::list<Module*>::iterator it) {
Module* m = *it;
void* h = m->getHandle();
modules.erase(m->self);
delete m;
if(h)
dlclose(h);
}
virtual void printHelp() = 0;
@@ -32,21 +142,6 @@ namespace Archimedes {
return l;
}
public:
App();
virtual ~App();
static App* Get() { return instance; }
virtual void handleArgs(const int&, char*[]) = 0;
virtual void run() = 0;
virtual void stopModule(std::list<Module*>::iterator);
virtual void startModule(std::string);
void end() { done = true; }
};
}

12
include/utils/GuiModule/GuiModule.h
View File

@@ -12,19 +12,17 @@ namespace Archimedes {
typedef GuiModule* create_t(void*, App*);
GuiModule(void* h, App* a) : Module(h, a) {
window = new WindowModule(nullptr, a);
deps["WindowModule"] = window;
windowModule = new WindowModule(nullptr, a);
deps["WindowModule"] = windowModule;
}
virtual ~GuiModule() { if(window) delete window; }
virtual ~GuiModule() {}
virtual void onLoad() = 0;
virtual void run() = 0;
Window* getWindow() { return window; }
void createWindow() { window = new Window(); }
Window* getWindow() { return windowModule; }
protected:
WindowModule* window;
//Renderer* renderer;
WindowModule* windowModule;
};
}

10
include/utils/Renderer/Renderer.cpp
View File

@@ -1,10 +0,0 @@
#include "Renderer.h"
#include "pch.hpp"
namespace Archimedes {
void Renderer::render() {
r.render(rc, w, h);
}
}

6
include/utils/Renderer/Renderer.h
View File

@@ -1,7 +1,7 @@
#ifndef RENDERER_H
#define RENDERER_H
#include "pch.hpp"
#include "RendererOpenGL/RendererOpenGL.h"
namespace Archimedes {
@@ -15,7 +15,9 @@ namespace Archimedes {
void init() { r.init(); }
void render();
void render() {
r.render(rc, w, h);
}
std::list<renderCmd*>::iterator addRenderCmd(renderCmd* cmd) {

18
include/utils/Window/Window.cpp
View File

@@ -1,18 +0,0 @@
#include "Window.h"
#include "pch.hpp"
namespace Archimedes {
void Window::doFrame() {
window.pollEvents();
window.getSize(renderer.w, renderer.h);
renderer.render();
window.doFrame();
}
}

17
include/utils/Window/Window.h
View File

@@ -15,13 +15,24 @@ namespace Archimedes {
bool shouldClose() { return window.shouldClose(); }
void doFrame();
void doFrame() {
window.pollEvents();
window.getSize(renderer->w, renderer->h);
renderer->render();
window.doFrame();
}
Renderer* getRenderer() { return renderer; }
void setRenderer(Renderer* r) { renderer = r; }
Renderer& getRenderer() { return renderer; }
WindowImpl& getWindowImpl() { return window; }
private:
Renderer renderer;
Renderer* renderer;
WindowImpl window;
};

8
modules/WindowModule/src/WindowModule.cpp
View File

@@ -7,11 +7,18 @@ WindowModule::WindowModule(void* h, Archimedes::App* a) : Module(h, a) {
WindowModule::~WindowModule() {
if(window)
delete window;
if(renderer)
delete renderer;
}
void WindowModule::onLoad() {
window = new Archimedes::Window();
renderer = new Archimedes::Renderer();
window->setRenderer(renderer);
renderer->init();
}
void WindowModule::run() {
@@ -22,3 +29,4 @@ void WindowModule::run() {
window->doFrame();
}

12
modules/WindowModule/src/WindowModule.h
View File

@@ -13,9 +13,21 @@ class WindowModule : public Archimedes::Module {
void onLoad();
//interface for other modules
std::list<Archimedes::Renderer::renderCmd*>::iterator addRenderCmd(Archimedes::Renderer::renderCmd* cmd) {
renderer->addRenderCmd(cmd);
}
void removeRenderCmd(std::list<Archimedes::Renderer::renderCmd*>::iterator cmd) {
renderer->removeRenderCmd(cmd);
}
auto getWindowImpl() { return window->getWindowImpl(); }
private:
Archimedes::Window* window;
Archimedes::Renderer* renderer;
};

18
modules/examples/GuiModules/TestImgui/src/TestImgui.cpp
View File

@@ -12,7 +12,7 @@ TestImgui::TestImgui(void* h, Archimedes::App* a) : Archimedes::GuiModule(h, a)
}
TestImgui::~TestImgui() {
window->getRenderer().removeRenderCmd(rcmd);
windowModule->removeRenderCmd(rcmd);
ImGui_ImplOpenGL3_Shutdown();
ImGui_ImplGlfw_Shutdown();
ImGui::DestroyContext();
@@ -20,10 +20,6 @@ TestImgui::~TestImgui() {
void TestImgui::onLoad() {
createWindow();
window->getRenderer().init();
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
@@ -38,10 +34,10 @@ void TestImgui::onLoad() {
//ImGui::StyleColorsLight();
// Setup Platform/Renderer backends
ImGui_ImplGlfw_InitForOpenGL(window->getWindowImpl().getWindow(), true);
ImGui_ImplOpenGL3_Init("#version 130");
ImGui_ImplGlfw_InitForOpenGL(windowModule->getWindowImpl().getWindow(), true);
ImGui_ImplOpenGL3_Init("#version 330");
rcmd = window->getRenderer().addRenderCmd([](){
rcmd = windowModule->addRenderCmd([](){
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
/*if (ImGui::GetIO().ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
@@ -51,7 +47,6 @@ void TestImgui::onLoad() {
}*/
});
//cmdlist.push_back(it);
}
void TestImgui::run() {
@@ -66,9 +61,4 @@ void TestImgui::run() {
ImGui::Render();
if(window->shouldClose())
app->end();
window->doFrame();
}