Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
207647a
Retroback to green triangle
eldu Feb 28, 2016
824f74a
Reorganized and cube implemented
eldu Mar 2, 2016
71296fd
Moved build directory
eldu Mar 2, 2016
b7a58ce
Cobverted everything to radians and applied force radians
eldu Mar 2, 2016
a0c1357
Cleaned up camera
eldu Mar 2, 2016
356bf37
Untested JSON parser, created fluidsolver layout
eldu Mar 2, 2016
9858a21
Implemented cube. It really should not have taken as long as it did
eldu Mar 2, 2016
e5f2a62
Seemingly only displaying one particle, but there are a bunch of part…
eldu Mar 2, 2016
4fcb162
ReadME
eldu Mar 2, 2016
be1377b
Readme edit
eldu Mar 2, 2016
52bb435
Readme edit
eldu Mar 2, 2016
8b2992b
Readme edit
eldu Mar 2, 2016
ce4f06e
FINIALLY FIGURED OUT WHY PARTICLES ALL DID NOT DRAW. FIXED INCORRECT …
eldu Mar 11, 2016
331e2fc
Added simple camera controls
eldu Mar 13, 2016
f33d8dc
Added gravity
eldu Mar 13, 2016
ceb695f
Framework for grids
eldu Mar 21, 2016
dd66161
AHH
eldu Mar 23, 2016
9df5517
not finished, disabled camera controls for now as well
eldu Mar 30, 2016
0729d69
Akshay told me to push crashing code
eldu Apr 7, 2016
989b53f
Fixing indices because it was wrong. Sigh.
eldu Apr 7, 2016
abbf8c1
Not crashing, but wrong code
eldu Apr 8, 2016
7f397f8
Made Grid explicitly generic. Why LOL
eldu Apr 9, 2016
7cd09f9
Can't draw the Mac Grid :(
eldu Apr 10, 2016
079c6c3
Removed generic because crashing. Oops
eldu Apr 11, 2016
9fcd3e7
Fixed boundary conditions, i think
eldu Apr 11, 2016
6bd4427
broken. restarting qt
eldu Apr 11, 2016
2f340fb
Somehow loadshaders no longer works
eldu Apr 11, 2016
90cbc54
Had to deal with weird build things
eldu Apr 11, 2016
3dd8ca0
Extrapolate Velocity, Something is wrong with trilinear? what?
eldu Apr 11, 2016
978b035
Changed display
eldu Apr 11, 2016
9ae817f
It's fine apparently
eldu Apr 11, 2016
5e27631
pressure
eldu Apr 17, 2016
323142f
pressure and boundary condition fix
eldu Apr 18, 2016
bc3a685
Probably overriding the wrong grid.
eldu Apr 18, 2016
1cac788
Fixed json file and building of A
eldu Apr 18, 2016
3ce1af7
Let the debugging games begin...
eldu Apr 19, 2016
51c96ad
Fixed indices
eldu Apr 20, 2016
fc2a292
No longer popping box, but hardcorded resolution and such. Disabled json
eldu Apr 26, 2016
b7907fd
Remade json files better to include more information
eldu Apr 27, 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
Binary file not shown.
15 changes: 13 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(COCOA "-framework Cocoa")
set(COREVIDEO "-framework CoreVideo")
set(IOKIT "-framework IOKit")
set(CORELIBS ${CORELIBS} ${COCOA} ${IOKIT} ${COREVIDEO})
set(CORE_LIBS ${CORE_LIBS} ${COCOA} ${IOKIT} ${COREVIDEO})
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

# Linux specific hacks/fixes
Expand Down Expand Up @@ -86,9 +86,20 @@ set(CORE_SRC
src/camera/camera.cpp
src/viewer/viewer.cpp
src/fluidSolver/fluidSolver.cpp
src/fluidSolver/fluidParticle.cpp
src/fluidSolver/grid.cpp
src/fluidSolver/MACGrid.cpp
src/fluidSolver/flipSolver.cpp
src/scene/scene.cpp
src/geom/geom.cpp
src/geom/cube.cpp
src/geom/triangle.cpp
src/shaders/shader.cpp
src/la.cpp
src/scene/jsonreader.cpp
src/camera/input.cpp
src/camera/controls.cpp
)

add_executable(Thanda ${CORE_SRC})
target_link_libraries(Thanda ${CORE_LIBS})
target_link_libraries(Thanda ${CORE_LIBS})
Binary file added Debug/Thanda
Binary file not shown.
Loading