Its been a while since I commited, so who knows what I've done. Anyway AA works now

Author: Scott Graham Mansell

camera.py

@@ -13,6 +13,7 @@ def __init__(self, scene, eyePoint, size):
 	self.at = Point3(.5,.5,.5)
 	self.scene = scene
 	self.maxLength = 0
+	self.pixels = [0,0,0,0,0,0,0,0,0]
 
 	self.Update()
 
@@ -51,15 +52,50 @@ def processRay(self, ray):
         hit.calcLights(self.scene)
         return hit
 
-    def pixelColour(self, x, y):
-        ray = self.getRay(x, y);
-	# full scene anti alising goes here
-	hit = self.processRay(ray)
+    def pixelColour(self, x, y, samples=1):
+	pitch = .5 / samples
+	colour = Colour(0,0,0)
+	count = 0
+	for subX in range(samples):
+	  for subY in range(samples):
+	    count += 1
+	    ray = self.getRay(x - .5 + (subX+1) * pitch + subX*pitch, 
+			      y - .5 + (subY+1) * pitch + subY*pitch)
+	    hit = self.processRay(ray)
+	    colour = colour + hit.colour()
+	    #depth = math.log((hit.length() + 0.1), 10)
+	    #colour = colour + Colour(depth, depth, depth)
+
+	self.pixels[samples] += 1 
+        return colour / count
+
+    def aa(self, x, y):
+	"""Detect if the pixel x,y is at an edge, then anti-alais it"""
+
+	#This code is ugly, I can't work out a more sane way to do it
+	M = self.size
+	(p1, p2, p3, p4, p6, p7, p8, p9) = [(0,0,0)] * 8
+	if x > 1 and y > 1: p1 = self.img.getpixel((x-1, y-1))
+	if y > 2: p2 = self.img.getpixel((x, y-1))
+	if x < M - 1 and y > 1: p3 = self.img.getpixel((x+1, y-1))
+	if x > 1: p4 = self.img.getpixel((x-1, y))
+	p5 = self.img.getpixel((x, y))
+	if x < M - 1: p6 = self.img.getpixel((x+1, y))
+	if x > 1 and y > M: p7 = self.img.getpixel((x-1, y+1))
+	if y > M: p8 = self.img.getpixel((x, y+1))
+	if x > M and y > M: p9 = self.img.getpixel((x+1, y+1))
 
-	depth = math.log((hit.length() + 0.1), 10)
-	colour = Colour(depth, depth, depth).intColour()
-	self.img.putpixel((x, y), colour)
-	if hit.length() > self.maxLength:
-	    self.maxLength = hit.length()
-        return colour
+	r = abs((p1[0] + 2 * p2[0] + p3[0]) - (p7[0] + 2 * p8[0] + p9[0])) + 	    abs((p2[0] + 2 * p6[0] + p9[0]) - (p1[0] + 2 * p4[0] + p7[0]))
+	g = abs((p1[1] + 2 * p2[1] + p3[1]) - (p7[1] + 2 * p8[1] + p9[1])) + 	    abs((p2[1] + 2 * p6[1] + p9[1]) - (p1[1] + 2 * p4[1] + p7[1]))
+	b = abs((p1[2] + 2 * p2[2] + p3[2]) - (p7[2] + 2 * p8[2] + p9[2])) + 	    abs( (p2[2] + 2 * p6[2] + p9[2]) - (p1[2] + 2 * p4[2] + p7[2]) )
+
+	sum = r + g + b
+
+	if sum > 300: # We do 2 levels of AA
+	    colour =  self.pixelColour(x, y, 4) # 16 samples per pixel
+	    return colour.intColour()
+	elif sum > 150:
+	    colour =  self.pixelColour(x, y, 2) # 4 samples per pixel
+	    return colour.intColour()
+	return p5
 

out.rgbz+edge.xcf

@@ -3,6 +3,7 @@
 from antiAlaising import *
 import Image
 import sys
+import time
 from Tkinter import Tk, Canvas, PhotoImage
 from camera import Camera
 
@@ -39,13 +40,6 @@ def putImageRow(self, row, colours):
         self.image.put(rowColourString, to=(0, row))
         self.root.update()
 
-    def rayColour(self, ray, scene):
-        
-        hit = scene.intersect(ray)
-        hit.calcReflections(scene)
-        hit.calcLights(scene)
-        return hit.colour()
-            
     # Main body. Set up an image then compute colour at each pixel
     def trace(self):
         camera = definition.camera
@@ -55,6 +49,7 @@ def trace(self):
         sys.stdout.flush()
 
         count = 0
+	t0 = time.clock()
         max = float(WIN_SIZE**2)
         lastPercentage = 0
         for row in range(WIN_SIZE):
@@ -63,15 +58,38 @@ def trace(self):
                 count += 1
 
                 pixel = camera.pixelColour(col, row)
+		camera.img.putpixel((col, row), pixel.intColour())
+                ROW.append(pixel.intColour())
+            percentage = (count / max * 100)
+            self.putImageRow(row, ROW)
+            if percentage - lastPercentage > .9:
+                print "\b\b\b\b\b\b%4.0f%%" % percentage,
+                sys.stdout.flush()
+                lastPercentage = percentage
+        print "\b\b\b\b\b\b Done (%f sec)" % (time.clock() - t0)
+
+	print "\tAnti-alasing...   0%",
+        sys.stdout.flush()
+	t0 = time.clock()
+        count = 0
+        lastPercentage = 0
+        for row in range(WIN_SIZE):
+            ROW = []
+            for col in range(WIN_SIZE):
+                count += 1
+
+                pixel = camera.aa(col, row)
+		camera.img.putpixel((col, row), pixel)
                 ROW.append(pixel)
             percentage = (count / max * 100)
             self.putImageRow(row, ROW)
             if percentage - lastPercentage > .9:
                 print "\b\b\b\b\b\b%4.0f%%" % percentage,
                 sys.stdout.flush()
                 lastPercentage = percentage
-        print "\b\b\b\b\b\b Done"
-	print camera.maxLength
+        print "\b\b\b\b\b\b (%f sec)" % (time.clock() - t0)
+
+	print camera.pixels
 
         camera.img.save("out.png")  # Display image in default image-viewer application
 

rayCaster.py

@@ -9,7 +9,7 @@
 from CSG import *
 from camera import Camera
 
-WIN_SIZE = 400                              # Screen window size (square)
+WIN_SIZE = 100                              # Screen window size (square)
 
 SHINY_RED = Material(Colour(0.7, 0.1, 0.2), Colour(0.4,0.4,0.4), 100, .2)
 SHINY_BLUE = Material(Colour(0.2, 0.3, 0.7), Colour(0.8,0.8,0.8), 200, .3)
@@ -50,5 +50,6 @@
 camera = Camera(scene, Point3(0, 0.2, 2),WIN_SIZE)
 #camera.lookAt(Point3(0.5,0.2,0.3))
 camera.lookAt(Point3(0.5,0.3, 0.5))
+#camera.setFoV(90)