Skip to content

Project1 submission #6

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

Project1 submission #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3f2abf
basic part finished
Sep 16, 2013
0fd490e
job's done! except for document
Sep 21, 2013
6b5c88f
updated readme file
Sep 21, 2013
81c0e3f
update readme
Sep 21, 2013
0099e9e
add DOF blur
Sep 21, 2013
1c7e34b
just add more screen shots result
Sep 21, 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
518 changes: 0 additions & 518 deletions PROJ1_MAC/glfw/include/GL/glfw.h
View file
Open in desktop

This file was deleted.

Binary file removed PROJ1_MAC/glfw/lib/libglfw.dylib
View file
Open in desktop
Binary file not shown.
26 changes: 0 additions & 26 deletions PROJ1_MAC/makefile
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions PROJ1_MAC/run.sh
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions PROJ1_MAC/shaders/passthroughFS.glsl
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions PROJ1_MAC/shaders/passthroughVS.glsl
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions PROJ1_NIX/makefile
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions PROJ1_NIX/shaders/passthroughFS.glsl
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions PROJ1_NIX/shaders/passthroughVS.glsl
View file
Open in desktop

This file was deleted.

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.
8 changes: 4 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 @@ -109,7 +109,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>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/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>D:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;D:\ProgramData\NVDIA Corporation\Cuda Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -122,7 +122,7 @@
</Link>
<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>
<Include>D:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;D:\ProgramData\NVDIA Corporation\Cuda Samples\v5.5\common\inc;../shared/glew/includes;../shared/freeglut/includes</Include>
</CudaCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (v5.5)|Win32'">
Expand Down Expand Up @@ -182,7 +182,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_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>D:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;D:\ProgramData\NVDIA Corporation\Cuda Samples\v5.5\common\inc;../shared/glew/include;../shared/freeglut/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -195,7 +195,7 @@
</Link>
<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>
<Include>D:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;D:\ProgramData\NVDIA Corporation\Cuda Samples\v5.5\common\inc;../shared/glew/includes;../shared/freeglut/includes</Include>
</CudaCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
59 changes: 59 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.Build.CppClean.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.EMBED.MANIFEST
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.EMBED.MANIFEST.RES
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.INTERMEDIATE.MANIFEST
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\565Raytracer_manifest.rc
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\cl.command.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\CL.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\CL.write.1.tlog
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\GLSLUTILITY.OBJ
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\IMAGE.OBJ
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.10044.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.10044.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.10044-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.10044-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14104.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14104.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14104-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14104-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14384.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14384.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14384-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.14384-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.18288.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.18288.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.18288-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.18288-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.1984.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.1984.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.1984-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.1984-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.2380.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.2380.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.2380-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.2380-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.8548.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.8548.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.8548-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.8548-cvtres.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.command.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.write.1.tlog
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\MAIN.OBJ
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.command.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.write.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\raytraceKernel.cu.cache
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.command.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.read.1.tlog
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.write.1.tlog
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\SCENE.OBJ
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE.OBJ
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE_WRITE.OBJ
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\UTILITIES.OBJ
E:\gitprojects\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\vc100.idb
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\VC100.PDB
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.EXE
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.ILK
E:\GITPROJECTS\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.PDB
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/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/565Raytracer.exe.embed.manifest.res
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/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/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|Win32|E:\gitprojects\Project1-RayTracer\PROJ1_WIN\|
Loading