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

Project2-Pathtracer submission #3

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

Project2-Pathtracer submission #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e276055
integrate project1
YuqinShao Sep 27, 2013
cae9fd7
basic+refraction
YuqinShao Sep 29, 2013
3310a09
add DOF
YuqinShao Sep 29, 2013
9910d59
Update README.md
YuqinShao Oct 2, 2013
c845298
Update README.md
YuqinShao Oct 2, 2013
908b82d
add obj loader+clean code+render img
YuqinShao Oct 2, 2013
bc07976
Update README.md
YuqinShao Oct 2, 2013
fc01666
final?
YuqinShao Oct 2, 2013
71cd73f
Update README.md
YuqinShao Oct 2, 2013
7530257
Merge branch 'master' of https://github.com/YuqinShao/Project2-Pathtr…
YuqinShao Oct 2, 2013
d4ee945
change evaluation image
YuqinShao Oct 2, 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
28 changes: 13 additions & 15 deletions PROJ1_WIN/565Pathtracer.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "565Pathtracer", "565Pathtracer\565Pathtracer.vcxproj", "{FF21CA49-522E-4E86-B508-EE515B248FC4}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "565Pathtracer", "565Pathtracer\565Raytracer.vcxproj", "{FF21CA49-522E-4E86-B508-EE515B248FC4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug (v4.0)|Win32 = Debug (v4.0)|Win32
Debug (v4.0)|x64 = Debug (v4.0)|x64
Debug (v5.5)|Win32 = Debug (v5.5)|Win32
Debug (v5.5)|x64 = Debug (v5.5)|x64
Release (v4.0)|Win32 = Release (v4.0)|Win32
Release (v4.0)|x64 = Release (v4.0)|x64
Debug(v4.0)|Win32 = Debug(v4.0)|Win32
Debug(v5.0)|Win32 = Debug(v5.0)|Win32
Debug|Win32 = Debug|Win32
Release (v5.5)|Win32 = Release (v5.5)|Win32
Release (v5.5)|x64 = Release (v5.5)|x64
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v4.0)|Win32.ActiveCfg = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v4.0)|Win32.Build.0 = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug (v4.0)|x64.ActiveCfg = Debug|Win32
{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}.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}.Debug(v4.0)|Win32.ActiveCfg = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug(v4.0)|Win32.Build.0 = Debug|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug(v5.0)|Win32.ActiveCfg = Debug (v5.5)|Win32
{FF21CA49-522E-4E86-B508-EE515B248FC4}.Debug(v5.0)|Win32.Build.0 = 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}.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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Binary file added PROJ1_WIN/565Pathtracer.suo
View file
Open in desktop
Binary file not shown.
12 changes: 9 additions & 3 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</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 @@ -146,6 +146,9 @@
<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_30,sm_30</CodeGeneration>
<GPUDebugInfo>true</GPUDebugInfo>
<HostDebugInfo>true</HostDebugInfo>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -196,10 +199,13 @@
<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_30,sm_30</CodeGeneration>
<GPUDebugInfo>true</GPUDebugInfo>
<HostDebugInfo>true</HostDebugInfo>
</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>
6 changes: 6 additions & 0 deletions PROJ1_WIN/565Pathtracer/565Pathtracer.vcxproj.yuqin.nvuser
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<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=../../scenes/sampleScene.txt" />
<Property Name="WorkingDirectory" Value="D:\A_UPenn\2013FALL\CIS565\projects2013\Project2-Pathtracer\PROJ1_WIN\565Pathtracer" />
</SettingsPointModel>
</ProjectSettingsModel>
41 changes: 41 additions & 0 deletions PROJ1_WIN/565Pathtracer/565Raytracer.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="glslUtility.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="glslUtility.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="kernel.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="main.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="kernel.cu">
<Filter>Source Files</Filter>
</CudaCompile>
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions PROJ1_WIN/565Pathtracer/565Raytracer.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
Loading