Skip to content

Project 1 submission #11

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
wuhao1117 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Project 1 submission #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
63c8b7e
No diffuse message
wuhao1117 Sep 18, 2013
d862fde
Diffuse Implement
wuhao1117 Sep 18, 2013
109770a
Test
wuhao1117 Sep 18, 2013
f4e1883
basic requirement working
wuhao1117 Sep 20, 2013
58d4811
All requirements done, writing readme
wuhao1117 Sep 20, 2013
1bb7373
Test screenshot
wuhao1117 Sep 21, 2013
c7d7dbb
modified: README.md
wuhao1117 Sep 21, 2013
1c09737
project running.jpg
wuhao1117 Sep 21, 2013
a342dda
Performance evaluation added
wuhao1117 Sep 21, 2013
a2bb7e7
modified: README.md
wuhao1117 Sep 21, 2013
a0c6975
modified: README.md
wuhao1117 Sep 21, 2013
9af7d18
modified: README.md
wuhao1117 Sep 21, 2013
e5329fb
update readme
wuhao1117 Jan 20, 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/565Raytracer.sdf
View file
Open in desktop
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer.suo
View file
Open in desktop
Binary file not shown.
22 changes: 19 additions & 3 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,16 @@
<ClCompile Include="..\..\src\utilities.cpp" />
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
<CudaCompile Include="..\..\src\raytraceKernel.cu">
<CodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">compute_20,sm_20</CodeGeneration>
<GPUDebugInfo Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">false</GPUDebugInfo>
<HostDebugInfo Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">false</HostDebugInfo>
<TargetMachinePlatform Condition="'$(Configuration)|$(Platform)'=='Release (v5.5)|Win32'">32</TargetMachinePlatform>
</CudaCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\README.md" />
<None Include="..\..\scenes\sampleScene.txt" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{FF21CA49-522E-4E86-B508-EE515B248FC4}</ProjectGuid>
Expand Down Expand Up @@ -75,7 +84,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 @@ -133,6 +142,9 @@
<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>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<IntrinsicFunctions>false</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -146,6 +158,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_20,sm_20</CodeGeneration>
<GPUDebugInfo>true</GPUDebugInfo>
<HostDebugInfo>false</HostDebugInfo>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -196,10 +211,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_21</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>
70 changes: 55 additions & 15 deletions PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,65 @@
<?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 Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\scene.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\utilities.cpp">
<Filter>Source Files</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>
<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\interactions.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\intersections.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\scene.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\utilities.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\src\sceneStructs.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CudaCompile Include="..\..\src\raytraceKernel.cu" />
Expand All @@ -38,5 +68,15 @@
<Filter Include="stb_image">
<UniqueIdentifier>{011aa553-95e8-4e59-b7ff-1bb89aebe21d}</UniqueIdentifier>
</Filter>
<Filter Include="Headers">
<UniqueIdentifier>{acc26eb9-7b5b-4540-b5b4-aee43f5a6096}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{417e01b4-4823-48f2-86cb-fb49182d90a6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\README.md" />
<None Include="..\..\scenes\sampleScene.txt" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions PROJ1_WIN/565Raytracer/565Raytracer.vcxproj.nemo.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="G:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer" />
</SettingsPointModel>
</ProjectSettingsModel>
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug (v5.5)/565Raytracer.exe.embed.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
Binary file added PROJ1_WIN/565Raytracer/Debug (v5.5)/565Raytracer.exe.embed.manifest.res
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug (v5.5)/565Raytracer.exe.intermediate.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
2 changes: 2 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug (v5.5)/565Raytracer.lastbuildstate
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#v4.0:v100:false
Debug (v5.5)|Win32|G:\GitHub\Project1-RayTracer\PROJ1_WIN\|
Loading