Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project 1: Liang Peng #20

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+571 −33
Open

Project 1: Liang Peng #20

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2dc149
Change to sm_50; Done flocking by brute force
Sep 6, 2016
cef0231
fix brute-force rule1 & rule3 bugs
Sep 9, 2016
6170711
Done flocking by uniform grid
Sep 10, 2016
a8d7c6c
Done flocking by coherent grid
Sep 12, 2016
47f85c3
fix bugs; add rendering pic
Sep 13, 2016
70e5f80
add screenshot
Sep 13, 2016
92cd5d3
add profiling screenshot
Sep 14, 2016
24b4534
Update README.md
Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix brute-force rule1 & rule3 bugs
Liang Peng committed Sep 9, 2016
commit cef0231f0a763dcf8a01e5844748e0f341cb0be7
6 changes: 2 additions & 4 deletions src/kernel.cu
View file
Original file line number Diff line number Diff line change
@@ -254,9 +254,8 @@ __device__ glm::vec3 computeVelocityChange(int N, int iSelf, const glm::vec3 *po

if (numOfNeighbors1 > 0) {
centerOfMass /= numOfNeighbors1 + 0.f;
vDelta += (centerOfMass - pos[iSelf]) * rule1Scale;
}

vDelta += (centerOfMass - pos[iSelf]) * rule1Scale;
#endif

#ifndef RULE2
@@ -296,9 +295,8 @@ __device__ glm::vec3 computeVelocityChange(int N, int iSelf, const glm::vec3 *po

if (numOfNeighbor3 > 0) {
vAverage /= numOfNeighbor3 + 0.f;
vDelta += vAverage * rule3Scale;
}

vDelta += vAverage * rule3Scale;
#endif

return vDelta;