added the map, switched branches

include/Ray.h

@@ -8,13 +8,13 @@ class Ray {
 		private:
 
 				// The Tail of the vector
-				sf::Vector3<float> origin
+			sf::Vector3<float> origin;
 
 				// Direction / Length of the vector
 				sf::Vector3<float> direction;
 
 				// The incrementing points at which T intersects int(X, Y, Z) points
-				sf::Vector3<float> intersction_t;
+				sf::Vector3<float> intersection_t;
 
 				// The speed at which the ray climbs.
 				// Take the slope of the line (1 / cartesian.x/y/z) = delta_t.x/y/z
@@ -24,20 +24,20 @@ class Ray {
 				sf::Vector3<int> voxel;
 
 				// Reference to the voxel map
-				Map *m;
+				Map *map;
 
 				// The dimensions of the voxel map
 				sf::Vector3<int> dimensions;
 
 		public:
 
-				public Ray(
-						Map *m,
-						sf::Vector2<int> resolution,
-						sf::Vector2<int> pixel,
-						sf::Vector3<float> camera_position,
-						sf::Vector3<float> ray_direction
-				);
+			Ray(
+				Map *m,
+				sf::Vector2<int> resolution,
+				sf::Vector2<int> pixel,
+				sf::Vector3<float> camera_position,
+				sf::Vector3<float> ray_direction
+			);
 
-				public sf::Color Cast();
-}
+			sf::Color Cast();
+};