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

triangle?

Browse Source
This commit is contained in:
Nathan
2026-02-10 23:51:27 -06:00
parent 1f22a661cd
commit 0244f463c4
11 changed files with 83 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ namespace Archimedes {
const Shader::LoadType& lt const Shader::LoadType& lt
) = 0; ) = 0;
virtual void draw(const RenderTarget&) = 0; virtual void draw(const RenderTarget*) = 0;
virtual Renderer* getRendererImpl() = 0; virtual Renderer* getRendererImpl() = 0;

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

@@ -1,6 +1,7 @@
#ifdef RENDERER_OPENGL #ifdef RENDERER_OPENGL
#undef RENDERER_OPENGL #ifndef RENDERER_OPENGL_H
#define RENDERER_OPENGL_H
#include "pch.hpp" #include "pch.hpp"
@@ -82,6 +83,7 @@ namespace Archimedes {
shader.id = shaderProgram; shader.id = shaderProgram;
std::cout << "createShader success!\n";
return shader; return shader;
} }
@@ -102,32 +104,42 @@ namespace Archimedes {
glBindVertexArray(rt->vertexArray.id); glBindVertexArray(rt->vertexArray.id);
glBindBuffer(GL_ARRAY_BUFFER, rt->vertexBuffer.id); glBindBuffer(GL_ARRAY_BUFFER, rt->vertexBuffer.id);
glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 6, data, GL_STATIC_DRAW);
glGenBuffers(1, &rt->indexArray.id); glGenBuffers(1, &rt->indexArray.id);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, rt->indexArray.id); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, rt->indexArray.id);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, count * sizeof(unsigned int), indices, GL_STATIC_DRAW);
glUseProgram(s.id);
glVertexAttribPointer(rt->vertexArray.id, count, GL_FLOAT, GL_FALSE, count * sizeof(float), (void*)0);
glEnableVertexAttribArray(rt->vertexArray.id);
glBindBuffer(GL_ARRAY_BUFFER, 0); glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0);
glEnableVertexAttribArray(0);
glBindVertexArray(0); glBindVertexArray(0);
glBindBuffer(GL_ARRAY_BUFFER, 0);
std::cout << "createRenderTarget success!\n";
return rt; return rt;
}; };
void draw(const RenderTarget& rt) override { void draw(const RenderTarget* rt) override {
glUseProgram(rt.shader.id); /*std::cout << "\nNow Rendering:\n"
<< "\nindex buffer id: " << rt.indexArray.id
<< "\nshader id: " << rt.shader.id
<< "\nvertex array id: " << rt.vertexArray.id
<< "\nvertex buffer id: " << rt.vertexBuffer.id
<< "\n" << "";*/
glBindVertexArray(rt.vertexArray.id); glUseProgram(rt->shader.id);
glDrawElements(GL_TRIANGLES, rt.indexArray.getCount(), GL_UNSIGNED_INT, 0); glBindVertexArray(rt->vertexArray.id);
glDrawElements(GL_TRIANGLES, rt->indexArray.getCount(), GL_UNSIGNED_INT, nullptr);
glBindVertexArray(0); glBindVertexArray(0);
} }
@@ -137,3 +149,4 @@ namespace Archimedes {
} }
#endif #endif
#endif

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

@@ -1,5 +1,6 @@
#ifndef RENDERER_SDL3 #ifdef RENDERER_SDL3
#define RENDERER_SDL3 #ifndef RENDERER_SDL3_H
#define RENDERER_SDL3_H
#include "pch.hpp" #include "pch.hpp"
@@ -39,3 +40,4 @@ namespace Archimedes {
} }
#endif #endif
#endif

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

