Rename boolean functions and variables to adhere to code style

This commit is contained in:
sylvass
2021-11-10 09:33:30 -05:00
parent 89e483c748
commit 206fc43f74
12 changed files with 83 additions and 79 deletions
+2 -5
View File
@@ -40,9 +40,6 @@ public:
constexpr static const float AcceptableDiff = 0.01f;
Pair(ScreenSpaceSkyBrowser* browser, ScreenSpaceSkyTarget* target);
Pair(Pair const&) = default;
Pair& operator=(Pair other);
void lock();
void unlock();
@@ -54,11 +51,11 @@ public:
void enable();
void disable();
void startAnimation(glm::dvec3 coordsEnd, float FOVEnd, bool shouldLockAfter = true);
void startAnimation(glm::dvec3 coordsEnd, float fovEnd, bool shouldLockAfter = true);
void centerTargetOnScreen();
void incrementallyAnimateToCoordinate(double deltaTime);
void incrementallyFade(float goalState, float fadeTime, float deltaTime);
bool isFinishedFading(float goalState);
bool hasFinishedFading(float goalState);
bool isCoordOnPair(glm::vec2 mousePosition);
bool isEnabled();
bool isLocked();
@@ -98,7 +98,7 @@ namespace openspace {
// Flags
bool _isUrlDirty = false;
bool _isDimensionsDirty = false;
bool _syncViewWithWwt;
bool _isSyncedWithWwt;
float _verticalFov;
std::thread _threadWwtMessages;
@@ -91,8 +91,8 @@ namespace openspace {
// Flags
bool _hasLoadedImages{ false };
bool _syncViewWithWwt{ false };
bool _fovIsAnimated{ false };
bool _isSyncedWithWwt{ false };
bool _isFovAnimated{ false };
float _endVfov{ 0.f };
float _fovDiff{ 0.01f };
@@ -34,7 +34,7 @@ namespace openspace {
void createShaders();
// Sky browser functionality
bool findSkyBrowser();
bool connectoToSkyBrowser();
void matchAppearanceToSkyBrowser();
// Getters
@@ -59,8 +59,8 @@ namespace openspace {
// Animation
bool isAnimated();
void startAnimation(glm::dvec3 end, bool lockAfter);
void animateToCoordinate(float deltaTime);
void startAnimation(glm::dvec3 end, bool shouldLockAfter);
void incrementallyAnimateToCoordinate(float deltaTime);
// Display
void highlight(glm::ivec3 addition);
void removeHighlight(glm::ivec3 removal);
@@ -76,7 +76,7 @@ namespace openspace {
// Flags
bool _isLocked{ false };
bool _isAnimated{ false };
bool _lockAfterAnimation{ false };
bool _shouldLockAfterAnimation{ false };
// Shader
UniformCache(
+2 -2
View File
@@ -42,7 +42,7 @@ namespace openspace {
// Camera roll and direction
// Camera roll is with respect to the equatorial North Pole
bool coordinateIsInView(glm::dvec3 equatorial);
bool isCoordinateInView(glm::dvec3 equatorial);
float windowRatio();
double cameraRoll();
glm::vec2 pixelToScreenSpace(glm::vec2& mouseCoordinate);
@@ -58,7 +58,7 @@ namespace openspace {
namespace wwtmessage {
inline int messageCounter{ 0 };
ghoul::Dictionary moveCamera(const glm::dvec2 celestCoords,
const double fov, const double roll, const bool moveInstantly = true);
const double fov, const double roll, const bool shouldMoveInstantly = true);
ghoul::Dictionary loadCollection(const std::string& url);
ghoul::Dictionary setForeground(const std::string& name);
ghoul::Dictionary addImage(const std::string& id, const std::string& url);