Fix bool usage in Body

pull/3/head
Hleb Valoshka 2019-06-17 15:18:47 +03:00
parent 9dbdf29c4a
commit c95fe7ee0f
2 changed files with 14 additions and 14 deletions

View File

@ -89,10 +89,10 @@ void Body::setDefaultProperties()
delete rings;
rings = nullptr;
classification = Unknown;
visible = 1;
clickable = 1;
visibleAsPoint = 1;
overrideOrbitColor = 0;
visible = true;
clickable = true;
visibleAsPoint = true;
overrideOrbitColor = false;
orbitVisibility = UseClassVisibility;
recomputeCullingRadius();
}
@ -1053,7 +1053,7 @@ Body::getReferenceMarks() const
*/
void Body::setVisible(bool _visible)
{
visible = _visible ? 1 : 0;
visible = _visible;
}
@ -1063,7 +1063,7 @@ void Body::setVisible(bool _visible)
*/
void Body::setClickable(bool _clickable)
{
clickable = _clickable ? 1 : 0;
clickable = _clickable;
}
@ -1074,7 +1074,7 @@ void Body::setClickable(bool _clickable)
*/
void Body::setVisibleAsPoint(bool _visibleAsPoint)
{
visibleAsPoint = _visibleAsPoint ? 1 : 0;
visibleAsPoint = _visibleAsPoint;
}
@ -1082,9 +1082,9 @@ void Body::setVisibleAsPoint(bool _visibleAsPoint)
* color should be used (specified via setOrbitColor) instead of the
* default class orbit color.
*/
void Body::setOrbitColorOverridden(bool override)
void Body::setOrbitColorOverridden(bool _override)
{
overrideOrbitColor = override ? 1 : 0;
overrideOrbitColor = _override;
}

View File

@ -310,18 +310,18 @@ class Body : public CatEntry
Location* findLocation(const std::string&, bool i18n = false) const;
void computeLocations();
bool isVisible() const { return visible == 1; }
bool isVisible() const { return visible; }
void setVisible(bool _visible);
bool isClickable() const { return clickable == 1; }
bool isClickable() const { return clickable; }
void setClickable(bool _clickable);
bool isVisibleAsPoint() const { return visibleAsPoint == 1; }
bool isVisibleAsPoint() const { return visibleAsPoint; }
void setVisibleAsPoint(bool _visibleAsPoint);
bool isOrbitColorOverridden() const { return overrideOrbitColor == 1; }
bool isOrbitColorOverridden() const { return overrideOrbitColor; }
void setOrbitColorOverridden(bool override);
bool isSecondaryIlluminator() const { return secondaryIlluminator; }
void setSecondaryIlluminator(bool enable);
bool hasVisibleGeometry() const { return classification != Invisible && visible != 0; }
bool hasVisibleGeometry() const { return classification != Invisible && visible; }
VisibilityPolicy getOrbitVisibility() const { return orbitVisibility; }
void setOrbitVisibility(VisibilityPolicy _orbitVisibility);