Skip to content

Collin Boots Project 2 Updates #5

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

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

Collin Boots Project 2 Updates #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
c183aac
Updated project for 5.5 VS 2012
cboots Sep 23, 2013
eaffe17
Redefined constants as #define so could use in device code.
cboots Sep 23, 2013
d609c1a
Added frame rate counter and replaced raycast camera kernel with my own.
cboots Sep 23, 2013
d3152c6
Added some debug code in attempt to profile more finely. Doesn't compile
cboots Sep 23, 2013
c8f4f43
Added project directories that link profiling libraries.
cboots Sep 23, 2013
44de4de
Removed nvtx tags and added CUDA properties debug print
cboots Sep 24, 2013
ab069bf
Merge remote-tracking branch 'remotes/starter/master'
cboots Sep 24, 2013
fd2e13c
Fixed merge error
cboots Sep 24, 2013
be1466c
Added ray pool struct
cboots Sep 26, 2013
65f9000
Added a bunch of stuff from my raytracer.
cboots Sep 26, 2013
5ee5792
Added the outline of ray pool allocation kernel.
cboots Sep 27, 2013
946304f
Fixed incorrect block allocation.
cboots Sep 27, 2013
d31ad35
Naive ray allocation successful.
cboots Sep 27, 2013
c354a8d
Added start of scan algorithm.
cboots Sep 27, 2013
a789f9a
Added some code from raytracer for sample allocation.
cboots Sep 28, 2013
a8e1ad5
Added mode change controls.
cboots Sep 28, 2013
61f6324
Finished first crack at exclusive scan implementation.
cboots Sep 28, 2013
720a1f6
Fixed several bugs in the scan code. Something is still wrong in the …
cboots Sep 28, 2013
e08b4ec
Got exclusive scan to work!!!
cboots Sep 28, 2013
5473d25
Added and tested float variation of exclusive scan template.
cboots Sep 28, 2013
d27569f
Added inclusive scan wrapper to exclusive scan
cboots Sep 28, 2013
2931f8a
Fixed copying bug that made array copy incorrectly.
cboots Sep 28, 2013
623ab02
Removed debug code.
cboots Sep 28, 2013
73cfdc4
Implemented frame filtering. Needs some tweak to account for pixel by…
cboots Sep 28, 2013
c4ed809
Fixed memory leak.
cboots Sep 28, 2013
a97f770
Fixed another memory leak.
cboots Sep 28, 2013
c59d3cc
Implemented Inclusive Scan kernel without copying from exclusive scan…
cboots Sep 29, 2013
b8c7404
Removed debug code again.
cboots Sep 29, 2013
d00c6cd
Implemented purely stochastic pixel assignment code.
cboots Sep 29, 2013
cb8cf7b
Added option for non-stochastic pixel assignment.
cboots Sep 29, 2013
c620138
Cleared out a bunch of dead code that I'm not using anymore.
cboots Sep 29, 2013
8f897b9
Implemented first bounce test code.
cboots Sep 29, 2013
577b954
Removed scaling step, shaved 3ms off every frame.
cboots Sep 29, 2013
ee8f966
Forked current kernel to make a first hit color scene.
cboots Sep 29, 2013
e31aec8
Implemented a lot of light physics.
cboots Sep 29, 2013
1e1fe61
Implemented fresnel equations
cboots Sep 29, 2013
8301167
Replaced starter code with my own intersection test wrapper.
cboots Sep 29, 2013
0bb25f4
Added background color.
cboots Sep 29, 2013
dddce36
Added light sources
cboots Sep 30, 2013
4102d7d
Added effects of absorption traveling through medium.
cboots Sep 30, 2013
3aef2fb
Added scenes
cboots Sep 30, 2013
61dcf3f
Added normal debug mode and some simplified mirror code for debugging…
cboots Sep 30, 2013
90cebfb
Fixed bug with box intersection test that resulted in normals not bei…
cboots Sep 30, 2013
e8749d5
Implemented perfect refraction.
cboots Sep 30, 2013
03a4c53
Fixed bug with matIndex not reseting to air -1
cboots Sep 30, 2013
29bff2a
Ran all night to see what I would get for illumination.
cboots Sep 30, 2013
a706b86
Tried to fix the refraction bug. I think I'm going at things backwards.
cboots Sep 30, 2013
7c8d989
Added debug mode showing the trace depth of each ray.
cboots Sep 30, 2013
181661e
Implemented system for background sky color rendering correctly while…
cboots Oct 1, 2013
e81452a
Started to repair refraction.
cboots Oct 1, 2013
26c3d27
Fixed refraction. Turns out it was a floating point error.
cboots Oct 1, 2013
2269c48
Fixed floating point bug that caused refractions to turn into reflect…
cboots Oct 1, 2013
1e35c8b
Implemented stream compaction.
cboots Oct 1, 2013
f1b5fea
Fixed memory leaks.
cboots Oct 1, 2013
af09852
Stupid compiler.
cboots Oct 1, 2013
efc9336
Removed debug statements.
cboots Oct 2, 2013
7e23b97
Added in transmitted light
cboots Oct 2, 2013
75f698c
Added glass ceiling to hall of mirrors
cboots Oct 2, 2013
4187457
Added specular exponent reflection. Not working
cboots Oct 2, 2013
e4462e4
Fixed specular diffusion
cboots Oct 2, 2013
231c0fd
Implemented fuzzy glass
cboots Oct 2, 2013
0548074
Added fuzzy glass rendering
cboots Oct 2, 2013
bb87552
Added better sky visualization
cboots Oct 2, 2013
23107aa
Added stonehenge scene
cboots Oct 2, 2013
2d59b2f
Implemented global lighting in scene file. Need to perform rendering …
cboots Oct 2, 2013
44049d8
Implemented movable global light
cboots Oct 2, 2013
06b77d6
Merge branch 'master' of github.com:cboots/Project2-Pathtracer
cboots Oct 2, 2013
0a837d9
Got global shadows to work decently.
cboots Oct 2, 2013
d8139e8
Added more renders.
cboots Oct 3, 2013
5b5774c
Added sundial images
cboots Oct 3, 2013
f483fe3
Update README.md
cboots Oct 3, 2013
7a85890
Added another rendering
cboots Oct 3, 2013
6d863da
Merge branch 'master' of github.com:cboots/Project2-Pathtracer
cboots Oct 3, 2013
286ddd2
Added debug mode screenshots.
cboots Oct 3, 2013
21b0083
Update README.md
cboots Oct 3, 2013
481a5ac
Update README.md
cboots Oct 3, 2013
f4444a6
Added performance metric code
cboots Oct 3, 2013
3a3adea
Added test results plotted
cboots Oct 3, 2013
e31081f
Revert "Added performance metric code"
cboots Oct 3, 2013
84cf1a9
Update README.md
cboots Oct 3, 2013
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
14 changes: 12 additions & 2 deletions PROJ1_WIN/565Pathtracer.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}") = "565Pathtracer", "565Pathtracer\565Pathtracer.vcxproj", "{FF21CA49-522E-4E86-B508-EE515B248FC4}"
EndProject
Global
Expand All @@ -9,10 +9,14 @@ Global
Debug (v4.0)|x64 = Debug (v4.0)|x64
Debug (v5.5)|Win32 = Debug (v5.5)|Win32
Debug (v5.5)|x64 = Debug (v5.5)|x64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release (v4.0)|Win32 = Release (v4.0)|Win32
Release (v4.0)|x64 = Release (v4.0)|x64
Release (v5.5)|Win32 = Release (v5.5)|Win32
Release (v5.5)|x64 = Release (v5.5)|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v4.0)|Win32.ActiveCfg = Debug|Win32
Expand All @@ -21,12 +25,18 @@ Global
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v5.5)|Win32.ActiveCfg = Debug (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v5.5)|Win32.Build.0 = Debug (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v5.5)|x64.ActiveCfg = Debug (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug|Win32.ActiveCfg = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug|Win32.Build.0 = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug|x64.ActiveCfg = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v4.0)|Win32.ActiveCfg = Release|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v4.0)|Win32.Build.0 = Release|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v4.0)|x64.ActiveCfg = Release|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v5.5)|Win32.ActiveCfg = Release (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v5.5)|Win32.Build.0 = Release (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release (v5.5)|x64.ActiveCfg = Release (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release|Win32.ActiveCfg = Release|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release|Win32.Build.0 = Release|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
24 changes: 17 additions & 7 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cudaAlgorithms.h" />
<ClInclude Include="..\..\src\cudaMat4.h" />
<ClInclude Include="..\..\src\glslUtility.h" />
<ClInclude Include="..\..\src\image.h" />
Expand All @@ -42,6 +43,7 @@
<ClCompile Include="..\..\src\utilities.cpp" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\cudaAlgorithms.cu" />
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
<PropertyGroup Label="Globals">
Expand All @@ -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" />
Expand Down Expand Up @@ -132,20 +138,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>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;C:\Program Files\NVIDIA Corporation\NvToolsExt\include;%(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>C:\Program Files\NVIDIA Corporation\NvToolsExt\lib\x64;../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;nvToolsExt64_1.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/includes;../shared/freeglut/includes</Include>
<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;C:\Program Files\NVIDIA Corporation\NvToolsExt\include</Include>
<GPUDebugInfo>true</GPUDebugInfo>
<GenerateLineInfo>true</GenerateLineInfo>
<CodeGeneration>compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -196,10 +205,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_20,sm_20</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>
2 changes: 2 additions & 0 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
<ClInclude Include="..\..\src\stb_image\stb_image.h">
<Filter>stb_image</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cudaAlgorithms.h" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
<CudaCompile Include="..\..\src\cudaAlgorithms.cu" />
</ItemGroup>
<ItemGroup>
<Filter Include="stb_image">
Expand Down
6 changes: 3 additions & 3 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<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 (v4.0)|Win32'">
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>scene=../../scenes/hallofmirrors.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
</Project>
Loading