General pass for coding style

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
@@ -593,8 +593,8 @@ protected:
DataMode mode, int lineNum, std::ofstream& outFile);
virtual bool convertCamera(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
virtual bool convertTimeChange(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
virtual bool convertTimeChange(std::stringstream& inStream, DataMode mode,
int lineNum, std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
virtual bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
DataMode readModeFromHeader(std::string filename);
@@ -54,4 +54,4 @@ private:
} // namespace openspace::interaction
#endif //__OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
#endif // __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
@@ -32,8 +32,6 @@
#include <string>
namespace openspace::interaction {
class ConvertRecFormatTask : public Task {
@@ -67,4 +65,4 @@ private:
} // namespace openspace::interaction
#endif //__OPENSPACE_CORE___CONVERTRECFORMATTASK___H__
#endif // __OPENSPACE_CORE___CONVERTRECFORMATTASK___H__
+2 -1
View File
@@ -105,7 +105,8 @@ VertexXYZ convertToXYZ(const Vertex& v);
std::vector<VertexXYZ> convert(std::vector<Vertex> v);
std::vector<Vertex> createRing(int nSegments, float radius, glm::vec4 colors = glm::vec4(1.f));
std::vector<Vertex> createRing(int nSegments, float radius,
glm::vec4 colors = glm::vec4(1.f));
} // namespace openspace::rendering::helper
+1 -1
View File
@@ -215,7 +215,7 @@ private:
_onDependencyInitializationFunctionRefs;
std::unordered_map<Asset*, std::map<Asset*, std::vector<int>>>
_onDependencyDeinitializationFunctionRefs;
int _assetsTableRef = 0;
};
+1 -1
View File
@@ -127,7 +127,7 @@ public:
* and all of the property & asset changes that were made since startup.
*/
void saveCurrentSettingsToProfile(const properties::PropertyOwner& rootOwner,
std::string currentTime,
std::string currentTime,
interaction::NavigationHandler::NavigationState navState);
/// If the value passed to this function is 'true', the addAsset and removeAsset
+2 -1
View File
@@ -160,7 +160,8 @@ private:
std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeChangeCallbacks;
std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeChangeCallbacks;
std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeStepsChangeCallbacks;
std::vector<std::pair<CallbackHandle, TimeChangeCallback>>
_deltaTimeStepsChangeCallbacks;
std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeJumpCallbacks;
std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timelineChangeCallbacks;