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

ToObjectSpace copies the Ray anyway, so pass by value

Browse source
This commit is contained in:
Eryn Wells 2014-08-10 16:58:05 -07:00
parent 4d4dc91ff4
commit 56fff1178e
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/object.cc
View file

@ -85,13 +85,12 @@ Object::Normal(const Vector4& p)
* charles::Object::ToObjectSpace -- * charles::Object::ToObjectSpace --
*/ */
Ray Ray
Object::ToObjectSpace(const Ray& ray) Object::ToObjectSpace(Ray ray)
const const
{ {
Ray objRay(ray); ray.origin = mTranslation * ray.origin;
objRay.origin = mTranslation * objRay.origin; ray.direction = mTranslation * ray.direction;
objRay.direction = mTranslation * objRay.direction; return ray;
return objRay;
} }

2
src/object.hh
View file

@ -59,7 +59,7 @@ protected:
private: private:
/** Convert `ray` to object space from global space. */ /** Convert `ray` to object space from global space. */
basics::Ray ToObjectSpace(const basics::Ray& ray) const; basics::Ray ToObjectSpace(basics::Ray ray) const;
/** Convert `v` to object space from global space. */ /** Convert `v` to object space from global space. */
basics::Vector4 ToObjectSpace(const basics::Vector4& v) const; basics::Vector4 ToObjectSpace(const basics::Vector4& v) const;