CIS565-Fall-2013 · cboots · Sep 10, 2013 · Sep 10, 2013 · Sep 13, 2013 · Sep 13, 2013
diff --git a/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj b/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj
@@ -19,6 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\cameraUtils.h" />
     <ClInclude Include="..\..\src\cudaMat4.h" />
     <ClInclude Include="..\..\src\glslUtility.h" />
     <ClInclude Include="..\..\src\image.h" />
@@ -33,6 +34,7 @@
     <ClInclude Include="..\..\src\utilities.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\cameraUtils.cpp" />
     <ClCompile Include="..\..\src\glslUtility.cpp" />
     <ClCompile Include="..\..\src\image.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
@@ -55,27 +57,31 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </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" />
@@ -200,6 +206,6 @@
   </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>
diff --git a/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.filters b/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.filters
@@ -12,6 +12,7 @@
     <ClCompile Include="..\..\src\stb_image\stb_image_write.c">
       <Filter>stb_image</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cameraUtils.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cudaMat4.h" />
@@ -30,6 +31,7 @@
     <ClInclude Include="..\..\src\stb_image\stb_image.h">
       <Filter>stb_image</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cameraUtils.h" />
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="..\..\src\raytraceKernel.cu" />

diff --git a/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.user b/PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.user
@@ -5,7 +5,7 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">
-    <LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>scene=../../scenes/hallofmirrors.txt</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/README.md b/README.md
diff --git a/renders/badshadow.0.bmp b/renders/badshadow.0.bmp
diff --git a/renders/combined.0.bmp b/renders/combined.0.bmp
diff --git a/renders/combined.1.bmp b/renders/combined.1.bmp
diff --git a/renders/framefiltered.0.bmp b/renders/framefiltered.0.bmp
diff --git a/renders/hallofmirrors.0.bmp b/renders/hallofmirrors.0.bmp
diff --git a/renders/hallofmirrorsdeep.0.bmp b/renders/hallofmirrorsdeep.0.bmp
diff --git a/renders/multisource.0.bmp b/renders/multisource.0.bmp
diff --git a/renders/refraction.0.bmp b/renders/refraction.0.bmp
diff --git a/renders/refractionwithmirrors.0.bmp b/renders/refractionwithmirrors.0.bmp
diff --git a/renders/test.0.bmp b/renders/test.0.bmp
diff --git a/scenes/cube.obj b/scenes/cube.obj
@@ -0,0 +1,28 @@
+v -0.5 -0.5 -0.5
+v -0.5 -0.5 0.5
+v -0.5 0.5 0.5
+v -0.5 0.5 -0.5
+v 0.5 0.5 -0.5
+v 0.5 0.5 0.5
+v 0.5 -0.5 0.5
+v 0.5 -0.5 -0.5
+
+vn 1 0 0
+vn 0 1 0
+vn 0 0 1
+vn -1 0 0
+vn 0 -1 0
+vn 0 0 -1
+
+f 1//4 2//4 4//4
+f 4//4 2//4 3//4
+f 8//6 1//6 5//6
+f 5//6 1//6 4//6
+f 4//2 3//2 5//2
+f 5//2 3//2 6//2
+f 5//1 6//1 8//1
+f 8//1 6//1 7//1
+f 2//3 7//3 3//3
+f 3//3 7//3 6//3
+f 8//5 7//5 1//5
+f 1//5 7//5 2//5
diff --git a/scenes/hallofmirrors.txt b/scenes/hallofmirrors.txt
@@ -0,0 +1,259 @@
+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      5      
+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      10      
+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      10      
+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         0 1 0
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0.65
+
+
+MATERIAL 9				//light
+RGB         1 0 0
+SPECEX      0      
+SPECRGB     0 0 0       
+REFL        0       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0      
+RSCTCOEFF   0
+EMITTANCE   0.75
+
+MATERIAL 10 				//bronze mirror
+RGB         0.8 0.5 0.195
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        1       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0
+RSCTCOEFF   0
+EMITTANCE   0
+
+MATERIAL 11 				//Pure mirror
+RGB         1 1 1
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        1       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0
+RSCTCOEFF   0
+EMITTANCE   0
+
+
+MATERIAL 12 				//blueish mirror
+RGB         0.75 0.75 1
+SPECEX      0      
+SPECRGB     1 1 1      
+REFL        1       
+REFR        0        
+REFRIOR     0       
+SCATTER     0        
+ABSCOEFF    0 0 0
+RSCTCOEFF   0
+EMITTANCE   0
+
+
+
+CAMERA
+RES         800 800
+FOVY        25
+ITERATIONS  500
+FILE        hallofmirrors.bmp
+frame 0
+EYE         0 4.5 4.9
+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 12
+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 10
+frame 0
+TRANS       0 2 -1
+ROTAT       0 180 0
+SCALE       3 3 3
+
+OBJECT 6
+sphere
+material 11
+frame 0
+TRANS       2 5 1
+ROTAT       0 180 0
+SCALE       2.5 2.5 2.5
+
+OBJECT 7
+sphere
+material 6
+frame 0
+TRANS       -2 5 -3
+ROTAT       0 180 0
+SCALE       3 3 3
+
+
+OBJECT 8
+sphere
+material 7 
+frame 0
+TRANS       0 9.5 2
+ROTAT       0 0 90
+SCALE       0.5 2 2
+
+OBJECT 9
+sphere
+material 9
+frame 0
+TRANS       -4 1.5 3
+ROTAT       0 0 90
+SCALE       1 1 1
+
+
+OBJECT 10
+cube
+material 11
+frame 0
+TRANS       0 5 5
+ROTAT       0 90 0
+SCALE       .01 10 10