Project 3: Taylor Nelms

.gitmodules

@@ -0,0 +1,11 @@
+[submodule "external/tinyobjloader"]
+	path = external/tinyobjloader
+	url = [email protected]:syoyo/tinyobjloader.git
+[submodule "external/oidn"]
+	path = external/oidn
+	url = https://github.com/OpenImageDenoise/oidn.git
+	branch = master
+[submodule "external/tbb"]
+	path = external/tbb
+	url = https://github.com/intel/tbb.git
+	branch = master

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 # Enable C++11 for host code
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
@@ -62,6 +62,10 @@ set(GLM_ROOT_DIR "external")
 find_package(GLM REQUIRED)
 include_directories(${GLM_INCLUDE_DIRS})
 
+include_directories(external/tinyobjloader)
+include_directories(external/gltfraytracexample)
+include_directories(external/oidn/include)
+
 set(headers
     src/main.h
     src/image.h
@@ -73,6 +77,9 @@ set(headers
     src/sceneStructs.h
     src/preview.h
     src/utilities.h
+    src/texture.h
+    external/gltfraytracexample/gltf-loader.h
+    external/tinyobjloader/tiny_obj_loader.h
     )
 
 set(sources
@@ -84,6 +91,9 @@ set(sources
     src/scene.cpp
     src/preview.cpp
     src/utilities.cpp
+    src/texture.cpp
+    external/gltfraytracexample/gltf-loader.cc
+    external/tinyobjloader/tiny_obj_loader.cc
     )
 
 list(SORT headers)
@@ -93,9 +103,12 @@ source_group(Headers FILES ${headers})
 source_group(Sources FILES ${sources})
 
 #add_subdirectory(stream_compaction)  # TODO: uncomment if using your stream compaction
+add_subdirectory(external/oidn)
 
 cuda_add_executable(${CMAKE_PROJECT_NAME} ${sources} ${headers})
 target_link_libraries(${CMAKE_PROJECT_NAME}
     ${LIBRARIES}
+    OpenImageDenoise
     #stream_compaction  # TODO: uncomment if using your stream compaction
     )
+

external/gltfraytracexample/README.md

@@ -0,0 +1,130 @@
+# NanoSG
+
+Simple, minimal and header-only scene graph library for NanoRT.
+
+NanoSG itself shoud be compiled with C++-03 compiler, but demo code uses C++11 features.
+
+![screenshot of the demo program](images/nanosg-demo.png)
+
+![Animation showing node manipulation](https://media.giphy.com/media/l3JDO29fMFndyObHW/giphy.gif)
+
+## Build
+
+### Linux or macOS
+
+```bash
+premake5 gmake
+make
+```
+
+### Windows
+
+```bash
+premake5 vs2015
+```
+
+## Data structure
+
+### Node
+
+Node represents scene graph node. Tansformation node or Mesh(shape) node.
+Node is interpreted as transformation node when passing `nullptr` to Node class constructure.
+
+Node can contain multiple children.
+
+### Scene
+
+Scene contains root nodes and provides the method to find an intersection of nodes.
+
+## User defined data structure
+
+Following are required in user application.
+
+### Mesh class
+
+Current example code assumes mesh is all composed of triangle meshes.
+
+Following method must be implemented for `Scene::Traversal`.
+
+```cpp
+///
+/// Get the geometric normal and the shading normal at `face_idx' th face.
+///
+template<typename T>
+void GetNormal(T Ng[3], T Ns[3], const unsigned int face_idx, const T u, const T v) const;
+```
+
+### Intersection class
+
+Represents intersection(hit) information.
+
+### Transform
+
+Transformation is done in the following procedure.
+
+`M' = parent_xform x local_xform x local_pivot`
+
+## Memory management
+
+`Scene` and `Node` does not create a copy of asset data(e.g. vertices, indices). Thus user must care about memory management of scene assets in user side.
+
+## API
+
+API is still subject to change.
+
+### Node
+
+```cpp
+void Node::SetName(const std::string &name);
+```
+
+Set (unique) name for the node.
+
+```cpp
+void Node::AddChild(const type &child);
+```
+
+Add node as child node.
+
+```cpp
+void Node::SetLocalXform(const T xform[4][4]) {
+```
+
+Set local transformation matrix. Default is identity matrix.
+
+### Scene
+
+```cpp
+bool Scene::AddNode(const Node<T, M> &node);
+```
+
+Add a node to the scene.
+
+```cpp
+bool Scene::Commit() {
+```
+
+Commit the scene. After adding nodes to the scene or changed transformation matrix, call this `Commit` before tracing rays.
+`Commit` triggers BVH build in each nodes and updates node's transformation matrix.
+
+```cpp
+template<class H>
+bool Scene::Traverse(nanort::Ray<T> &ray, H *isect, const bool cull_back_face = false) const;
+```
+
+Trace ray into the scene and find an intersection.
+Returns `true` when there is an intersection and hit information is stored in `isect`.
+
+## TODO
+
+* [ ] Compute pivot point of each node(mesh).
+
+## Third party libraries and its icenses
+
+* picojson : BSD license.
+* bt3gui : zlib license.
+* glew : BSD/MIT license.
+* tinyobjloader : MIT license.
+* glm : The Happy Bunny License (Modified MIT License). Copyright (c) 2005 - 2017 G-Truc Creation
+* ImGui : The MIT License (MIT). Copyright (c) 2014-2015 Omar Cornut and ImGui contributors
+* ImGuizmo : The MIT License (MIT). Copyright (c) 2016 Cedric Guillemet

external/gltfraytracexample/config.json

@@ -0,0 +1,23 @@
+{
+  "commented_out_obj_filename": "cornellbox_suzanne.obj",
+  "gltf_filename": "../../models/Cube/Cube.gltf",
+  "scene_scale": 1.0,
+  "width": 512,
+  "height": 512,
+  "eye": [
+    0,
+    2.5,
+    15
+  ],
+  "up": [
+    0,
+    1,
+    0
+  ],
+  "look_at": [
+    0,
+    0,
+    0
+  ],
+  "dummy": 0
+}