projects
/
MicroTrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
solution for assignment 2.2: working flat shader
[MicroTrace.git]
/
Ray.hxx
diff --git
a/Ray.hxx
b/Ray.hxx
index
f37425c
..
0b4e796
100644
(file)
--- a/
Ray.hxx
+++ b/
Ray.hxx
@@
-13,10
+13,11
@@
public:
~Ray();
Ray(const Ray& r);
Ray& operator=(const Ray& r);
~Ray();
Ray(const Ray& r);
Ray& operator=(const Ray& r);
-
+
const Vec3f& origin() const;
const Vec3f& direction() const;
float t() const;
const Vec3f& origin() const;
const Vec3f& direction() const;
float t() const;
+ void setHit(Primitive * p);
Primitive* hit();
unsigned int recursionDepth() const;
Primitive* hit();
unsigned int recursionDepth() const;
@@
-29,9
+30,9
@@
private:
Vec3f m_org; //!< ray origin
Vec3f m_dir; //!< ray direction
float m_t; //!< current/maximum hit distance
Vec3f m_org; //!< ray origin
Vec3f m_dir; //!< ray direction
float m_t; //!< current/maximum hit distance
-
+
unsigned int m_level; //!< level of recursion
unsigned int m_level; //!< level of recursion
-
+
Primitive* m_hit;
};
Primitive* m_hit;
};
This page took
0.027983 seconds
and
4
git commands to generate.