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

Fix applications of Time::ref and replace with TimeManager calls

Browse Source
This commit is contained in:
Alexander Bock
2017-05-25 11:09:19 -04:00
parent 788d5f4b04
commit 8db2db6c1d
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/galaxy/rendering/renderablegalaxy.cpp
View File

@@ -285,7 +285,8 @@ void RenderableGalaxy::update(const UpdateData& data) {
_raycaster->setStepSize(_stepSize);
_raycaster->setAspect(_aspect);
_raycaster->setModelTransform(volumeTransform);
_raycaster->setTime(data.time);
// @EMIL: is this correct? ---abock
_raycaster->setTime(data.time.j2000Seconds());
}
}

2
modules/iswa/rendering/datacygnet.h
View File

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

6
modules/iswa/rendering/iswacygnet.cpp
View File

@@ -185,8 +185,8 @@ 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().j2000Seconds();
double clockwiseSign = (OsEng.timeManager().time().deltaTime()>0) ? 1.0 : -1.0;
_openSpaceTime = OsEng.timeManager().time().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);
@@ -230,7 +230,7 @@ void IswaCygnet::unregisterProperties(){
}
void IswaCygnet::initializeTime(){
_openSpaceTime = Time::ref().j2000Seconds();
_openSpaceTime = OsEng.timeManager().time().j2000Seconds();
_lastUpdateOpenSpaceTime = 0.0;
_realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());

6
modules/iswa/rendering/screenspacecygnet.cpp
View File

@@ -50,7 +50,7 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
_downloadImage = true;
_url = IswaManager::ref().iswaUrl(_cygnetId);
_openSpaceTime = Time::ref().j2000Seconds();
_openSpaceTime = OsEng.timeManager().time().j2000Seconds();
_lastUpdateOpenSpaceTime = _openSpaceTime;
_realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
@@ -70,13 +70,13 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
ScreenSpaceCygnet::~ScreenSpaceCygnet(){}
void ScreenSpaceCygnet::update(){
_openSpaceTime = Time::ref().j2000Seconds();
_openSpaceTime = OsEng.timeManager().time().j2000Seconds();
_realTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
bool timeToUpdate = (fabs(_openSpaceTime-_lastUpdateOpenSpaceTime) >= _updateTime &&
(_realTime.count()-_lastUpdateRealTime.count()) > _minRealTimeUpdateInterval);
if((Time::ref().timeJumped() || timeToUpdate )){
if((OsEng.timeManager().time().timeJumped() || timeToUpdate )){
_url = IswaManager::ref().iswaUrl(_cygnetId);
updateTexture();
_lastUpdateRealTime = _realTime;

2
modules/iswa/rendering/texturecygnet.h
View File

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