sfeng/ray-tracer-comp371
1
0
Fork 0
mirror of https://github.com/vonhyou/ray-tracer-comp371.git synced 2025-06-08 07:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

calculate nearest hit

Browse source
This commit is contained in:
Shuo Feng 2024-02-28 00:58:29 -05:00
parent a8a00d386e
commit 184812c533
Signed by: sfeng
GPG key ID: 1E83AE6CD1C037B1
6 changed files with 92 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Geometry.h
View file

@ -1,6 +1,7 @@
#ifndef GEOMETRY_H_
#define GEOMETRY_H_
#include "Optional.h"
#include "Ray.h"
#include <Eigen/Core>
@ -8,6 +9,7 @@
using Eigen::Matrix;
using Eigen::Matrix4f;
using Eigen::Vector3f;
using utils::Optional;
// Abstract class for Geometries
class Geometry {
@ -15,7 +17,7 @@ public:
enum class Type { SPHERE, RECTANGLE };
virtual ~Geometry() = default;
virtual bool intersect(const Ray &) const = 0;
virtual Optional<float> intersect(const Ray &) const = 0;
protected:
Geometry(Type type, float ka, float kd, float ks, const Vector3f &ca,
@ -42,7 +44,7 @@ public:
: Geometry(Type::SPHERE, ka, kd, ks, ca, cd, cs, pc), radius(radius),
center(center) {}
bool intersect(const Ray &) const override;
Optional<float> intersect(const Ray &) const override;
private:
float radius;
@ -57,7 +59,7 @@ public:
: Geometry(Type::RECTANGLE, ka, kd, ks, ca, cd, cs, pc), p1(p1), p2(p2),
p3(p3), p4(p4) {}
bool intersect(const Ray &) const override;
Optional<float> intersect(const Ray &) const override;
private:
Vector3f p1, p2, p3, p4;