eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up Object object space conversions

Browse source 
- Ray directions shouldn't be translated
- Implement vector translation to global space
This commit is contained in:
Eryn Wells 2014-08-15 22:33:22 -07:00
parent 8af03c3f3d
commit bbbac6ff92
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/object.cc
View file

@ -16,6 +16,7 @@
using charles::basics::Ray; using charles::basics::Ray;
using charles::basics::Matrix4;
using charles::basics::Vector4; using charles::basics::Vector4;
@ -25,7 +26,7 @@ namespace charles {
* charles::Object::Object -- * charles::Object::Object --
*/ */
Object::Object(const Vector4& origin) Object::Object(const Vector4& origin)
: mTranslation(basics::Matrix4::Translation(origin.X(), origin.Y(), origin.Z())), : mTranslation(Matrix4::Translation(origin.X(), origin.Y(), origin.Z())),
mMaterial() mMaterial()
{ } { }
@ -99,7 +100,6 @@ Object::ToObjectSpace(Ray ray)
const const
{ {
ray.origin = mTranslation * ray.origin; ray.origin = mTranslation * ray.origin;
ray.direction = mTranslation * ray.direction;
return ray; return ray;
} }
@ -122,7 +122,7 @@ Vector4
Object::FromObjectSpace(const Vector4& v) Object::FromObjectSpace(const Vector4& v)
const const
{ {
return v; return Inverse(mTranslation) * v;
} }