Skip to content

Project1-RayTracer Submission #4

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 23 commits into
base: master
Choose a base branch
from
Open

Project1-RayTracer Submission #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3a05acf
first commit
YuqinShao Sep 17, 2013
7bc7511
finish code
YuqinShao Sep 17, 2013
1b03989
first image
YuqinShao Sep 18, 2013
543373f
image
YuqinShao Sep 18, 2013
3c1e367
shadow correct
YuqinShao Sep 19, 2013
901b5e1
image
YuqinShao Sep 19, 2013
fa6f5bc
recursive raytrace
YuqinShao Sep 19, 2013
d08640a
specular highlight added
YuqinShao Sep 19, 2013
4f5c494
add camera mouse interaction
YuqinShao Sep 19, 2013
2de0c3e
soft shadow added
YuqinShao Sep 19, 2013
7f6c75a
add rendered images
YuqinShao Sep 20, 2013
baac823
generate random point on sphere done
YuqinShao Sep 20, 2013
89ffeca
submit version1
YuqinShao Sep 20, 2013
d7b125a
rendered images
YuqinShao Sep 20, 2013
a7b2541
image
YuqinShao Sep 20, 2013
76ee437
youtube
YuqinShao Sep 20, 2013
c69b7da
Update README.md
YuqinShao Sep 20, 2013
26779cc
evaluation
YuqinShao Sep 20, 2013
587dee5
Merge branch 'master' of https://github.com/YuqinShao/Project1-RayTracer
YuqinShao Sep 20, 2013
858d60d
Update README.md
YuqinShao Sep 20, 2013
815ecb0
Merge branch 'master' of https://github.com/YuqinShao/Project1-RayTracer
YuqinShao Sep 20, 2013
a9fecc5
img
YuqinShao Sep 20, 2013
3282c0a
eval
YuqinShao Sep 20, 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
16 changes: 12 additions & 4 deletions PROJ1_WIN/565Raytracer/565Raytracer.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
<ClCompile Include="..\..\src\utilities.cpp" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
<CudaCompile Include="..\..\src\raytraceKernel.cu">
<FileType>Document</FileType>
<GPUDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">true</GPUDebugInfo>
<HostDebugInfo Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">true</HostDebugInfo>
<CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
Expand Down Expand Up @@ -75,7 +80,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 @@ -123,6 +128,7 @@
<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>
<CodeGeneration>compute_20,sm_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">
Expand All @@ -132,7 +138,7 @@
<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;../shared/glfw/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -146,6 +152,7 @@
<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_20</CodeGeneration>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -196,10 +203,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_30,sm_30</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>
6 changes: 3 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 @@ -31,12 +31,12 @@
<Filter>stb_image</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
<ItemGroup>
<Filter Include="stb_image">
<UniqueIdentifier>{011aa553-95e8-4e59-b7ff-1bb89aebe21d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
</ItemGroup>
</Project>
Binary file added PROJ1_WIN/565Raytracer/test.correctShadow.bmp
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/test.ref1.bmp
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/test.reflect.bmp
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/test.specularHighliht.bmp
View file
Open in desktop
Binary file not shown.
Loading