sphere and disk area lights mostly ready (I think :S).

scenes/scene3.json

@@ -30,7 +30,7 @@
 	}
     },
 
-    "sphere":{
+    "sphere_area_light":{
 	"position": [1.0, 0.0, -3.25],
 	"radius": 1.5,
 	"material": {

scenes/scene5.json

@@ -7,15 +7,17 @@
 	"position": [0.0, 0.0, -2.0],
 	"radius": 0.5,
 	"material": {
-	    "diffuse": [0.5, 0.5, 0.5]
+	    "diffuse": [1.0, 1.0, 0.0],
+	    "transmissive": true,
+	    "ref_index": 1.33
 	}
     },
 
-    "sphere": {
-	"position": [0.0, 2.0, -2.0],
-	"radius": 0.25,
+    "sphere_area_light": {
+	"position": [0.0, 1.0, -2.0],
+	"radius": 0.15,
 	"material": {
-	    "emission": [10.0, 10.0, 10.0]
+	    "emission": [1.0, 1.0, 1.0]
 	}
     },
 

scenes/scene6.json

@@ -0,0 +1,90 @@
+{
+    "sphere_area_light": {
+	"position": [0.0, 0.75, -1.0],
+	"radius": 0.15,
+	"material": {
+	    "emission": [1.0, 1.0, 1.0]
+	}
+    },
+    
+    "sphere": {
+	"position": [0.2, 0.0, -0.75],
+	"radius": 0.25,
+	"material": {
+	    "diffuse": [1.0, 1.0, 1.0]
+	}
+    },
+
+    "sphere": {
+	"position": [-0.5, -0.5, -1.5],
+	"radius": 0.5,
+	"material": {
+	    "diffuse": [0.0, 0.0, 0.0],
+	    "rho": 1.0
+	}
+    },
+
+    "sphere": {
+	"position": [-0.5, -0.5, 0.6],
+	"radius": 0.5,
+	"material": {
+	    "diffuse": [1.0, 1.0, 0.0],
+	    "transmissive": true,
+	    "ref_index": 1.33
+	}
+    },
+
+    "plane": {
+	"position": [0.0, -1.0, 0.0],
+	"normal": [0.0, 1.0, 0.0],
+	"material": {
+	    "diffuse": [0.0, 1.0, 0.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    },
+
+    "plane": {
+	"position": [-2.0, 0.0, 0.0],
+	"normal": [1.0, 0.0, 0.0],
+	"material": {
+	    "diffuse": [1.0, 0.0, 0.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    },
+
+    "plane": {
+	"position": [2.0, 0.0, 0.0],
+	"normal": [-1.0, 0.0, 0.0],
+	"material": {
+	    "diffuse": [0.0, 0.0, 1.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    },
+
+    "plane": {
+	"position": [0.0, 1.0, 0.0],
+	"normal": [0.0, -1.0, 0.0],
+	"material": {
+	    "diffuse": [0.0, 1.0, 1.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    },
+
+    "plane": {
+	"position": [0.0, 0.0, -2.0],
+	"normal": [0.0, 0.0, 1.0],
+	"material": {
+	    "diffuse": [1.0, 0.0, 1.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    },
+
+    "plane": {
+	"position": [0.0, 0.0, 1.1],
+	"normal": [0.0, 0.0, -1.0],
+	"material": {
+	    "diffuse": [1.0, 1.0, 0.0],
+	    "specular": [0.0, 0.0, 0.0]
+	}
+    }
+}