CIS565-Fall-2013 · vimanyu · Sep 25, 2013 · Sep 26, 2013 · Sep 27, 2013 · Sep 27, 2013
diff --git a/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj b/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj
@@ -25,6 +25,8 @@
     <ClInclude Include="..\..\src\interactions.h" />
     <ClInclude Include="..\..\src\intersections.h" />
     <ClInclude Include="..\..\src\main.h" />
+    <ClInclude Include="..\..\src\materials.h" />
+    <ClInclude Include="..\..\src\perlin.h" />
     <ClInclude Include="..\..\src\raytraceKernel.h" />
     <ClInclude Include="..\..\src\scene.h" />
     <ClInclude Include="..\..\src\sceneStructs.h" />
@@ -75,7 +77,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\Build\CUDA 4.0.props" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -196,10 +198,11 @@
     <CudaCompile>
       <CompileOut>$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
       <Include>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:/ProgramData/NVIDIA Corporation/CUDA Samples/v5.5/common/inc;../shared/glew/includes;../shared/freeglut/includes</Include>
+      <CodeGeneration>compute_10,sm_10</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\Build\CUDA 4.0.targets" />
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\CUDA 5.5.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.filters b/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.filters
@@ -30,6 +30,8 @@
     <ClInclude Include="..\..\src\stb_image\stb_image.h">
       <Filter>stb_image</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\materials.h" />
+    <ClInclude Include="..\..\src\perlin.h" />
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="..\..\src\raytraceKernel.cu" />

diff --git a/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.user b/PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.user
@@ -13,7 +13,7 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">
-    <LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt frame=0 mblur=0 dof=0</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/README.md b/README.md
diff --git a/renders/test.0.bmp → renders/depthMap_pool.bmp b/renders/test.0.bmp → renders/depthMap_pool.bmp
diff --git a/renders/depth_map.bmp b/renders/depth_map.bmp
diff --git a/renders/depth_map0.bmp b/renders/depth_map0.bmp
diff --git a/renders/dof.bmp b/renders/dof.bmp
diff --git a/renders/dof_image.bmp b/renders/dof_image.bmp
diff --git a/renders/fresnel_frame1.bmp b/renders/fresnel_frame1.bmp
diff --git a/renders/mblur.bmp b/renders/mblur.bmp
diff --git a/renders/motion_blurred.bmp b/renders/motion_blurred.bmp
diff --git a/renders/perlin_earth.bmp b/renders/perlin_earth.bmp
diff --git a/renders/perlin_texture.bmp b/renders/perlin_texture.bmp
diff --git a/renders/pool.0.bmp b/renders/pool.0.bmp
diff --git a/renders/refr_refl_diff_DOF.bmp b/renders/refr_refl_diff_DOF.bmp
diff --git a/renders/refr_refl_fresnel.bmp b/renders/refr_refl_fresnel.bmp
diff --git a/renders/texture_session.bmp b/renders/texture_session.bmp
diff --git a/scenes/dof_demo.txt b/scenes/dof_demo.txt
@@ -0,0 +1,305 @@
+MAP 0
+base
+COL1        1 1 1
+COL2        1 1 1  
+WIDTH1	    1
+WIDTH2 	    1
+SMOOTH	    0
+
+MAP 1
+hstripe
+COL1        0 1 1
+COL2        1 1 0  
+WIDTH1	    0.4
+WIDTH2 	    0.5
+SMOOTH	    0
+
+MAP 2
+vstripe
+COL1        0.9 0.9 0.9
+COL2        0.9 0.9 0.9  
+WIDTH1	    0.5
+WIDTH2 	    0.2
+SMOOTH	    0
+
+MAP 3   //Sphere checker
+checkerboard
+COL1        1.0 0.0 0.0
+COL2        1.0 1.0 0.0  
+WIDTH1	    0.1
+WIDTH2 	    0.1
+SMOOTH	    0
+
+MAP 4   //Perlin
+marble
+COL1        1.0 0.0 0.0
+COL2        1.0 1.0 0.0  
+WIDTH1	    0.1
+WIDTH2 	    0.1
+SMOOTH	    0
+
+
+MATERIAL 0				//white diffuse
+RGB         0.9 0.9 0.9       
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+DIFFCOEFF   1
+MAPID 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
+DIFFCOEFF   1
+MAPID 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
+DIFFCOEFF   1
+MAPID 0
+
+MATERIAL 3 				//red glossy
+RGB         .63 .26 .24      
+SPECEX      0      
+SPECRGB     1 1 1       
+REFL        0       
+REFR        0        
+REFRIOR     2       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+DIFFCOEFF   1
+MAPID 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
+DIFFCOEFF   1
+MAPID 0
+
+MATERIAL 5 				//glass
+RGB         1 1 1    
+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
+DIFFCOEFF   1
+MAPID 0
+
+MATERIAL 6 				//green glossy
+RGB         .35 .48 .29      
+SPECEX      0      
+SPECRGB     1 1 1     
+REFL        1       
+REFR        0        
+REFRIOR     2.6       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+DIFFCOEFF   0.7
+MAPID 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
+DIFFCOEFF   1
+MAPID 0
+
+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
+DIFFCOEFF   1
+MAPID 0
+
+MATERIAL 9 				//green glossy
+RGB         .35 .48 .29      
+SPECEX      0      
+SPECRGB     1 1 1     
+REFL        1       
+REFR        0        
+REFRIOR     2.6       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0
+DIFFCOEFF   1.0
+MAPID 4
+
+
+CAMERA
+RES         800 800
+FOVY        25
+ITERATIONS  5000
+FILE        test.bmp
+FOCALDIST   2
+APERTURE    2.2
+frame 0
+EYE         0 4.5 12
+VIEW        0 0 -1
+UP          0 1 0
+frame 1
+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 
+frame 1
+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 
+frame 1
+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
+frame 1
+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
+frame 1
+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
+frame 1
+TRANS       5 5 0
+ROTAT       0 0 0
+SCALE       .01 10 10
+
+OBJECT 5
+sphere
+material 5
+frame 0
+TRANS       0 5 0
+ROTAT       0 180 0
+SCALE       3 3 3
+frame 1
+TRANS       0 5 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       3 3 3
+frame 1
+TRANS       2 5 2
+ROTAT       0 180 0
+SCALE       3 3 3
+
+OBJECT 7
+sphere
+material 6
+frame 0
+TRANS       -2 5 -2
+ROTAT       0 180 0
+SCALE       3 3 3
+frame 1
+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
+SCALE       .3 3 3
+frame 1
+TRANS       0 10 0
+ROTAT       0 0 90
+SCALE       .3 3 3