--- a/include/material.h Thu Apr 24 10:49:11 2008 +0200
+++ b/include/material.h Thu Apr 24 13:55:11 2008 +0200
@@ -51,6 +51,7 @@
class ColourMap
{
public:
+ virtual ~ColourMap() {};
virtual Colour map(const Float &val) = 0;
};
@@ -106,6 +107,7 @@
public:
TextureMap(const Vector3 &acenter, const Float &size):
center(acenter), invsize(1./size) {};
+ virtual ~TextureMap() {};
virtual void map(const Vector3 &point, Float &u, Float &v) = 0;
};
@@ -257,7 +259,7 @@
u -= floor(u);
v = -(v - 0.5);
v -= floor(v);
- return pixmap->get(u*pixmap->getWidth(), v*pixmap->getHeight());
+ return pixmap->get((int)(u*pixmap->getWidth()), (int)(v*pixmap->getHeight()));
};
};