Catcrafts/Crafter.Graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

working heightmap shader?

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-05-25 23:04:56 +02:00
commit fe15d3e8ca
15 changed files with 331 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

49
main.cpp
View file

@ -31,8 +31,8 @@ import Crafter.Event;
import Crafter.Math;
using namespace Crafter;
typedef VulkanShader<"MeshShaderXYZUV.spirv", "main", VK_SHADER_STAGE_MESH_BIT_EXT, 3, {{{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2}}}> MeshVulkanShader;
typedef VulkanShader<"FragmentShaderTexture.spirv", "main", VK_SHADER_STAGE_FRAGMENT_BIT, 1, {{{VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 0}}}> FragmentShader;
typedef VulkanShader<"MeshShaderHeightmapRGBA.spirv", "main", VK_SHADER_STAGE_MESH_BIT_EXT, 2, {{{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, {VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1}}}> MeshVulkanShader;
typedef VulkanShader<"FragmentShaderVertexColor.spirv", "main", VK_SHADER_STAGE_FRAGMENT_BIT, 0, {}> FragmentShader;
typedef VulkanPipeline<MeshVulkanShader, FragmentShader> Pipeline;
int main() {
@ -43,48 +43,35 @@ int main() {
WindowWaylandVulkan window("Crafter.Graphics", 1280, 720);
AssetLoad asset("cannon.cras");
Camera camera(1.57079633, 16 / 9, 0.01, 512);
Camera camera(1.57079633, 1280.0f / 720.0f, 0.01, 512);
camera.view = MatrixRowMajor<float, 4, 4, 1>::Translation(0, 2, -10);
camera.Update();
VkCommandBuffer cmd = window.StartInit();
std::vector<char> meshVector = asset.Load(0);
Mesh<VertexUV> mesh(meshVector.data());
MeshShader<VertexUV> meshShader(&mesh, &camera);
AssetLoad asset2("texture.cras");
std::vector<char> texvector = asset2.Load(0);
VulkanTexture<Pixel_RU8_GU8_BU8_AU8> txt = VulkanTexture<Pixel_RU8_GU8_BU8_AU8>(texvector.data(), cmd);
TextureShader texShader(&txt);
DescriptorSet<MeshVulkanShader, FragmentShader> descriptors;
EventListener<void> bruhlistener(&descriptors.onDescriptorRefresh, [&meshShader, &texShader, &camera, &descriptors](){
meshShader.WriteDescriptors(descriptors.set[0]);
texShader.WriteDescriptors(descriptors.set[1]);
});
meshShader.WriteDescriptors(descriptors.set[0]);
texShader.WriteDescriptors(descriptors.set[1]);
MeshShader<VertexUV> meshShader2(&mesh, &camera);
TextureShader texShader2(&txt);
DescriptorSet<MeshVulkanShader, FragmentShader> descriptors2;
meshShader2.WriteDescriptors(descriptors2.set[0]);
texShader2.WriteDescriptors(descriptors2.set[1]);
DescriptorSet<MeshVulkanShader, FragmentShader> descriptors;
HeightmapShader<HeightRGBA> meshShader(4, 4, 1, &camera);
for(uint32_t i = 0; i < 1*1*4*64; i++) {
meshShader.heights.value[i].height = -0.5;
meshShader.heights.value[i].r = 255;
meshShader.heights.value[i].g = 255;
meshShader.heights.value[i].b = 255;
meshShader.heights.value[i].a = 255;
}
meshShader.WriteDescriptors(descriptors.set[0]);
meshShader.Update();
meshShader2.Update();
window.FinishInit();
EventListener<VkCommandBuffer> listener(&window.onDraw, [&descriptors, &meshShader, &descriptors2, &meshShader2](VkCommandBuffer cmd){
EventListener<VkCommandBuffer> listener(&window.onDraw, [&descriptors, &meshShader](VkCommandBuffer cmd){
vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, Pipeline::pipelineLayout, 0, 2, &descriptors.set[0], 0, NULL);
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, Pipeline::pipeline);
VulkanDevice::vkCmdDrawMeshTasksEXTProc(cmd, meshShader.threadCount, 1, 1);
vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, Pipeline::pipelineLayout, 0, 2, &descriptors2.set[0], 0, NULL);
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, Pipeline::pipeline);
VulkanDevice::vkCmdDrawMeshTasksEXTProc(cmd, meshShader2.threadCount, 1, 1);
});
window.Start();
while(true) {
}
}
}