kbz_8/42_vox
1
0
Fork 0
mirror of https://github.com/Kbz-8/42_vox.git synced 2026-01-11 06:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding loading screen

Browse Source
This commit is contained in:
kbz_8
2025-06-03 07:52:42 +02:00
parent f26ad5855d
commit 5910541b5c
5 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ScopEngine/Assets/Shaders/2DVertex.nzsl
View File

@@ -23,8 +23,8 @@ struct ViewerData
struct SpriteData
{
model_matrix: mat4[f32],
color: vec4[f32],
position: vec2[f32]
}
external
@@ -36,10 +36,11 @@ external
[entry(vert)]
fn main(input: VertIn) -> VertOut
{
let position: vec4[f32] = vec4[f32](input.pos.xy, 0.0, 1.0);
input.uv.x *= -1.0;
let output: VertOut;
output.uv = input.uv;
output.color = model.color;
output.pos = viewer_data.projection_matrix * vec4[f32](input.pos.xy + model.position, 0.0, 1.0);
output.pos = viewer_data.projection_matrix * model.model_matrix * position;
return output;
}

20
ScopEngine/Runtime/Sources/Renderer/RenderPasses/2DPass.cpp
View File

@@ -10,8 +10,8 @@ namespace Scop
{
struct SpriteData
{
Mat4f model_matrix;
Vec4f color;
Vec2f position;
};
struct ViewerData2D
@@ -88,8 +88,15 @@ namespace Scop
for(const auto& [_, sprite] : scene.GetSprites())
{
SpriteData sprite_data;
sprite_data.position = Vec2f{ static_cast<float>(sprite.GetPosition().x), static_cast<float>(sprite.GetPosition().y) };
sprite_data.color = sprite.GetColor();
Mat4f translation_matrix = Mat4f::Identity().ApplyTranslation(Vec3f{ Vec2f(sprite.GetPosition()), 0.0f });
Mat4f scale_matrix = Mat4f::Identity().ApplyScale(Vec3f{ sprite.GetScale(), 1.0f });
sprite_data.model_matrix = Mat4f::Identity();
sprite_data.model_matrix.ConcatenateTransform(scale_matrix);
sprite_data.model_matrix.ConcatenateTransform(translation_matrix);
if(!sprite.IsSetInit())
const_cast<Sprite&>(sprite).UpdateDescriptorSet(p_texture_set);
const_cast<Sprite&>(sprite).Bind(frame_index, cmd);
@@ -101,8 +108,15 @@ namespace Scop
for(const auto& [_, text] : scene.GetTexts())
{
SpriteData sprite_data;
sprite_data.position = Vec2f{ static_cast<float>(text.GetPosition().x), static_cast<float>(text.GetPosition().y) };
sprite_data.color = text.GetColor();
Mat4f translation_matrix = Mat4f::Identity().ApplyTranslation(Vec3f{ Vec2f(text.GetPosition()), 0.0f });
Mat4f scale_matrix = Mat4f::Identity().ApplyScale(Vec3f{ text.GetScale(), 1.0f });
sprite_data.model_matrix = Mat4f::Identity();
sprite_data.model_matrix.ConcatenateTransform(scale_matrix);
sprite_data.model_matrix.ConcatenateTransform(translation_matrix);
if(!text.IsSetInit())
const_cast<Text&>(text).UpdateDescriptorSet(p_texture_set);
const_cast<Text&>(text).Bind(frame_index, cmd);