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 uniform buffers and projection matrix management in vertex shader

Browse Source
This commit is contained in:
kbz_8
2023-01-24 17:27:55 +01:00
parent 006d665ce2
commit b66476ef4f
6 changed files with 73 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/platform/window.cpp
View File

@@ -6,7 +6,7 @@
/* By: maldavid <kbz_8.dev@akel-engine.com> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/04 17:36:44 by maldavid #+# #+# */
/* Updated: 2023/01/22 18:53:41 by maldavid ### ########.fr */
/* Updated: 2023/01/24 17:21:40 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
@@ -20,8 +20,6 @@
namespace mlx
{
static glm::mat4 proj = glm::mat4(1.0);
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)
{
_win = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, w, h, SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN);
@@ -30,8 +28,6 @@ namespace mlx
_renderer->setWindow(this);
_renderer->init();
_vbo.create(sizeof(Vertex));
proj = glm::ortho<float>(0, _width, 0, _height);
}
bool MLX_Window::beginFrame()
@@ -39,17 +35,16 @@ namespace mlx
bool success = _renderer->beginFrame();
if(success)
_vbo.bind(*_renderer);
_proj = glm::ortho<float>(0, _width, 0, _height);
_renderer->getUniformBuffer()->setData(sizeof(_proj), &_proj);
vkCmdBindDescriptorSets(_renderer->getActiveCmdBuffer().get(), VK_PIPELINE_BIND_POINT_GRAPHICS, _renderer->getPipeline().getPipelineLayout(), 0, 1, &_renderer->getDescriptorSet().get(), 0, nullptr);
return success;
}
void MLX_Window::pixel_put(int x, int y, int color)
{
Vertex vert;
float xf = glm::vec4(glm::vec4((float)x, (float)y, 0.0, 0.0) * proj).x;
float yf = glm::vec4(glm::vec4((float)x, (float)y, 0.0, 0.0) * proj).y;
std::cout << xf << " " << yf << " " << std::endl;
vert.pos = glm::vec2(xf, yf);
vert.pos = glm::vec2(x, y);
vert.color.r = (color >> 16) & 0xFF;
vert.color.g = (color >> 8) & 0xFF;
vert.color.b = color & 0xFF;

3
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: 2022/12/19 14:43:19 by maldavid ### ########.fr */
/* Updated: 2023/01/24 17:15:09 by maldavid ### ########.fr */
/* */
/* ************************************************************************** */
@@ -38,6 +38,7 @@ namespace mlx
private:
std::unique_ptr<Renderer> _renderer;
glm::mat4 _proj = glm::mat4(1.0);
VBO _vbo;
SDL_Window* _win = nullptr;
int _width = 0;