diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 6ec41ece62..bc72ae17b3 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -24,7 +24,7 @@ local vrt_folders = { -- We recommend using this folder for CTX openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'), -- if not and you have a custom path for CTX layers, enter it below - 'D:/Pessoal/Work/OpenSpaceData/Mars-Gale-Crater', + '', -- Our provided HiRISE layer openspace.absPath('${ASSETS}/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE'), diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 0596418316..851e8d135c 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -23,10 +23,6 @@ local Moon = { Type = "SpiceRotation", SourceFrame = "IAU_MOON", DestinationFrame = "GALACTIC" - }, - Scale = { - Type = "StaticScale", - Scale = 1.0 } }, Renderable = { diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 4b413a9a7c..bd330c8c01 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -15,7 +15,6 @@ local textures = asset.syncedResource({ -- local marsRadii = { 3396190.0, 3396190.0, 3376200.0 } local marsRadii = { 3396190.0, 3396190.0, 3396190.0 } --- local marsRadii = { 6378137.0, 6378137.0, 6378137.0 } local mapServiceConfigs = asset.localResource("map_service_configs") diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index 413673b3f3..7e7c31f59b 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -32,12 +32,6 @@ #include #include - //JCC: Temp property to save the fps to a file -#include -#include -#include -#include - namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; @@ -184,52 +178,12 @@ documentation::Documentation DashboardItemFramerate::Documentation() { }; } -//JCC: Temp property to save the fps to a file -#ifdef __PERFORMANCE_MEASUREMENTS__ -DashboardItemFramerate::~DashboardItemFramerate() -{ - _runThread = false; // bad, but is just for collecting the data - - if (_fpsRecordings[0] != -1 && _deltaTRecordings[0] != -1) { - std::string fpsFileS("fpsData.txt"), deltaTimeFileS("deltaTimeData.txt"), marksFileS("marksData.txt"); - std::fstream fpsFile, deltaTimeFile, marksFile; - - fpsFile.open(fpsFileS.c_str(), std::fstream::out); - deltaTimeFile.open(deltaTimeFileS.c_str(), std::fstream::out); - marksFile.open(marksFileS.c_str(), std::fstream::out); - - if (fpsFile.is_open() && deltaTimeFile.is_open() && marksFile.is_open()) { - - std::cout << "\nWriting FPS to file..."; - for (int i = 0; i < _currentFrameRecording; ++i) { - fpsFile << _fpsRecordings[i] << std::endl; - deltaTimeFile << _deltaTRecordings[i] << std::endl; - } - - for (int j = 0; j < _numberMarkedItems; ++j) { - marksFile << _markRecordings[j] << std::endl; - } - - fpsFile.close(); - deltaTimeFile.close(); - marksFile.close(); - - std::cout << "end!\n"; - } - } -} -#endif - DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictionary) : DashboardItem(dictionary) , _fontName(FontNameInfo, KeyFontMono) , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f) , _frametimeType(FrametimeInfo, properties::OptionProperty::DisplayType::Dropdown) , _clearCache(ClearCacheInfo) -#ifdef __PERFORMANCE_MEASUREMENTS__ - , _enableFPSRecording({"EnableFPSRecording", "Enable FPS Recording", ""}, false) - , _markTimeRecording({"MarkPointInterest", "Mark Point of Interest", ""}, false) -#endif { documentation::testSpecificationAndThrow( Documentation(), @@ -307,37 +261,9 @@ DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictiona }); addProperty(_clearCache); - //JCC: Temp property to save the fps to a file -#ifdef __PERFORMANCE_MEASUREMENTS__ - addProperty(_enableFPSRecording); - addProperty(_markTimeRecording); - _runThread = true; - _dataCollectingThread = std::thread([this] { this->threadFunction(); }); - _dataCollectingThread.detach(); -#endif - _font = global::fontManager.font(_fontName, _fontSize); } -//JCC: Temp property to save the fps to a file -#ifdef __PERFORMANCE_MEASUREMENTS__ -void DashboardItemFramerate::threadFunction() { - while (_runThread) - { - std::this_thread::sleep_for(std::chrono::seconds(1)); - //std::cout << "One Second!" << std::endl; - if (_enableFPSRecording) { - float avgDeltaTime = openspace::global::windowDelegate.averageDeltaTime(); - _fpsRecordings[_currentFrameRecording] = 1.f / avgDeltaTime; - _deltaTRecordings[_currentFrameRecording++] = avgDeltaTime * 1000.f; - } - if (_markTimeRecording) { - _markRecordings[_numberMarkedItems++] = _currentFrameRecording; - } - } -} -#endif - void DashboardItemFramerate::render(glm::vec2& penPosition) { if (_shouldClearCache) { _minDeltaTimeCache = 1.0; diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h index 90dd1b3412..2b1b8c2de9 100644 --- a/modules/base/dashboard/dashboarditemframerate.h +++ b/modules/base/dashboard/dashboarditemframerate.h @@ -30,16 +30,8 @@ #include #include #include -#include #include -#define __PERFORMANCE_MEASUREMENTS__ - -#ifdef __PERFORMANCE_MEASUREMENTS__ -//JCC: Temp property to save the fps to a file -#include -#endif - namespace ghoul { class Dictionary; } namespace ghoul::fontrendering { class Font; } @@ -65,31 +57,12 @@ public: glm::vec2 size() const override; static documentation::Documentation Documentation(); - //JCC: Temp property to save the fps to a file -#ifdef __PERFORMANCE_MEASUREMENTS__ - ~DashboardItemFramerate(); - void threadFunction(); -#endif - private: properties::StringProperty _fontName; properties::FloatProperty _fontSize; properties::OptionProperty _frametimeType; properties::TriggerProperty _clearCache; - //JCC: Temp property to save the fps to a file -#ifdef __PERFORMANCE_MEASUREMENTS__ - properties::BoolProperty _enableFPSRecording; - properties::BoolProperty _markTimeRecording; - int _markRecordings[100] = { -1 }; - float _fpsRecordings[1200] = { -1.f }; - float _deltaTRecordings[1200] = { -1.f }; - std::size_t _currentFrameRecording = 0; - int _numberMarkedItems = 0; - std::thread _dataCollectingThread; - bool _runThread = false; -#endif - std::shared_ptr _font; double _minDeltaTimeCache = 1.0; diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp index d390d2462f..bb282dfb9e 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -58,7 +58,7 @@ double StaticScale::scaleValue(const UpdateData&) const { return _scaleValue; } -StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 10000.f) { +StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 100.f) { addProperty(_scaleValue); _scaleValue.onChange([this]() { diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp index 8c2df12b35..d205fc4a5a 100644 --- a/modules/globebrowsing/src/renderableglobe.cpp +++ b/modules/globebrowsing/src/renderableglobe.cpp @@ -822,7 +822,6 @@ void RenderableGlobe::render(const RenderData& data, RendererTasks& rendererTask _ringsComponent.draw(data, RingsComponent::GeometryAndShading); } } - _globeLabelsComponent.draw(data); } catch (const ghoul::opengl::TextureUnit::TextureUnitError&) { std::string layer = _lastChangedLayer ? _lastChangedLayer->guiName() : ""; diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp index b663438232..37d2cd70e4 100644 --- a/modules/multiresvolume/rendering/localtfbrickselector.cpp +++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp @@ -28,7 +28,6 @@ #include #include #include -#include namespace { bool compareSplitPoints(const openspace::BrickSelection& a, diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp index 90acc37e7b..78d99e7796 100644 --- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp +++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp @@ -29,7 +29,6 @@ #include #include #include -#include namespace { constexpr const char* _loggerCat = "SimpleTfBrickSelector"; diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp index 8e5a46020c..75036f1a09 100644 --- a/modules/multiresvolume/rendering/tfbrickselector.cpp +++ b/modules/multiresvolume/rendering/tfbrickselector.cpp @@ -29,7 +29,6 @@ #include #include #include -#include namespace { bool compareSplitPoints(const openspace::BrickSelection& a, diff --git a/openspace.cfg b/openspace.cfg index e2f645e5a7..c73d8154f3 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -6,10 +6,10 @@ -- occurs in a single window, a fisheye projection, or a dome cluster system -- A regular 1280x720 window --- SGCTConfig = sgct.config.single{} +SGCTConfig = sgct.config.single{} -- A regular 1920x1080 window -SGCTConfig = sgct.config.single{1920, 1080} +-- SGCTConfig = sgct.config.single{1920, 1080} -- A windowed 1920x1080 fullscreen -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}} @@ -45,8 +45,7 @@ SGCTConfig = sgct.config.single{1920, 1080} -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace -Asset = "atmPaper" --- Asset = "default" +Asset = "default" -- Asset = "default_full" -- Asset = "newhorizons" -- Asset = "rosetta" @@ -95,12 +94,12 @@ Paths = { ModuleConfigurations = { GlobeBrowsing = { - WMSCacheEnabled = true, + WMSCacheEnabled = false, -- OfflineMode = true, -- NoWarning = true, WMSCacheLocation = "${BASE}/cache_gdal", WMSCacheSize = 1024, -- in megabytes PER DATASET - TileCacheSize = 1024 -- for all globes (CPU and GPU memory) + TileCacheSize = 2048 -- for all globes (CPU and GPU memory) }, Sync = { SynchronizationRoot = "${SYNC}",