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

fixing transformations

Browse Source
This commit is contained in:
kbz_8
2025-01-07 19:57:03 +01:00
parent b432e3e2e1
commit deb6c20361
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/Sources/Core/Graphics.cpp
View File

@@ -143,7 +143,7 @@ namespace mlx
m_pixelput_called = false; m_pixelput_called = false;
} }
Sprite& new_sprite = p_scene->CreateSprite(texture); Sprite& new_sprite = p_scene->CreateSprite(texture);
new_sprite.SetCenter(Vec2f{ texture->GetWidth() / 2.0f, texture->GetHeight() / 2.0f }); new_sprite.SetCenter(Vec2f{ texture->GetWidth() * 0.5f, texture->GetHeight() * 0.5f });
new_sprite.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) }); new_sprite.SetPosition(Vec2f{ static_cast<float>(x), static_cast<float>(y) });
new_sprite.SetScale(Vec2f{ scale_x, scale_y }); new_sprite.SetScale(Vec2f{ scale_x, scale_y });
new_sprite.SetRotation(angle); new_sprite.SetRotation(angle);

18
runtime/Sources/Renderer/RenderPasses/2DPass.cpp
View File

@@ -100,9 +100,9 @@ namespace mlx
for(auto& drawable : drawables) for(auto& drawable : drawables)
{ {
// Check every textures and update modified ones to GPU before starting the render pass // Check every textures and update modified ones to GPU before starting the render pass
drawable->Update(cmd);
if(!drawable->IsSetInit()) if(!drawable->IsSetInit())
drawable->UpdateDescriptorSet(p_texture_set); drawable->UpdateDescriptorSet(p_texture_set);
drawable->Update(cmd);
} }
m_pipeline.BindPipeline(cmd, 0, {}); m_pipeline.BindPipeline(cmd, 0, {});
@@ -110,11 +110,19 @@ namespace mlx
{ {
DrawableData drawable_data; DrawableData drawable_data;
drawable_data.color = drawable->GetColor(); drawable_data.color = drawable->GetColor();
Mat4f rotation_matrix = Mat4f::Identity();
rotation_matrix.ApplyTranslation(Vec3f{ -drawable->GetCenter(), 0.0f });
rotation_matrix.ApplyRotation(drawable->GetRotation());
rotation_matrix.ApplyTranslation(Vec3f{ drawable->GetCenter(), 0.0f });
Mat4f translation_matrix = Mat4f::Identity().ApplyTranslation(Vec3f{ drawable->GetPosition(), 0.0f });
Mat4f scale_matrix = Mat4f::Identity().ApplyScale(Vec3f{ drawable->GetScale(), 1.0f });
drawable_data.model_matrix = Mat4f::Identity(); drawable_data.model_matrix = Mat4f::Identity();
drawable_data.model_matrix.ApplyTranslation(Vec3f{ -drawable->GetCenter() / 2.0f, 0.0f }); drawable_data.model_matrix.ConcatenateTransform(rotation_matrix);
drawable_data.model_matrix.ApplyRotation(drawable->GetRotation()); drawable_data.model_matrix.ConcatenateTransform(scale_matrix);
drawable_data.model_matrix.ApplyTranslation(Vec3f{ drawable->GetPosition() + drawable->GetCenter() / 2.0f, 0.0f }); drawable_data.model_matrix.ConcatenateTransform(translation_matrix);
drawable_data.model_matrix.ApplyScale(Vec3f{ drawable->GetScale(), 1.0f });
drawable->Bind(frame_index, cmd); drawable->Bind(frame_index, cmd);