mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 12:30:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-05-24 16:53:34 -04:00
parent 554cbcf32a 788d5f4b04
commit 0cd56d776c
72 changed files with 1457 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globes/renderableglobe.cpp
+2 -2
View File
@@ -423,7 +423,7 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& tasks) {
}
void RenderableGlobe::update(const UpdateData& data) {
_time = data.time;
_time = data.time.j2000Seconds();
_distanceSwitch.update(data);
glm::dmat4 translation =
@@ -445,7 +445,7 @@ void RenderableGlobe::update(const UpdateData& data) {
#ifdef OPENSPACE_MODULE_ATMOSPHERE_ENABLED
if (_deferredcaster) {
_deferredcaster->setTime(data.time);
_deferredcaster->setTime(data.time.j2000Seconds());
_deferredcaster->setModelTransform(_cachedModelTransform);
}
#endif
modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
+3 -1
View File
@@ -28,8 +28,10 @@
#ifdef GLOBEBROWSING_USE_GDAL
#include <modules/globebrowsing/tile/tileprovider/tileprovider.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/util/time.h>
#include <openspace/util/timemanager.h>
#include <openspace/util/timerange.h>
#include <ghoul/misc/dictionary.h>
@@ -197,7 +199,7 @@ public:
typedef std::string TimeKey;
std::shared_ptr<TileProvider> getTileProvider(Time t = Time::ref());
std::shared_ptr<TileProvider> getTileProvider(Time t = OsEng.timeManager().time());
std::shared_ptr<TileProvider> getTileProvider(TimeKey timekey);
private: