feat: engine class impl + IApplication interface

This commit is contained in:
2025-10-05 16:27:58 +02:00
parent 9d56515fe5
commit 431d723afc
10 changed files with 318 additions and 263 deletions

View File

@ -1,195 +1,47 @@
#include "renderer/engine.h"
#include <memory>
#ifdef WIN32
#include <corecrt_math_defines.h>
#endif
#include <GL/glew.h>
#include <glm/ext/matrix_clip_space.hpp>
#include <glm/ext/matrix_transform.hpp>
#include "renderer/engine.h"
#include "window/event.h"
#include "IO/file_manager.h"
#include "renderer/shader.h"
#include "renderer/wavefront.h"
Engine::Engine() {
m_window = std::make_unique<Window>();
m_isRunning = true;
m_projection = glm::perspective(
static_cast<float>(M_PI_2),
static_cast<float>(m_window->GetWidth()) / static_cast<float>(m_window->GetHeight()),
0.01f,
100.0f
);
std::unique_ptr<IApplication> Engine::s_app = nullptr;
std::shared_ptr<Window> Engine::s_window = nullptr;
bool Engine::s_running = false;
m_window->subscribe<WindowResized>([this](const WindowResized& e) {
HandleWindowResized(e);
void Engine::Run(std::unique_ptr<IApplication> app) {
s_app = std::move(app);
s_window = Window::GetInstance();
s_running = true;
s_app->OnInit();
s_window->Subscribe<WindowCloseRequested>([](const WindowCloseRequested& e) {
Engine::s_running = false;
});
m_window->subscribe<WindowCloseRequested>([this](const WindowCloseRequested& e) {
Stop();
s_window->Subscribe<WindowResized>([](const WindowResized& e) {
Engine::s_app->OnWindowResized(e);
});
}
bool Engine::Running() const {
return m_isRunning && m_window->IsOpen();
}
void Engine::Stop() {
m_isRunning = false;
}
void Engine::HandleWindowResized(const WindowResized& event) {
m_projection = glm::perspective(
static_cast<float>(M_PI_2),
static_cast<float>(event.w) / static_cast<float>(event.h),
0.01f,
100.0f
);
}
void Engine::Run() {
Shader simpleShader;
simpleShader.init(
FileManager::read("./src/shaders/simple.vs"),
FileManager::read("./src/shaders/simple.fs")
);
glm::vec3 cameraPosition(0.f, 0.f, 2.f);
// glm::vec3 cameraViewDirection(0.f, 0.f, -1.f);
// glm::vec3 lightPosition(1.f, 3.5f, -2.f);
glm::vec3 lightPosition(-5.f, 5.f, 5.f);
glm::mat4 model(1.f);
float angle = 3.45f;
Uint64 lastTicks = SDL_GetTicks();
Object lightSource = Object::LoadFile("./assets/cube.obj");
Object target = Object::LoadFile("./assets/monkey.obj");
bool paused = false;
float yaw = -90.0f; // looking along -Z initially
float pitch = 0.0f; // no vertical tilt
// FPS tracking
Uint64 startTicks = SDL_GetTicks();
int frameCount = 0;
while (m_isRunning) {
m_window->ProcessEvents();
Uint64 currentTicks = SDL_GetTicks();
float deltaTime = static_cast<float>(currentTicks - lastTicks) / 1000.0f; // seconds
lastTicks = currentTicks;
float mouseXRel, mouseYRel;
SDL_GetRelativeMouseState(&mouseXRel, &mouseYRel);
float sensitivity = 0.1f; // tweak as needed
yaw += mouseXRel * sensitivity;
pitch -= mouseYRel * sensitivity; // invert Y for typical FPS control
// clamp pitch to avoid flipping
// if (pitch > 89.0f) pitch = 89.0f;
// if (pitch < -89.0f) pitch = -89.0f;
pitch = glm::clamp(pitch, -89.0f, 89.0f);
// convert to direction vector
glm::vec3 cameraViewDirection(0.f, 0.f, -1.f);
cameraViewDirection.x = cos(glm::radians(yaw)) * cos(glm::radians(pitch));
cameraViewDirection.y = sin(glm::radians(pitch));
cameraViewDirection.z = sin(glm::radians(yaw)) * cos(glm::radians(pitch));
cameraViewDirection = glm::normalize(cameraViewDirection);
glm::vec3 velocity(0.f);
const bool* state = SDL_GetKeyboardState(nullptr);
if (state[SDL_SCANCODE_P]) paused = !paused;
glm::vec3 front = glm::normalize(glm::vec3(cameraViewDirection.x, 0.f, cameraViewDirection.z));
glm::vec3 right = glm::normalize(glm::cross(front, glm::vec3(0.f, 1.f, 0.f)));
if (state[SDL_SCANCODE_W]) velocity += front;
if (state[SDL_SCANCODE_S]) velocity -= front;
if (state[SDL_SCANCODE_A]) velocity -= right;
if (state[SDL_SCANCODE_D]) velocity += right;
if (state[SDL_SCANCODE_SPACE]) velocity.y += 1.f;
if (state[SDL_SCANCODE_LSHIFT]) velocity.y -= 1.f;
cameraPosition += velocity * deltaTime * 2.5f; // speed is e.g. 2.5f
glm::mat4 view = glm::lookAt(
cameraPosition,
cameraPosition + cameraViewDirection,
glm::vec3(0.f, 1.f, 0.f)
);
// update rotation
if (!paused) {
angle += glm::radians(45.0f) * deltaTime; // 72° per second
if (angle > glm::two_pi<float>()) {
angle -= glm::two_pi<float>(); // keep value small
}
}
while (s_running) {
s_window->ProcessEvents();
s_app->OnUpdate();
glClearColor(0x18/255.0f, 0x18/255.0f, 0x18/255.0f, 1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
// Triangle render
{
simpleShader.use();
s_app->OnRender();
simpleShader.setMat4("u_view", view);
simpleShader.setMat4("u_projection", m_projection);
simpleShader.setVec3("lightColor", glm::vec3(1.0f, 1.0f, 1.0f));
simpleShader.setVec3("lightPos", lightPosition);
simpleShader.setVec3("viewPos", cameraPosition);
model = glm::mat4(1.f);
model = glm::translate(model, lightPosition);
simpleShader.setMat4("u_model", model);
lightSource.Render(simpleShader);
// lightPosition -= glm::vec3(0.05f, 0.f, 0.f) * deltaTime;
model = glm::rotate(
glm::mat4(1.f),
angle,
glm::vec3(0.f, -0.5f, 0.0f)
) * 0.5f;
simpleShader.setMat4("u_model", model);
target.Render(simpleShader);
}
m_window->SwapBuffers();
frameCount++;
currentTicks = SDL_GetTicks();
Uint64 elapsed = currentTicks - startTicks;
if (elapsed >= 1000) { // one second passed
double fps = static_cast<double>(frameCount) / (static_cast<double>(elapsed) / 1000.0);
std::cout << "FPS: " << fps << std::endl;
frameCount = 0;
startTicks = currentTicks;
}
s_window->SwapBuffers();
}
}
Engine::~Engine() {
Destroy();
}
void Engine::Destroy() const {
m_window->Destroy();
s_app->OnShutdown();
s_window->Destroy();
s_app.reset();
}

View File

@ -259,14 +259,14 @@ Mesh& Object::GetLastMesh()
return m_meshes.back();
}
Object Object::LoadFile(const std::string& filename) {
Object* Object::LoadFile(const std::string& filename) {
std::ifstream file(filename);
if (!file.is_open()) {
std::cerr << "Failed to open OBJ file: " << filename << std::endl;
return {};
}
Object obj;
Object* obj = new Object();
char line[1024]; // static buffer for each line (enough for OBJ lines)
while (file.getline(line, sizeof(line))) {
@ -284,7 +284,7 @@ Object Object::LoadFile(const std::string& filename) {
if (mtlFile) {
std::filesystem::path fullPath = filename;
std::filesystem::path mtlPath = fullPath.replace_filename(mtlFile);
obj.LoadMaterials(mtlPath);
obj->LoadMaterials(mtlPath);
}
break;
}
@ -293,11 +293,11 @@ Object Object::LoadFile(const std::string& filename) {
{
char* materialName = p.TakeWord();
if (materialName) {
auto& mesh = obj.GetLastMesh();
auto& mesh = obj->GetLastMesh();
if (mesh.materialName != materialName) {
Mesh newMesh;
newMesh.materialName = materialName;
obj.m_meshes.push_back(newMesh);
obj->m_meshes.push_back(newMesh);
}
}
break;
@ -306,7 +306,7 @@ Object Object::LoadFile(const std::string& filename) {
case ObjElement::O: // object name
{
char* name = p.TakeWord();
if (name) obj.m_name = name;
if (name) obj->m_name = name;
break;
}
@ -320,7 +320,7 @@ Object Object::LoadFile(const std::string& filename) {
if (w != 0.0f && w != 1.0f) {
x /= w; y /= w; z /= w;
}
obj.m_vertices.emplace_back(x, y, z);
obj->m_vertices.emplace_back(x, y, z);
break;
}
@ -329,7 +329,7 @@ Object Object::LoadFile(const std::string& filename) {
float x = p.TakeFloat();
float y = p.TakeFloat();
float z = p.TakeFloat();
obj.m_normals.emplace_back(x, y, z);
obj->m_normals.emplace_back(x, y, z);
break;
}
@ -337,32 +337,32 @@ Object Object::LoadFile(const std::string& filename) {
{
float u = p.TakeFloat();
float v = p.TakeFloat();
obj.m_texCoords.emplace_back(u, 1.0f - v);
obj->m_texCoords.emplace_back(u, 1.0f - v);
break;
}
case ObjElement::F: // face
{
auto& mesh = obj.GetLastMesh();
auto& mesh = obj->GetLastMesh();
int raw_vi, raw_ti, raw_ni;
while (p.TakeFaceIndices(raw_vi, raw_ti, raw_ni)) {
// Convert raw OBJ indices to 0-based / -1 sentinel
int vi = Object::NormalizeIndex(raw_vi, (int)obj.m_vertices.size());
int ti = Object::NormalizeIndex(raw_ti, (int)obj.m_texCoords.size());
int ni = Object::NormalizeIndex(raw_ni, (int)obj.m_normals.size());
int vi = Object::NormalizeIndex(raw_vi, (int)obj->m_vertices.size());
int ti = Object::NormalizeIndex(raw_ti, (int)obj->m_texCoords.size());
int ni = Object::NormalizeIndex(raw_ni, (int)obj->m_normals.size());
if (vi < 0) {
// malformed token (no vertex) — skip
continue;
}
glm::vec3 vert = obj.m_vertices[vi];
glm::vec3 vert = obj->m_vertices[vi];
glm::vec3 norm(0.0f);
glm::vec2 texCoord(0.0f);
if (ni >= 0) norm = obj.m_normals[ni];
if (ti >= 0) texCoord = obj.m_texCoords[ti];
if (ni >= 0) norm = obj->m_normals[ni];
if (ti >= 0) texCoord = obj->m_texCoords[ti];
mesh.m_vertexBuffer.emplace_back(vert, norm, texCoord);
mesh.m_indexBuffer.push_back(mesh.m_vertexBuffer.size() - 1);
@ -376,16 +376,16 @@ Object Object::LoadFile(const std::string& filename) {
}
}
std::cout << "Object name: " << obj.m_name << std::endl;
std::cout << "Vertices count: " << obj.m_vertices.size() << std::endl;
std::cout << "Normals count: " << obj.m_normals.size() << std::endl;
std::cout << "TexCoords count: " << obj.m_texCoords.size() << std::endl;
std::cout << "Meshes count: " << obj.m_meshes.size() << std::endl;
std::cout << "Materials count: " << obj.m_materials.size() << std::endl;
std::cout << "Object name: " << obj->m_name << std::endl;
std::cout << "Vertices count: " << obj->m_vertices.size() << std::endl;
std::cout << "Normals count: " << obj->m_normals.size() << std::endl;
std::cout << "TexCoords count: " << obj->m_texCoords.size() << std::endl;
std::cout << "Meshes count: " << obj->m_meshes.size() << std::endl;
std::cout << "Materials count: " << obj->m_materials.size() << std::endl;
file.close();
for (auto &mesh : obj.m_meshes) {
for (auto &mesh : obj->m_meshes) {
mesh.Upload();
}