mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 17:30:04 -05:00
Update GLM version
Correctly initialize all values as they are no longer default-initialized
This commit is contained in:
@@ -64,12 +64,12 @@ protected:
|
||||
void setFriction(double friction);
|
||||
void setVelocityScaleFactor(double scaleFactor);
|
||||
|
||||
glm::dvec2 previousPosition;
|
||||
glm::dvec2 previousPosition = glm::dvec2(0.0);
|
||||
DelayedVariable<glm::dvec2, double> velocity;
|
||||
};
|
||||
|
||||
|
||||
double _sensitivity;
|
||||
double _sensitivity = 0.0;
|
||||
|
||||
InteractionState _globalRotationState;
|
||||
InteractionState _localRotationState;
|
||||
|
||||
@@ -46,8 +46,8 @@ public:
|
||||
private:
|
||||
ScaleType _scaleFactor;
|
||||
ScaleType _friction;
|
||||
T _targetValue;
|
||||
T _currentValue;
|
||||
T _targetValue = T(0);
|
||||
T _currentValue = T(0);
|
||||
};
|
||||
|
||||
} // namespace openspace::interaction
|
||||
|
||||
@@ -70,7 +70,7 @@ private:
|
||||
|
||||
// Input from mouse
|
||||
std::vector<MouseButton> _mouseButtonsDown;
|
||||
glm::dvec2 _mousePosition;
|
||||
glm::dvec2 _mousePosition = glm::dvec2(0.0);
|
||||
double _mouseScrollDelta;
|
||||
};
|
||||
|
||||
|
||||
@@ -49,8 +49,8 @@ public:
|
||||
BooleanType(Inclusive);
|
||||
|
||||
struct CameraPose {
|
||||
glm::dvec3 position;
|
||||
glm::quat rotation;
|
||||
glm::dvec3 position = glm::dvec3(0.0);
|
||||
glm::quat rotation = glm::quat(1.f, 0.f, 0.f, 0.f);
|
||||
std::string focusNode;
|
||||
float scale;
|
||||
bool followFocusNodeRotation;
|
||||
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
std::string anchor;
|
||||
std::string aim;
|
||||
std::string referenceFrame;
|
||||
glm::dvec3 position;
|
||||
glm::dvec3 position = glm::dvec3(0.0);
|
||||
std::optional<glm::dvec3> up;
|
||||
double yaw = 0.0;
|
||||
double pitch = 0.0;
|
||||
|
||||
@@ -99,13 +99,13 @@ public:
|
||||
|
||||
private:
|
||||
struct CameraRotationDecomposition {
|
||||
glm::dquat localRotation;
|
||||
glm::dquat globalRotation;
|
||||
glm::dquat localRotation = glm::dquat(1.0, 0.0, 0.0, 0.0);
|
||||
glm::dquat globalRotation = glm::dquat(1.0, 0.0, 0.0, 0.0);
|
||||
};
|
||||
|
||||
struct CameraPose {
|
||||
glm::dvec3 position;
|
||||
glm::dquat rotation;
|
||||
glm::dvec3 position = glm::dvec3(0.0);
|
||||
glm::dquat rotation = glm::dquat(1.0, 0.0, 0.0, 0.0);
|
||||
};
|
||||
|
||||
using Displacement = std::pair<glm::dvec3, glm::dvec3>;
|
||||
|
||||
@@ -42,11 +42,11 @@ public:
|
||||
void addGlobalRoll(const glm::dvec2& delta);
|
||||
|
||||
private:
|
||||
glm::dvec2 _localRotation;
|
||||
glm::dvec2 _globalRotation;
|
||||
glm::dvec2 _truckMovement;
|
||||
glm::dvec2 _localRoll;
|
||||
glm::dvec2 _globalRoll;
|
||||
glm::dvec2 _localRotation = glm::dvec2(0.0);
|
||||
glm::dvec2 _globalRotation = glm::dvec2(0.0);
|
||||
glm::dvec2 _truckMovement = glm::dvec2(0.0);
|
||||
glm::dvec2 _localRoll = glm::dvec2(0.0);
|
||||
glm::dvec2 _globalRoll = glm::dvec2(0.0);
|
||||
};
|
||||
|
||||
} // namespace openspace::interaction
|
||||
|
||||
Reference in New Issue
Block a user