Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project 2 - Path Tracer Submission #3

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Project 2 - Path Tracer Submission #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4066cb5
2nd Commit
shehzan10 Oct 11, 2012
a2452df
Submission
shehzan10 Oct 13, 2012
c3555c2
Submission
shehzan10 Oct 13, 2012
85a5edd
Submission 2
shehzan10 Oct 13, 2012
1bc801a
Submission 3
shehzan10 Oct 13, 2012
f02a1ff
Added OBJ Loader
shehzan10 Oct 14, 2012
be56597
Copied over from Private Repo
shehzan10 Oct 29, 2012
ca43cf2
Integrated OBJ Loaded
shehzan10 Nov 27, 2012
2033d4c
Fixed Minor Bug with Intersection Normals
shehzan10 Nov 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added PROJ1_WIN/565Raytracer.sdf
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer.sln.docstates.suo
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer.suo
View file
Open in desktop
Binary file not shown.
29 changes: 28 additions & 1 deletion PROJ1_WIN/565Raytracer/565Raytracer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<ClInclude Include="..\..\src\interactions.h" />
<ClInclude Include="..\..\src\intersections.h" />
<ClInclude Include="..\..\src\main.h" />
<ClInclude Include="..\..\src\obj.h" />
<ClInclude Include="..\..\src\objloader.h" />
<ClInclude Include="..\..\src\raytraceKernel.h" />
<ClInclude Include="..\..\src\scene.h" />
<ClInclude Include="..\..\src\sceneStructs.h" />
Expand All @@ -28,6 +30,8 @@
<ClCompile Include="..\..\src\glslUtility.cpp" />
<ClCompile Include="..\..\src\image.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\obj.cpp" />
<ClCompile Include="..\..\src\objloader.cpp" />
<ClCompile Include="..\..\src\scene.cpp" />
<ClCompile Include="..\..\src\stb_image\stb_image.c" />
<ClCompile Include="..\..\src\stb_image\stb_image_write.c" />
Expand All @@ -36,6 +40,26 @@
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\README.md" />
<None Include="..\..\scenes\MeshCornellSimple.txt" />
<None Include="..\..\scenes\MeshScene.txt" />
<None Include="..\..\scenes\sampleScene.txt" />
<None Include="..\..\scenes\sampleScene2.txt" />
<None Include="..\..\scenes\sampleScene3.txt" />
<None Include="..\..\scenes\sampleScene4.txt" />
<None Include="..\..\scenes\sampleScene5.txt" />
<None Include="..\..\scenes\sampleScene6.txt" />
<None Include="..\..\scenes\sampleScene7.txt" />
<None Include="..\..\scenes\Scene.txt" />
<None Include="..\..\scenes\StanfordBunny.txt" />
<None Include="..\..\scenes\TeapotInCornellBox.txt" />
<None Include="..\..\scenes\UtahTeapot.txt" />
<None Include="Interactions_Back_Up.txt" />
<None Include="Junk.txt" />
<None Include="rayTraceKernalBackUp.txt" />
<None Include="sceneCPPBackUp.txt" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
Expand Down Expand Up @@ -107,7 +131,7 @@
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Expand All @@ -117,6 +141,9 @@
<CudaCompile>
<CompileOut>$(ProjectDir)$(Platform)/$(Configuration)/%(Filename)%(Extension).obj</CompileOut>
<Include>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc;../shared/glew/includes;../shared/freeglut/includes</Include>
<GPUDebugInfo>false</GPUDebugInfo>
<HostDebugInfo>false</HostDebugInfo>
<CodeGeneration>compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
80 changes: 77 additions & 3 deletions PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
<ClCompile Include="..\..\src\stb_image\stb_image_write.c">
<Filter>stb_image</Filter>
</ClCompile>
<ClCompile Include="..\..\src\obj.cpp">
<Filter>OBJ Loader</Filter>
</ClCompile>
<ClCompile Include="..\..\src\objloader.cpp">
<Filter>OBJ Loader</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cudaMat4.h" />
Expand All @@ -30,13 +36,81 @@
<ClInclude Include="..\..\src\stb_image\stb_image.h">
<Filter>stb_image</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
<ClInclude Include="..\..\src\obj.h">
<Filter>OBJ Loader</Filter>
</ClInclude>
<ClInclude Include="..\..\src\objloader.h">
<Filter>OBJ Loader</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="stb_image">
<UniqueIdentifier>{011aa553-95e8-4e59-b7ff-1bb89aebe21d}</UniqueIdentifier>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{4264a23b-e3ab-4947-acc4-4e29b9984c4b}</UniqueIdentifier>
</Filter>
<Filter Include="OBJ Loader">
<UniqueIdentifier>{a701b79d-9abf-4e45-8070-302c89e05e77}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\scenes\sampleScene.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\README.md">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene2.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="Junk.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene3.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene4.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="Interactions_Back_Up.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene5.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene6.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\Scene.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="sceneCPPBackUp.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\MeshScene.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\StanfordBunny.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\TeapotInCornellBox.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="rayTraceKernalBackUp.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\MeshCornellSimple.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\sampleScene7.txt">
<Filter>Resource Files</Filter>
</None>
<None Include="..\..\scenes\UtahTeapot.txt">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.shehzan.nvuser
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<ProjectSettingsModel DefinitionId="a218e900-1199-4ab1-a767-7976786f04d4" DisplayName="Nexus Project User Settings" xmlns="clr-namespace:Ark.PropertyModel;assembly=Ark">
<SettingsPointModel DefinitionId="3eb7ba04-016d-475e-b0ff-daa5f0e59a08" DisplayName="Launch">
<Property Name="Arguments" Value="scene=&quot;../../scenes/MeshScene.txt&quot;" />
</SettingsPointModel>
</ProjectSettingsModel>
6 changes: 5 additions & 1 deletion PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerCommandArguments>scene="../../scenes/sampleScene.txt"</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>scene="../../scenes/UtahTeapot.txt"</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>scene="../../scenes/MeshScene.txt"</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
47 changes: 47 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.Build.CppClean.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.EMBED.MANIFEST
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.EMBED.MANIFEST.RES
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.INTERMEDIATE.MANIFEST
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\565Raytracer_manifest.rc
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\cl.command.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\CL.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\CL.write.1.tlog
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\GLSLUTILITY.OBJ
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\IMAGE.OBJ
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.1320.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.1320.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.1320-cvtres.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.1320-cvtres.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.4856.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.4856.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.4856-cvtres.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.4856-cvtres.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.5584.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.5584.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.5584-cvtres.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.5584-cvtres.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.7320.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.7320.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.7320-cvtres.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.7320-cvtres.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.command.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.write.1.tlog
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\MAIN.OBJ
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\mt.command.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\mt.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\mt.write.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\raytraceKernel.cu.cache
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\rc.command.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\rc.read.1.tlog
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\rc.write.1.tlog
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\SCENE.OBJ
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE.OBJ
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE_WRITE.OBJ
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\UTILITIES.OBJ
C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\565Raytracer\Debug\vc100.idb
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\VC100.PDB
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.EXE
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.ILK
C:\USERS\SHEHZAN\DOCUMENTS\VISUAL STUDIO 2010\PROJECTS\PROJECT2-PATHTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.PDB
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.exe.embed.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
Binary file added PROJ1_WIN/565Raytracer/Debug/565Raytracer.exe.embed.manifest.res
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.exe.intermediate.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
2 changes: 2 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.lastbuildstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#v4.0:v100:false
Debug|Win32|C:\Users\Shehzan\Documents\Visual Studio 2010\Projects\Project2-Pathtracer\PROJ1_WIN\|
Loading