CJSatnarine/Raytracer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
CJSatnarine
2024-07-11 21:23:14 -04:00
parent eafb2947cc
commit 2197114459
6 changed files with 155003 additions and 154991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
constantMedium.h
View File

@@ -8,58 +8,65 @@
class constantMedium : public hittable {
public:
constantMedium(shared_ptr<hittable> boundary, double density, shared_ptr<texture> tex): boundary(boundary), negativeInvDensity(-1/density), phaseFunction(make_shared<isotropic>(tex)) {}
constantMedium(shared_ptr<hittable> boundary, double density, shared_ptr<texture> tex): boundary(boundary), negInvDensity(-1 / density), phaseFunction(make_shared<isotropic>(tex)) {}
constantMedium(shared_ptr<hittable> boundary, double density, const colour& albedo) : boundary(boundary), negativeInvDensity(-1 / density), phaseFunction(make_shared<isotropic>(albedo)) {}
constantMedium(shared_ptr<hittable> boundary, double density, const colour& albedo) : boundary(boundary), negInvDensity(-1 / density), phaseFunction(make_shared<isotropic>(albedo)) {}
bool hit(const ray& r, interval rayT, hitRecord& rec) const override {
// Print occasional samples when debugging. To enable, set enableDebug true;
bool hit(const ray& r, interval ray_t, hitRecord& rec) const override {
// Print occasional samples when debugging. To enable, set enableDebug true.
const bool enableDebug = false;
const bool debugging = enableDebug && randomDouble() < 0.00001;
hitRecord rec1, rec2;
if (!boundary->hit(r, interval::universe, rec1)) return false;
if (!boundary->hit(r, interval::universe, rec1))
return false;
if (!boundary->hit(r, interval(rec1.t+0.0001, infinity), rec2)) return false;
if (!boundary->hit(r, interval(rec1.t+0.0001, infinity), rec2))
return false;
if (debugging) std::clog << "\ntMin=" << rec1.t << ", tMax=" << rec2.t << '\n';
if (debugging) std::clog << "\nt_min=" << rec1.t << ", t_max=" << rec2.t << '\n';
if (rec1.t < rayT.min) rec1.t = rayT.min;
if (rec2.t > rayT.max) rec2.t = rayT.max;
if (rec1.t < ray_t.min) rec1.t = ray_t.min;
if (rec2.t > ray_t.max) rec2.t = ray_t.max;
if (rec1.t >= rec2.t) return false;
if (rec1.t >= rec2.t)
return false;
if (rec1.t < 0) rec1.t = 0;
if (rec1.t < 0)
rec1.t = 0;
auto rayLength = r.direction().length();
auto distanceInsideBoundary = (rec2.t - rec1.t) * rayLength;
auto hitDistance = negativeInvDensity * log(randomDouble());
auto hitDistance = negInvDensity * log(randomDouble());
if (hitDistance > distanceInsideBoundary) return false;
if (hitDistance > distanceInsideBoundary)
return false;
rec.t = rec1.t + hitDistance / rayLength;
rec.p = r.at(rec.t);
if (debugging) {
std::clog << "hitDistance = " << hitDistance << '\n' << "rec.t = " << rec.t << '\n' << "rec.p = " << rec.p << '\n';
std::clog << "hit_distance = " << hitDistance << '\n'
<< "rec.t = " << rec.t << '\n'
<< "rec.p = " << rec.p << '\n';
}
rec.normal = vec3(1, 0, 0); // arbitrary
rec.frontFace = true; // also abritrary
rec.normal = vec3(1,0,0); // arbitrary
rec.frontFace = true; // also arbitrary
rec.mat = phaseFunction;
return true;
}
aabb boundingBox() const override {
return boundary->boundingBox();
aabb boundingBox() const override {
return boundary->boundingBox();
}
private:
shared_ptr<hittable> boundary;
double negativeInvDensity;
private:
shared_ptr<hittable> boundary;
double negInvDensity;
shared_ptr<material> phaseFunction;
};
};
#endif