Mixture Densities

Yousazoe · Aug 15, 2021 · 50f64bd · 50f64bd
1 parent 198d1c3
commit 50f64bd
Show file tree

Hide file tree

Showing 18 changed files with 60,137 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,4 +23,4 @@ add_executable(RayTracing_Dev
         rtw_stb_image.h
         aarect.h
         box.h
-        constant_medium.h onb.h)
+        constant_medium.h onb.h pdf.h)
diff --git a/aarect.h b/aarect.h
@@ -31,13 +31,30 @@ class xz_rect: public hittable {
     xz_rect(double _x0, double _x1, double _z0, double _z1, double _k, shared_ptr<material> mat)
             : x0(_x0), x1(_x1), z0(_z0), z1(_z1), k(_k), mp(mat) {};
 
-    virtual bool hit(const ray& r, double t0, double t1, hit_record& rec) const;
+    virtual bool hit(const ray& r, double t0, double t1, hit_record& rec) const override ;
 
-    virtual bool bounding_box(double t0, double t1, aabb& output_box) const {
+    virtual bool bounding_box(double t0, double t1, aabb& output_box) const override {
         output_box =  aabb(vec3(x0,k-0.0001,z0), vec3(x1, k+0.0001, z1));
         return true;
     }
 
+    virtual double pdf_value(const vec3& origin, const vec3& v) const override {
+        hit_record rec;
+        if (!this->hit(ray(origin, v), 0.001, infinity, rec))
+            return 0;
+
+        auto area = (x1-x0)*(z1-z0);
+        auto distance_squared = rec.t * rec.t * v.length_squared();
+        auto cosine = fabs(dot(v, rec.normal) / v.length());
+
+        return distance_squared / (cosine * area);
+    }
+
+    virtual vec3 random(const vec3& origin) const override {
+        auto random_point = vec3(random_double(x0,x1), k, random_double(z0,z1));
+        return random_point - origin;
+    }
+
 public:
     shared_ptr<material> mp;
     double x0, x1, z0, z1, k;

diff --git a/cmake-build-debug/.DS_Store b/cmake-build-debug/.DS_Store
diff --git a/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/CXX.includecache
@@ -87,6 +87,8 @@ box.h
 /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/box.h
 constant_medium.h
 /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/constant_medium.h
+pdf.h
+/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/pdf.h
 iostream
 -
 memory
@@ -112,6 +114,12 @@ aabb.h
 rtweekend.h
 /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/rtweekend.h
 
+/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/pdf.h
+rtweekend.h
+/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/rtweekend.h
+onb.h
+/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/onb.h
+
 /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/perlin.h
 rtweekend.h
 /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/rtweekend.h

diff --git a/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/depend.internal b/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/depend.internal
@@ -14,6 +14,7 @@ CMakeFiles/RayTracing_Dev.dir/main.cpp.o
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/material.h
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/moving_sphere.h
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/onb.h
+ /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/pdf.h
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/perlin.h
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/ray.h
  /Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/rtw_stb_image.h

diff --git a/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/depend.make b/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/depend.make
@@ -13,6 +13,7 @@ CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../main.cpp
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../material.h
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../moving_sphere.h
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../onb.h
+CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../pdf.h
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../perlin.h
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../ray.h
 CMakeFiles/RayTracing_Dev.dir/main.cpp.o: ../rtw_stb_image.h

diff --git a/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/main.cpp.o b/cmake-build-debug/CMakeFiles/RayTracing_Dev.dir/main.cpp.o
diff --git a/cmake-build-debug/RayTracing_Dev b/cmake-build-debug/RayTracing_Dev
diff --git a/cmake-build-debug/RayTracing_Dev.cbp b/cmake-build-debug/RayTracing_Dev.cbp
@@ -116,6 +116,9 @@
 		<Unit filename="/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/onb.h">
 			<Option target="RayTracing_Dev"/>
 		</Unit>
+		<Unit filename="/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/pdf.h">
+			<Option target="RayTracing_Dev"/>
+		</Unit>
 		<Unit filename="/Users/apple/Desktop/Dev/Clion/RayTracing/RayTracing-Dev/perlin.h">
 			<Option target="RayTracing_Dev"/>
 		</Unit>

diff --git a/cmake-build-debug/image/image25 b/cmake-build-debug/image/image25