diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/defines.hpp | 10 | ||||
| -rw-r--r-- | include/rt.hpp | 22 | ||||
| -rw-r--r-- | include/vec3.hpp | 1 | ||||
| -rw-r--r-- | include/vk-renderer.hpp | 4 | ||||
| -rw-r--r-- | include/vulkan-loader.hpp | 5 |
5 files changed, 15 insertions, 27 deletions
diff --git a/include/defines.hpp b/include/defines.hpp new file mode 100644 index 0000000..2cb14a0 --- /dev/null +++ b/include/defines.hpp @@ -0,0 +1,10 @@ +#ifndef __DEFINES_HPP_ +#define __DEFINES_HPP_ + +#if defined(__linux__) +#define LINUX +#elif defined(_WIN32) || defined(_WIN64) +#define WINDOWS +#endif + +#endif // !__DEFINES_HPP_ diff --git a/include/rt.hpp b/include/rt.hpp deleted file mode 100644 index c7fa9a0..0000000 --- a/include/rt.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __RT_HPP_ -#define __RT_HPP_ - -#if defined(__linux__) -#define LINUX -#include <unistd.h> -#include <dlfcn.h> -#elif defined(_WIN32) || defined(_WIN64) -#define WINDOWS -#include <Windows.h> -#endif - -#include "utils.hpp" -#include "vec3.hpp" -#include "color.hpp" -#include "sphere.hpp" -#include "camera.hpp" -#include "material.hpp" - -#include "window.hpp" - -#endif // !__RT_HPP_ diff --git a/include/vec3.hpp b/include/vec3.hpp index 26cd2b3..112fdf9 100644 --- a/include/vec3.hpp +++ b/include/vec3.hpp @@ -2,7 +2,6 @@ #define __VEC3_HPP_ #include <iostream> -#include <cmath> class vec3 { public: diff --git a/include/vk-renderer.hpp b/include/vk-renderer.hpp index aecda0f..c2344c9 100644 --- a/include/vk-renderer.hpp +++ b/include/vk-renderer.hpp @@ -6,7 +6,9 @@ #include "vulkan-loader.hpp" #include "thirdparty/vk_mem_alloc.h" -#include "rt.hpp" +#include "window.hpp" +#include "camera.hpp" +#include "sphere.hpp" struct input_data { color sky_color; diff --git a/include/vulkan-loader.hpp b/include/vulkan-loader.hpp index cafd5bc..3e01132 100644 --- a/include/vulkan-loader.hpp +++ b/include/vulkan-loader.hpp @@ -1,10 +1,9 @@ #ifndef __VULKAN_LOADER_HPP_ #define __VULKAN_LOADER_HPP_ -#if defined(WINDOWS) -#include <Windows.h> -#include <windowsx.h> +#include "defines.hpp" +#if defined(WINDOWS) #define VK_USE_PLATFORM_WIN32_KHR #elif defined(LINUX) #define VK_USE_PLATFORM_XCB_KHR |