allowing transform blocks inside boolean shapes, but using a shape reference to a boolean shape does not propagate transform properly

git-svn-id: svn://anubis/fart/trunk@286 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop committed 2010-07-09 18:33:26 +00:00
1 parent fc2c62d5ac
commit b4a2c8ef8e
7 files changed
+73 -36

No files matched your search

-8
View File
@@ -7,11 +7,3 @@ void BoolShape::setMaterial(refptr<Material> material)
m_shape1->setMaterial(material);
m_shape2->setMaterial(material);
}
void BoolShape::setTransform(Transform & t)
{
m_transform = t;
m_inverse = t.getInverse();
m_shape1->setTransform(t);
m_shape2->setTransform(t);
}
-1
View File
@@ -9,7 +9,6 @@ class BoolShape : public Shape
public:
virtual IntersectionList intersect(refptr<Shape> _this, const Ray & ray) = 0;
virtual void setMaterial(refptr<Material> material);
virtual void setTransform(Transform & t);
virtual refptr<Shape> clone() = 0;
protected:
+1 -1
View File
@@ -103,7 +103,7 @@ class Shape
const Ray & ray) = 0;
virtual refptr<Shape> clone() = 0;
virtual void setTransform(Transform & t)
void setTransform(Transform & t)
{
m_transform = t;
m_inverse = t.getInverse();