mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-28 23:09:32 -05:00
Coding style adaptations
This commit is contained in:
@@ -115,14 +115,14 @@ private:
|
||||
struct JoystickCameraState {
|
||||
std::string joystickName;
|
||||
|
||||
// We use an array for the axes and a map for the buttons since the axis are going to
|
||||
// be accessed much more often and thus have to be more efficient. And storing a few
|
||||
// extra AxisInformation that are not used will not matter that much; finding an axis
|
||||
// location in a potential map each frame, however, would
|
||||
// We use an array for the axes and a map for the buttons since the axis are going
|
||||
// to be accessed much more often and thus have to be more efficient. And storing
|
||||
// a few extra AxisInformation that are not used will not matter that much;
|
||||
// finding an axis location in a potential map each frame, however, would
|
||||
std::array<AxisInformation, JoystickInputState::MaxAxes> axisMapping;
|
||||
|
||||
// This array is used to store the old axis values from the previous frame,
|
||||
// it is used to calculate the difference in the values in the case of a sticky axis
|
||||
// This array is used to store the old axis values from the previous frame, it is
|
||||
// used to calculate the difference in the values in the case of a sticky axis
|
||||
std::array<float, JoystickInputState::MaxAxes> prevAxisValues;
|
||||
|
||||
struct ButtonInformation {
|
||||
|
||||
@@ -492,7 +492,8 @@ public:
|
||||
/**
|
||||
* Reads header information from a session recording file
|
||||
*
|
||||
* \param stringstream reference to ifstream that contains the session recording file data
|
||||
* \param stringstream reference to ifstream that contains the session recording file
|
||||
* data
|
||||
* \param readLen_chars number of characters to be read, which may be the expected
|
||||
* length of the header line, or an arbitrary number of characters within it
|
||||
*/
|
||||
|
||||
@@ -64,7 +64,7 @@ private:
|
||||
ghoul::opengl::Texture::FilterMode::LinearMipMap;
|
||||
ghoul::opengl::Texture::WrappingMode _wrappingMode =
|
||||
ghoul::opengl::Texture::WrappingMode::Repeat;
|
||||
|
||||
|
||||
bool _shouldWatchFile = true;
|
||||
bool _shouldPurgeFromRAM = true;
|
||||
|
||||
|
||||
@@ -89,12 +89,12 @@ public:
|
||||
bool isLocal;
|
||||
std::string script;
|
||||
};
|
||||
|
||||
|
||||
struct Keybinding {
|
||||
KeyWithModifier key;
|
||||
std::string action;
|
||||
};
|
||||
|
||||
|
||||
struct Time {
|
||||
enum class Type {
|
||||
Absolute,
|
||||
@@ -104,7 +104,7 @@ public:
|
||||
Type type;
|
||||
std::string value;
|
||||
};
|
||||
|
||||
|
||||
struct CameraNavState {
|
||||
static constexpr const char* Type = "setNavigationState";
|
||||
|
||||
@@ -116,7 +116,7 @@ public:
|
||||
std::optional<double> yaw;
|
||||
std::optional<double> pitch;
|
||||
};
|
||||
|
||||
|
||||
struct CameraGoToGeo {
|
||||
static constexpr const char* Type = "goToGeo";
|
||||
|
||||
@@ -125,7 +125,7 @@ public:
|
||||
double longitude;
|
||||
std::optional<double> altitude;
|
||||
};
|
||||
|
||||
|
||||
using CameraType = std::variant<CameraNavState, CameraGoToGeo>;
|
||||
|
||||
Profile() = default;
|
||||
|
||||
Reference in New Issue
Block a user