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

sandbox

Browse Source
This commit is contained in:
Nathan
2026-02-13 08:24:03 -06:00
parent ec8a9c9f4f
commit f9f311c82b
12 changed files with 569 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/extratools.h
View File

@@ -2,6 +2,10 @@
#define EXTRATOOLS_H
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <nlohmann/json.hpp>
#include <curl/curl.h>

3
include/utils/Objects/Object.h
View File

@@ -14,7 +14,8 @@ namespace Archimedes {
~Object() {};
private:
glm::mat4 worldTransform = glm::mat4(1.0f);
};
}

27
include/utils/Renderer/RenderTarget.h
View File

@@ -43,6 +43,8 @@ namespace Archimedes {
public:
VertexBuffer(const void* data, size_t size) : data(data), size(size) {
}
VertexBuffer() {}
~VertexBuffer() {}
@@ -73,6 +75,8 @@ namespace Archimedes {
public:
IndexArray(const unsigned int* indices, size_t count) : indices(indices), count(count) {
}
IndexArray() {}
~IndexArray() {}
@@ -95,7 +99,15 @@ namespace Archimedes {
FromFileBin
};
Shader(const std::string& vs, const std::string& fs, LoadType loadType) : loadType(loadType) {
Shader() {}
Shader(const std::string& vs, const std::string& fs, LoadType loadType) {
init(vs, fs, loadType);
}
~Shader() {}
void init(const std::string& vs, const std::string& fs, LoadType loadType) {
switch(loadType) {
case LoadType::FromSource:
this->vs = vs;
@@ -113,17 +125,12 @@ namespace Archimedes {
break;
}
}
~Shader() {}
std::string getVSource() const { return vs; }
std::string getFSource() const { return fs; }
unsigned int id;
private:
LoadType loadType;
std::string vs;
std::string fs;
@@ -165,6 +172,8 @@ namespace Archimedes {
}
RenderTarget() {}
~RenderTarget() {}
//private:
@@ -173,11 +182,13 @@ namespace Archimedes {
VertexArray vertexArray;
VertexLayout layout;
IndexArray indexArray;
VertexLayout layout;
Shader shader;
glm::mat4 transform = glm::mat4(1.0f);
};
}

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

@@ -26,18 +26,18 @@ namespace Archimedes {
virtual Shader createShader(const std::string& vs, const std::string& fs, const Shader::LoadType& lt) = 0;
virtual RenderTarget* createRenderTarget(
const void* data,
size_t size,
unsigned int* indices,
size_t count,
VertexLayout layout,
const std::string& vs,
const std::string& fs,
const Shader::LoadType& lt
virtual void useShader(Shader& shader) = 0;
virtual RenderTarget createRenderTarget(
VertexBuffer vb,
IndexArray ia,
VertexLayout layout,
Shader& s
) = 0;
virtual void useRenderTarget(RenderTarget& rt) = 0;
virtual void draw(const RenderTarget*) = 0;
virtual void draw(const RenderTarget&) = 0;
virtual Renderer* getRendererImpl() = 0;

136
include/utils/Renderer/RendererImpl/RendererOpenGL/RendererOpenGL.h
View File

@@ -21,15 +21,21 @@ namespace Archimedes {
RendererOpenGL() {};
~RendererOpenGL() {};
bool init() override {
return glewInit() == GLEW_OK;
bool init() override {
bool ok = glewInit() == GLEW_OK;
if(ok) {
glEnable(GL_DEPTH_TEST);
}
return ok;
};
void render() override {
glViewport(0, 0, w, h);
glClearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a);
glClear(GL_COLOR_BUFFER_BIT);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
@@ -85,31 +91,74 @@ namespace Archimedes {
return shader;
}
void useShader(Shader& shader) override {
std::string vss = shader.getVSource();
std::string fss = shader.getFSource();
const char* vsc = vss.c_str();
const char* fsc = fss.c_str();
unsigned int vertexShader = glCreateShader(GL_VERTEX_SHADER);
glShaderSource(vertexShader, 1, &vsc, NULL);
glCompileShader(vertexShader);
// check for shader compile errors
int success;
char infoLog[512];
glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &success);
if (!success)
{
glGetShaderInfoLog(vertexShader, 512, NULL, infoLog);
std::cout << "ERROR::SHADER::VERTEX::COMPILATION_FAILED\n" << infoLog << std::endl;
}
// fragment shader
unsigned int fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);
glShaderSource(fragmentShader, 1, &fsc, NULL);
glCompileShader(fragmentShader);
// check for shader compile errors
glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &success);
if (!success)
{
glGetShaderInfoLog(fragmentShader, 512, NULL, infoLog);
std::cout << "ERROR::SHADER::FRAGMENT::COMPILATION_FAILED\n" << infoLog << std::endl;
}
// link shaders
unsigned int shaderProgram = glCreateProgram();
glAttachShader(shaderProgram, vertexShader);
glAttachShader(shaderProgram, fragmentShader);
glLinkProgram(shaderProgram);
// check for linking errors
glGetProgramiv(shaderProgram, GL_LINK_STATUS, &success);
if (!success) {
glGetProgramInfoLog(shaderProgram, 512, NULL, infoLog);
std::cout << "ERROR::SHADER::PROGRAM::LINKING_FAILED\n" << infoLog << std::endl;
}
glDeleteShader(vertexShader);
glDeleteShader(fragmentShader);
shader.id = shaderProgram;
}
RenderTarget* createRenderTarget(const void* data, size_t size, unsigned int* indices, size_t count, VertexLayout layout, const std::string& vs, const std::string& fs, const Shader::LoadType& lt) override {
VertexBuffer vb(data, size);
RenderTarget createRenderTarget(VertexBuffer vb, IndexArray ia, VertexLayout layout, Shader& s) override {
auto rt = RenderTarget(vb, ia, layout, s);
IndexArray ia(indices, count);
glGenVertexArrays(1, &rt.vertexArray.id);
Shader s = createShader(vs, fs, lt);
glGenBuffers(1, &rt.vertexBuffer.id);
auto rt = new RenderTarget(vb, ia, layout, s);
glBindVertexArray(rt.vertexArray.id);
glGenVertexArrays(1, &rt->vertexArray.id);
glGenBuffers(1, &rt->vertexBuffer.id);
glBindVertexArray(rt->vertexArray.id);
glBindBuffer(GL_ARRAY_BUFFER, rt->vertexBuffer.id);
glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 6, data, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, rt.vertexBuffer.id);
glBufferData(GL_ARRAY_BUFFER, vb.getSize(), vb.getData(), GL_STATIC_DRAW);
glGenBuffers(1, &rt->indexArray.id);
glGenBuffers(1, &rt.indexArray.id);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, rt->indexArray.id);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, count * sizeof(unsigned int), indices, GL_STATIC_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, rt.indexArray.id);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, rt.indexArray.getCount() * sizeof(unsigned int), rt.indexArray.getIndicies(), GL_STATIC_DRAW);
glUseProgram(s.id);
@@ -124,13 +173,52 @@ namespace Archimedes {
return rt;
};
void draw(const RenderTarget* rt) override {
void useRenderTarget(RenderTarget& rt) override {
glGenVertexArrays(1, &rt.vertexArray.id);
glGenBuffers(1, &rt.vertexBuffer.id);
glBindVertexArray(rt.vertexArray.id);
glBindBuffer(GL_ARRAY_BUFFER, rt.vertexBuffer.id);
glBufferData(GL_ARRAY_BUFFER, rt.vertexBuffer.getSize(), rt.vertexBuffer.getData(), GL_STATIC_DRAW);
glUseProgram(rt->shader.id);
glBindVertexArray(rt->vertexArray.id);
glGenBuffers(1, &rt.indexArray.id);
glDrawElements(GL_TRIANGLES, rt->indexArray.getCount(), GL_UNSIGNED_INT, nullptr);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, rt.indexArray.id);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, rt.indexArray.getCount() * sizeof(unsigned int), rt.indexArray.getIndicies(), GL_STATIC_DRAW);
glUseProgram(rt.shader.id);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), (void*)0);
glEnableVertexAttribArray(0);
glBindVertexArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
};
void draw(const RenderTarget& rt) override {
glUseProgram(rt.shader.id);
unsigned int transformLoc = glGetUniformLocation(rt.shader.id, "model");
glUniformMatrix4fv(transformLoc, 1, GL_FALSE, glm::value_ptr(rt.transform));
unsigned int resLoc = glGetUniformLocation(rt.shader.id, "res");
glUniform2ui(resLoc, w, h);
unsigned int ccLoc = glGetUniformLocation(rt.shader.id, "clearColor");
glUniform4f(ccLoc, clearColor.r, clearColor.g, clearColor.b, clearColor.a);
glBindVertexArray(rt.vertexArray.id);
glDrawElements(GL_TRIANGLES, rt.indexArray.getCount(), GL_UNSIGNED_INT, nullptr);
glBindVertexArray(0);
}

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

