Submission: TRUNG T. LE

.gitignore

@@ -1,8 +1,12 @@
-Thanda.xcodeproj
-Thanda.build
+Korra.xcodeproj
+Korra.build
 DerivedData
 CMakeScripts
 CMakeFiles
 CMakeCache.txt
 cmake_install.cmake
 CMakeLists.txt.user
+build*/
+Debug/
+*.sublime*
+*.log

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "src/thirdparty/jsoncpp"]
+	path = src/thirdparty/jsoncpp
+	url = git@github.com:open-source-parsers/jsoncpp.git
+
+[submodule "src/thirdparty/nanogui"]
+	path = src/thirdparty/nanogui
+	url = git@github.com:wjakob/nanogui.git

CMakeLists.txt

@@ -1,13 +1,18 @@
 ##################
-#     Thanda     #
+#     Korra     #
 ##################
 
 # credit - base CMake config : Yining Karl Li , edited CMake config: Akshay Shah & Debanshu Singh
 
 #name your project
-project(Thanda)
+project(Korra)
 cmake_minimum_required(VERSION 2.8)
 
+# include source directories
+include_directories(
+        src/
+)
+
 # set creates a variable
 set (NUPARU "nuparu")
 # add include and src directories to path
@@ -26,6 +31,28 @@ elseif(WIN32)
     set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${NUPARU}/lib/win)
 endif()
 
+# set creates a variable
+set (THIRDPARTY "src/thirdparty")
+# add include and src directories to path for nanogui
+include_directories(
+        ${THIRDPARTY}/nanogui/include
+        ${THIRDPARTY}/nanogui/src
+)
+
+# NanoGUI library path
+set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${THIRDPARTY}/nanogui)
+
+# add include and src directories to path for openvdb_points
+include_directories(
+    /usr/local/include/openvdb/
+    /usr/local/openvdb/
+    /Library/Frameworks/Houdini.framework/Versions/15.0.347/Resources/toolkit/include/
+)
+
+# OpenVDB point library path
+set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/local/openvdb/lib)
+set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /Library/Frameworks/Houdini.framework/Versions/15.0.347/Libraries/)
+
 #set include variables
 set(GLFW_INCLUDE_DIR ${NUPARU}/include )
 set(GLEW_INCLUDE_DIR ${NUPARU}/include )
@@ -37,6 +64,11 @@ find_package(OPENGL REQUIRED)
 find_package(GLEW)
 find_library(GLFW_LIBRARY "glfw3" HINTS ${GLFW_LIBRARY_DIR})
 find_library(JSONCPP "jsoncpp")
+find_library(TBB "tbb")
+find_library(NANOGUI "nanogui")
+find_library(HALF "half")
+find_library(OPENVDB "openvdb")
+find_library(OPENVDB_POINTS "openvdb_points")
 
 add_definitions(
         -DTW_STATIC
@@ -46,14 +78,18 @@ add_definitions(
         -D_CRT_SECURE_NO_WARNINGS
 )
 
-set(CORE_LIBS ${GLFW_LIBRARY} ${GLUT_LIBRARY} ${GLEW_LIBRARY} ${JSONCPP} ${OPENGL_LIBRARY} )
+set(CORE_LIBS ${GLFW_LIBRARY} ${GLUT_LIBRARY} ${GLEW_LIBRARY} ${JSONCPP} ${TBB} ${HALF} ${OPENVDB} ${OPENVDB_POINTS} ${NANOGUI} ${OPENGL_LIBRARY} )
 
 # OSX-specific hacks/fixes
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    #Link IOKit because this is where we get GL stuff for OSX
-    set(COREVIDEO "-framework CoreVideo")
-    set(IOKIT "-framework IOKit")
-    set(CORELIBS ${CORELIBS} ${IOKIT} ${COREVIDEO})
+    find_library(COCOA Cocoa)
+    find_library(COREVIDEO CoreVideo)
+    find_library(IOKIT IOKit)
+    find_library(COREFOUNDATION CoreFoundation)
+    find_library(CARBON_FRAMEWORK Carbon)
+
+    set(CORE_LIBS ${CORE_LIBS} "-framework Cocoa -framework IOKit -framework CoreFoundation -framework CoreVideo -framework Carbon")
+
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Linux specific hacks/fixes
@@ -69,25 +105,44 @@ elseif(WIN32)
 endif()
 
 if(MSVC)
-    set(COMPILER_FLAGS 
+    set(COMPILER_FLAGS
             CMAKE_CXX_FLAGS
             CMAKE_CXX_FLAGS_DEBUG
             CMAKE_CXX_FLAGS_RELEASE
-            CMAKE_C_FLAGS 
+            CMAKE_C_FLAGS
             CMAKE_C_FLAGS_DEBUG
             CMAKE_C_FLAGS_RELEASE
         )
 endif()
 
 # Add source files you want to compile (.cpp)
 set(CORE_SRC
+        nuparu/src/stb_image/stb_image_write.c
+        src/loadShaders.cpp
+        src/utility.cpp
         src/main.cpp
+        src/shaderProgram/shaderProgram.cpp
+        src/shaderProgram/particleAdvectProgram.cpp
+        src/input/keyboardControl.cpp
+        src/viewer.cpp
         src/camera/camera.cpp
-        src/viewer/viewer.cpp
+        src/geometry/geometry.cpp
+        src/geometry/box.cpp
+        src/geometry/fluidGeo.cpp
+        src/fluidSolver/fluidParticle.cpp
         src/fluidSolver/fluidSolver.cpp
+        src/fluidSolver/SPHGrid.cpp
+        src/fluidSolver/SPHSolver.cpp
         src/scene/scene.cpp
-        src/geom/geom.cpp
 )
 
-add_executable(Thanda ${CORE_SRC})
-target_link_libraries(Thanda ${CORE_LIBS})
+add_executable(Korra ${CORE_SRC})
+target_link_libraries(Korra ${CORE_LIBS})
+
+# Include zlib for osx
+find_package( ZLIB REQUIRED )
+if ( ZLIB_FOUND )
+    include_directories( ${ZLIB_INCLUDE_DIRS} )
+    target_link_libraries( Korra ${ZLIB_LIBRARIES} )
+endif( ZLIB_FOUND )
+

LICENSE.md

@@ -0,0 +1,98 @@
+The MIT License
+
+Copyright (c) 2016 [Trung Le](http://www.trungtuanle.com/), [Debanshu Singh](http://www.debanshusingh.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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 OR COPYRIGHT HOLDERS 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.
+
+Third-Party Code
+=============================
+
+Korra fluid solver includes the following third-party code.
+
+## easylogging++
+
+https://github.com/easylogging/easyloggingpp
+
+The MIT License (MIT)
+
+Copyright (c) 2015 muflihun.com
+
+http://github.com/easylogging/
+http://easylogging.muflihun.com
+http://muflihun.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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 OR
+COPYRIGHT HOLDERS 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.
+
+## nanogui
+
+https://github.com/wjakob/nanogui
+
+Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>, All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+You are under no obligation whatsoever to provide any bug fixes, patches, or
+upgrades to the features, functionality or performance of the source code
+("Enhancements") to anyone; however, if you choose to make your Enhancements
+available either publicly, or directly to the author of this software, without
+imposing a separate written license agreement for such Enhancements, then you
+hereby grant the following license: a non-exclusive, royalty-free perpetual
+license to install, use, modify, prepare derivative works, incorporate into
+other computer software, distribute, and sublicense such enhancements or
+derivative works thereof, in binary and source code form.
+
+