added operator<<(ostream, Ray) to util/Ray, main/Scene now calculating rays
git-svn-id: svn://anubis/fart/trunk@38 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
1 parent
f03b19a022
commit
7d461477b3
3 files changed
+20
-1
No files matched your search
@@ -1,5 +1,6 @@
|
||||
|
||||
#include "Ray.h"
|
||||
#include <iostream>
|
||||
|
||||
Ray::Ray()
|
||||
{
|
||||
@@ -24,3 +25,9 @@ Vector Ray::getPositionAt(double dist) const
|
||||
v[2] = m_origin[2] + dist * m_direction[2];
|
||||
return v;
|
||||
}
|
||||
|
||||
std::ostream & operator<<(std::ostream & out, const Ray & r)
|
||||
{
|
||||
out << "(" << r.getOrigin() << " -> " << r.getDirection() << ")";
|
||||
return out;
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
#define RAY_H RAY_H
|
||||
|
||||
#include "Vector.h"
|
||||
#include <iostream>
|
||||
|
||||
class Ray
|
||||
{
|
||||
@@ -19,5 +20,7 @@ class Ray
|
||||
Vector m_direction;
|
||||
};
|
||||
|
||||
std::ostream & operator<<(std::ostream & out, const Ray & r);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user