Merge pull request #6098 from cyberbotics/sync-master-ceb889b15

Merge master into develop

Author: Benjamin Délèze

src/ode/Makefile

@@ -17,7 +17,6 @@ space := $(null) $(null)
 WEBOTS_HOME_PATH?=$(subst $(space),\ ,$(strip $(subst \,/,$(WEBOTS_HOME))))
 include $(WEBOTS_HOME_PATH)/resources/Makefile.os.include
 
-TARGET_LIB_DIR=$(WEBOTS_LIB_PATH)
 ifeq ($(OSTYPE),darwin)
 INSTALL_NAME = @rpath/Contents/lib/webots/libode.dylib
 endif
@@ -33,6 +32,8 @@ endif
 
 ifeq ($(MAKECMDGOALS),profile)
   STATIC_LIBRARY = true
+else
+  TARGET_LIB_DIR=$(WEBOTS_LIB_PATH)
 endif
 
 FILES_TO_REMOVE = $(MAIN_TARGET_COPY) libode.a ode.a

src/webots/nodes/utils/WbObjectDetection.cpp

@@ -423,8 +423,9 @@ bool WbObjectDetection::isContainedInFrustum(const WbAffinePlane *frustumPlanes)
   return true;
 }
 
-WbAffinePlane *WbObjectDetection::computeFrustumPlanes(const WbSolid *device, double verticalFieldOfView,
-                                                       double horizontalFieldOfView, double maxRange, bool isPlanarProjection) {
+WbAffinePlane *WbObjectDetection::computeFrustumPlanes(const WbSolid *device, const double verticalFieldOfView,
+                                                       const double horizontalFieldOfView, const double maxRange,
+                                                       bool isPlanarProjection) {
   const WbVector3 devicePosition = device->position();
   const WbMatrix3 deviceRotation = device->rotationMatrix();
   // construct the 4 planes defining the sides of the frustum

src/webots/nodes/utils/WbObjectDetection.hpp

@@ -50,8 +50,9 @@ class WbObjectDetection {
   bool isContainedInFrustum(const WbAffinePlane *frustumPlanes);
 
   // Computes the frustum plane for the given device ray.
-  static WbAffinePlane *computeFrustumPlanes(const WbSolid *device, double verticalFieldOfView, double horizontalFieldOfView,
-                                             double maxRange, bool isPlanarProjection);
+  static WbAffinePlane *computeFrustumPlanes(const WbSolid *device, const double verticalFieldOfView,
+                                             const double horizontalFieldOfView, const double maxRange,
+                                             bool isPlanarProjection);
 
 private:
   static void mergeBounds(WbVector3 &referenceObjectSize, WbVector3 &referenceObjectRelativePosition,