diff --git a/Cpp_Stuff/README.md b/Cpp_Stuff/README.md
index 7cbc06d..7285323 100644
--- a/Cpp_Stuff/README.md
+++ b/Cpp_Stuff/README.md
@@ -1 +1,27 @@
# C++ Particle Sim
+
+This is still very much a work not really in progress!
+
+## TODO
+- [x] Particle collisions with the walls
+- [] Particle gravities
+- [] Particle collision with other particles
+- [] Maybe add a 3rd dimension?
+
+## Building and Running
+
+You're on your own with figuring out how to install cuda...but in theory once that's installed it should be pretty straight forward:
+```
+cmake -S ./ -B build/
+cmake --build build/
+cd build/
+./src/particle_sim_exe
+```
+
+Current system runs 10,000 particles at 50fps. The gif below only appears to be moving slow because the time steps between renders is much lower then in the python example. The frame is actually higher here then it was in python.
+
+
+ 
+
+
+
diff --git a/Cpp_Stuff/assets/c_render.gif b/Cpp_Stuff/assets/c_render.gif
new file mode 100644
index 0000000..6dd105e
Binary files /dev/null and b/Cpp_Stuff/assets/c_render.gif differ
diff --git a/Cpp_Stuff/src/CMakeLists.txt b/Cpp_Stuff/src/CMakeLists.txt
index 24f3d5d..db7f72c 100644
--- a/Cpp_Stuff/src/CMakeLists.txt
+++ b/Cpp_Stuff/src/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(CUDAToolkit REQUIRED)
file(GLOB project_cuda_src "**/*.cu")
file(GLOB project_cpp_src "**/*.cpp")
# set(project_src ${project_cpp_src} ${project_cuda_src})
-include_directories(${CMAKE_PROJECT_NAME} "${PROJECT_SOURCE_DIR}/../include")
+include_directories(${CMAKE_PROJECT_NAME} "${PROJECT_SOURCE_DIR}/include")
include_directories(${CMAKE_PROJECT_NAME} ${SDL2_INCLUDE_DIRS})
#include_directories(${CMAKE_PROJECT_NAME} ${CUDA_INCLUDE_DIRS})
message(STATUS "${SDL2_LIBRARIES}")
diff --git a/Cpp_Stuff/src/renderer/sim_renderer.cpp b/Cpp_Stuff/src/renderer/sim_renderer.cpp
index 31fdb23..6106b50 100644
--- a/Cpp_Stuff/src/renderer/sim_renderer.cpp
+++ b/Cpp_Stuff/src/renderer/sim_renderer.cpp
@@ -76,7 +76,7 @@ int begin_sim(SDL_Renderer *renderer, SDL_Window *win)
{
/* Do nothing. */
}
-
+
}
else if (event.type == SDL_QUIT)
{
diff --git a/Cpp_Stuff/src/simulator/universe.cpp b/Cpp_Stuff/src/simulator/universe.cpp
index d53614e..2dcd6a7 100644
--- a/Cpp_Stuff/src/simulator/universe.cpp
+++ b/Cpp_Stuff/src/simulator/universe.cpp
@@ -12,12 +12,12 @@
#include "custom_kernels.cuh"
#include "util.hpp"
-#define DELTA_TIME 0.5
+#define DELTA_TIME 0.005
void universe::process_collisions_with_rays(void)
{
- float temp_directions[][3] =
+ float temp_directions[][3] =
{
{1.0,0.0,0.0},
{0.0,1.0,0.0},
@@ -25,7 +25,7 @@ void universe::process_collisions_with_rays(void)
{0.0,1.0,0.0}
};
- float temp_positions[][3] =
+ float temp_positions[][3] =
{
{0.0,0.0,0.0},
{0.0,0.0,0.0},
@@ -38,7 +38,7 @@ void universe::process_collisions_with_rays(void)
float * dev_dot_product_result;
float * dev_direction_vec;
-
+
CHECK_CUDA_ERROR(cudaMallocManaged(&(dev_dot_product_result),
long(num_of_particles*sizeof(float))));
@@ -72,7 +72,7 @@ void universe::process_collisions_with_rays(void)
num_of_particles * 3));
CHECK_CUDA_ERROR(cublasSaxpy(cublas_handle, num_of_particles, &alpha,
- &dev_direction_vec[num_of_particles * 1], 1,
+ &dev_direction_vec[num_of_particles * 1], 1,
dev_direction_vec, 1));
CHECK_CUDA_ERROR(cublasSaxpy(cublas_handle, num_of_particles, &alpha,
@@ -85,13 +85,13 @@ void universe::process_collisions_with_rays(void)
CHECK_CUDA_ERROR(nppsDiv_32f_I(dev_direction_vec, device_scratch_padA,
num_of_particles));
- CHECK_CUDA_ERROR(nppsDiv_32f_I(dev_direction_vec,
+ CHECK_CUDA_ERROR(nppsDiv_32f_I(dev_direction_vec,
&device_scratch_padA[1 * num_of_particles], num_of_particles));
- CHECK_CUDA_ERROR(nppsDiv_32f_I(dev_direction_vec,
+ CHECK_CUDA_ERROR(nppsDiv_32f_I(dev_direction_vec,
&device_scratch_padA[2 * num_of_particles], num_of_particles));
- custom_kernel_process_ray_collision(num_of_particles, dev_direction_vec,
+ custom_kernel_process_ray_collision(num_of_particles, dev_direction_vec,
device_scratch_padA, device_velocity, device_position,
array_size, &device_ray_direction[i*3]);
@@ -105,13 +105,13 @@ void universe::process_collisions_with_rays(void)
void universe::process_collisions_with_other_particles(void)
{
-
+
}
void universe::process_particles(void)
{
const float delta = DELTA_TIME;
-
+
// // Update the positions of the particles:
// // self.positions[counti] = self.velocities[counti] * DELTA_TIME + self.positions[counti]
CHECK_CUDA_ERROR(cublasSaxpy(cublas_handle, array_size*3, &delta,
@@ -129,7 +129,7 @@ void universe::process_particles(void)
void universe::get_positions(float ** in_out_buffer, int * size, int * stride)
{
- CHECK_CUDA_ERROR(cudaMemcpy(host_position, device_position,
+ CHECK_CUDA_ERROR(cudaMemcpy(host_position, device_position,
long(array_size * 3 * sizeof(float)), cudaMemcpyDeviceToHost));
*in_out_buffer = host_position;
@@ -145,12 +145,12 @@ curandCreateGenerator(&gen,
CHECK_CUDA_ERROR(cublasCreate(&cublas_handle));
num_of_particles = size;
- array_size = size;
-
- CHECK_CUDA_ERROR(cudaMallocManaged(&(device_position),
+ array_size = size;
+
+ CHECK_CUDA_ERROR(cudaMallocManaged(&(device_position),
long(array_size*3*sizeof(float))));
- CHECK_CUDA_ERROR(cudaMallocManaged(&(device_velocity),
+ CHECK_CUDA_ERROR(cudaMallocManaged(&(device_velocity),
long(array_size*3*sizeof(float))));
CHECK_CUDA_ERROR(cudaMallocManaged(&(device_acceleration),
@@ -174,7 +174,7 @@ curandCreateGenerator(&gen,
CHECK_CUDA_ERROR(cudaMallocManaged(&(device_ray_direction),
long(4*3*sizeof(float))));
-
+
float temp_positions[] = {0.0,0.0,0.0,0.0,0.0,0.0,800.0,800.0,800.0,800.0,800.0,800.0};
float temp_directions[] = {1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0};
@@ -184,7 +184,7 @@ curandCreateGenerator(&gen,
CHECK_CUDA_ERROR(cudaMemcpy(device_ray_direction, temp_directions,
long(sizeof(temp_directions)), cudaMemcpyHostToDevice));
-
+
}
universe::~universe()
diff --git a/Python_Stuff/README.md b/Python_Stuff/README.md
index 5038f96..4d00757 100644
--- a/Python_Stuff/README.md
+++ b/Python_Stuff/README.md
@@ -13,6 +13,6 @@ python python_particle_simulator.py
This script will generate 100 particles to be used in the simulation and renders at about 20fps.
- 
+