Skip to content
Snippets Groups Projects
Commit 2db47eb6 authored by Séverin Lemaignan's avatar Séverin Lemaignan
Browse files

[wip/{BioMove3D=>libmove3d}] Renamed BioMove3D in libmove3d

While here:
 - the package now produce only a library, libmove3d, meant to be linked
   to SPARK and MHP for instance.
 - updated to latest version (3.9.1).
   Changelog:
	Trajectory Planning
	- P3D_PLAN is now supported by softMotion (maybe)
	- Fix some discontinuity when exporting the softmotion trajectory
	- Adapt the task armToFreePoint for cartesian

	Path Planning
	- Fix free Approch config bug
	- Error messages are better handled
	- The user is able to constraint the position and rotation of the object sampling
	- Function pointers in manip. planner for planning/smoothing
	- A robot agent can hold an object (SPARK)

	HRI
	- Finish manage isMoving , hasDisappear migration to BioMove3D
	- Start manage link between hand and object in spark
	- add/update isPointedAt, isLookedAt management

	DISPLAY
	- Deformable body is included but commented for the moment
	- GLUT display works

	Other
	- CMakeFiles reorganized and simplified (less options)

 - uses GLUT by default, instead of Qt. Qt dependency is removed, along with Eigen and Boost.
 - Dependencies have been cleaned up.
parent 1b8e644f
No related branches found
No related tags found
No related merge requests found
Motion planning and geometric reasonning module
# robotpkg Makefile for: path/BioMove3D
# Created: Severin Lemaignan on Tue, 31 Aug 2010
#
DISTNAME= BioMove3D-3.8.2
PKGREVISION= 1
CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=BioMove3D/}
MASTER_REPOSITORY= git http://trac.laas.fr/git/robots/BioMove3D.git
MAINTAINER= biomove3dgitrepo@laas.fr
COMMENT= Motion planning and geometric reasonning module
#BioMove 3D is currently GPL because it depends
# on GSL and GLPK that are 2 GLP librairies.
LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c c++
CMAKE_ARGS+= -DEigen_INCLUDE_DIR=${PREFIX.eigen2}/include/eigen2
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBRARYDIR=${PREFIX.boost-libs}/lib
PKG_OPTIONS_REQUIRED_GROUPS= mode
PKG_OPTIONS_GROUP.mode= standalone jido
##
## Option standalone
##
PKG_OPTION_DESCR.standalone= Compile BioMove3D as an executable
define PKG_OPTION_SET.standalone
endef
##
## Option jido
##
PKG_OPTION_DESCR.jido= Compile BioMove3D for Jido as a library only
define PKG_OPTION_SET.jido
CMAKE_ARGS+= -DCOMPILE_FOR_GENOM=ON
include ../../graphics/pqp/depend.mk
include ../../math/gbM/depend.mk
include ../../motion/softMotion-libs/depend.mk
endef
## Default option
PKG_SUGGESTED_OPTIONS+= jido
## Common includes
include ../../mk/sysdep/cmake.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../mk/sysdep/glu.mk
include ../../math/eigen2/depend.mk
include ../../mk/sysdep/gsl.mk
include ../../wip/sysdep/glpk.mk
include ../../wip/sysdep/gts.mk
include ../../wip/sysdep/qhull.mk
include ../../wip/sysdep/libxpm.mk
include ../../mk/sysdep/qt4-libs.mk
include ../../mk/robotpkg.mk
This diff is collapsed.
# Copyright (c) 2010 LAAS/CNRS
# 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.
#
# Severin Lemaignan on Tue 31 Aug 2010
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
BIOMOVE3D_DEPEND_MK:= ${BIOMOVE3D_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= BioMove3D
endif
ifeq (+,$(BIOMOVE3D_DEPEND_MK)) # ----------------------------------
PREFER.BioMove3D?= robotpkg
SYSTEM_SEARCH.BioMove3D=\
include/BioMove3D/include/move3d.h \
lib/libBioMove3D.so
DEPEND_USE+= BioMove3D
DEPEND_ABI.BioMove3D?=BioMove3D>=3.7.17
DEPEND_DIR.BioMove3D?=../../wip/BioMove3D
#include ../../wip/??
endif # BIOMOVE3D_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
SHA1 (BioMove3D-3.8.2.tar.gz) = f203ac62acd3216c4e0d2b9a02a28a3e382e0f70
RMD160 (BioMove3D-3.8.2.tar.gz) = ea3d66d57df87f5f02937ce96a7f35bcb1627874
Size (BioMove3D-3.8.2.tar.gz) = 5404444 bytes
......@@ -3,7 +3,7 @@
COMMENT= WIP packages
SUBDIR+= BioMove3D
SUBDIR+= libmove3d
SUBDIR+= gest-genom
SUBDIR+= kukaFri-libs
SUBDIR+= libfreenect
......
The BioMove3D library provides motion planning and geometric reasonning functionalities
to be embedded in robots.
# robotpkg Makefile for: path/libmove3d
# Created: Severin Lemaignan on Fri, 11 Feb 2011
#
DISTNAME= libmove3d-3.9.1
CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=BioMove3D/}
#MASTER_REPOSITORY= git http://trac.laas.fr/git/robots/BioMove3D.git
MASTER_REPOSITORY= git /home/slemaign/softs-local/BioMove3D
MAINTAINER= biomove3dgitrepo@laas.fr
COMMENT= Library for motion planning and geometric reasonning
#libmove3d is currently GPL because it depends
# on GSL and GLPK that are 2 GLP librairies.
LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c c++
CMAKE_ARGS+= -DGENERATE_LIBMOVE3D=ON
## Dependencies
include ../../math/gbM/depend.mk
include ../../motion/softMotion-libs/depend.mk
include ../../mk/sysdep/glu.mk
include ../../mk/sysdep/freeglut.mk
include ../../mk/sysdep/gsl.mk
include ../../mk/sysdep/libxml2.mk
include ../../mk/sysdep/glib2.mk
include ../../wip/sysdep/glpk.mk
include ../../wip/sysdep/gts.mk
include ../../wip/sysdep/qhull.mk
include ../../wip/sysdep/libxpm.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/robotpkg.mk
This diff is collapsed.
## robotpkg depend.mk for: path/libmove3d
# Created: Severin Lemaignan on Fri, 11 Feb 2011
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
LIBMOVE3D_DEPEND_MK:= ${LIBMOVE3D_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= libmove3d
endif
ifeq (+,$(LIBMOVE3D_DEPEND_MK)) # ----------------------------------
PREFER.libmove3d?= robotpkg
SYSTEM_SEARCH.libmove3d=\
include/libmove3d/include/move3d.h \
lib/libmove3d.so
DEPEND_USE+= libmove3d
DEPEND_ABI.libmove3d?=libmove3d>=3.9
DEPEND_DIR.libmove3d?=../../wip/libmove3d
endif # LIBMOVE3D_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
SHA1 (libmove3d-3.9.1.tar.gz) = 9f41852677184f86b5c476ea64dbd34d0200a606
RMD160 (libmove3d-3.9.1.tar.gz) = 646347f56ae155c53d581968d5cde976e7ddf0e1
Size (libmove3d-3.9.1.tar.gz) = 5405692 bytes
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment