mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-06 03:29:44 -06:00
Pass through the coding styles
This commit is contained in:
@@ -266,7 +266,7 @@ struct EventMissionAdded : public Event {
|
||||
|
||||
/**
|
||||
* Creates an instance of an EventMissionAdded event.
|
||||
*
|
||||
*
|
||||
* \param identifier The identifier of the mission added
|
||||
*/
|
||||
EventMissionAdded(std::string_view identifier);
|
||||
@@ -310,7 +310,7 @@ struct EventPlanetEclipsed : public Event {
|
||||
|
||||
/**
|
||||
* Creates an instance of an EventPlanetEclipsed event.
|
||||
|
||||
|
||||
* \param eclipsee_ The scene graph node that is eclipsed by another object
|
||||
* \param eclipser_ The scene graph node that is eclipsing the other object
|
||||
*
|
||||
|
||||
@@ -106,7 +106,8 @@ public:
|
||||
* and all keyframes deleted from memory.
|
||||
* \param filename File saved with recorded keyframes
|
||||
*/
|
||||
void stopRecording(const std::filesystem::path& filename, DataMode dataMode, bool overwrite = false);
|
||||
void stopRecording(const std::filesystem::path& filename, DataMode dataMode,
|
||||
bool overwrite = false);
|
||||
|
||||
/**
|
||||
* Used to check if a session recording is in progress.
|
||||
|
||||
@@ -62,7 +62,7 @@ T NumericalProperty<T>::minValue() const {
|
||||
template <typename T>
|
||||
void NumericalProperty<T>::setMinValue(T value) {
|
||||
_minimumValue = std::move(value);
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@@ -73,7 +73,7 @@ T NumericalProperty<T>::maxValue() const {
|
||||
template <typename T>
|
||||
void NumericalProperty<T>::setMaxValue(T value) {
|
||||
_maximumValue = std::move(value);
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@@ -84,7 +84,7 @@ T NumericalProperty<T>::steppingValue() const {
|
||||
template <typename T>
|
||||
void NumericalProperty<T>::setSteppingValue(T value) {
|
||||
_stepping = std::move(value);
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
Property::notifyMetaDataChangeListeners();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
@@ -127,10 +127,22 @@ void NumericalProperty<T>::setExponent(float exponent) {
|
||||
template <typename T>
|
||||
nlohmann::json NumericalProperty<T>::generateAdditionalJsonDescription() const {
|
||||
nlohmann::json result = {
|
||||
{ MinimumValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_minimumValue))) },
|
||||
{ MaximumValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_maximumValue))) },
|
||||
{ SteppingValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_stepping))) },
|
||||
{ ExponentValueKey, nlohmann::json::parse(luaToJson(ghoul::to_string(_exponent))) }
|
||||
{
|
||||
MinimumValueKey,
|
||||
nlohmann::json::parse(luaToJson(ghoul::to_string(_minimumValue)))
|
||||
},
|
||||
{
|
||||
MaximumValueKey,
|
||||
nlohmann::json::parse(luaToJson(ghoul::to_string(_maximumValue)))
|
||||
},
|
||||
{
|
||||
SteppingValueKey,
|
||||
nlohmann::json::parse(luaToJson(ghoul::to_string(_stepping)))
|
||||
},
|
||||
{
|
||||
ExponentValueKey,
|
||||
nlohmann::json::parse(luaToJson(ghoul::to_string(_exponent)))
|
||||
}
|
||||
};
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -463,7 +463,7 @@ public:
|
||||
|
||||
/**
|
||||
* Creates the information that is general to every Property and adds the
|
||||
* `description`, `guiName`, `group`, `isReadOnly`, `needsConfirmation` `type`,
|
||||
* `description`, `guiName`, `group`, `isReadOnly`, `needsConfirmation` `type`,
|
||||
* and `visibility` keys and their values.
|
||||
*
|
||||
* \return The base description common to all Property classes
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace openspace {
|
||||
class TransferFunction {
|
||||
public:
|
||||
using TfChangedCallback = std::function<void (const TransferFunction&)>;
|
||||
|
||||
|
||||
explicit TransferFunction(const std::filesystem::path& filepath,
|
||||
TfChangedCallback tfChangedCallback = TfChangedCallback());
|
||||
~TransferFunction();
|
||||
|
||||
@@ -78,8 +78,9 @@ public:
|
||||
void remove(const std::string& path);
|
||||
|
||||
/**
|
||||
* Reloads the asset at the provided \p path as a new root asset of the AssetManager. If the
|
||||
* asset at that path was not previously loaded, acts the same as the add function.
|
||||
* Reloads the asset at the provided \p path as a new root asset of the AssetManager.
|
||||
* If the asset at that path was not previously loaded, acts the same as the add
|
||||
* function.
|
||||
*
|
||||
* \param path The path from which the Asset is loaded. This path can be either
|
||||
* relative to the base directory (the path starting with . or ..), an absolute
|
||||
|
||||
@@ -110,7 +110,7 @@ public:
|
||||
void queueScript(Script script);
|
||||
void queueScript(std::string script);
|
||||
|
||||
// Runs the `script` every `timeout` seconds wallclock time
|
||||
// Runs the `script` every `timeout` seconds wallclock time
|
||||
void registerRepeatedScript(std::string identifier, std::string script,
|
||||
double timeout, std::string preScript = "", std::string postScript = "");
|
||||
void removeRepeatedScript(std::string_view identifier);
|
||||
|
||||
Reference in New Issue
Block a user