@@ -18,10 +18,10 @@ namespace Archimedes {
void doFrame() { void doFrame() {
renderer->render();
swapBuffers(); swapBuffers();
renderer->render();
pollEvents(); pollEvents();
} }
@@ -32,6 +32,8 @@ namespace Archimedes {
virtual void pollEvents() = 0; virtual void pollEvents() = 0;
virtual void restoreContext() = 0;
virtual void getSize(int& w, int& h) { virtual void getSize(int& w, int& h) {
w = this->w; w = this->w;
h = this->h; h = this->h;

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

@@ -1,5 +1,6 @@
#ifdef WINDOW_GLFW #ifdef WINDOW_GLFW
#undef WINDOW_GLFW #ifndef WINDOW_GLFW_H
#define WINDOW_GLFW_H
#include "pch.hpp" #include "pch.hpp"
@@ -33,7 +34,7 @@ namespace Archimedes {
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
//glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1); glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, 1);
#endif #endif
window = glfwCreateWindow(640, 480, "Archimedes", NULL, NULL); window = glfwCreateWindow(640, 480, "Archimedes", NULL, NULL);
@@ -115,7 +116,7 @@ namespace Archimedes {
return glfwWindowShouldClose(window); return glfwWindowShouldClose(window);
} }
void restoreContext() { glfwMakeContextCurrent(window); } void restoreContext() override { glfwMakeContextCurrent(window); }
void getSize(int& w, int& h) override { void getSize(int& w, int& h) override {
glfwGetFramebufferSize(window, &w, &h); glfwGetFramebufferSize(window, &w, &h);
@@ -135,3 +136,4 @@ namespace Archimedes {
} }
#endif #endif
#endif

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

@@ -1,5 +1,6 @@
#ifdef WINDOW_SDL3 #ifdef WINDOW_SDL3
#undef WINDOW_SDL3 #ifndef WINDOW_SDL3_H
#define WINDOW_SDL3_H
#include "pch.hpp" #include "pch.hpp"
@@ -7,7 +8,7 @@
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#if RENDERER == 1 #ifdef RENDERER_OPENGL
#include <SDL3/SDL_opengl.h> #include <SDL3/SDL_opengl.h>
@@ -76,13 +77,14 @@ namespace Archimedes {
std::abort(); std::abort();
} }
#if RENDERER == 1 #ifdef RENDERER_OPENGL
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
SDL_WindowFlags window_flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN; SDL_WindowFlags window_flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN;
#elif RENDERER == 2 #endif
#ifdef RENDERER_SDL3
SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY; SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
#endif #endif
@@ -94,7 +96,7 @@ namespace Archimedes {
} }
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
#if RENDERER == 1 #ifdef RENDERER_OPENGL
gl_context = SDL_GL_CreateContext(window); gl_context = SDL_GL_CreateContext(window);
if (gl_context == nullptr) if (gl_context == nullptr)
@@ -112,7 +114,7 @@ namespace Archimedes {
} }
~WindowSDL3() { ~WindowSDL3() {
#if RENDERER == 1 #ifdef RENDERER_OPENGL
SDL_GL_DestroyContext(gl_context); SDL_GL_DestroyContext(gl_context);
#endif #endif
SDL_RemoveEventWatch(EventCallback, &data); SDL_RemoveEventWatch(EventCallback, &data);
@@ -123,7 +125,7 @@ namespace Archimedes {
bool shouldClose() override { return false; } bool shouldClose() override { return false; }
void swapBuffers() override { void swapBuffers() override {
#if RENDERER == 1 #ifdef RENDERER_OPENGL
restoreContext(); restoreContext();
SDL_GL_SwapWindow(window); SDL_GL_SwapWindow(window);
#endif #endif
@@ -136,8 +138,8 @@ namespace Archimedes {
WindowSDL3* getWindowImpl() override { return this; }; WindowSDL3* getWindowImpl() override { return this; };
#if RENDERER == 1 #ifdef RENDERER_OPENGL
void restoreContext() { SDL_GL_MakeCurrent(window, gl_context); } void restoreContext() override { SDL_GL_MakeCurrent(window, gl_context); }
#endif #endif
void getSize(int& w, int& h) override { void getSize(int& w, int& h) override {
w = this->w; w = this->w;
@@ -150,14 +152,14 @@ namespace Archimedes {
} }
SDL_Window* getWindow() { return window; } SDL_Window* getWindow() { return window; }
#if RENDERER == 1 #ifdef RENDERER_OPENGL
SDL_GLContext getContext() { return gl_context; } SDL_GLContext getContext() { return gl_context; }
#endif #endif
WindowData data; WindowData data;
private: private:
SDL_Window* window; SDL_Window* window;
#if RENDERER == 1 #ifdef RENDERER_OPENGL
SDL_GLContext gl_context; SDL_GLContext gl_context;
#endif #endif
@@ -165,3 +167,4 @@ namespace Archimedes {
} }
#endif #endif
#endif

11
modules/Archimedes-Modules/TestTriangle/TestTriangle.cpp
View File

@@ -24,6 +24,8 @@ TestTriangle::~TestTriangle() {
#endif #endif
*/ */
wm->releaseWindow(window); wm->releaseWindow(window);
delete rt;
} }
} }
@@ -32,12 +34,14 @@ void TestTriangle::onLoad() {
WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; } WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; }
if(!wm) { if(!wm) {
std::cout << "No WindowModule for ImguiModule!\n"; std::cout << "No WindowModule TestTriangle!\n";
std::abort(); std::abort();
} }
window = wm->aquireWindow(); window = wm->aquireWindow();
window->getRenderer()->clearColor = { 0.2, 0.2, 0.4, 0.7 };
rt = window->getRenderer()->createRenderTarget( rt = window->getRenderer()->createRenderTarget(
vertices, vertices,
9 * sizeof(float), 9 * sizeof(float),
@@ -53,7 +57,10 @@ void TestTriangle::onLoad() {
void TestTriangle::run() { void TestTriangle::run() {
window->getRenderer()->draw(*rt); window->getRenderer()->render();
window->getRenderer()->draw(rt);
window->swapBuffers();
window->pollEvents();
} }

8
modules/Archimedes-Modules/TestTriangle/TestTriangle.h
View File

@@ -51,10 +51,12 @@ class TestTriangle : public Archimedes::Module {
}; };
unsigned int indices[3] = { unsigned int indices[3] = {
1, // left 0, // left
2, // right 1, // right
3 // top 2 // top
}; };
unsigned int vao, vbo, ibo, shaderProgram;
}; };
#ifdef TESTTRIANGLE_DYNAMIC #ifdef TESTTRIANGLE_DYNAMIC

8
modules/ImguiModule/ImguiModule.cpp
View File

@@ -15,7 +15,7 @@ ImguiModule::~ImguiModule() {
if(app) { if(app) {
WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; } WindowModule* wm; { wm = (WindowModule*) moduleInstances[WindowModule()]; }
#if WINDOW == 2 #ifdef WINDOW_SDL3
wm->removeEventFn(ecmd_it); wm->removeEventFn(ecmd_it);
#endif #endif
@@ -38,8 +38,8 @@ void ImguiModule::onLoad() {
window = wm->aquireWindow(); window = wm->aquireWindow();
#if RENDERER == 2 #ifdef RENDERER_SDL3
renderer = window->getRenderer()->getRendererImpl().renderer; renderer = window->getRenderer()->getRendererImpl()->renderer;
#endif #endif
IMGUI_CHECKVERSION(); IMGUI_CHECKVERSION();
@@ -105,7 +105,7 @@ void ImguiModule::run() {
ImGui::UpdatePlatformWindows(); ImGui::UpdatePlatformWindows();
ImGui::RenderPlatformWindowsDefault(); ImGui::RenderPlatformWindowsDefault();
window->getWindowImpl().restoreContext(); window->getWindowImpl()->restoreContext();
} }
}; };

16
modules/ImguiModule/ImguiModule.h
View File

@@ -6,22 +6,24 @@
#include "modules/WindowModule/WindowModule.h" #include "modules/WindowModule/WindowModule.h"
#if RENDERER == 1 #ifdef RENDERER_OPENGL
#include "backends/imgui_impl_opengl3.h" #include "backends/imgui_impl_opengl3.h"
#elif RENDERER == 2 #endif
#ifdef RENDERER_SDL3
#include "backends/imgui_impl_sdlrenderer3.h" #include "backends/imgui_impl_sdlrenderer3.h"
#endif #endif
#if WINDOW == 1 #ifdef WINDOW_GLFW
#include "backends/imgui_impl_glfw.h" #include "backends/imgui_impl_glfw.h"
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#elif WINDOW == 2 #endif
#ifdef WINDOW_SDL3
#include "backends/imgui_impl_sdl3.h" #include "backends/imgui_impl_sdl3.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
@@ -68,14 +70,14 @@ class ImguiModule : public Archimedes::Module {
std::list<std::function<void(Archimedes::Event*)>>::iterator ecmd_it; std::list<std::function<void(Archimedes::Event*)>>::iterator ecmd_it;
#if RENDERER == 1 #ifdef RENDERER_OPENGL
auto rendererInit() { return ImGui_ImplOpenGL3_Init("#version 330"); } auto rendererInit() { return ImGui_ImplOpenGL3_Init("#version 330"); }
void rendererShutdown() { ImGui_ImplOpenGL3_Shutdown(); } void rendererShutdown() { ImGui_ImplOpenGL3_Shutdown(); }
void rendererNewFrame() { ImGui_ImplOpenGL3_NewFrame(); } void rendererNewFrame() { ImGui_ImplOpenGL3_NewFrame(); }
void rendererRenderDrawData() { ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); } void rendererRenderDrawData() { ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); }
#endif
#elif RENDERER == 2 #ifdef RENDERER_SDL3
SDL_Renderer* renderer; SDL_Renderer* renderer;
auto rendererInit() { return ImGui_ImplSDLRenderer3_Init(renderer); } auto rendererInit() { return ImGui_ImplSDLRenderer3_Init(renderer); }
void rendererShutdown() { ImGui_ImplSDLRenderer3_Shutdown(); } void rendererShutdown() { ImGui_ImplSDLRenderer3_Shutdown(); }

7
modules/WindowModule/WindowModule.cpp
View File

@@ -42,11 +42,12 @@ void WindowModule::onLoad() {
void WindowModule::run() { void WindowModule::run() {
if(window) if(window) {
window->doFrame(); //window->doFrame();
else } else {
app->emitEvent(new Archimedes::DoUnloadModuleEvent(name)); app->emitEvent(new Archimedes::DoUnloadModuleEvent(name));
} }
}
bool WindowModule::onEvent(const Archimedes::Event& e) { bool WindowModule::onEvent(const Archimedes::Event& e) {