Skip to content

Commit 15e0be4

Browse files
committed
Merge branch 'develop'
2 parents 5ef2732 + e293995 commit 15e0be4

File tree

53 files changed

+197
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+197
-142
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ include(cmakemodules/script_SIMD.cmake REQUIRED) # SSE2/SSE3/... optimiza
308308
include(cmakemodules/script_simpleini.cmake REQUIRED) # SimpleINI lib
309309
include(cmakemodules/script_suitesparse.cmake REQUIRED) # SuiteSparse libs
310310
include(cmakemodules/script_swissrange.cmake REQUIRED) # Support for SWISSRANGE 3D camera:
311+
include(cmakemodules/script_tbb.cmake REQUIRED) # TBB
311312
include(cmakemodules/script_tinyxml2.cmake REQUIRED) # tinyxml2 lib
312313
include(cmakemodules/script_triclops.cmake REQUIRED) # Check for PointGreyResearch (PGR) Triclops library
313314
include(cmakemodules/script_videre_svs.cmake REQUIRED) # Support for Videre Design stereo camera:

apps/ro-localization/CPosePDFParticlesExtended.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class TExtendedCPose2D
3030
mrpt::math::CVectorDouble state;
3131
};
3232

33-
#define DUMMY_LINKAGE
34-
3533
/** Declares a class that represents a Probability Distribution
3634
* function (PDF) of a 2D pose (x,y,phi).
3735
* This class implements that PDF using a set of particles

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 2.13.8-{branch}-build{build}
2+
version: 2.14.0-{branch}-build{build}
33

44
os: Visual Studio 2019
55

cmakemodules/script_show_final_summary.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ SHOW_CONFIG_LINE_SYSTEM("OpenGL GLES " CMAKE_MRPT_HAS_GL
143143
SHOW_CONFIG_LINE_SYSTEM("GLUT " CMAKE_MRPT_HAS_GLUT)
144144
SHOW_CONFIG_LINE_SYSTEM("PCAP (Wireshark logs for Velodyne) " CMAKE_MRPT_HAS_LIBPCAP)
145145
SHOW_CONFIG_LINE_SYSTEM("SuiteSparse " CMAKE_MRPT_HAS_SUITESPARSE "[Version: ${SuiteSparse_VERSION}]")
146+
SHOW_CONFIG_LINE_SYSTEM("TBB " CMAKE_MRPT_HAS_TBB "[Version: ${TBB_VERSION}]")
146147
SHOW_CONFIG_LINE_SYSTEM("tinyxml2 " CMAKE_MRPT_HAS_TINYXML2)
147148
SHOW_CONFIG_LINE_SYSTEM("wxWidgets " CMAKE_MRPT_HAS_WXWIDGETS "[Version: ${wxWidgets_VERSION_STRING} ${CMAKE_WXWIDGETS_TOOLKIT_NAME}]")
148149
message(STATUS "")

cmakemodules/script_tbb.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
set(CMAKE_MRPT_HAS_TBB 0)
3+
set(CMAKE_MRPT_HAS_TBB_SYSTEM 0)
4+
5+
option(DISABLE_TBB "Force not using TBB" "OFF")
6+
mark_as_advanced(DISABLE_TBB)
7+
if(DISABLE_TBB)
8+
return()
9+
endif()
10+
11+
find_package(TBB QUIET)
12+
13+
if(TBB_FOUND)
14+
set(CMAKE_MRPT_HAS_TBB 1)
15+
set(CMAKE_MRPT_HAS_TBB_SYSTEM 1)
16+
endif()

doc/source/doxygen-docs/changelog.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
\page changelog Change Log
22

3+
# Version 2.14.0: Released Sep 15th, 2024
4+
- Changes in libraries:
5+
- \ref mrpt_slam_grp:
6+
- Particle filtering algorithm pfStandardProposal now uses TBB (if present) for automatically running weight updates in parallel.
7+
- \ref mrpt_rtti_grp:
8+
- mrpt::rtti::CObject::GetRuntimeClassIdStatic() no longer depends on static variables, but on constexpr. This totally removes the possibility of initialization order fiasco while registering classes.
9+
- **IMPORTANT CHANGE**: To make the change above possible, these macros have changed:
10+
- `DEFINE_VIRTUAL_SERIALIZABLE(class)` ==>`DEFINE_VIRTUAL_SERIALIZABLE(class, namespace)`
11+
- `DEFINE_VIRTUAL_MRPT_OBJECT(class)` ==>`DEFINE_VIRTUAL_MRPT_OBJECT(class, namespace)`
12+
- BUG FIXES:
13+
- Fix recursive mutex lock if calling mrpt::opengl::CPointCloud::insertPoint() with signatures for mrpt::math::TPoint3D.
14+
- Fix potential initialization-order fiasco accessing GetRuntimeClassIdStatic() in clang (see change above).
15+
316
# Version 2.13.8: Released Sep 7th, 2024
417
- Changes in libraries:
518
- \ref mrpt_vision_grp:

libs/kinematics/include/mrpt/kinematics/CVehicleVelCmd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace mrpt::kinematics
2121
* \ingroup mrpt_kinematics_grp */
2222
class CVehicleVelCmd : public mrpt::serialization::CSerializable, public mrpt::Stringifyable
2323
{
24-
DEFINE_VIRTUAL_SERIALIZABLE(CVehicleVelCmd)
24+
DEFINE_VIRTUAL_SERIALIZABLE(CVehicleVelCmd, mrpt::kinematics)
2525
public:
2626
CVehicleVelCmd();
2727
CVehicleVelCmd(const CVehicleVelCmd& other);

libs/maps/include/mrpt/maps/CPointsMap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class CPointsMap :
7575
public mrpt::opengl::PLY_Exporter,
7676
public mrpt::maps::NearestNeighborsCapable
7777
{
78-
DEFINE_VIRTUAL_SERIALIZABLE(CPointsMap)
78+
DEFINE_VIRTUAL_SERIALIZABLE(CPointsMap, mrpt::maps)
7979
// This must be added for declaration of MEX-related functions
8080
DECLARE_MEX_CONVERSION
8181

libs/maps/include/mrpt/maps/CRandomFieldGridMap2D.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class CRandomFieldGridMap2D :
158158
{
159159
using BASE = mrpt::containers::CDynamicGrid<TRandomFieldCell>;
160160

161-
DEFINE_VIRTUAL_SERIALIZABLE(CRandomFieldGridMap2D)
161+
DEFINE_VIRTUAL_SERIALIZABLE(CRandomFieldGridMap2D, mrpt::maps)
162162
public:
163163
/** Calls the base CMetricMap::clear
164164
* Declared here to avoid ambiguity between the two clear() in both base

libs/nav/include/mrpt/nav/holonomic/CAbstractHolonomicReactiveMethod.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace mrpt::nav
2828
*/
2929
class CAbstractHolonomicReactiveMethod : public mrpt::serialization::CSerializable
3030
{
31-
DEFINE_VIRTUAL_SERIALIZABLE(CAbstractHolonomicReactiveMethod)
31+
DEFINE_VIRTUAL_SERIALIZABLE(CAbstractHolonomicReactiveMethod, mrpt::nav)
3232
public:
3333
/** Input parameters for CAbstractHolonomicReactiveMethod::navigate() */
3434
struct NavInput

0 commit comments

Comments
 (0)