Merge pull request #6066 from cyberbotics/sync-master-2ffbd626a

Merge master into develop

Author: Benjamin Délèze

dependencies/Makefile.linux

@@ -6,7 +6,7 @@ include $(WEBOTS_HOME)/resources/Makefile.os.include
 
 DEPENDENCIES_URL = https://cyberbotics.com/files/repository/dependencies/linux64/release
 
-QT_VERSION = 6.2.3
+QT_VERSION = 6.4.3
 QT_PACKAGE = webots-qt-$(QT_VERSION)-linux64-release.tar.bz2
 OPENAL_PACKAGE = openal-linux64-1.16.0.tar.bz2
 OIS_PACKAGE = libOIS.1.4.tar.bz2
@@ -53,7 +53,7 @@ $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE):
 	@rm -f $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE)
 	@echo "# downloading $(QT_PACKAGE)"
 	@wget -qq $(DEPENDENCIES_URL)/$(QT_PACKAGE) -P $(WEBOTS_DEPENDENCY_PATH)
-	@if [ "$$(md5sum $(QT_PACKAGE) | awk '{print $$1;}')" != "edaea63de3772637993cb3facdd51d26" ]; then echo "MD5 checksum failed for $(QT_PACKAGE)"; exit 1; fi
+	@if [ "$$(md5sum $(QT_PACKAGE) | awk '{print $$1;}')" != "a5448e2005fa981278f5348b43809932" ]; then echo "MD5 checksum failed for $(QT_PACKAGE)"; exit 1; fi
 	@touch $(WEBOTS_DEPENDENCY_PATH)/$(QT_PACKAGE)
 
 

docs/reference/changelog-r2023.md

@@ -69,6 +69,7 @@ Released on ??
     - Fixed unwanted altitude change when reaching a target waypoint in `mavic2pro_patrol.c` ([#5981](https://github.com/cyberbotics/webots/pull/5981)).
     - Fixed the extern controller connection to a target Webots instance when a snap one is running ([#6002](https://github.com/cyberbotics/webots/pull/6002)).
     - Fixed the double downloading of meshes ([#6034](https://github.com/cyberbotics/webots/pull/6034)).
+    - Fixed the loading of remote mesh bounding objects ([#6047](https://github.com/cyberbotics/webots/pull/6047)).
 
 ## Webots R2023a
 Released on November 29th, 2022.

scripts/install/qt_linux_installer.sh

@@ -5,7 +5,7 @@ set -e
 
 # follow the instructions from https://github.com/cyberbotics/webots/wiki/Qt-compilation#linux to download and compile Qt before executing this script.
 
-QT_VERSION=6.2.3
+QT_VERSION=6.4.3
 ICU_VERSION=56
 QT_INSTALLATION_PATH=~/Qt/${QT_VERSION}/gcc_64
 WEBOTS_HOME="$(cd "$(dirname "${BASH_SOURCE[0]}" )"/../.. && pwd)"

src/webots/nodes/WbFluid.hpp

@@ -47,6 +47,7 @@ class WbFluid : public WbMatter {
 public slots:
   // recursions through solid children with bounding objects for material updates
   void propagateBoundingObjectMaterialUpdate(bool onSelection = false) override;
+  void updateBoundingObject() override;
 
 protected:
   // this constructor is reserved for derived classes only
@@ -81,7 +82,6 @@ public slots:
 
 private slots:
   void createOdeGeomFromInsertedGroupItem(WbBaseNode *node) override;
-  void updateBoundingObject() override;
   void updateStreamVelocity();
   void updateDensity();
   void updateViscosity();

src/webots/nodes/WbMatter.hpp

@@ -89,6 +89,7 @@ class WbMatter : public WbTransform {
 public slots:
   // recursions through bounding objects for material updates
   virtual void propagateBoundingObjectMaterialUpdate(bool onSelection = false) = 0;
+  virtual void updateBoundingObject() = 0;
 
 protected:
   // Abstract class: constructors are reserved for derived classes only
@@ -179,7 +180,6 @@ protected slots:
   static bool cShowMatterCenter;
 
 private slots:
-  virtual void updateBoundingObject() = 0;
   virtual void createOdeGeomFromInsertedGroupItem(WbBaseNode *node) = 0;
   void createOdeGeomFromInsertedTransformItem();
   void createOdeGeomFromInsertedShapeItem();

src/webots/nodes/WbMesh.cpp

@@ -20,7 +20,9 @@
 #include "WbField.hpp"
 #include "WbGroup.hpp"
 #include "WbMFString.hpp"
+#include "WbMatter.hpp"
 #include "WbNetwork.hpp"
+#include "WbNodeUtilities.hpp"
 #include "WbResizeManipulator.hpp"
 #include "WbTriangleMesh.hpp"
 #include "WbUrl.hpp"
@@ -84,6 +86,12 @@ void WbMesh::downloadUpdate() {
   WbGroup *group = dynamic_cast<WbGroup *>(const_cast<WbNode *>(ancestor));
   if (group)
     group->recomputeBoundingSphere();
+
+  if (isInBoundingObject()) {
+    WbMatter *boundingObjectAncestor = WbNodeUtilities::findBoundingObjectAncestor(this);
+    if (boundingObjectAncestor)
+      boundingObjectAncestor->updateBoundingObject();
+  }
 }
 
 void WbMesh::preFinalize() {

src/webots/nodes/WbSolid.cpp

@@ -260,6 +260,12 @@ void WbSolid::validateProtoNode() {
   }
 }
 
+void WbSolid::downloadAssets() {
+  WbGroup::downloadAssets();
+  if (boundingObject())
+    boundingObject()->downloadAssets();
+}
+
 void WbSolid::preFinalize() {
   mHasNoSolidAncestor = false;
 

src/webots/nodes/WbSolid.hpp

@@ -54,6 +54,7 @@ class WbSolid : public WbMatter {
 
   // reimplemented public functions
   int nodeType() const override { return WB_NODE_SOLID; }
+  void downloadAssets() override;
   void createWrenObjects() override;
   void preFinalize() override;
   void validateProtoNode() override;
@@ -245,6 +246,7 @@ public slots:
   void updateGraphicalGlobalCenterOfMass();
   void resetPhysicsIfRequired(bool changedFromSupervisor);
   virtual void updateChildren();
+  void updateBoundingObject() override;
 
 protected:
   // this constructor is reserved for derived classes only
@@ -461,7 +463,6 @@ private slots:
   void updatePhysics();
   void updateRadarCrossSection();
   void updateRecognitionColors();
-  void updateBoundingObject() override;
   void updateOdeMass();
   void applyToOdeMass();
   void updateOdeInertiaMatrix();