From 4844a05aeab90a9e78d8e97ffdb6a5804a215e07 Mon Sep 17 00:00:00 2001
From: Mirko Waechter <mirko.waechter@kit.edu>
Date: Sun, 21 Oct 2018 15:18:51 +0200
Subject: [PATCH] improved debug message and sanity checks
---
VirtualRobot/CollisionDetection/CDManager.cpp | 2 +-
VirtualRobot/CollisionDetection/PQP/CollisionCheckerPQP.cpp | 4 ++--
VirtualRobot/SceneObjectSet.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/VirtualRobot/CollisionDetection/CDManager.cpp b/VirtualRobot/CollisionDetection/CDManager.cpp
index 0e3466ac2..bd44df1be 100644
--- a/VirtualRobot/CollisionDetection/CDManager.cpp
+++ b/VirtualRobot/CollisionDetection/CDManager.cpp
@@ -36,7 +36,7 @@ namespace VirtualRobot
{
if (m->getCollisionChecker() != colChecker)
{
- VR_WARNING << "CollisionModel is linked to different instance of collision checker..." << endl;
+ VR_WARNING << "CollisionModel of SceneObjectSet '" << m->getName() << "' is linked to a different instance of collision checker than this CollisionManager..." << endl;
}
for (size_t i = 0; i < colModels.size(); i++)
diff --git a/VirtualRobot/CollisionDetection/PQP/CollisionCheckerPQP.cpp b/VirtualRobot/CollisionDetection/PQP/CollisionCheckerPQP.cpp
index df4288207..6bb10f4fc 100644
--- a/VirtualRobot/CollisionDetection/PQP/CollisionCheckerPQP.cpp
+++ b/VirtualRobot/CollisionDetection/PQP/CollisionCheckerPQP.cpp
@@ -7,7 +7,6 @@
#include "../../SceneObjectSet.h"
#include "PQP.h"
#include "../../VirtualRobotException.h"
-
namespace VirtualRobot
{
@@ -64,7 +63,8 @@ namespace VirtualRobot
BOOST_ASSERT(model2->getCollisionModelImplementation());
boost::shared_ptr<PQP::PQP_Model> m1 = model1->getCollisionModelImplementation()->getPQPModel();
boost::shared_ptr<PQP::PQP_Model> m2 = model2->getCollisionModelImplementation()->getPQPModel();
- VR_ASSERT_MESSAGE(m1 && m2, "NULL data in ColChecker!");
+ BOOST_ASSERT_MSG(m1, "NULL data in ColChecker in m1!");
+ BOOST_ASSERT_MSG(m2, "NULL data in ColChecker in m2!");
PQP::PQP_CollideResult result;
PQP::PQP_REAL R1[3][3];
diff --git a/VirtualRobot/SceneObjectSet.cpp b/VirtualRobot/SceneObjectSet.cpp
index 407b73a6e..1b5dae76f 100644
--- a/VirtualRobot/SceneObjectSet.cpp
+++ b/VirtualRobot/SceneObjectSet.cpp
@@ -58,7 +58,7 @@ namespace VirtualRobot
if (colChecker != sceneObject->getCollisionChecker())
{
- VR_WARNING << " col model belongs to different instance of collision checker, in: " << name << endl;
+ VR_WARNING << " col model belongs to different instance of collision checker, in: '" << name << "'" << endl;
return false;
}
--
GitLab