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

CIS 565 Project 2 #19

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

CIS 565 Project 2 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3e078ac
ray tracer working code
harmoli Sep 25, 2013
44f9856
naive obj loader (no normal/texture support), triangle intersection
harmoli Sep 26, 2013
ab3d814
clean obj loader
harmoli Sep 26, 2013
6cafdda
somewhat working path tracing :)
harmoli Oct 2, 2013
aa2d432
working pathtracing without stream compaction
harmoli Oct 3, 2013
60cf8b3
working naive parallel scan/prefix sum
harmoli Oct 13, 2013
473041f
scan
harmoli Oct 14, 2013
ac53245
fresnel working, obj loading working but w problematic color accumula…
harmoli Oct 19, 2013
ab25b9e
Delete test.0.bmp
Oct 19, 2013
c96337d
Update README.md
Oct 19, 2013
6995cab
Update README.md
Oct 19, 2013
8ad35b9
Update README.md
Oct 19, 2013
569c5b4
[HL] mesh loading
harmoli Feb 3, 2014
6fa88b3
Merge branch 'master' of https://github.com/harmoli/Project2-Pathtracer
harmoli Feb 3, 2014
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/565Pathtracer.sdf
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Pathtracer.suo
View file
Open in desktop
Binary file not shown.
8 changes: 7 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 @@ -19,7 +19,9 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\clock.h" />
<ClInclude Include="..\..\src\cudaMat4.h" />
<ClInclude Include="..\..\src\fps.h" />
<ClInclude Include="..\..\src\glslUtility.h" />
<ClInclude Include="..\..\src\image.h" />
<ClInclude Include="..\..\src\interactions.h" />
Expand All @@ -30,9 +32,11 @@
<ClInclude Include="..\..\src\sceneStructs.h" />
<ClInclude Include="..\..\src\stb_image\stb_image.h" />
<ClInclude Include="..\..\src\stb_image\stb_image_write.h" />
<ClInclude Include="..\..\src\timer.h" />
<ClInclude Include="..\..\src\utilities.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\fps.cpp" />
<ClCompile Include="..\..\src\glslUtility.cpp" />
<ClCompile Include="..\..\src\image.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
Expand All @@ -49,6 +53,7 @@
<Keyword>Win32Proj</Keyword>
<RootNamespace>565Pathtracer</RootNamespace>
<ProjectName>565Pathtracer</ProjectName>
<CudaToolkitCustomDir>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5</CudaToolkitCustomDir>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -196,10 +201,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_10,sm_10</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\Build\CUDA 4.0.targets" />
</ImportGroup>
</Project>
</Project>
4 changes: 4 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 @@ -12,6 +12,7 @@
<ClCompile Include="..\..\src\stb_image\stb_image_write.c">
<Filter>stb_image</Filter>
</ClCompile>
<ClCompile Include="..\..\src\fps.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cudaMat4.h" />
Expand All @@ -30,6 +31,9 @@
<ClInclude Include="..\..\src\stb_image\stb_image.h">
<Filter>stb_image</Filter>
</ClInclude>
<ClInclude Include="..\..\src\clock.h" />
<ClInclude Include="..\..\src\fps.h" />
<ClInclude Include="..\..\src\timer.h" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
Expand Down
4 changes: 2 additions & 2 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">
<LocalDebuggerCommandArguments>scene=../../scenes/sampleScene.txt</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>scene=../../scenes/color_glass_2.txt</LocalDebuggerCommandArguments>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
</Project>
Binary file added PROJ1_WIN/565Pathtracer/glew32.dll
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Pathtracer/test.0.bmp
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Pathtracer/vc100.pdb
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/ipch/565pathtracer-9c02bd51/565pathtracer-b2e0d6d3.ipch
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/ipch/565pathtracer-9c02bd51/565pathtracer-e9499.ipch
View file
Open in desktop
Binary file not shown.
286 changes: 139 additions & 147 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

Loading