Skip to content
Snippets Groups Projects
Verified Commit ace88fff authored by Josch Morgenstern's avatar Josch Morgenstern
Browse files

[#111] decrease numer of particles

parent 7deb24cc
No related branches found
No related tags found
1 merge request!95Resolve "Wassersimulation mit Interaktion"
Pipeline #27208 passed
...@@ -133,7 +133,7 @@ int main(int argc, const char **argv) { ...@@ -133,7 +133,7 @@ int main(int argc, const char **argv) {
1 1
); );
int numberParticles = 10000; int numberParticles = 1000;
std::vector<Particle> particles; std::vector<Particle> particles;
for (int i = 0; i < numberParticles; i++) { for (int i = 0; i < numberParticles; i++) {
const float lo = 0.4; const float lo = 0.4;
...@@ -273,6 +273,7 @@ int main(int argc, const char **argv) { ...@@ -273,6 +273,7 @@ int main(int argc, const char **argv) {
pushConstantsCompute.appendDrawcall(pushData); pushConstantsCompute.appendDrawcall(pushData);
uint32_t computeDispatchCount[3] = {static_cast<uint32_t> (std::ceil(numberParticles/256.f)),1,1}; uint32_t computeDispatchCount[3] = {static_cast<uint32_t> (std::ceil(numberParticles/256.f)),1,1};
core.recordComputeDispatchToCmdStream(cmdStream, core.recordComputeDispatchToCmdStream(cmdStream,
computePipeline1, computePipeline1,
computeDispatchCount, computeDispatchCount,
...@@ -292,25 +293,25 @@ int main(int argc, const char **argv) { ...@@ -292,25 +293,25 @@ int main(int argc, const char **argv) {
core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle()); core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle());
core.recordComputeDispatchToCmdStream(cmdStream, core.recordComputeDispatchToCmdStream(cmdStream,
computePipeline3, computePipeline3,
computeDispatchCount, computeDispatchCount,
{ vkcv::DescriptorSetUsage(0,core.getDescriptorSet(computeDescriptorSet3).vulkanHandle) }, { vkcv::DescriptorSetUsage(0,core.getDescriptorSet(computeDescriptorSet3).vulkanHandle) },
pushConstantsCompute); pushConstantsCompute);
core.recordBufferMemoryBarrier(cmdStream, particleBuffer1.getHandle()); core.recordBufferMemoryBarrier(cmdStream, particleBuffer1.getHandle());
core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle()); core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle());
core.recordComputeDispatchToCmdStream(cmdStream, core.recordComputeDispatchToCmdStream(cmdStream,
computePipeline4, computePipeline4,
computeDispatchCount, computeDispatchCount,
{ vkcv::DescriptorSetUsage(0,core.getDescriptorSet(computeDescriptorSet4).vulkanHandle) }, { vkcv::DescriptorSetUsage(0,core.getDescriptorSet(computeDescriptorSet4).vulkanHandle) },
pushConstantsCompute); pushConstantsCompute);
core.recordBufferMemoryBarrier(cmdStream, particleBuffer1.getHandle()); core.recordBufferMemoryBarrier(cmdStream, particleBuffer1.getHandle());
core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle()); core.recordBufferMemoryBarrier(cmdStream, particleBuffer2.getHandle());
//bloomAndFlares & tonemapping // bloomAndFlares & tonemapping
vkcv::PushConstants pushConstantsDraw (sizeof(renderingMatrices)); vkcv::PushConstants pushConstantsDraw (sizeof(renderingMatrices));
pushConstantsDraw.appendDrawcall(renderingMatrices); pushConstantsDraw.appendDrawcall(renderingMatrices);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment