mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/gamma-correction

Browse Source
This commit is contained in:
Ylva Selling
2022-06-29 04:21:46 -04:00
parent f80cc0cd53 4cb75f5820
commit bcb5c7bd28
197 changed files with 492 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/openspace/interaction/sessionrecording.h
View File

@@ -101,7 +101,7 @@ public:
SessionRecording();
SessionRecording(bool isGlobal);
~SessionRecording();
~SessionRecording() override;
/**
* Used to de-initialize the session recording feature. Any recording or playback
@@ -604,7 +604,7 @@ protected:
Timestamps t3stamps;
};
double _timestampRecordStarted = 0.0;
Timestamps _timestamps3RecordStarted;
Timestamps _timestamps3RecordStarted{ 0.0, 0.0, 0.0 };
double _timestampPlaybackStarted_application = 0.0;
double _timestampPlaybackStarted_simulation = 0.0;
double _timestampApplicationStarted_simulation = 0.0;
@@ -696,10 +696,12 @@ protected:
std::string& version, DataMode& mode);
void populateListofLoadedSceneGraphNodes();
bool checkIfScriptUsesScenegraphNode(std::string s);
void checkForScenegraphNodeAccess_Scene(std::string& s, std::string& result);
void checkForScenegraphNodeAccess_Nav(std::string& s, std::string& result);
void checkIfScriptUsesScenegraphNode(std::string s);
bool checkForScenegraphNodeAccessScene(std::string& s);
bool checkForScenegraphNodeAccessNav(std::string& navTerm);
std::string extractScenegraphNodeFromScene(std::string& s);
bool checkIfInitialFocusNodeIsLoaded(unsigned int firstCamIndex);
std::string isolateTermFromQuotes(std::string s);
void eraseSpacesFromString(std::string& s);
std::string getNameFromSurroundingQuotes(std::string& s);
@@ -733,11 +735,11 @@ protected:
bool _saveRenderingDuringPlayback = false;
double _saveRenderingDeltaTime = 1.0 / 30.0;
double _saveRenderingCurrentRecordedTime;
double _saveRenderingCurrentRecordedTime = 0.0;
std::chrono::steady_clock::duration _saveRenderingDeltaTime_interpolation_usec;
std::chrono::steady_clock::time_point _saveRenderingCurrentRecordedTime_interpolation;
double _saveRenderingCurrentApplicationTime_interpolation;
long long _saveRenderingClockInterpolation_countsPerSec;
double _saveRenderingCurrentApplicationTime_interpolation = 0.0;
long long _saveRenderingClockInterpolation_countsPerSec = 1;
bool _saveRendering_isFirstFrame = true;
unsigned char _keyframeBuffer[_saveBufferMaxSize_bytes];
@@ -835,7 +837,7 @@ protected:
class SessionRecording_legacy_0085 : public SessionRecording {
public:
SessionRecording_legacy_0085() : SessionRecording() {}
~SessionRecording_legacy_0085() {}
~SessionRecording_legacy_0085() override {}
char FileHeaderVersion[FileHeaderVersionLength+1] = "00.85";
char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
std::string fileFormatVersion() override {

2
include/openspace/interaction/tasks/convertrecfileversiontask.h
View File

@@ -37,7 +37,7 @@ namespace openspace::interaction {
class ConvertRecFileVersionTask : public Task {
public:
ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary);
~ConvertRecFileVersionTask();
~ConvertRecFileVersionTask() override;
std::string description() override;
void perform(const Task::ProgressCallback& progressCallback) override;
static documentation::Documentation documentation();

2
include/openspace/interaction/tasks/convertrecformattask.h
View File

@@ -41,7 +41,7 @@ public:
ToBinary
};
ConvertRecFormatTask(const ghoul::Dictionary& dictionary);
~ConvertRecFormatTask();
~ConvertRecFormatTask() override;
std::string description() override;
void perform(const Task::ProgressCallback& progressCallback) override;
static documentation::Documentation documentation();

2
include/openspace/navigation/navigationhandler.h
View File

@@ -61,7 +61,7 @@ class PathNavigator;
class NavigationHandler : public properties::PropertyOwner {
public:
NavigationHandler();
~NavigationHandler();
virtual ~NavigationHandler() override;
void initialize();
void deinitialize();

2
include/openspace/navigation/pathnavigator.h
View File

@@ -51,7 +51,7 @@ class Path;
class PathNavigator : public properties::PropertyOwner {
public:
PathNavigator();
~PathNavigator();
virtual ~PathNavigator() override;
// Accessors
Camera* camera() const;

2
include/openspace/network/parallelpeer.h
View File

@@ -47,7 +47,7 @@ namespace scripting { struct LuaLibrary; }
class ParallelPeer : public properties::PropertyOwner {
public:
ParallelPeer();
~ParallelPeer();
~ParallelPeer() override;
void connect();
void setPort(std::string port);

2
include/openspace/properties/listproperty.h
View File

@@ -35,7 +35,7 @@ class ListProperty : public TemplateProperty<std::vector<T>> {
public:
ListProperty(Property::PropertyInfo info, std::vector<T> values);
virtual ~ListProperty() = 0;
virtual ~ListProperty() override = 0;
};
} // namespace openspace::properties

2
include/openspace/properties/propertyowner.h
View File

@@ -77,7 +77,7 @@ public:
* The destructor will remove all Propertys and PropertyOwners it owns along with
* itself.
*/
virtual ~PropertyOwner();
virtual ~PropertyOwner() override;
/**
* Sets the identifier for this PropertyOwner. If the PropertyOwner does not have an

2
include/openspace/rendering/dashboard.h
View File

@@ -41,7 +41,7 @@ namespace scripting { struct LuaLibrary; }
class Dashboard : public properties::PropertyOwner {
public:
Dashboard();
~Dashboard() = default;
virtual ~Dashboard() override = default;
void render(glm::vec2& penPosition);

2
include/openspace/rendering/framebufferrenderer.h
View File

@@ -58,7 +58,7 @@ class FramebufferRenderer : public RaycasterListener,
public DeferredcasterListener
{
public:
virtual ~FramebufferRenderer() = default;
virtual ~FramebufferRenderer() override final = default;
void initialize();
void deinitialize();

2
include/openspace/rendering/luaconsole.h
View File

@@ -46,7 +46,7 @@ namespace openspace {
class LuaConsole : public properties::PropertyOwner {
public:
LuaConsole();
~LuaConsole();
~LuaConsole() override;
void initialize();
void deinitialize();

2
include/openspace/rendering/renderable.h
View File

@@ -65,7 +65,7 @@ public:
ghoul::Dictionary dictionary);
Renderable(const ghoul::Dictionary& dictionary);
virtual ~Renderable() = default;
virtual ~Renderable() override = default;
virtual void initialize();
virtual void initializeGL();

2
include/openspace/rendering/renderengine.h
View File

@@ -66,7 +66,7 @@ struct ShutdownInformation;
class RenderEngine : public properties::PropertyOwner {
public:
RenderEngine();
~RenderEngine();
virtual ~RenderEngine() override;
void initialize();
void initializeGL();

2
include/openspace/rendering/screenspacerenderable.h
View File

@@ -58,7 +58,7 @@ public:
static constexpr const char* KeyIdentifier = "Identifier";
ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
virtual ~ScreenSpaceRenderable();
virtual ~ScreenSpaceRenderable() override;
virtual void render();

2
include/openspace/scene/lightsource.h
View File

@@ -47,7 +47,7 @@ public:
LightSource();
LightSource(const ghoul::Dictionary& dictionary);
virtual ~LightSource() = default;
~LightSource() override = default;
virtual glm::vec3 directionViewSpace(const RenderData& renderData) const = 0;

2
include/openspace/scene/rotation.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
Rotation();
virtual ~Rotation() = default;
virtual ~Rotation() override = default;
virtual bool initialize();

2
include/openspace/scene/scale.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
Scale();
virtual ~Scale() = default;
virtual ~Scale() override = default;
virtual bool initialize();

13
include/openspace/scene/scene.h
View File

@@ -82,7 +82,7 @@ public:
// constructors & destructor
Scene(std::unique_ptr<SceneInitializer> initializer);
~Scene();
virtual ~Scene() override;
/**
* Clear the scene graph,
@@ -253,6 +253,17 @@ public:
*/
void setPropertiesFromProfile(const Profile& p);
/**
* Searches for any properties that match the regex propertyString, and returns
* the results in a vector.
*
* \param propertyString the regex string that is intended to match one or more
* properties in the currently-available properties
* \return Vector of Property objs containing property names that matched the regex
*/
std::vector<properties::Property*> propertiesMatchingRegex(
std::string propertyString);
private:
/**
* Accepts string version of a property value from a profile, converts it to the

2
include/openspace/scene/scenegraphnode.h
View File

@@ -81,7 +81,7 @@ public:
static constexpr const char* KeyTag = "Tag";
SceneGraphNode();
~SceneGraphNode();
virtual ~SceneGraphNode() override;
static ghoul::mm_unique_ptr<SceneGraphNode> createFromDictionary(
const ghoul::Dictionary& dictionary);

2
include/openspace/scene/timeframe.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
TimeFrame();
virtual ~TimeFrame() = default;
virtual ~TimeFrame() override = default;
virtual bool initialize();

2
include/openspace/scene/translation.h
View File

@@ -47,7 +47,7 @@ public:
const ghoul::Dictionary& dictionary);
Translation();
virtual ~Translation() = default;
virtual ~Translation() override = default;
virtual bool initialize();
virtual void update(const UpdateData& data);

4
include/openspace/util/httprequest.h
View File

@@ -375,7 +375,7 @@ public:
* This destructor will cancel any ongoing download and wait for its completion, so it
* might not block for a short amount of time.
*/
virtual ~HttpFileDownload() = default;
virtual ~HttpFileDownload() override = default;
/**
* Returns the path where the contents of the URL provided in the constructor will be
@@ -443,7 +443,7 @@ public:
* This destructor will cancel any ongoing download and wait for its completion, so it
* might not block for a short amount of time.
*/
virtual ~HttpMemoryDownload() = default;
virtual ~HttpMemoryDownload() override = default;
/**
* Returns a reference to the buffer that is used to store the contents of the URL

2
include/openspace/util/openspacemodule.h
View File

@@ -58,7 +58,7 @@ public:
OpenSpaceModule(std::string name);
/// Default destructor
virtual ~OpenSpaceModule() = default;
virtual ~OpenSpaceModule() override = default;
/**
* Initialization method that will register a token of the form

2
include/openspace/util/screenlog.h
View File

@@ -82,7 +82,7 @@ public:
/**
* Destructor
*/
~ScreenLog() = default;
~ScreenLog() override = default;
/**
* Overwritten ghoul::loggling::Log method that is called whenever a new log message