@@ -39,8 +39,17 @@ namespace Archimedes {
h = this->h;
}
virtual void setSize(const int& w, const int& h) {
this->w = w;
this->h = h;
}
Renderer* getRenderer() { return renderer; }
void setRenderer(Renderer* r) { renderer = r; }
void setRenderer(Renderer* r) {
renderer = r;
renderer->w = w;
renderer->h = h;
}
virtual Window* getWindowImpl() = 0;

7
include/utils/Window/WindowImpl/WindowGLFW/WindowGLFW.h
View File

@@ -116,6 +116,13 @@ namespace Archimedes {
return glfwWindowShouldClose(window);
}
void setSize(const int& w, const int& h) override {
this->w = w;
this->h = h;
glfwSetWindowSize(window, w, h);
}
void restoreContext() override { glfwMakeContextCurrent(window); }
void getSize(int& w, int& h) override {

9
include/utils/Window/WindowImpl/WindowSDL3/WindowSDL3.h
View File

@@ -141,15 +141,6 @@ namespace Archimedes {
#ifdef RENDERER_OPENGL
void restoreContext() override { SDL_GL_MakeCurrent(window, gl_context); }
#endif
void getSize(int& w, int& h) override {
w = this->w;
h = this->h;
}
void setSize(int& w, int& h) {
this->w = w;
this->h = h;
}
SDL_Window* getWindow() { return window; }
#ifdef RENDERER_OPENGL