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.

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: Xueyin Wan #24

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
Ready to make a pull request
Xueyin committed Sep 14, 2016
commit 88a3969e49619a9f316bf2ab98490fc6fea0d089
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
**University of Pennsylvania, CIS 565: GPU Programming and Architecture,
Project 1 - Flocking**

* (TODO) YOUR NAME HERE
* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
* Xueyin Wan
* Tested on: Windows 10, i7-4870 @ 2.50GHz 16GB, NVIDIA GeForce GT 750M 2GB (Personal Laptop)

### (TODO: Your README)

Binary file added images/Xueyin_Performance.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/kernel.cu
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ void checkCUDAError(const char *msg, int line = -1) {

// LOOK-1.2 Parameters for the boids algorithm.
// These worked well in our reference implementation.
#define rule1Distance 50.0f
#define rule1Distance 5.0f
#define rule2Distance 3.0f
#define rule3Distance 5.0f

2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
#define COHERENT_GRID 1

// LOOK-1.2 - change this to adjust particle count in the simulation
const int N_FOR_VIS = 5000;
const int N_FOR_VIS = 15000;
const float DT = 0.2f;

/**
6 changes: 3 additions & 3 deletions src/main.hpp
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ const float fovy = (float) (PI / 4);
const float zNear = 0.10f;
const float zFar = 10.0f;
// LOOK-1.2: for high DPI displays, you may want to double these settings.
int width = 1280;
int height = 720;
int pointSize = 2.0f;
int width = 2560;
int height = 1440;
int pointSize = 3.0f;

// For camera controls
bool leftMousePressed = false;