portersky/cuber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: split into static libraries and restructure scenes

Browse Source 
- Create cbt_opengl static library for OpenGL abstraction
- Create cbt_scene static library for base scene class
- Create scenes_cube static library for cube scene
- Move scene base to cbt/ (utility), scenes to root scenes/
- Link libraries in dependency chain: cuber -> scenes -> cbt_scene -> cbt_opengl
This commit is contained in:
portersky
2026-05-05 22:27:19 +02:00
parent 30ddaf7d39
commit e71c4d55cf
6 changed files with 252 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cuber.cpp
+9 -126
View File
@@ -2,18 +2,11 @@
#include "GLFW/glfw3.h"
#include "cbt/opengl/context.hpp"
#include "cbt/opengl/shader.hpp"
#include "cbt/opengl/buffer.hpp"
#include "cbt/opengl/vao.hpp"
#include "scenes/cube.hpp"
#include <chrono>
#include <csignal>
#include <asio.hpp>
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include "glad/glad.h"
auto main(int, char const*[]) -> int {
auto ctx = cbt::opengl::context("cuber", 1280, 720);
@@ -22,106 +15,11 @@ auto main(int, char const*[]) -> int {
return 1;
}
// compile shader
auto prog = cbt::opengl::shader();
char const* vert_src = R"glsl(
#version 410 core
layout(location = 0) in vec3 a_pos;
layout(location = 1) in vec3 a_color;
uniform mat4 u_model;
uniform mat4 u_view;
uniform mat4 u_proj;
out vec3 v_color;
void main() {
gl_Position = u_proj * u_view * u_model * vec4(a_pos, 1.0);
v_color = a_color;
}
)glsl";
char const* frag_src = R"glsl(
#version 410 core
in vec3 v_color;
out vec4 frag_color;
void main() {
frag_color = vec4(v_color, 1.0);
}
)glsl";
if (!prog.compile_vertex(vert_src) || !prog.compile_fragment(frag_src) || !prog.link()) {
auto scn = cbt::scenes::cube();
if (!scn.init()) {
return 1;
}
// cube vertices: 6 faces, 2 triangles per face, 3 verts each = 36 vertices
// each vertex: x, y, z, r, g, b
std::array<float, 36 * 6> vertices = {
// front face (cyan)
0.5f, -0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
0.5f, -0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 1.0f,
// back face (magenta)
0.5f, -0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
0.5f, -0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 0.0f, 1.0f,
// top face (yellow)
0.5f, 0.5f, 0.5f, 1.0f, 1.0f, 0.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 1.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f, 0.0f,
// bottom face (white)
0.5f, -0.5f, -0.5f, 1.0f, 1.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 1.0f, 1.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 1.0f, 1.0f, 1.0f,
0.5f, -0.5f, -0.5f, 1.0f, 1.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 1.0f, 1.0f, 1.0f,
0.5f, -0.5f, 0.5f, 1.0f, 1.0f, 1.0f,
// right face (lime)
0.5f, -0.5f, -0.5f, 0.0f, 1.0f, 0.0f,
0.5f, -0.5f, 0.5f, 0.0f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 0.0f,
0.5f, -0.5f, -0.5f, 0.0f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 0.0f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 0.0f, 1.0f, 0.0f,
// left face (orange)
-0.5f, -0.5f, -0.5f, 1.0f, 0.5f, 0.0f,
-0.5f, -0.5f, 0.5f, 1.0f, 0.5f, 0.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 0.5f, 0.0f,
-0.5f, -0.5f, -0.5f, 1.0f, 0.5f, 0.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 0.5f, 0.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 0.5f, 0.0f,
};
auto vbo = cbt::opengl::buffer(cbt::opengl::buffer_type::vertex);
vbo.upload(vertices.data(), vertices.size() * sizeof(float));
// bind VAO and configure vertex attributes
auto vao = cbt::opengl::vao();
vao.bind();
vbo.bind();
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float), nullptr);
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float),
reinterpret_cast<void*>(3 * sizeof(float)));
vbo.unbind();
vao.unbind();
// enable depth testing
glEnable(GL_DEPTH_TEST);
// signal handling
asio::io_context io;
asio::signal_set signals(io, SIGINT, SIGTERM);
@@ -137,7 +35,7 @@ auto main(int, char const*[]) -> int {
};
// render loop
auto start = std::chrono::steady_clock::now();
auto prev = std::chrono::steady_clock::now();
while (!ctx.should_close()) {
process_signals();
@@ -147,26 +45,11 @@ auto main(int, char const*[]) -> int {
}
auto now = std::chrono::steady_clock::now();
auto elapsed = std::chrono::duration<float>(now - start).count();
auto dt = std::chrono::duration<float>(now - prev).count();
prev = now;
glClearColor(0.15f, 0.15f, 0.2f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// compute MVP matrices
auto aspect = 1280.0f / 720.0f;
auto proj = glm::perspective(glm::radians(45.0f), aspect, 0.1f, 100.0f);
auto view = glm::translate(glm::mat4{1.0f}, glm::vec3{0.0f, 0.0f, -3.0f});
auto model = glm::rotate(glm::mat4{1.0f}, elapsed, glm::vec3{1.0f, 0.5f, 0.3f});
prog.use();
glUniformMatrix4fv(glGetUniformLocation(prog.id(), "u_proj"), 1, GL_FALSE, glm::value_ptr(proj));
glUniformMatrix4fv(glGetUniformLocation(prog.id(), "u_view"), 1, GL_FALSE, glm::value_ptr(view));
glUniformMatrix4fv(glGetUniformLocation(prog.id(), "u_model"), 1, GL_FALSE, glm::value_ptr(model));
vao.bind();
glDrawArrays(GL_TRIANGLES, 0, 36);
vao.unbind();
prog.unuse();
scn.update(dt);
scn.render();
ctx.swap_buffers();
ctx.poll_events();