src/scene.cc
branchpyrit
changeset 91 9d66d323c354
parent 86 ce6abe0aeeae
child 92 9af5c039b678
--- a/src/scene.cc	Tue Apr 29 23:31:08 2008 +0200
+++ b/src/scene.cc	Fri May 02 13:27:47 2008 +0200
@@ -53,15 +53,15 @@
 	x = 2*( (t8 + t10)*p.x + (t6 -  t4)*p.y + (t3 + t7)*p.z ) + p.x;
 	y = 2*( (t4 +  t6)*p.x + (t5 + t10)*p.y + (t9 - t2)*p.z ) + p.y;
 	z = 2*( (t7 -  t3)*p.x + (t2 +  t9)*p.y + (t5 + t8)*p.z ) + p.z;
-	p = Vector3(x,y,z);
+	p = Vector(x,y,z);
 	x = 2*( (t8 + t10)*u.x + (t6 -  t4)*u.y + (t3 + t7)*u.z ) + u.x;
 	y = 2*( (t4 +  t6)*u.x + (t5 + t10)*u.y + (t9 - t2)*u.z ) + u.y;
 	z = 2*( (t7 -  t3)*u.x + (t2 +  t9)*u.y + (t5 + t8)*u.z ) + u.z;
-	u = Vector3(x,y,z);
+	u = Vector(x,y,z);
 	x = 2*( (t8 + t10)*v.x + (t6 -  t4)*v.y + (t3 + t7)*v.z ) + v.x;
 	y = 2*( (t4 +  t6)*v.x + (t5 + t10)*v.y + (t9 - t2)*v.z ) + v.y;
 	z = 2*( (t7 -  t3)*v.x + (t2 +  t9)*v.y + (t5 + t8)*v.z ) + v.z;
-	v = Vector3(x,y,z);
+	v = Vector(x,y,z);
 	p.normalize();
 	u.normalize();
 	v.normalize();
@@ -108,6 +108,7 @@
 	return true;
 }
 
+#ifndef NO_SSE
 // rewrite of BBox::intersect for ray packets
 __m128 BBox::intersect_packet(const RayPacket &rays, __m128 &a, __m128 &b)
 {
@@ -149,3 +150,4 @@
 	b = tfar;
 	return mask;
 }
+#endif