include/scene.h
branchpyrit
changeset 93 96d65f841791
parent 92 9af5c039b678
child 94 4c8abb8977dc
--- a/include/scene.h	Mon May 05 15:31:14 2008 +0200
+++ b/include/scene.h	Tue May 06 09:39:58 2008 +0200
@@ -79,11 +79,11 @@
 	Vector eye, p, u, v;
 	Float F;
 public:
-	Camera(): eye(0,0,10), p(0,0,-1), u(-1,0,0), v(0,1,0), F(2.*tan(M_PI/8.)) {};
+	Camera(): eye(0,0,10), p(0,0,-1), u(-1,0,0), v(0,1,0), F(2*tan(PI/8)) {};
 	Camera(const Vector &C, const Vector &ap, const Vector &au, const Vector &av):
-		eye(C), p(ap), u(au), v(av), F(2.*tan(M_PI/8.)) {};
+		eye(C), p(ap), u(au), v(av), F(2*tan(PI/8)) {};
 	Camera(const Vector &from, const Vector &lookat, const Vector &up):
-		eye(from), F(2.*tan(M_PI/8.))
+		eye(from), F(2*tan(PI/8))
 	{
 		p = lookat - from; u = cross(up, p);
 		p.normalize(); u.normalize();
@@ -100,7 +100,7 @@
 	void setu(const Vector &au) { u = au; };
 	void setv(const Vector &av) { v = av; };
 	void setF(const Float &aF) { F = aF; };
-	void setAngle(const Float angle) { F = 2.0f*tan(angle/2.0f); };
+	void setAngle(const Float angle) { F = 2*tan(angle/2); };
 	void rotate(const Quaternion &q);
 	void move(const Float fw, const Float left, const Float up);
 
@@ -173,13 +173,13 @@
 public:
 	Vector pos;
 	Colour colour;
-	bool cast_shadows;
+	int cast_shadows;
 
 	Light():
 		pos(Vector(0,0,0)), colour(Colour(1,1,1)), cast_shadows(true) {};
 	Light(const Vector &position, const Colour &acolour):
 		pos(position), colour(acolour), cast_shadows(true) {};
-	void castShadows(bool cast) { cast_shadows = cast; };
+	void castShadows(int cast) { cast_shadows = cast; };
 };
 
 /**