Skip to content
Snippets Groups Projects
Verified Commit 3428a701 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Implemented updating of particle positions 


Signed-off-by: default avatarTobias Frisch <tfrisch@uni-koblenz.de>
parent 505dc8b4
Branches
Tags
1 merge request!103Added project wobble_bobble and refactored some parts of the framework
Hide whitespace changes
Inline Side-by-side
projects/wobble_bobble/shaders/update_particle_positions.comp
+ 17
− 0
View file @ 3428a701
#version 450 #version 450
#extension GL_GOOGLE_include_directive : enable
layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
#include "particle.inc"
layout(set=0, binding=0, std430) buffer particleBuffer {
Particle particles [];
};
layout( push_constant ) uniform constants {
float t;
float dt;
};
void main() { void main() {
if (gl_GlobalInvocationID.x < particles.length()) {
vec3 position = particles[gl_GlobalInvocationID.x].minimal.position;
position = position + particles[gl_GlobalInvocationID.x].minimal.velocity * dt;
particles[gl_GlobalInvocationID.x].minimal.position = position;
}
} }
\ No newline at end of file
projects/wobble_bobble/src/main.cpp
+ 70
− 46
View file @ 3428a701
...@@ -35,7 +35,7 @@ void distributeParticles(Particle *particles, size_t count, const glm::vec3& cen ...@@ -35,7 +35,7 @@ void distributeParticles(Particle *particles, size_t count, const glm::vec3& cen
particles[i].position = center + offset; particles[i].position = center + offset;
particles[i].size = size; particles[i].size = size;
particles[i].velocity = glm::vec3(0.0f); particles[i].velocity = glm::vec3(0.1f);
volume += size; volume += size;
} }
...@@ -47,7 +47,7 @@ void distributeParticles(Particle *particles, size_t count, const glm::vec3& cen ...@@ -47,7 +47,7 @@ void distributeParticles(Particle *particles, size_t count, const glm::vec3& cen
vkcv::ComputePipelineHandle createComputePipeline(vkcv::Core& core, vkcv::shader::GLSLCompiler& compiler, vkcv::ComputePipelineHandle createComputePipeline(vkcv::Core& core, vkcv::shader::GLSLCompiler& compiler,
const std::string& path, const std::string& path,
std::vector<vkcv::DescriptorSetLayoutHandle>& descriptorSetLayouts) { std::vector<vkcv::DescriptorSetHandle>& descriptorSets) {
vkcv::ShaderProgram shaderProgram; vkcv::ShaderProgram shaderProgram;
compiler.compile( compiler.compile(
...@@ -68,10 +68,14 @@ vkcv::ComputePipelineHandle createComputePipeline(vkcv::Core& core, vkcv::shader ...@@ -68,10 +68,14 @@ vkcv::ComputePipelineHandle createComputePipeline(vkcv::Core& core, vkcv::shader
} }
} }
std::vector<vkcv::DescriptorSetLayoutHandle> descriptorSetLayouts;
descriptorSetLayouts.resize(count); descriptorSetLayouts.resize(count);
descriptorSets.resize(count);
for (const auto& descriptor : descriptors) { for (const auto& descriptor : descriptors) {
descriptorSetLayouts[descriptor.first] = core.createDescriptorSetLayout(descriptor.second); descriptorSetLayouts[descriptor.first] = core.createDescriptorSetLayout(descriptor.second);
descriptorSets[descriptor.first] = core.createDescriptorSet(descriptorSetLayouts[descriptor.first]);
} }
vkcv::ComputePipelineConfig config { vkcv::ComputePipelineConfig config {
...@@ -154,68 +158,68 @@ int main(int argc, const char **argv) { ...@@ -154,68 +158,68 @@ int main(int argc, const char **argv) {
vkcv::shader::GLSLCompiler compiler; vkcv::shader::GLSLCompiler compiler;
std::vector<vkcv::DescriptorSetLayoutHandle> transformParticlesToGridLayouts;
std::vector<vkcv::DescriptorSetHandle> transformParticlesToGridSets; std::vector<vkcv::DescriptorSetHandle> transformParticlesToGridSets;
vkcv::ComputePipelineHandle transformParticlesToGridPipeline = createComputePipeline( vkcv::ComputePipelineHandle transformParticlesToGridPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/transform_particles_to_grid.comp", "shaders/transform_particles_to_grid.comp",
transformParticlesToGridLayouts transformParticlesToGridSets
); );
transformParticlesToGridSets.resize(transformParticlesToGridLayouts.size()); {
vkcv::DescriptorWrites writes;
for (size_t i = 0; i < transformParticlesToGridSets.size(); i++) { writes.storageBufferWrites.push_back(vkcv::BufferDescriptorWrite(0, particles.getHandle()));
transformParticlesToGridSets[i] = core.createDescriptorSet(transformParticlesToGridLayouts[i]); writes.storageImageWrites.push_back(vkcv::StorageImageDescriptorWrite(1, grid.getHandle()));
core.writeDescriptorSet(transformParticlesToGridSets[0], writes);
} }
vkcv::DescriptorWrites writes; std::vector<vkcv::DescriptorSetHandle> initParticleVolumesSets;
writes.storageBufferWrites.push_back(vkcv::BufferDescriptorWrite(0, particles.getHandle()));
writes.storageImageWrites.push_back(vkcv::StorageImageDescriptorWrite(1, grid.getHandle()));
core.writeDescriptorSet(transformParticlesToGridSets[0], writes);
std::vector<vkcv::DescriptorSetLayoutHandle> initParticleVolumesLayouts;
vkcv::ComputePipelineHandle initParticleVolumesPipeline = createComputePipeline( vkcv::ComputePipelineHandle initParticleVolumesPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/init_particle_volumes.comp", "shaders/init_particle_volumes.comp",
initParticleVolumesLayouts initParticleVolumesSets
); );
std::vector<vkcv::DescriptorSetLayoutHandle> updateGridForcesLayouts; std::vector<vkcv::DescriptorSetHandle> updateGridForcesSets;
vkcv::ComputePipelineHandle updateGridForcesPipeline = createComputePipeline( vkcv::ComputePipelineHandle updateGridForcesPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/update_grid_forces.comp", "shaders/update_grid_forces.comp",
updateGridForcesLayouts updateGridForcesSets
); );
std::vector<vkcv::DescriptorSetLayoutHandle> updateGridVelocitiesLayouts; std::vector<vkcv::DescriptorSetHandle> updateGridVelocitiesSets;
vkcv::ComputePipelineHandle updateGridVelocitiesPipeline = createComputePipeline( vkcv::ComputePipelineHandle updateGridVelocitiesPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/update_grid_velocities.comp", "shaders/update_grid_velocities.comp",
updateGridVelocitiesLayouts updateGridVelocitiesSets
); );
std::vector<vkcv::DescriptorSetLayoutHandle> updateParticleDeformationLayouts; std::vector<vkcv::DescriptorSetHandle> updateParticleDeformationSets;
vkcv::ComputePipelineHandle updateParticleDeformationPipeline = createComputePipeline( vkcv::ComputePipelineHandle updateParticleDeformationPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/update_particle_deformation.comp", "shaders/update_particle_deformation.comp",
updateParticleDeformationLayouts updateParticleDeformationSets
); );
std::vector<vkcv::DescriptorSetLayoutHandle> updateParticleVelocitiesLayouts; std::vector<vkcv::DescriptorSetHandle> updateParticleVelocitiesSets;
vkcv::ComputePipelineHandle updateParticleVelocitiesPipeline = createComputePipeline( vkcv::ComputePipelineHandle updateParticleVelocitiesPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/update_particle_velocities.comp", "shaders/update_particle_velocities.comp",
updateParticleVelocitiesLayouts updateParticleVelocitiesSets
); );
std::vector<vkcv::DescriptorSetLayoutHandle> updateParticlePositionsLayouts; std::vector<vkcv::DescriptorSetHandle> updateParticlePositionsSets;
vkcv::ComputePipelineHandle updateParticlePositionsPipeline = createComputePipeline( vkcv::ComputePipelineHandle updateParticlePositionsPipeline = createComputePipeline(
core, compiler, core, compiler,
"shaders/update_particle_positions.comp", "shaders/update_particle_positions.comp",
updateParticlePositionsLayouts updateParticlePositionsSets
); );
{
vkcv::DescriptorWrites writes;
writes.storageBufferWrites.push_back(vkcv::BufferDescriptorWrite(0, particles.getHandle()));
core.writeDescriptorSet(updateParticlePositionsSets[0], writes);
}
vkcv::ShaderProgram gfxProgram; vkcv::ShaderProgram gfxProgram;
compiler.compile( compiler.compile(
...@@ -253,9 +257,11 @@ int main(int argc, const char **argv) { ...@@ -253,9 +257,11 @@ int main(int argc, const char **argv) {
vkcv::DescriptorSetHandle gfxSet = core.createDescriptorSet(gfxSetLayout); vkcv::DescriptorSetHandle gfxSet = core.createDescriptorSet(gfxSetLayout);
vkcv::DescriptorWrites writesGfx; {
writesGfx.storageBufferWrites.push_back(vkcv::BufferDescriptorWrite(0, particles.getHandle())); vkcv::DescriptorWrites writes;
core.writeDescriptorSet(gfxSet, writesGfx); writes.storageBufferWrites.push_back(vkcv::BufferDescriptorWrite(0, particles.getHandle()));
core.writeDescriptorSet(gfxSet, writes);
}
vkcv::PassHandle gfxPass = core.createPass(passConfig); vkcv::PassHandle gfxPass = core.createPass(passConfig);
...@@ -293,7 +299,6 @@ int main(int argc, const char **argv) { ...@@ -293,7 +299,6 @@ int main(int argc, const char **argv) {
triangleIndices.getCount() triangleIndices.getCount()
); );
vkcv::PushConstants pushConstants (0);
std::vector<vkcv::DrawcallInfo> drawcalls; std::vector<vkcv::DrawcallInfo> drawcalls;
drawcalls.push_back(vkcv::DrawcallInfo( drawcalls.push_back(vkcv::DrawcallInfo(
...@@ -305,6 +310,8 @@ int main(int argc, const char **argv) { ...@@ -305,6 +310,8 @@ int main(int argc, const char **argv) {
bool initializedParticleVolumes = false; bool initializedParticleVolumes = false;
auto start = std::chrono::system_clock::now(); auto start = std::chrono::system_clock::now();
auto current = start;
while (vkcv::Window::hasOpenWindow()) { while (vkcv::Window::hasOpenWindow()) {
vkcv::Window::pollEvents(); vkcv::Window::pollEvents();
...@@ -327,15 +334,26 @@ int main(int argc, const char **argv) { ...@@ -327,15 +334,26 @@ int main(int argc, const char **argv) {
swapchainExtent.height = swapchainHeight; swapchainExtent.height = swapchainHeight;
} }
auto end = std::chrono::system_clock::now(); auto next = std::chrono::system_clock::now();
auto deltatime = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
auto time = std::chrono::duration_cast<std::chrono::microseconds>(next - start);
auto deltatime = std::chrono::duration_cast<std::chrono::microseconds>(next - current);
current = next;
start = end; double t = 0.000001 * static_cast<double>(time.count());
cameraManager.update(0.000001 * static_cast<double>(deltatime.count())); double dt = 0.000001 * static_cast<double>(deltatime.count());
vkcv::PushConstants timePushConstants (sizeof(float));
timePushConstants.appendDrawcall(static_cast<float>(t));
timePushConstants.appendDrawcall(static_cast<float>(dt));
cameraManager.update(dt);
auto cmdStream = core.createCommandStream(vkcv::QueueType::Graphics); auto cmdStream = core.createCommandStream(vkcv::QueueType::Graphics);
const uint32_t dispatchSizeTransformParticlesToGrid [3] = { 16, 16, 16 }; const uint32_t dispatchSizeTransformParticlesToGrid [3] = { 16, 16, 16 };
const uint32_t dispatchSizeUpdateParticles [3] = { static_cast<uint32_t>(particles.getCount() + 63) / 64, 1, 1 };
const uint32_t dispatchSize [3] = { 1, 1, 1 }; const uint32_t dispatchSize [3] = { 1, 1, 1 };
core.recordBeginDebugLabel(cmdStream, "TRANSFORM PARTICLES TO GRID", { 0.47f, 0.77f, 0.85f, 1.0f }); core.recordBeginDebugLabel(cmdStream, "TRANSFORM PARTICLES TO GRID", { 0.47f, 0.77f, 0.85f, 1.0f });
...@@ -346,8 +364,10 @@ int main(int argc, const char **argv) { ...@@ -346,8 +364,10 @@ int main(int argc, const char **argv) {
{ vkcv::DescriptorSetUsage( { vkcv::DescriptorSetUsage(
0, core.getDescriptorSet(transformParticlesToGridSets[0]).vulkanHandle 0, core.getDescriptorSet(transformParticlesToGridSets[0]).vulkanHandle
) }, ) },
pushConstants vkcv::PushConstants(0)
); );
core.recordImageMemoryBarrier(cmdStream, grid.getHandle());
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
if (!initializedParticleVolumes) { if (!initializedParticleVolumes) {
...@@ -357,7 +377,7 @@ int main(int argc, const char **argv) { ...@@ -357,7 +377,7 @@ int main(int argc, const char **argv) {
initParticleVolumesPipeline, initParticleVolumesPipeline,
dispatchSize, dispatchSize,
{}, {},
pushConstants vkcv::PushConstants(0)
); );
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
initializedParticleVolumes = true; initializedParticleVolumes = true;
...@@ -369,7 +389,7 @@ int main(int argc, const char **argv) { ...@@ -369,7 +389,7 @@ int main(int argc, const char **argv) {
updateGridForcesPipeline, updateGridForcesPipeline,
dispatchSize, dispatchSize,
{}, {},
pushConstants vkcv::PushConstants(0)
); );
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
...@@ -379,7 +399,7 @@ int main(int argc, const char **argv) { ...@@ -379,7 +399,7 @@ int main(int argc, const char **argv) {
updateGridVelocitiesPipeline, updateGridVelocitiesPipeline,
dispatchSize, dispatchSize,
{}, {},
pushConstants vkcv::PushConstants(0)
); );
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
...@@ -387,9 +407,9 @@ int main(int argc, const char **argv) { ...@@ -387,9 +407,9 @@ int main(int argc, const char **argv) {
core.recordComputeDispatchToCmdStream( core.recordComputeDispatchToCmdStream(
cmdStream, cmdStream,
updateParticleDeformationPipeline, updateParticleDeformationPipeline,
dispatchSize, dispatchSizeUpdateParticles,
{}, {},
pushConstants vkcv::PushConstants(0)
); );
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
...@@ -397,9 +417,9 @@ int main(int argc, const char **argv) { ...@@ -397,9 +417,9 @@ int main(int argc, const char **argv) {
core.recordComputeDispatchToCmdStream( core.recordComputeDispatchToCmdStream(
cmdStream, cmdStream,
updateParticleVelocitiesPipeline, updateParticleVelocitiesPipeline,
dispatchSize, dispatchSizeUpdateParticles,
{}, {},
pushConstants vkcv::PushConstants(0)
); );
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
...@@ -407,10 +427,14 @@ int main(int argc, const char **argv) { ...@@ -407,10 +427,14 @@ int main(int argc, const char **argv) {
core.recordComputeDispatchToCmdStream( core.recordComputeDispatchToCmdStream(
cmdStream, cmdStream,
updateParticlePositionsPipeline, updateParticlePositionsPipeline,
dispatchSize, dispatchSizeUpdateParticles,
{}, { vkcv::DescriptorSetUsage(
pushConstants 0, core.getDescriptorSet(updateParticlePositionsSets[0]).vulkanHandle
) },
timePushConstants
); );
core.recordBufferMemoryBarrier(cmdStream, particles.getHandle());
core.recordEndDebugLabel(cmdStream); core.recordEndDebugLabel(cmdStream);
std::vector<vkcv::ImageHandle> renderTargets { std::vector<vkcv::ImageHandle> renderTargets {
...@@ -423,7 +447,7 @@ int main(int argc, const char **argv) { ...@@ -423,7 +447,7 @@ int main(int argc, const char **argv) {
cmdStream, cmdStream,
gfxPass, gfxPass,
gfxPipeline, gfxPipeline,
pushConstants, vkcv::PushConstants(0),
drawcalls, drawcalls,
renderTargets, renderTargets,
windowHandle windowHandle
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment