Skip to content

submission: NANCY HUANG #5

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

submission: NANCY HUANG #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a04dc6b
yo
nonchee Feb 29, 2016
76367d2
yo
nonchee Feb 29, 2016
97157a4
pls
nonchee Feb 29, 2016
b8f964b
lololol
nonchee Mar 23, 2016
d41b8b0
sprint dos
nonchee Mar 30, 2016
0e1de93
kernels are <3
nonchee Mar 31, 2016
03f5a19
i extrapolate great things from you, flipsolver
nonchee Mar 31, 2016
4e28452
kernel have yo numbah
nonchee Mar 31, 2016
838dd74
why
nonchee Apr 4, 2016
78158e9
fixed indexing error v.1000aldfkjlbk
nonchee Apr 5, 2016
804264f
i love fluid solving especially how it takes so long that's the best …
nonchee Apr 5, 2016
202cacd
lol always make box bounds > fluid bounds
nonchee Apr 5, 2016
923d5d8
merp
nonchee Apr 5, 2016
be48eff
fluid is life
nonchee Apr 5, 2016
b97a238
fixed resetting and indexing
nonchee Apr 7, 2016
52345f1
idk what even changed lulllll
nonchee Apr 7, 2016
71e78c1
hello sun
nonchee Apr 7, 2016
3a3d13d
should probably have aded a message lol uhhhh everything up to pressu…
nonchee Apr 7, 2016
8067c9c
is it actually working
nonchee Apr 7, 2016
cea66a2
LET THE EGGBASS DROP. except pressure solving issues are causing out …
nonchee Apr 11, 2016
e39e74a
this is hilarious
nonchee Apr 11, 2016
2276de4
FLEWED
nonchee Apr 11, 2016
56ef1ba
as of flolid solving
nonchee Apr 11, 2016
c8a8226
added screen recording to repo
nonchee Apr 11, 2016
076bdb6
TRIAL BY FIRE
nonchee Apr 18, 2016
889d34a
omg pressure solving why
nonchee Apr 18, 2016
d9fea51
lol copypaste error #30092034
nonchee Apr 18, 2016
438b608
still a flolid but better
nonchee Apr 19, 2016
a4f05ed
JUST PRETEND EXTRAPOLATE DOESN'T EXIST
nonchee Apr 19, 2016
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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
21 changes: 19 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ find_package(OPENGL REQUIRED)
find_package(GLEW)
find_library(GLFW_LIBRARY "glfw3" HINTS ${GLFW_LIBRARY_DIR})
find_library(JSONCPP "jsoncpp")
find_library(OPENVDB "openvdb")
find_library(ZLIB "z")
find_library(HALF "half")
find_library(TBB "tbb")

add_definitions(
-DTW_STATIC
Expand All @@ -46,7 +50,7 @@ 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} ${OPENVDB} ${ZLIB} ${HALF} ${OPENGL_LIBRARY} )

# OSX-specific hacks/fixes
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
Expand Down Expand Up @@ -85,9 +89,22 @@ set(CORE_SRC
src/main.cpp
src/camera/camera.cpp
src/viewer/viewer.cpp
src/fluidSolver/fluidSolver.cpp
src/solvers/FluidSolver.hpp
src/solvers/FlipSolver.h
src/solvers/Particle.hpp
src/solvers/FluidSolver.cpp
src/solvers/FlipSolver.cpp
src/solvers/Particle.cpp
src/scene/scene.cpp
src/geom/geom.hpp
src/geom/geom.cpp
src/shaders/shader.cpp
src/shaders/texture.cpp
src/Grid/grid.h
src/Grid/grid.cpp
src/Grid/MACGrid.h
src/Grid/MACGrid.cpp

)

add_executable(Thanda ${CORE_SRC})
Expand Down
Loading