Making Galaxy, iSWA, and multiresvolume modules compile again

modules/galaxy/rendering/galaxyraycaster.cpp

@@ -134,7 +134,7 @@ bool GalaxyRaycaster::cameraIsInside(const RenderData& data, glm::vec3& localPos
 
     glm::vec4 modelPos = (glm::inverse(scaledModelTransform) / divisor) * camWorldPos;
     
-    localPosition = (modelPos.xyz() + glm::vec3(0.5));
+    localPosition = (glm::vec3(modelPos) + glm::vec3(0.5));
     return (localPosition.x > 0 && localPosition.y > 0 && localPosition.z > 0 && localPosition.x < 1 && localPosition.y < 1 && localPosition.z < 1);
 }
 

modules/iswa/rendering/datacygnet.h

@@ -108,7 +108,7 @@ protected:
 
 private:
     bool readyToRender() const override;
-    bool downloadTextureResource(double timestamp = Time::ref().currentTime()) override;
+    bool downloadTextureResource(double timestamp = Time::ref().j2000Seconds()) override;
 };
 } //namespace openspace
 

modules/iswa/rendering/iswacygnet.cpp

@@ -178,7 +178,7 @@ void IswaCygnet::update(const UpdateData& data){
     // the texture resource is downloaded ahead of time, so we need to
     // now if we are going backwards or forwards
     double clockwiseSign = (Time::ref().deltaTime()>0) ? 1.0 : -1.0;
-    _openSpaceTime = Time::ref().currentTime();
+    _openSpaceTime = Time::ref().j2000Seconds();
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
     _stateMatrix = TransformationManager::ref().frameTransformationMatrix(_data->frame, "GALACTIC", _openSpaceTime);
 
@@ -222,7 +222,7 @@ void IswaCygnet::unregisterProperties(){
 }
 
 void IswaCygnet::initializeTime(){
-    _openSpaceTime = Time::ref().currentTime();
+    _openSpaceTime = Time::ref().j2000Seconds();
     _lastUpdateOpenSpaceTime = 0.0;
 
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());

modules/iswa/rendering/screenspacecygnet.cpp

@@ -50,7 +50,7 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
     _downloadImage = true;
     _url = IswaManager::ref().iswaUrl(_cygnetId);
         
-    _openSpaceTime = Time::ref().currentTime();
+    _openSpaceTime = Time::ref().j2000Seconds();
     _lastUpdateOpenSpaceTime = _openSpaceTime;
 
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
@@ -69,7 +69,7 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
 ScreenSpaceCygnet::~ScreenSpaceCygnet(){}
 
 void ScreenSpaceCygnet::update(){
-    _openSpaceTime = Time::ref().currentTime();
+    _openSpaceTime = Time::ref().j2000Seconds();
     _realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
 
     bool timeToUpdate = (fabs(_openSpaceTime-_lastUpdateOpenSpaceTime) >= _updateTime &&

modules/iswa/rendering/texturecygnet.h

@@ -43,7 +43,7 @@ public:
 protected:
 
     bool updateTexture() override;
-    bool downloadTextureResource(double timestamp = Time::ref().currentTime()) override;
+    bool downloadTextureResource(double timestamp = Time::ref().j2000Seconds()) override;
     bool readyToRender() const override;
     bool updateTextureResource() override;
 

modules/multiresvolume/rendering/multiresvolumeraycaster.cpp

@@ -149,7 +149,7 @@ bool MultiresVolumeRaycaster::cameraIsInside(const RenderData& data, glm::vec3&
     glm::vec4 modelPos = (glm::inverse(scaledModelTransform) / divisor) * camWorldPos;
 
 
-    localPosition = (modelPos.xyz() + glm::vec3(0.5));
+    localPosition = (glm::vec3(modelPos) + glm::vec3(0.5));
     return (localPosition.x > 0 && localPosition.y > 0 && localPosition.z > 0 && localPosition.x < 1 && localPosition.y < 1 && localPosition.z < 1);
 
 }