Moved arguments around

CMakeLists.txt

@@ -15,24 +15,24 @@ include_directories(src)
 include_directories(include)
 
 add_executable(blinn
-        src/color.cpp
-        src/color.h
-        src/dbg.h
-        src/geometry.cpp
-        src/geometry.h
+        src/basics/color.cpp
+        src/basics/color.h
+        src/utils/dbg.h
+        src/basics/geometry.cpp
+        src/basics/geometry.h
         src/main.cpp
-        src/point.cpp
-        src/point.h
-        src/ray.cpp
-        src/ray.h
-        src/render.cpp
-        src/render.h
-        src/sphere.cpp
-        src/sphere.h
-        src/square.cpp
-        src/square.h
-        src/blobsys.cpp
-        src/blobsys.h
+        src/basics/point.cpp
+        src/basics/point.h
+        src/basics/ray.cpp
+        src/basics/ray.h
+        src/rendersys/render.cpp
+        src/rendersys/render.h
+        src/renderables/sphere.cpp
+        src/renderables/sphere.h
+        src/basics/square.cpp
+        src/basics/square.h
+        src/physics/blobsys.cpp
+        src/physics/blobsys.h
         #src/test.cpp
-        src/tracer.cpp
-        src/tracer.h src/config.cpp src/config.h src/scene.cpp src/scene.h)
+        src/rendersys/tracer.cpp
+        src/rendersys/tracer.h src/utils/config.cpp src/utils/config.h src/rendersys/scene.cpp src/rendersys/scene.h)

README.md

@@ -0,0 +1,18 @@
+# Metaball/Spheres Raytracer
+
+Renders metaballs and spheres. Uses C++. No external libraries (as of yet). Project is still being improved on. This is also an excuse for me to learn more C++.
+
+## Current Features and Methods
+
+Renders metaballs and spheres using ray marching and raytracing, respectively. Metaball rendering is done by first checking if a ray will enter a proper bounding sphere, before inching a ray through the bounding sphere to determine where the isosurface lies. This task is parallelized with OpenMP. 
+
+To create an interesting animation, metaballs are connected to each other with springs with various k values. We let the physics dictate the movement of the metaballs (each with a mass of 1kg) between frames. See video below:
+
+[![Metaball Minute Youtube Video](https://img.youtube.com/vi/dfxTMVnEfB0/0.jpg)](https://www.youtube.com/watch?v=dfxTMVnEfB0)
+
+
+
+## Todo:
+
+- [ ] Finish writing this README...
+- [ ] Multi-node cluster computing. Current metaball rendering takes a bit too long (4 cores ~ 6 sec), rendering frames are parallizable, however 

src/color.cpp → src/basics/color.cpp

@@ -1,6 +1,6 @@
 #include <iostream>
 #include "color.h"
-#include "dbg.h"
+#include "utils/dbg.h"
 
 using namespace std;
 

src/point.cpp → src/basics/point.cpp

@@ -1,6 +1,6 @@
 
 
-#include <math.h>
+#include <cmath>
 
 #include "ray.h"
 

src/ray.cpp → src/basics/ray.cpp

@@ -1,8 +1,5 @@
 #include "ray.h"
-#include "point.h"
 #include <sstream>
-#include <iostream>
-#include <stdio.h>
 
 
 using namespace std;

src/square.cpp → src/basics/square.cpp

@@ -1,6 +1,5 @@
 #include "color.h"
 #include "square.h"
-#include "point.h"
 
 square::square() {
 	this->x = 0;