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

Jump to bottom

Pathtracer Project submission #13

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

Pathtracer Project submission #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
742728f
First commit from working raytracer code.
rohith10 Sep 26, 2013
1ca69db
Added gitignore.
rohith10 Sep 26, 2013
8541570
Rudimentary stream compaction; Host-side code somewhat complete. Need…
rohith10 Sep 26, 2013
689b42a
BSDF/BRDF implemented. Commented out legacy raytracer code. Using sha…
rohith10 Sep 27, 2013
dea63d1
Almost done?
rohith10 Sep 27, 2013
3586552
Closer to result.
rohith10 Sep 27, 2013
5d877b7
Coding completed. Debugging to commence.
rohith10 Sep 28, 2013
8377d75
More debugging required.
rohith10 Sep 28, 2013
806e8fb
Cool! It works without stream compaction!
rohith10 Sep 29, 2013
fd03686
Stream compaction fixed.
rohith10 Sep 29, 2013
c4a6671
Relegated noise adding to addNoise kernel. Final image is averaged in…
rohith10 Sep 29, 2013
8a1b212
Stream compaction working on GPU. Minor bug causes lines to be displa…
rohith10 Sep 30, 2013
64b17db
Baseline commit - All required parts completed.
rohith10 Sep 30, 2013
43b6136
Fixed small bug that caused screenshot to be completely black.
rohith10 Sep 30, 2013
3a39107
Removing dead code.
rohith10 Sep 30, 2013
55fcb9d
Incomplete Fresnel Reflectance.
rohith10 Oct 1, 2013
b4c34f2
Completed refraction/Fresnel reflectance.
rohith10 Oct 1, 2013
ea2264d
Fresnel-correct Refractions!!
rohith10 Oct 1, 2013
e959afe
Fresnel refraction screenshot and scene file commit.
rohith10 Oct 1, 2013
5f879d2
Diffuse reflectance.
rohith10 Oct 2, 2013
feaa3a7
Texture mapping in progress.
rohith10 Oct 2, 2013
b056874
Texture mapping coding completed. Now to start debugging.
rohith10 Oct 2, 2013
edb9e54
Compilable code.
rohith10 Oct 2, 2013
59a047e
Broken texture mapping
rohith10 Oct 2, 2013
fcf56ab
Merge branch 'master' of https://github.com/rohith10/Project2-Pathtra…
rohith10 Oct 2, 2013
d41ef8b
Removing dead code, some refactoring, and error checking on secondary…
rohith10 Oct 2, 2013
1f275bc
Debugging parallel scan issues.
rohith10 Oct 2, 2013
7267010
More efficient shift right.
rohith10 Oct 2, 2013
3e920b2
CPU/GPU hybrid stream compaction.
rohith10 Oct 3, 2013
6e7775d
Better diffuse reflectance.
rohith10 Oct 3, 2013
a4ab004
Update README.md
rohith10 Oct 3, 2013
71a8b16
Added Performance Analysis document.
rohith10 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
58 changes: 58 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Folders #
###################
PROJ1_WIN/ipch/*
PROJ1_WIN/Debug/*
PROJ1_WIN/Debug (v5.5)/*
PROJ1_WIN/Release/*
PROJ1_WIN/565Pathtracer/Debug/*
PROJ1_WIN/565Pathtracer/Debug (v5.5)/*
PROJ1_WIN/565Pathtracer/Release/*
PROJ1_WIN/565Pathtracer/Win32/*

# Misc #
###################
*.pdf
*.suo
*.user

# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite
*.sdf
*.pdb

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
*.opensdf
*.ipch
5 changes: 4 additions & 1 deletion PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\scenes\sampleScene.txt" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
Expand Down Expand Up @@ -202,4 +205,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\Build\CUDA 4.0.targets" />
</ImportGroup>
</Project>
</Project>
77 changes: 59 additions & 18 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\src\glslUtility.cpp" />
<ClCompile Include="..\..\src\image.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\scene.cpp" />
<ClCompile Include="..\..\src\utilities.cpp" />
<ClCompile Include="..\..\src\stb_image\stb_image.c">
<Filter>stb_image</Filter>
</ClCompile>
<ClCompile Include="..\..\src\stb_image\stb_image_write.c">
<Filter>stb_image</Filter>
</ClCompile>
<ClCompile Include="..\..\src\glslUtility.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utilities.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\src\image.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\src\main.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="..\..\src\scene.cpp">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cudaMat4.h" />
<ClInclude Include="..\..\src\glslUtility.h" />
<ClInclude Include="..\..\src\image.h" />
<ClInclude Include="..\..\src\interactions.h" />
<ClInclude Include="..\..\src\intersections.h" />
<ClInclude Include="..\..\src\main.h" />
<ClInclude Include="..\..\src\raytraceKernel.h" />
<ClInclude Include="..\..\src\scene.h" />
<ClInclude Include="..\..\src\sceneStructs.h" />
<ClInclude Include="..\..\src\utilities.h" />
<ClInclude Include="..\..\src\stb_image\stb_image_write.h">
<Filter>stb_image</Filter>
</ClInclude>
<ClInclude Include="..\..\src\stb_image\stb_image.h">
<Filter>stb_image</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
<ClInclude Include="..\..\src\cudaMat4.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\glslUtility.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\image.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\main.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\raytraceKernel.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sceneStructs.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\scene.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utilities.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\interactions.h">
<Filter>Source</Filter>
</ClInclude>
<ClInclude Include="..\..\src\intersections.h">
<Filter>Source</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="stb_image">
<UniqueIdentifier>{011aa553-95e8-4e59-b7ff-1bb89aebe21d}</UniqueIdentifier>
</Filter>
<Filter Include="Source">
<UniqueIdentifier>{1235a944-4608-4364-a5d4-5fc5408f61ca}</UniqueIdentifier>
</Filter>
<Filter Include="Headers">
<UniqueIdentifier>{df94487e-df64-4170-b341-0725bfbb39a9}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu">
<Filter>Source</Filter>
</CudaCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\scenes\sampleScene.txt" />
</ItemGroup>
</Project>
10 changes: 9 additions & 1 deletion PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,12 @@
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
Binary file added PROJ1_WIN/565Pathtracer/Mytry02.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PROJ1_WIN/565Pathtracer/test.0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Project2-PerfAnalysis.docx
View file
Open in desktop
Binary file not shown.
Loading