CIS565-Fall-2014 · jianqiaol · Oct 2, 2014 · Oct 10, 2014 · Oct 11, 2014 · Oct 11, 2014
diff --git a/AA_compare.png b/AA_compare.png
diff --git a/DOF.png b/DOF.png
diff --git a/README.md b/README.md
diff --git a/Thumbs.db b/Thumbs.db
diff --git a/data/scenes/sampleScene.txt b/data/scenes/sampleScene.txt
@@ -1,190 +1,190 @@
-MATERIAL 0				//white diffuse
-RGB         1 1 1       
-SPECEX      0      
-SPECRGB     1 1 1      
-REFL        0       
-REFR        0        
-REFRIOR     0       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 1 				//red diffuse
-RGB         .63 .06 .04       
-SPECEX      0      
-SPECRGB     1 1 1      
-REFL        0       
-REFR        0        
-REFRIOR     0       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 2 				//green diffuse
-RGB         .15 .48 .09      
-SPECEX      0      
-SPECRGB     1 1 1      
-REFL        0       
-REFR        0        
-REFRIOR     0       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 3 				//red glossy
-RGB         .63 .06 .04      
-SPECEX      0      
-SPECRGB     1 1 1       
-REFL        0       
-REFR        0        
-REFRIOR     2       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 4 				//white glossy
-RGB         1 1 1     
-SPECEX      0      
-SPECRGB     1 1 1      
-REFL        0       
-REFR        0        
-REFRIOR     2      
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 5 				//glass
-RGB         0 0 0    
-SPECEX      0      
-SPECRGB     1 1 1      
-REFL        0       
-REFR        1        
-REFRIOR     2.2       
-SCATTER     0        
-ABSCOEFF    .02 5.1 5.7      
-RSCTCOEFF   13
-EMITTANCE   0
-
-MATERIAL 6 				//green glossy
-RGB         .15 .48 .09      
-SPECEX      0      
-SPECRGB     1 1 1     
-REFL        0       
-REFR        0        
-REFRIOR     2.6       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   0
-
-MATERIAL 7				//light
-RGB         1 1 1       
-SPECEX      0      
-SPECRGB     0 0 0       
-REFL        0       
-REFR        0        
-REFRIOR     0       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   1
-
-MATERIAL 8				//light
-RGB         1 1 1       
-SPECEX      0      
-SPECRGB     0 0 0       
-REFL        0       
-REFR        0        
-REFRIOR     0       
-SCATTER     0        
-ABSCOEFF    0 0 0      
-RSCTCOEFF   0
-EMITTANCE   15
-
-CAMERA
-RES         800 800
-FOVY        25
-ITERATIONS  5000
-FILE        test.bmp
-frame 0
-EYE         0 4.5 12
-VIEW        0 0 -1
-UP          0 1 0
-
-OBJECT 0
-cube
-material 0
-frame 0
-TRANS       0 0 0
-ROTAT       0 0 90
-SCALE       .01 10 10 
-
-OBJECT 1
-cube
-material 0
-frame 0
-TRANS       0 5 -5
-ROTAT       0 90 0
-SCALE       .01 10 10 
-
-OBJECT 2
-cube
-material 0
-frame 0
-TRANS       0 10 0
-ROTAT       0 0 90
-SCALE       .01 10 10
-
-OBJECT 3
-cube
-material 1
-frame 0
-TRANS       -5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
-
-OBJECT 4
-cube
-material 2
-frame 0
-TRANS       5 5 0
-ROTAT       0 0 0
-SCALE       .01 10 10
-
-OBJECT 5
-sphere
-material 4
-frame 0
-TRANS       0 2 0
-ROTAT       0 180 0
-SCALE       3 3 3
-
-OBJECT 6
-sphere
-material 3
-frame 0
-TRANS       2 5 2
-ROTAT       0 180 0
-SCALE       2.5 2.5 2.5
-
-OBJECT 7
-sphere
-material 6
-frame 0
-TRANS       -2 5 -2
-ROTAT       0 180 0
-SCALE       3 3 3
-
-
-OBJECT 8
-cube
-material 8 
-frame 0
-TRANS       0 10 0
-ROTAT       0 0 90
+MATERIAL 0				//white diffuse
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 1 				//red diffuse
+RGB         .63 .06 .04       
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 2 				//green diffuse
+RGB         .15 .48 .09      
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 3 				//red glossy
+RGB         .63 .06 .04      
+SPECEX      0      
+SPECRGB     1 1 1       
+REFL        0       
+REFR        0        
+REFRIOR     2       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 4 				//white glossy
+RGB         1 1 1     
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     2      
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 5 				//glass
+RGB         0 0 0    
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        1        
+REFRIOR     2.2       
+SCATTER     0        
+ABSCOEFF    .02 5.1 5.7      
+RSCTCOEFF   13
+EMITTANCE   0
+
+MATERIAL 6 				//green glossy
+RGB         .15 .48 .09      
+SPECEX      0      
+SPECRGB     1 1 1     
+REFL        0       
+REFR        0        
+REFRIOR     2.6       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 7				//light
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   1
+
+MATERIAL 8				//light
+RGB         1 1 1       
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   15
+
+CAMERA
+RES         800 800
+FOVY        25
+ITERATIONS  5000
+FILE        test.bmp
+frame 0
+EYE         0 4.5 12
+VIEW        0 0 -1
+UP          0 1 0
+
+OBJECT 0
+cube
+material 0
+frame 0
+TRANS       0 0 0
+ROTAT       0 0 90
+SCALE       .01 100 100 
+
+OBJECT 1
+cube
+material 0
+frame 0
+TRANS       0 5 -10
+ROTAT       0 90 0
+SCALE       .01 100 100 
+
+OBJECT 2
+cube
+material 0
+frame 0
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .01 100 100
+
+OBJECT 3
+cube
+material 1
+frame 0
+TRANS       -5 5 0
+ROTAT       0 0 0
+SCALE       .01 100 100
+
+OBJECT 4
+cube
+material 2
+frame 0
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 100 100
+
+OBJECT 5
+sphere
+material 4
+frame 0
+TRANS       0 2 -1
+ROTAT       0 180 0
+SCALE       3 3 3
+
+OBJECT 6
+sphere
+material 3
+frame 0
+TRANS       2 5 2
+ROTAT       0 180 0
+SCALE       2.5 2.5 2.5
+
+OBJECT 7
+sphere
+material 6
+frame 0
+TRANS       -2 5 -4
+ROTAT       0 180 0
+SCALE       3 3 3
+
+
+OBJECT 8
+cube
+material 8 
+frame 0
+TRANS       0 10 0
+ROTAT       0 0 90
 SCALE       .3 3 3
diff --git a/first_result_failed.png b/first_result_failed.png
diff --git a/first_result_success.png b/first_result_success.png
diff --git a/motion_blur.png b/motion_blur.png
diff --git a/performance_analysis.png b/performance_analysis.png
diff --git a/result_with_AA.png b/result_with_AA.png