View difference between Paste ID: U5tsN7L7 and F8f5GHJZ

 from PIL import Image
-import Image
+
 
 class Vector( object ):
-
+
 	def __init__(self,x,y,z):
 		self.x = x
 		self.y = y
 		self.z = z
-
+
 	def dot(self, b):
 		return self.x*b.x + self.y*b.y + self.z*b.z
-
+
 	def cross(self, b):
 		return (self.y*b.z-self.z*b.y, self.z*b.x-self.x*b.z, self.x*b.y-self.y*b.x)
-
+
 	def magnitude(self):
 		return sqrt(self.x**2+self.y**2+self.z**2)
-
+
 	def normal(self):
 		mag = self.magnitude()
 		return Vector(self.x/mag,self.y/mag,self.z/mag)
-
+
 	def __add__(self, b):
 		return Vector(self.x + b.x, self.y+b.y, self.z+b.z)
-
+
 	def __sub__(self, b):
 		return Vector(self.x-b.x, self.y-b.y, self.z-b.z)
-
+
 	def __mul__(self, b):
 		assert type(b) == float or type(b) == int
-		return Vector(self.x*b, self.y*b, self.z*b)
+		return Vector(self.x*b, self.y*b, self.z*b)
-
+
 class Sphere( object ):
-
+
 	def __init__(self, center, radius, color):
 		self.c = center
 		self.r = radius
 		self.col = color
-
+
 	def intersection(self, l):
 		q = l.d.dot(l.o - self.c)**2 - (l.o - self.c).dot(l.o - self.c) + self.r**2
 		if q < 0:
 			return Intersection( Vector(0,0,0), -1, Vector(0,0,0), self)
 		else:
 			d = -l.d.dot(l.o - self.c)
 			d1 = d - sqrt(q)
 			d2 = d + sqrt(q)
 			if 0 < d1 and ( d1 < d2 or d2 < 0):
 				return Intersection(l.o+l.d*d1, d1, self.normal(l.o+l.d*d1), self)
 			elif 0 < d2 and ( d2 < d1 or d1 < 0):
 				return Intersection(l.o+l.d*d2, d2, self.normal(l.o+l.d*d2), self)
 			else:
-				return Intersection( Vector(0,0,0), -1, Vector(0,0,0), self)
+				return Intersection( Vector(0,0,0), -1, Vector(0,0,0), self)
-
+
 	def normal(self, b):
 		return (b - self.c).normal()
-
+
 class Plane( object ):
-
+
 	def __init__(self, point, normal, color):
 		self.n = normal
 		self.p = point
 		self.col = color
-
+
 	def intersection(self, l):
 		d = l.d.dot(self.n)
 		if d == 0:
 			return Intersection( vector(0,0,0), -1, vector(0,0,0), self)
 		else:
 			d = (self.p - l.o).dot(self.n) / d
 			return Intersection(l.o+l.d*d, d, self.n, self)
-
+
 class Ray( object ):
-
+
 	def __init__(self, origin, direction):
 		self.o = origin
 		self.d = direction
-
+
 class Intersection( object ):
-
+
 	def __init__(self, point, distance, normal, obj):
 		self.p = point
 		self.d = distance
 		self.n = normal
 		self.obj = obj
-
+
 def testRay(ray, objects, ignore=None):
 	intersect = Intersection( Vector(0,0,0), -1, Vector(0,0,0), None)
-
+
 	for obj in objects:
 		if obj is not ignore:
 			currentIntersect = obj.intersection(ray)
 			if currentIntersect.d > 0 and intersect.d < 0:
 				intersect = currentIntersect
 			elif 0 < currentIntersect.d < intersect.d:
 				intersect = currentIntersect
 	return intersect
-
+
 def trace(ray, objects, light, maxRecur):
 	if maxRecur < 0:
 		return (0,0,0)
-	intersect = testRay(ray, objects)
+	intersect = testRay(ray, objects)
 	if intersect.d == -1:
 		col = vector(AMBIENT,AMBIENT,AMBIENT)
 	elif intersect.n.dot(light - intersect.p) < 0:
 		col = intersect.obj.col * AMBIENT
 	else:
 		lightRay = Ray(intersect.p, (light-intersect.p).normal())
 		if testRay(lightRay, objects, intersect.obj).d == -1:
 			lightIntensity = 1000.0/(4*pi*(light-intersect.p).magnitude()**2)
 			col = intersect.obj.col * max(intersect.n.normal().dot((light - intersect.p).normal()*lightIntensity), AMBIENT)
 		else:
 			col = intersect.obj.col * AMBIENT
 	return col
-
+
 def gammaCorrection(color,factor):
 	return (int(pow(color.x/255.0,factor)*255),
 			int(pow(color.y/255.0,factor)*255),
 			int(pow(color.z/255.0,factor)*255))
-
+
 
 AMBIENT = 0.1
 GAMMA_CORRECTION = 1/2.2
-
+
 objs = []
 objs.append(Sphere( Vector(-2,0,-10), 2, Vector(0,255,0)))
 objs.append(Sphere( Vector(2,0,-10), 3.5, Vector(255,0,0)))
 objs.append(Sphere( Vector(0,-4,-10), 3, Vector(0,0,255)))
 objs.append(Plane( Vector(0,0,-12), Vector(0,0,1), Vector(255,255,255)))
-lightSource = Vector(0,10,0)
+lightSource = Vector(5,5,2)
-img = Image.new("RGB",(500,500))
+realWidth = 200
 antialias = True
-for x in range(500):
+
 width = realWidth if not(antialias) else 2*realWidth
-	for y in range(500):
+img = Image.new("RGB",(width,width))
-		ray = Ray( cameraPos, (Vector(x/50.0-5,y/50.0-5,0)-cameraPos).normal())
+
 cameraPos = Vector(0,0,20)
-		img.putpixel((x,499-y),gammaCorrection(col,GAMMA_CORRECTION))
+for x in xrange(width):
-img.save("trace.bmp","BMP")
+
 	for y in xrange(width):
 		ray = Ray( cameraPos, (Vector(((10.0*x)/width-5),((10.0*y)/width-5),0)-cameraPos).normal())
 		col = trace(ray, objs, lightSource, 10)
 		img.putpixel((x,width-1-y),gammaCorrection(col,GAMMA_CORRECTION))
 
 if not(antialias):
     img.save("trace.bmp","BMP")
 else:
     img_antialias = Image.new("RGB", (realWidth, realWidth))
     for x in xrange(realWidth):
         for y in xrange(realWidth):
             col1 = img.getpixel((2*x, 2*y))
             col2 = img.getpixel((2*x + 1, 2*y))
             col3 = img.getpixel((2*x + 1, 2*y + 1))
             col4 = img.getpixel((2*x, 2*y + 1))
             blended = (int((col1[0]+col2[0]+col3[0]+col4[0])/4.0), int((col1[1]+col2[1]+col3[1]+col4[1])/4.0), int((col1[2]+col2[2]+col3[2]+col4[2])/4.0))
             img_antialias.putpixel((x, y), blended)
     img_antialias.save("trace.bmp", "BMP")