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.

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

Human joint constraints #919

Closed
wants to merge 11 commits into from
Closed

Human joint constraints #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d36e0a6
Add human meshes and skel files
Sep 29, 2017
8b8c887
update skel files
jyf588 Sep 29, 2017
6907760
upload neural net weight files
jyf588 Oct 2, 2017
20a95c2
add human arm & leg joint position constraints
jyf588 Oct 2, 2017
0a32f16
add external headers tiny-dnn
jyf588 Oct 2, 2017
c7f3274
add an example on human joint limits
jyf588 Oct 3, 2017
62d1ffa
revise typos
jyf588 Oct 3, 2017
6c04669
add external library cereal: used by tiny-dnn
jyf588 Oct 3, 2017
1d1ce4d
Revert "add external library cereal: used by tiny-dnn"
jyf588 Oct 3, 2017
1e4dfee
Merge branch 'master' into human-joint-constraints
jslee02 Nov 11, 2017
8a3090c
Merge branch 'master' into human-joint-constraints
jslee02 Nov 11, 2017
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
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
if(GCC_VERSION VERSION_LESS 4.8)
message(FATAL_ERROR "The installed g++ version is ${GCC_VERSION}. ${PROJECT_NAME} requires g++ 4.8 or greater.")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
endif()
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls")
Expand All @@ -205,7 +205,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if(CLANG_VERSION VERSION_LESS 3.3)
message(FATAL_ERROR "The installed Clang version is ${CLANG_VERSION}. ${PROJECT_NAME} requires clang 3.3 or greater.")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
endif()
if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
Expand All @@ -214,6 +214,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-omit-frame-pointer -fno-inline-functions -fno-optimize-sibling-calls")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}")
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_DEBUG} -pg")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")

else()

Expand Down Expand Up @@ -280,6 +281,7 @@ if(TARGET dart)
dart_add_example(examples/softBodies dart dart-io-urdf dart-gui)
dart_add_example(examples/speedTest dart dart-io-urdf dart-gui)
dart_add_example(examples/vehicle dart dart-io-urdf dart-gui)
dart_add_example(examples/humanJointLimits dart dart-io-urdf dart-gui dart-collision-ode dart-collision-bullet)

if(TARGET dart-gui-osg)
dart_add_example(examples/osgExamples/osgAtlasPuppet dart dart-io-urdf dart-gui-osg)
Expand Down
Loading