rayzor
diff src/vmathray.h @ 14:a9a948809c6f
starting the renderer screen, plus misc stuff
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Sun, 13 Apr 2014 08:06:21 +0300 |
parents | 964f8ea5f095 |
children |
line diff
1.1 --- a/src/vmathray.h Sat Apr 12 23:37:55 2014 +0300 1.2 +++ b/src/vmathray.h Sun Apr 13 08:06:21 2014 +0300 1.3 @@ -6,10 +6,10 @@ 1.4 1.5 class Ray { 1.6 public: 1.7 - Vector3 pos, dir; 1.8 + Vector3 origin, dir; 1.9 1.10 Ray() {} 1.11 - Ray(const Vector3 &p, const Vector3 &d) : pos(p), dir(d) {} 1.12 + Ray(const Vector3 &p, const Vector3 &d) : origin(p), dir(d) {} 1.13 }; 1.14 1.15 inline Ray transform(const Matrix4x4 &m, const Ray &r) 1.16 @@ -18,7 +18,7 @@ 1.17 rmat[0][3] = rmat[1][3] = rmat[2][3] = rmat[3][0] = rmat[3][1] = rmat[3][2] = 0.0; 1.18 rmat[3][3] = 1.0; 1.19 1.20 - return Ray(transform(m, r.pos), transform(rmat, r.dir)); 1.21 + return Ray(transform(m, r.origin), transform(rmat, r.dir)); 1.22 } 1.23 1.24 #endif // VMATH_RAY_H_