From a9f073542c6cf7b9c8778c85622585ca02c7453b Mon Sep 17 00:00:00 2001
From: elom0n <74347790+elom0n@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:06:18 +0200
Subject: [PATCH] added sorting
---
projects/fire_works/src/main.cpp | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/projects/fire_works/src/main.cpp b/projects/fire_works/src/main.cpp
index ea24d23a..c42b2302 100644
--- a/projects/fire_works/src/main.cpp
+++ b/projects/fire_works/src/main.cpp
@@ -290,7 +290,7 @@ int main(int argc, const char **argv) {
events.emplace_back(
glm::vec3(0, 1, 0),
- 0.0f,
+ 0.5f,
glm::vec3(0.0f, 1.0f, 0.0f),
12.5f,
@@ -307,13 +307,13 @@ int main(int argc, const char **argv) {
events.emplace_back(
glm::vec3(0.0f),
- 1.0f,
+ 1.5f,
glm::vec3(0.0f, 1.0f, 1.0f),
10.0f,
100,
0,
- events.size() - 3,
+ events.size() - 1,
0,
10.0f,
@@ -324,7 +324,7 @@ int main(int argc, const char **argv) {
events.emplace_back(
glm::vec3(0.5, 1, 0),
- 0.1f,
+ 0.25f,
glm::vec3(0.0f, 1.5f, 0.0f),
15.0f,
@@ -341,7 +341,7 @@ int main(int argc, const char **argv) {
events.emplace_back(
glm::vec3(0.0f),
- 1.0f,
+ 0.75f,
glm::vec3(0.0f, 1.5f, 1.0f),
8.0f,
@@ -908,6 +908,12 @@ int main(int argc, const char **argv) {
gui.endGUI();
core.endFrame(windowHandle);
+
+ particleBuffer.read(particles);
+ sort(particles.begin(), particles.end(),
+ [](const particle_t p1, const particle_t p2) {
+ return p1.eventId < p2.eventId;
+ });
if (resetTime) {
start = std::chrono::system_clock::now();
--
GitLab