Skip to content
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.

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

Jiayi(Eris) Zhang HW4 #38

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f5c8063
biharmonic deformation working
alecjacobson Feb 27, 2017
2eee44d
update shared
alecjacobson Mar 5, 2017
39336a6
working code
alecjacobson Mar 5, 2017
a7e481c
knight image
alecjacobson Mar 5, 2017
5af3d93
images and text before posting
alecjacobson Mar 6, 2017
dcac634
update shared
alecjacobson Mar 6, 2017
0f915ab
clarify about deformation gradient
alecjacobson Mar 6, 2017
c8f684d
equation numbers and fix F
alecjacobson Mar 12, 2017
306773f
note about rotations per vertex or per face
alecjacobson Mar 12, 2017
c9d2877
what is K?
alecjacobson Mar 13, 2017
cfd9b97
update shared
alecjacobson Feb 4, 2018
422727e
use libigl v2.0
alecjacobson Oct 16, 2018
fad1d86
try again to update shared
alecjacobson Oct 16, 2018
e2b8bb9
update shared
alecjacobson Oct 20, 2018
eb3a16e
update shared
alecjacobson Oct 21, 2018
730b123
finish biharmonic
ErisZhang Oct 23, 2018
75df251
finish arap
ErisZhang Oct 23, 2018
df98b4d
fit rotation
ErisZhang May 6, 2019
e5d39be
profile
ErisZhang May 7, 2019
3aa999b
save code
ErisZhang May 7, 2019
3f67cae
small rotation works
ErisZhang May 8, 2019
7d21ebe
both identity and last step R work
ErisZhang May 8, 2019
8744edc
neater
ErisZhang May 8, 2019
096ff14
save code before avx
ErisZhang May 14, 2019
d48fd65
forget to initialize R...
ErisZhang May 15, 2019
98b927f
save parallel for
ErisZhang May 19, 2019
dfb94c2
record octopi caylay small
ErisZhang May 19, 2019
c449540
save working timing code
ErisZhang May 20, 2019
8d5c3d5
clean up
ErisZhang Oct 5, 2020
52c3d2f
remove biharmonic
ErisZhang Oct 5, 2020
247f158
clean up
ErisZhang Oct 5, 2020
9eae4be
save avx code
ErisZhang Oct 5, 2020
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "shared"]
path = shared
url = https://github.com/alecjacobson/geometry-processing-shared.git
[submodule "libigl"]
path = libigl
url = http://github.com/libigl/libigl
38 changes: 36 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,38 @@
cmake_minimum_required(VERSION 2.6)
project(deformation)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/shared/cmake)
include("${CMAKE_CURRENT_SOURCE_DIR}/shared/cmake/CMakeLists.txt")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

### libIGL options: choose between header only and compiled static library
option(LIBIGL_USE_STATIC_LIBRARY "Use libigl as static library" OFF)
option(LIBIGL_WITH_OPENGL "Use OpenGL" ON)
option(LIBIGL_WITH_OPENGL_GLFW "Use GLFW" ON)

find_package(LIBIGL REQUIRED)

if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
add_compile_options(-mavx2)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
message(FATAL_ERROR "Intel not supported")
elseif((CMAKE_CXX_COMPILER_ID MATCHES "MSVC") AND NOT CMAKE_CL_64)
add_compile_options(/arch:AVX2)
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

add_definitions(${CMAKE_CXX_FLAGS} "-mfpmath=sse")
add_definitions(${CMAKE_CXX_FLAGS} "-march=native")
add_definitions(${CMAKE_CXX_FLAGS} "-g")
add_definitions(${CMAKE_CXX_FLAGS} "-Wall")

# Add your project files
include_directories("include/")
if(USE_SOLUTION)
file(GLOB SRCFILES solution/*.cpp)
else()
file(GLOB SRCFILES src/*.cpp)
endif()

add_library(core ${SRCFILES})
target_link_libraries(core igl::core igl::opengl igl::opengl_glfw )

add_executable(deformation "main.cpp")
target_link_libraries(deformation core igl::core igl::opengl igl::opengl_glfw )
807 changes: 807 additions & 0 deletions README.html

Large diffs are not rendered by default.

Loading