kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: fix warning in NavigationStyle

Browse Source 
Fix warning: suggest braces around empty body in an ‘if’ statement.
While there also guard similar debug messages instead of commenting
them out.

Fixes: 8d2cb99712 ("Gui: Added classic trackball orbit style")
This commit is contained in:
Ladislav Michl
2025-04-30 20:13:35 +02:00
committed by Kacper Donat
parent 07c413967a
commit 4414042b8f
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Gui/Navigation/NavigationStyle.cpp
View File

@@ -117,20 +117,18 @@ public:
// drop the sphere intersection onto the tolerance plane
SbLine projectLine(sphereIntersection, sphereIntersection + planeDir);
if (!tolPlane.intersect(projectLine, planeIntersection))
#ifdef DEBUG
if (!tolPlane.intersect(projectLine, planeIntersection)) {
#ifdef FC_DEBUG
SoDebugError::post("SbSphereSheetProjector::project",
"Couldn't intersect working line with plane");
#else
/* Do nothing */;
#endif
}
}
else if (!tolPlane.intersect(workingLine, planeIntersection)) {
#ifdef FC_DEBUG
SoDebugError::post("SbSphereSheetProjector::project", "Couldn't intersect with plane");
#endif
}
else if (!tolPlane.intersect(workingLine, planeIntersection))
#ifdef DEBUG
SoDebugError::post("SbSphereSheetProjector::project", "Couldn't intersect with plane");
#else
/* Do nothing */;
#endif
// Three possibilities:
// (1) Intersection is on the sphere inside where the fillet
@@ -813,13 +811,16 @@ void NavigationStyle::zoom(SoCamera * cam, float diffvalue)
// frustum (similar to glFrustum())
if (!t.isDerivedFrom(SoPerspectiveCamera::getClassTypeId()) &&
tname != "FrustumCamera") {
/* static SbBool first = true;
if (first) {
SoDebugError::postWarning("SoGuiFullViewerP::zoom",
"Unknown camera type, "
"will zoom by moving position, but this might not be correct.");
first = false;
}*/
#ifdef FC_DEBUG
static SbBool first = true;
if (first) {
SoDebugError::postWarning("NavigationStyle::zoom",
"Unknown camera type, "
"will zoom by moving position, "
"but this might not be correct.");
first = false;
}
#endif
}
const float oldfocaldist = cam->focalDistance.getValue();
@@ -1719,8 +1720,9 @@ void NavigationStyle::syncWithEvent(const SoEvent * const ev)
auto const event = static_cast<const SoMouseButtonEvent *>(ev);
const int button = event->getButton();
const SbBool press = event->getState() == SoButtonEvent::DOWN ? true : false;
// SoDebugError::postInfo("processSoEvent", "button = %d", button);
#ifdef FC_DEBUG
SoDebugError::postInfo("processSoEvent", "button = %d", button);
#endif
switch (button) {
case SoMouseButtonEvent::BUTTON1:
this->button1down = press;