Skip to content

Commit 79e274f

Browse files
committed
Use Multiple Threads for Boid Calculation
1 parent b7b7d54 commit 79e274f

File tree

12 files changed

+220
-289
lines changed

12 files changed

+220
-289
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.17)
2-
project(UltimateFlox VERSION 1.5.1)
2+
project(UltimateFlox VERSION 1.5.2)
33

44
set(CMAKE_CXX_STANDARD 20)
55
#if (MSVC)

src/app/Algorithm/Algorithm.hpp

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/app/Algorithm/DirectLoopAlgorithm.cpp

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/app/Algorithm/DirectLoopAlgorithm.hpp

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/app/Algorithm/QuadtreeAlgorithm.cpp

Lines changed: 0 additions & 113 deletions
This file was deleted.

src/app/Algorithm/QuadtreeAlgorithm.hpp

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/app/Application.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
#include "Core/Lua/VirtualMachine.hpp"
44
#include "Core/Lua/Types/LuaVector.hpp"
55
#include "World/Flock.hpp"
6-
//#include "Algorithm/DirectLoopAlgorithm.hpp"
7-
#include "Algorithm/QuadtreeAlgorithm.hpp"
86
#include "Render/Boid/FlockRenderer.hpp"
97
#include "Render/QuadtreeRenderer.hpp"
108

@@ -127,11 +125,7 @@ int run() {
127125
aspect >= 1.0f ? worldBound * aspect : worldBound,
128126
aspect < 1.0f ? worldBound * aspect : worldBound
129127
};
130-
Flock flock{flockSize};
131-
//DirectLoopAlgorithm directLoopAlgorithm{bounds};
132-
QuadtreeAlgorithm quadtreeAlgorithm{bounds};
133-
//Algorithm* algorithm = &directLoopAlgorithm;
134-
Algorithm *algorithm = &quadtreeAlgorithm;
128+
Flock flock{flockSize, bounds};
135129

136130
Projection projection{
137131
1.0f / bounds.x, 0.0f, 0.0f, 0.0f,
@@ -281,7 +275,7 @@ int run() {
281275
// Update engine
282276
bool doUpdates = !paused && !consoleOpen;
283277
if (doUpdates) {
284-
flock.update(algorithm, dt);
278+
flock.update(dt);
285279
}
286280

287281
#ifdef FLOX_SHOW_DEBUG_INFO
@@ -296,7 +290,7 @@ int run() {
296290
}
297291

298292
if (renderQuadtree) {
299-
qtRenderer.update(quadtreeAlgorithm.tree());
293+
qtRenderer.update(flock.tree());
300294
}
301295
}
302296

src/app/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ target_sources(
33
Application.cpp
44
Common.hpp
55

6-
# ALGORITHM
7-
Algorithm/Algorithm.hpp
8-
# Algorithm/DirectLoopAlgorithm.hpp
9-
# Algorithm/DirectLoopAlgorithm.cpp
10-
Algorithm/QuadtreeAlgorithm.hpp
11-
Algorithm/QuadtreeAlgorithm.cpp
12-
136
# MATH
147
Math/Rectangle.hpp
158
Math/Rectangle.cpp

0 commit comments

Comments
 (0)