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.

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

submission #2

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e48cfe5
updated to vs2012
mchen15 Sep 25, 2013
28f52f5
Merge remote-tracking branch 'upstream/master'
mchen15 Sep 25, 2013
e2550bb
copying over ray tracer
mchen15 Sep 28, 2013
11fcbc9
replaced base with ray tracer code completely to get rid of anti alia…
mchen15 Sep 28, 2013
27a0a97
commit before adding obj loader
mchen15 Sep 30, 2013
0e7d148
working on obj loader
mchen15 Sep 30, 2013
8501625
continuing obj loader.
mchen15 Oct 1, 2013
b703e30
obj loader done. Need to debug lighting problem
mchen15 Oct 1, 2013
242774a
obj loader done
mchen15 Oct 1, 2013
cdeb2ef
stream compaction and debugging path tracing kernel
mchen15 Oct 1, 2013
0dd493b
debugging path tracing step still
mchen15 Oct 2, 2013
219ee28
fixed indexing problem regarding ray pool access
mchen15 Oct 2, 2013
bd45df5
anti-aliasing done
mchen15 Oct 2, 2013
5b75115
reflectance done
mchen15 Oct 2, 2013
5300fec
changed seed for calculateBSDF
mchen15 Oct 2, 2013
85bffe1
fixed bug regarding obj loading
mchen15 Oct 2, 2013
d4a648c
motion blur and camera control
mchen15 Oct 2, 2013
ef28261
removed some useless code and comments
mchen15 Oct 3, 2013
89b3bf5
updated block dimension for path tracing kernel. This mitigated the a…
mchen15 Oct 3, 2013
c30a447
updating readme
mchen15 Oct 3, 2013
05598a2
screenshot and readme update
mchen15 Oct 3, 2013
f617dc8
read me update
mchen15 Oct 3, 2013
079b208
screenshot and video
mchen15 Oct 3, 2013
b85f2e8
read me and additional screenshot
mchen15 Oct 3, 2013
7c917ea
final
mchen15 Oct 3, 2013
45ea43e
final final...
mchen15 Oct 3, 2013
c7bb368
FINAL
mchen15 Oct 3, 2013
9ca8943
fixing bugs
mchen15 Oct 14, 2013
2b58a67
added DOF
mchen15 Oct 14, 2013
69a9d6f
interactive dof
mchen15 Oct 14, 2013
0898406
updated readme
mchen15 Oct 14, 2013
a5dd27c
updated readme
mchen15 Oct 14, 2013
af176cb
updated readme
mchen15 Oct 14, 2013
2d5e8fa
updated readme
mchen15 Oct 14, 2013
a07dd0c
updated readme
mchen15 Oct 14, 2013
affddf7
bug fix: mainly changed the seed value
mchen15 Nov 10, 2013
33cdea8
simple refraction and color update
mchen15 Nov 10, 2013
2d38bd7
removed some commented code
mchen15 Nov 10, 2013
f6b60d0
updated read me
mchen15 Nov 11, 2013
ea34ad2
Update README.md
mchen15 Nov 11, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
151 changes: 151 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store
Empty file removed PROJ1_MAC/bin/makefile
Empty file.
Loading