CIS565-Fall-2013 · uriahjb · Sep 26, 2013 · Sep 26, 2013 · Sep 26, 2013 · Sep 26, 2013
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
@@ -0,0 +1,139 @@
+# This file is NOT licensed under the GPLv3, which is the license for the rest
+# of YouCompleteMe.
+#
+# Here's the license text for this file:
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
+import os
+import ycm_core
+
+# These are the compilation flags that will be used in case there's no
+# compilation database set (by default, one is not set).
+# CHANGE THIS LIST OF FLAGS. YES, THIS IS THE DROID YOU HAVE BEEN LOOKING FOR.
+flags = [
+'-lglut',
+'-lGL',
+'-lGLEW',
+'-Wall',
+'-Wextra',
+'-Werror',
+'-Wc++98-compat',
+'-Wno-long-long',
+'-Wno-variadic-macros',
+'-fexceptions',
+'-DNDEBUG',
+'-DUSE_CLANG_COMPLETER',
+# THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
+# language to use when compiling headers. So it will guess. Badly. So C++
+# headers will be compiled as C headers. You don't want that so ALWAYS specify
+# a "-std=<something>".
+# For a C project, you would set this to something like 'c99' instead of
+# 'c++11'.
+'-std=c++11',
+# ...and the same thing goes for the magic -x option which specifies the
+# language that the files to be compiled are written in. This is mostly
+# relevant for c++ headers.
+# For a C project, you would set this to 'c' instead of 'c++'.
+'-x',
+'c++',
+'-I/usr/local/cuda/samples/common/inc',
+'-I/usr/local/cuda/include'
+]
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = ''
+
+if compilation_database_folder:
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return list( flags )
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def FlagsForFile( filename ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = database.GetCompilationInfoForFile( filename )
+    final_flags = MakeRelativePathsInFlagsAbsolute(
+      compilation_info.compiler_flags_,
+      compilation_info.compiler_working_dir_ )
+
+    # NOTE: This is just for YouCompleteMe; it's highly likely that your project
+    # does NOT need to remove the stdlib flag. DO NOT USE THIS IN YOUR
+    # ycm_extra_conf IF YOU'RE NOT 100% YOU NEED IT.
+    '''
+    try:
+      final_flags.remove( '-stdlib=libc++' )
+    except ValueError:
+      pass
+    '''
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }
diff --git a/PROJ2_NIX/565Pathtracer b/PROJ2_NIX/565Pathtracer
diff --git a/PROJ2_NIX/glslUtility.o b/PROJ2_NIX/glslUtility.o
diff --git a/PROJ2_NIX/image.o b/PROJ2_NIX/image.o
diff --git a/PROJ2_NIX/main.o b/PROJ2_NIX/main.o
diff --git a/PROJ1_NIX/makefile → PROJ2_NIX/makefile b/PROJ1_NIX/makefile → PROJ2_NIX/makefile
diff --git a/PROJ2_NIX/raytraceKernel.o b/PROJ2_NIX/raytraceKernel.o
diff --git a/PROJ2_NIX/scene.o b/PROJ2_NIX/scene.o
diff --git a/PROJ1_NIX/shaders/passthroughFS.glsl → PROJ2_NIX/shaders/passthroughFS.glsl b/PROJ1_NIX/shaders/passthroughFS.glsl → PROJ2_NIX/shaders/passthroughFS.glsl
diff --git a/PROJ1_NIX/shaders/passthroughVS.glsl → PROJ2_NIX/shaders/passthroughVS.glsl b/PROJ1_NIX/shaders/passthroughVS.glsl → PROJ2_NIX/shaders/passthroughVS.glsl
diff --git a/PROJ2_NIX/stb_image.o b/PROJ2_NIX/stb_image.o
diff --git a/PROJ2_NIX/stb_image_write.o b/PROJ2_NIX/stb_image_write.o
diff --git a/PROJ2_NIX/utilities.o b/PROJ2_NIX/utilities.o
diff --git a/README.md b/README.md
@@ -1,3 +1,108 @@
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/all_features_awesome.bmp)
+
+-------------------------------------------------------------------------------
+Pathtracer:
+-------------------------------------------------------------------------------
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/dof_nice.bmp)
+
+
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/all_features.bmp)
+
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/dof_refl_refr.bmp)
+
+
+-------------------------------------------------------------------------------
+Video:
+-------------------------------------------------------------------------------
+This is pretty low-res. High-res to come soon!!!
+http://youtu.be/hzeRzmRnIo0
+
+-------------------------------------------------------------------------------
+Features:
+-------------------------------------------------------------------------------
+I implementing the requred features:
+
+* Properly accumulating emittance and colors to generate a final image
+* Supersampled antialiasing
+* Parallelization by ray instead of by pixel via stream compaction
+ * I used thrust for the scan step and implented my own parallel scatter
+* Perfect specular reflection
+
+And:
+* Fresnel-based Refraction, i.e. glass
+* Depth of field
+
+The following screenshot shows a comparison between anti-aliased and non-anti-aliased edges, its a bit hard to see because the render isn't fully converged. 
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/anti_aliasing.png)
+
+-------------------------------------------------------------------------------
+Cool Bugs:
+-------------------------------------------------------------------------------
+In the process of implementing various features in my path tracer I ran into 
+a number of awesome bugs. 
+
+This one is the result of poorly seeded random number, I'm still not sure if 
+I can recreate it :). 
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/artsy_bug.png)
+
+While implementing refraction a missing sqrt and refractive index flip lead to this one. 
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/refraction_bug.bmp)
+
+For comparison here is the fixed pure-refraction
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/refraction_pure.png)
+
+-------------------------------------------------------------------------------
+Performance Evalutation:
+-------------------------------------------------------------------------------
+TileSize vs. Average Time-per-frame ( seconds ) for a 400 by 400 Image on a GEFORCE 610M 1GB. 
+
+With stream compaction:
+* 2, 0.81
+* 4, 0.33
+* 8, 0.18
+* 16, 0.25
+
+Without stream compaction ( note: this code produces incorrect results but will be fixed ):
+* 2, 0.43
+* 4, 0.17
+* 8, 0.08
+* 16, 0.11
+
+At the moment it looks like my non-stream compaction implementation is faster by about a factor of 2. Once I get NVVP up and running I'll evaluate more closely the difference between the two. 
+
+
+For a 600 by 600 image using a TileSize of 8 I acheive an average time-per-frame of 0.33 with a raydepth of 6. 
+This comes out to ~6480000 rays/sec. 
+
+Once I fix the thrust::dealloc error in my code ( a quick google search seems to hint at the problem being some sort of ECC problem ) I'm going to do some profiling useing NVidia Visual Profiler ( such a cool tool! ). 
+
+
+
+
+
+
+
+
+-------------------------------------------------------------------------------
+First Steps:
+-------------------------------------------------------------------------------
+Moved some of my code from Project1 over and started getting the path tracer up and working. 
+Naive Implementation: 
+* Send out ray from camera, then calculate new ray direction by randomly sampling on a hemisphere
+* Sample the brdf using the new direction 
+
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/path_tracer_first_steps.png)
+
+I put together debug some simple debug modes:
+
+New Ray direction ( converges to the point normal ):
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/sampled_directions.png)
+
+
+BRDF ( first object intersected color ):
+![screenshot](https://raw.github.com/uriahjb/Project2-PathTracer/master/renders/brdf_sampling.png)
+
+
 -------------------------------------------------------------------------------
 CIS565: Project 2: CUDA Pathtracer
 -------------------------------------------------------------------------------

diff --git a/renders/all_features.bmp b/renders/all_features.bmp
diff --git a/renders/all_features_awesome.bmp b/renders/all_features_awesome.bmp
diff --git a/renders/anti_aliasing.png b/renders/anti_aliasing.png
diff --git a/renders/antialiased.bmp b/renders/antialiased.bmp
diff --git a/renders/artsy_bug.png b/renders/artsy_bug.png
diff --git a/renders/brdf_sampling.png b/renders/brdf_sampling.png
diff --git a/renders/dof.bmp b/renders/dof.bmp
diff --git a/renders/dof_highres.bmp b/renders/dof_highres.bmp
diff --git a/renders/dof_nice.bmp b/renders/dof_nice.bmp
diff --git a/renders/dof_refl_refr.bmp b/renders/dof_refl_refr.bmp
diff --git a/renders/no_antialiasing.bmp b/renders/no_antialiasing.bmp
diff --git a/renders/ok_render.bmp b/renders/ok_render.bmp
diff --git a/renders/path_tracer_first_steps.png b/renders/path_tracer_first_steps.png
diff --git a/renders/reflections.bmp b/renders/reflections.bmp
diff --git a/renders/refraction_bug.bmp b/renders/refraction_bug.bmp
diff --git a/renders/refraction_pure.png b/renders/refraction_pure.png
diff --git a/renders/sampled_directions.png b/renders/sampled_directions.png
diff --git a/renders/second_bounce_direction.bmp b/renders/second_bounce_direction.bmp
diff --git a/renders/stream_compaction.bmp b/renders/stream_compaction.bmp
diff --git a/renders/test.0.bmp b/renders/test.0.bmp