Rename to cu/cuh

Author: tigert1998

CMakeLists.txt

@@ -1,13 +1,18 @@
-project(ray-tracing-cuda LANGUAGES CXX)
+project(ray-tracing-cuda LANGUAGES CXX CUDA)
 
 set(CMAKE_CXX_STANDARD 14)
 
 add_subdirectory(third_party)
 
-find_package(CUDA REQUIRED)
-
 set(rt_root_dir "ray-tracing-cuda")
-file(GLOB_RECURSE rt_srcs "${rt_root_dir}/*.cc")
+file(GLOB_RECURSE rt_srcs "${rt_root_dir}/*.cu")
 add_library(rt STATIC "${rt_srcs}")
 target_link_libraries(rt glm)
-target_include_directories(rt PUBLIC "${rt_root_dir}" "${CUDA_INCLUDE_DIRS}")
+target_include_directories(rt PUBLIC "${rt_root_dir}")
+set_target_properties(rt PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+target_compile_features(rt PUBLIC cxx_std_14)
+
+add_executable(hello "scenes/main.cu")
+target_link_libraries(hello rt)
+set_target_properties(hello PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+target_compile_features(hello PUBLIC cxx_std_14)

ray-tracing-cuda/hitable.cuh

@@ -6,8 +6,8 @@ struct HitRecord;
 
 #include <memory>
 
-#include "material.h"
-#include "ray.h"
+#include "material.cuh"
+#include "ray.cuh"
 
 struct HitRecord {
   double t;

ray-tracing-cuda/hitable_list.cc ray-tracing-cuda/hitable_list.curay-tracing-cuda/hitable_list.cc renamed to ray-tracing-cuda/hitable_list.cu

@@ -1,4 +1,4 @@
-#include "hitable_list.h"
+#include "hitable_list.cuh"
 
 using std::pair;
 

ray-tracing-cuda/hitable_list.h ray-tracing-cuda/hitable_list.cuhray-tracing-cuda/hitable_list.h renamed to ray-tracing-cuda/hitable_list.cuh

@@ -1,4 +1,4 @@
-#include "material.h"
+#include "material.cuh"
 
 __device__ glm::vec3 Material::Emit(double u, double v,
                                     const glm::vec3 &p) const {

ray-tracing-cuda/main.cu

@@ -5,7 +5,7 @@ class Material;
 #include <glm/glm.hpp>
 
 #include "hitable.cuh"
-#include "ray.h"
+#include "ray.cuh"
 
 class Material {
  public:

ray-tracing-cuda/material.cc ray-tracing-cuda/material.curay-tracing-cuda/material.cc renamed to ray-tracing-cuda/material.cu

@@ -1,4 +1,4 @@
-#include "ray.h"
+#include "ray.cuh"
 
 using glm::normalize;
 using glm::vec3;

ray-tracing-cuda/material.h ray-tracing-cuda/material.cuhray-tracing-cuda/material.h renamed to ray-tracing-cuda/material.cuh

@@ -6,8 +6,8 @@ class Ray {
  public:
   Ray() = delete;
   Ray(glm::vec3 position, glm::vec3 direction);
-  glm::vec3 position() const;
-  glm::vec3 direction() const;
+  __device__ __host__ glm::vec3 position() const;
+  __device__ __host__ glm::vec3 direction() const;
 
  private:
   glm::vec3 position_, direction_;

ray-tracing-cuda/ray.cc ray-tracing-cuda/ray.curay-tracing-cuda/ray.cc renamed to ray-tracing-cuda/ray.cu

@@ -1,11 +1,11 @@
-#include "sphere.h"
+#include "sphere.cuh"
 
 using namespace glm;
 
 Sphere::Sphere(vec3 position, double radius, Material* material_ptr)
     : radius_(radius), position_(position), material_ptr_(material_ptr) {}
 
-bool Sphere::Hit(const Ray& ray, std::pair<double, double> t_range,
+__device__ bool Sphere::Hit(const Ray& ray, std::pair<double, double> t_range,
                  HitRecord* out) const {
   double a = pow(length(ray.direction()), 2);
   double b = 2 * dot(ray.direction(), ray.position() - this->position());