HW4 Submission

PROJ4_WIN/565Rasterizer.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "565Rasterizer", "565Rasterizer\565Rasterizer.vcxproj", "{FF21CA49-522E-4E86-B508-EE515B248FC4}"
 EndProject
 Global
@@ -21,4 +21,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal

PROJ4_WIN/565Rasterizer/565Rasterizer.vcxproj

@@ -12,15 +12,20 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cudaMat4.h" />
+    <ClInclude Include="..\..\src\glm.h" />
     <ClInclude Include="..\..\src\glslUtility.h" />
     <ClInclude Include="..\..\src\main.h" />
     <ClInclude Include="..\..\src\ObjCore\obj.h" />
     <ClInclude Include="..\..\src\ObjCore\objloader.h" />
     <ClInclude Include="..\..\src\rasterizeKernels.h" />
     <ClInclude Include="..\..\src\rasterizeTools.h" />
+    <ClInclude Include="..\..\src\statVal.h" />
+    <ClInclude Include="..\..\src\util.h" />
     <ClInclude Include="..\..\src\utilities.h" />
+    <ClInclude Include="..\..\src\variables.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\glm.cpp" />
     <ClCompile Include="..\..\src\glslUtility.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\ObjCore\obj.cpp" />
@@ -30,6 +35,10 @@
   <ItemGroup>
     <CudaCompile Include="..\..\src\rasterizeKernels.cu" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="shaders\passthroughFS.glsl" />
+    <None Include="shaders\passthroughVS.glsl" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -41,12 +50,14 @@
     <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>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -70,20 +81,23 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../shared/freeglut/include;../shared/glui/include;../shared/glew/include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>cudart.lib; glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../shared/glew/lib;../shared/freeglut/lib;../shared/glui;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>freeglut.lib;cudart.lib;glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>
     <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/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</Include>
+      <Include>%(AdditionalIncludeDirectories)</Include>
+      <CodeGeneration>compute_20,sm_20</CodeGeneration>
+      <GenerateLineInfo>false</GenerateLineInfo>
+      <GPUDebugInfo>true</GPUDebugInfo>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -95,20 +109,21 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../shared/freeglut/include;../shared/glui/include;../shared/glew/include;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:\ProgramData\NVIDIA Corporation\CUDA Samples\v5.5\common\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>cudart.lib; glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../shared/glew/lib;../shared/glui;../shared/freeglut/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>freeglut.lib;cudart.lib;glew32.lib;glui32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
     </Link>
     <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/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</Include>
+      <Include>%(AdditionalIncludeDirectories)</Include>
+      <CodeGeneration>compute_20,sm_20;compute_30,sm_30</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

PROJ4_WIN/565Rasterizer/565Rasterizer.vcxproj.filters

@@ -25,6 +25,18 @@
     <ClInclude Include="..\..\src\utilities.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\util.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\statVal.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\glm.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\variables.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\ObjCore\obj.cpp">
@@ -42,6 +54,9 @@
     <ClCompile Include="..\..\src\main.cpp">
       <Filter>source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\glm.cpp">
+      <Filter>source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="ObjCore">
@@ -59,4 +74,8 @@
       <Filter>source</Filter>
     </CudaCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="shaders\passthroughFS.glsl" />
+    <None Include="shaders\passthroughVS.glsl" />
+  </ItemGroup>
 </Project>

PROJ4_WIN/565Rasterizer/box.mtl

@@ -0,0 +1,25 @@
+# Max2Mtl Version 4.0 Mar 10th, 2001
+newmtl m1
+Ns 50
+d 1
+illum 2
+Kd 0.7 0.7 0.7
+Ks 1 1 1
+Ka 0.15 0.15 0.15
+map_Kd test.ppm
+
+newmtl m2
+Ka  0.1 0.1 0.1
+Kd  0.0 1 0.0
+Ks  0.3 0.3 0.3
+d  1.0
+Ns  2.2
+illum 2
+
+newmtl m3
+Ka  0.0 0.0 0.0
+Kd  0.0 0.0 1.0
+Ks  0.3 0.3 0.3
+d  1.0
+Ns  2.2
+illum 2

PROJ4_WIN/565Rasterizer/box.obj

@@ -0,0 +1,42 @@
+mtllib box.mtl
+usemtl m1
+g Box01
+v -2.5 -2.5 10
+v -2.5 2.5 10
+v 2.5 2.5 10
+v 2.5 -2.5 10
+v -2.5 -2.5 15
+v 2.5 -2.5 15
+v 2.5 2.5 15
+v -2.5 2.5 15
+# 8 verticies
+vn 0 0 -1
+vn 0 0 1
+vn 0 -1 0
+vn 1 0 0
+vn 0 1 0
+vn -1 0 0
+# 6 normals
+vt 0 0
+vt 0 1
+vt 1 1
+vt 1 0
+# 4 texture coordinates
+usemtl m1
+f 1/1/1 2/2/1 3/3/1
+f 3/3/1 4/4/1 1/1/1
+#usemtl m2
+f 5/1/2 6/2/2 7/3/2
+f 7/3/2 8/4/2 5/1/2
+#usemtl m3
+f 1/1/3 4/2/3 6/3/3
+f 6/3/3 5/4/3 1/1/3
+#usemtl m1
+f 4/1/4 3/2/4 7/3/4
+f 7/3/4 6/4/4 4/1/4
+#usemtl m2
+f 3/1/5 2/2/5 8/3/5
+f 8/3/5 7/4/5 3/1/5
+#usemtl m3
+f 2/1/6 1/2/6 5/3/6
+f 5/3/6 8/4/6 2/1/6

PROJ4_WIN/565Rasterizer/buddha_new.mtl

@@ -0,0 +1,26 @@
+#
+# Wavefront material file: c:\documents and settings\administrator\�ୱ\buddha_new\buddha_new.mtl
+#
+# Converted by the PolyTrans geometry converter from Okino Computer Graphics, Inc.
+# Date/time of export: 07/10/2005 22:12:00
+#
+# Bounding box of geometry = (-72.2539,-113.165,-79.253) to (78.209,117.606,70.5918).
+
+newmtl default
+	Ns 32
+	d 1
+	illum 2
+	Kd 0.4 0.4 0.4
+	Ks 0.7 0.7 0.7
+	Ka 0.3 0.3 0.3
+
+newmtl mat1
+Ns 50
+d 1
+illum 2
+Kd 0.7 0.7 0.7
+Ks 1 1 1
+Ka 0.15 0.15 0.15
+map_Kd Buddha.ppm
+map_Ka Buddha.ppm
+