mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

General pass for coding style

Browse Source
This commit is contained in:
Alexander Bock
2020-11-28 22:31:06 +01:00
parent ab78132607
commit 60e3ed2170
56 changed files with 377 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/orbitalnavigator.cpp
+4 -2
View File
@@ -256,7 +256,7 @@ OrbitalNavigator::OrbitalNavigator()
, _flightDestinationDistance(FlightDestinationDistInfo, 2e8f, 0.0f, 1e10f)
, _flightDestinationFactor(FlightDestinationFactorInfo, 1E-4, 1E-6, 0.5)
, _applyLinearFlight(ApplyLinearFlightInfo, false)
, _velocitySensitivity(VelocityZoomControlInfo, 3.5f, 0.001f, 20.f)
, _velocitySensitivity(VelocityZoomControlInfo, 3.5f, 0.001f, 20.f)
, _mouseSensitivity(MouseSensitivityInfo, 15.f, 1.f, 50.f)
, _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
, _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
@@ -476,7 +476,9 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
// Fly towards the flight destination distance. When getting closer than
// arrivalThreshold terminate the flight
if (std::fabs(distFromCameraToFocus - _flightDestinationDistance) > arrivalThreshold) {
if (std::fabs(distFromCameraToFocus - _flightDestinationDistance) >
arrivalThreshold)
{
pose.position = moveCameraAlongVector(
pose.position,
distFromCameraToFocus,
src/interaction/sessionrecording.cpp
+12 -12
View File
@@ -976,7 +976,8 @@ bool SessionRecording::readSingleKeyframeCamera(datamessagestructures::CameraKey
void SessionRecording::saveSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
Timestamps& times, DataMode mode,
std::ofstream& file, unsigned char* buffer)
std::ofstream& file,
unsigned char* buffer)
{
if (mode == DataMode::Binary) {
saveCameraKeyframeBinary(times, kf, buffer, file);
@@ -1068,9 +1069,9 @@ bool SessionRecording::playbackTimeChange() {
return success;
}
bool SessionRecording::convertTimeChange(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile,
unsigned char* buffer)
bool SessionRecording::convertTimeChange(std::stringstream& inStream, DataMode mode,
int lineNum, std::string& inputLine,
std::ofstream& outFile, unsigned char* buffer)
{
Timestamps times;
datamessagestructures::TimeKeyframe kf;
@@ -1210,9 +1211,9 @@ bool SessionRecording::playbackScript() {
return success;
}
bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile,
unsigned char* buffer)
bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode,
int lineNum, std::string& inputLine,
std::ofstream& outFile, unsigned char* buffer)
{
Timestamps times;
datamessagestructures::ScriptMessage kf;
@@ -1252,7 +1253,8 @@ bool SessionRecording::readSingleKeyframeScript(datamessagestructures::ScriptMes
void SessionRecording::saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
Timestamps& times, DataMode mode,
std::ofstream& file, unsigned char* buffer)
std::ofstream& file,
unsigned char* buffer)
{
if (mode == DataMode::Binary) {
saveScriptKeyframeBinary(times, kf, buffer, file);
@@ -1300,8 +1302,7 @@ bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
datamessagestructures::ScriptMessage& kf,
std::string currentParsingLine,
int lineN)
std::string currentParsingLine, int lineN)
{
std::string entryType;
std::istringstream iss(currentParsingLine);
@@ -1366,8 +1367,7 @@ bool SessionRecording::addKeyframe(double timestamp,
bool SessionRecording::addKeyframeToTimeline(RecordedType type,
size_t indexIntoTypeKeyframes,
double timestamp,
int lineNum)
double timestamp, int lineNum)
{
try {
_timeline.push_back({
src/interaction/tasks/convertrecformattask.cpp
+2 -1
View File
@@ -117,7 +117,8 @@ void ConvertRecFormatTask::convert() {
);
return;
}
else if (!SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_out)) {
else if (!SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_out))
{
_outFilePath += expectedFileExtension_out;
}