Fixed problems after merging master into this branch.

include/openspace/rendering/renderengine.h

@@ -77,10 +77,7 @@ public:
         FILMIC, //6
         UNCHARTED, //7
         COSTA, //8
-        ADAPTIVE, //8
-        GLOBAL, //9
-        PHOTOGRAPHIC_REINHARD, //10
-        MIPMAPPING //11
+        PHOTOGRAPHIC_REINHARD, //9
     };
 
     enum class COLORSPACE {
@@ -212,7 +209,21 @@ private:
     properties::TriggerProperty _takeScreenshot;
     bool _shouldTakeScreenshot = false;
     properties::BoolProperty _applyWarping;
-    properties::BoolProperty _showFrameNumber;
+    properties::BoolProperty _showFrameInformation;
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    struct FrameInfo {
+        uint64_t iFrame;
+        double deltaTime;
+        double avgDeltaTime;
+    };
+
+    struct {
+        std::vector<FrameInfo> frames;
+        uint64_t lastSavedFrame = 0;
+        uint16_t saveEveryNthFrame = 2048;
+    } _frameInfo;
+    properties::BoolProperty _saveFrameInformation;
+#endif // OPENSPACE_WITH_INSTRUMENTATION
     properties::BoolProperty _disableMasterRendering;
 
     properties::FloatProperty _globalBlackOutFactor;
@@ -243,7 +254,7 @@ private:
 
     std::vector<ghoul::opengl::ProgramObject*> _programs;
 
-    std::shared_ptr<ghoul::fontrendering::Font> _fontBig;
+    std::shared_ptr<ghoul::fontrendering::Font> _fontFrameInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontDate;
     std::shared_ptr<ghoul::fontrendering::Font> _fontLog;

modules/base/rendering/renderabletrailorbit.cpp

@@ -233,8 +233,8 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
     // Write the current location into the floating position
     const glm::vec3 p = _translation->position({
         {},
-        data.time.j2000Seconds(),
-        0.0,
+        data.time.now(),
+        Time(0.0),
         false
     });
     _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -412,8 +412,8 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             // location
             const glm::vec3 p = _translation->position({
                 {},
-                _lastPointTime,
-                0.0,
+                Time(_lastPointTime),
+                Time(0.0),
                 false
             });
             _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -452,8 +452,8 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             // location
             const glm::vec3 p = _translation->position({
                 {},
-                _firstPointTime,
-                0.0,
+                Time(_firstPointTime),
+                Time(0.0),
                 false
             });
             _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -496,7 +496,7 @@ void RenderableTrailOrbit::fullSweep(double time) {
     const double secondsPerPoint = _period / (_resolution - 1);
     // starting at 1 because the first position is a floating current one
     for (int i = 1; i < _resolution; ++i) {
-        const glm::vec3 p = _translation->position({ {}, time, 0.0, false });
+        const glm::vec3 p = _translation->position({ {}, Time(time), Time(0.0), false });
         _vertexArray[i] = { p.x, p.y, p.z };
 
         time -= secondsPerPoint;

src/rendering/renderengine.cpp

@@ -303,7 +303,6 @@ RenderEngine::RenderEngine()
     , _disableMasterRendering(DisableMasterInfo, false)
     , _globalBlackOutFactor(GlobalBlackoutFactorInfo, 1.f, 0.f, 1.f)
     , _nAaSamples(AaSamplesInfo, 4, 1, 8)
-<<<<<<< HEAD
     , _tmoOwner(TMOInfo)
     , _hdrExposure(HDRExposureInfo, 1.68f, 0.01f, 10.0f)
     , _maxWhite(MaxWhiteInfo, 4.f, 0.001f, 100.0f)
@@ -315,11 +314,6 @@ RenderEngine::RenderEngine()
     , _value(ValueInfo, 1.f, 0.0f, 5.0f)
     , _lightness(LightnessInfo, 1.1f, 0.0f, 5.0f)
     , _colorSpace(ColorSpaceInfo, properties::OptionProperty::DisplayType::Dropdown)
-=======
-    , _hdrExposure(HDRExposureInfo, 0.4f, 0.01f, 10.0f)
-    , _hdrBackground(BackgroundExposureInfo, 2.8f, 0.01f, 10.0f)
-    , _gamma(GammaInfo, 2.2f, 0.01f, 10.0f)
->>>>>>> master
     , _horizFieldOfView(HorizFieldOfViewInfo, 80.f, 1.f, 179.0f)
     , _globalRotation(
         GlobalRotationInfo,
@@ -338,11 +332,7 @@ RenderEngine::RenderEngine()
         glm::vec3(0.f),
         glm::vec3(-glm::pi<float>()),
         glm::vec3(glm::pi<float>())
-<<<<<<< HEAD
     )    
-=======
-    )
->>>>>>> master
 {
     _doPerformanceMeasurements.onChange([this](){
         global::performanceManager.setEnabled(_doPerformanceMeasurements);