diff --git a/README.md b/README.md index 3f2118c..902b1b9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +```markdown # RayTracer A simple ray tracer written purely in C++ @@ -7,3 +8,4 @@ To compile, simply do: ``` g++ main.cpp ``` +``` \ No newline at end of file diff --git a/camera.h b/camera.h index 28e57bc..18ad725 100644 --- a/camera.h +++ b/camera.h @@ -1,9 +1,10 @@ -#ifndef CAMERA_H -#define CAMERA_H +#ifndef CAMERA_H +#define CAMERA_H +#include #include "ray.hpp" -class Camera +class Camera { private: glm::vec3 lower_left_corner; @@ -12,19 +13,19 @@ class Camera glm::vec3 vertical; public: - Camera() + Camera() { - lower_left_corner = glm::vec3(-2.0f, -1.0f, -1.0f); + lower_left_corner = +glm::vec3(-2.0f, -1.0f, -1.0f); horizontal = glm::vec3(4.0f, 0.0f, 0.0f); vertical = glm::vec3(0.0f, 2.0f, 0.0f); origin = glm::vec3(0.0f); } - ray get_ray(float u, float v) - { + inline ray get_ray(float u, float v)const{ return ray(origin, lower_left_corner + horizontal*u + vertical*v - origin); - } + } }; -#endif +#endif \ No newline at end of file