Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix shader_material_glsl example #9513

Merged
merged 1 commit into from
Aug 21, 2023
Merged

fix shader_material_glsl example #9513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions assets/shaders/custom_material.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ layout(set = 0, binding = 0) uniform CameraViewProj {
};

struct Mesh {
mat4 Model;
mat3x4 Model;
mat4 InverseTransposeModel;
uint flags;
};
Expand All @@ -30,9 +30,18 @@ layout(set = 2, binding = 0) readonly buffer _Meshes {
};
#endif // PER_OBJECT_BUFFER_BATCH_SIZE

mat4 affine_to_square(mat3x4 affine) {
return transpose(mat4(
affine[0],
affine[1],
affine[2],
vec4(0.0, 0.0, 0.0, 1.0)
));
}

void main() {
v_Uv = Vertex_Uv;
gl_Position = ViewProj
* Meshes[gl_InstanceIndex].Model
* affine_to_square(Meshes[gl_InstanceIndex].Model)
* vec4(Vertex_Position, 1.0);
}