kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-12 15:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding graphics support class, refactoring the code

Browse Source
This commit is contained in:
kbz_8
2023-04-02 17:37:38 +02:00
parent 7eea6ea1d5
commit aaf7e861d5
14 changed files with 318 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/platform/window.cpp
View File

@@ -6,80 +6,24 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 17:36:44 by maldavid #+# #+# */
/* Updated: 2023/04/01 17:50:22 by maldavid ### ########.fr */
/* Updated: 2023/04/02 15:39:59 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
#include "window.h"
#include <platform/window.h>
#include <core/errors.h>
#include <glm/glm.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <iostream>
#include <cstring>
namespace mlx
{
MLX_Window::MLX_Window(std::size_t w, std::size_t h, std::string title, int id) : _id(id), _renderer(new Renderer), _width(w), _height(h)
MLX_Window::MLX_Window(std::size_t w, std::size_t h, std::string title) : _width(w), _height(h)
{
_win = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN);
if(!_win)
core::error::report(e_kind::fatal_error, std::string("unable to open a new window, ") + SDL_GetError());
_renderer->setWindow(this);
_renderer->init();
_renderer->getPixelPutPipeline().init(w, h, *_renderer);
}
bool MLX_Window::beginFrame()
{
if(!_renderer->beginFrame())
return false;
_proj = glm::ortho<float>(0, _width, 0, _height);
_renderer->getUniformBuffer()->setData(sizeof(_proj), &_proj);
return true;
}
void MLX_Window::pixel_put(int x, int y, int color)
{
_renderer->getPixelPutPipeline().setPixel(x, y, color);
}
void MLX_Window::texture_put(std::shared_ptr<Texture> texture, int x, int y)
{
if(texture->getSet() == VK_NULL_HANDLE)
texture->setDescriptor(_renderer->getFragDescriptorSet().duplicate());
texture->updateSet(0);
std::vector<VkDescriptorSet> sets;
sets.push_back(_renderer->getVertDescriptorSet().get());
sets.push_back(texture->getSet());
vkCmdBindDescriptorSets(_renderer->getActiveCmdBuffer().get(), VK_PIPELINE_BIND_POINT_GRAPHICS, _renderer->getPipeline().getPipelineLayout(), 0, sets.size(), sets.data(), 0, nullptr);
texture->render(*_renderer, x, y);
}
void MLX_Window::clear()
{
_renderer->getPixelPutPipeline().clear();
}
void MLX_Window::endFrame()
{
auto cmd_buff = _renderer->getActiveCmdBuffer().get();
_renderer->getPixelPutPipeline().present();
std::vector<VkDescriptorSet> sets;
sets.push_back(_renderer->getVertDescriptorSet().get());
sets.push_back(_renderer->getPixelPutPipeline().getDescriptorSet());
vkCmdBindDescriptorSets(cmd_buff, VK_PIPELINE_BIND_POINT_GRAPHICS, _renderer->getPipeline().getPipelineLayout(), 0, sets.size(), sets.data(), 0, nullptr);
_renderer->getPixelPutPipeline().render(*_renderer);
_renderer->endFrame();
}
MLX_Window::~MLX_Window()
{
_renderer->destroy();
if(_win)
SDL_DestroyWindow(_win);
}

21
src/platform/window.h
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 21:53:12 by maldavid #+# #+# */
/* Updated: 2023/04/01 17:26:18 by maldavid ### ########.fr */
/* Updated: 2023/04/02 15:39:53 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
@@ -15,37 +15,24 @@
#include <SDL2/SDL.h>
#include <string>
#include <memory>
#include <renderer/renderer.h>
#include <renderer/images/texture.h>
#include <renderer/buffers/vk_buffer.h>
namespace mlx
{
class MLX_Window
{
public:
MLX_Window(std::size_t w, std::size_t h, std::string title, int id);
MLX_Window(std::size_t w, std::size_t h, std::string title);
inline int& get_id() noexcept { return _id; }
inline SDL_Window* getNativeWindow() const noexcept { return _win; }
inline int getWidth() const noexcept { return _width; }
inline int getHeight() const noexcept { return _height; }
bool beginFrame();
void clear();
void endFrame();
void pixel_put(int x, int y, int color);
void texture_put(std::shared_ptr<Texture> texture, int x, int y);
~MLX_Window();
private:
glm::mat4 _proj = glm::mat4(1.0);
std::unique_ptr<Renderer> _renderer;
SDL_Window* _win = nullptr;
int _width = 0;
int _height = 0;
int _id;
};
}