mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-26 14:08:53 -05:00
Remove clang warnings
Update SGCT repository
This commit is contained in:
@@ -51,10 +51,6 @@
|
||||
namespace {
|
||||
constexpr const char* _loggerCat = "DownloadManager";
|
||||
|
||||
constexpr const char* RequestIdentifier = "identifier";
|
||||
constexpr const char* RequestFileVersion = "file_version";
|
||||
constexpr const char* RequestApplicationVersion = "application_version";
|
||||
|
||||
struct ProgressInformation {
|
||||
std::shared_ptr<openspace::DownloadManager::FileFuture> future;
|
||||
std::chrono::system_clock::time_point startTime;
|
||||
|
||||
@@ -111,11 +111,9 @@ namespace {
|
||||
constexpr const char* SgctConfigArgumentCommand = "-config";
|
||||
|
||||
constexpr const int CacheVersion = 1;
|
||||
constexpr const int DownloadVersion = 1;
|
||||
|
||||
const glm::ivec3 FontAtlasSize{ 1536, 1536, 1 };
|
||||
|
||||
|
||||
struct {
|
||||
std::string configurationName;
|
||||
std::string sgctConfigurationName;
|
||||
@@ -707,7 +705,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
|
||||
}
|
||||
}
|
||||
}
|
||||
_loadingScreen->setItemNumber(resourceSyncs.size());
|
||||
_loadingScreen->setItemNumber(static_cast<int>(resourceSyncs.size()));
|
||||
|
||||
bool loading = true;
|
||||
while (loading) {
|
||||
|
||||
@@ -73,7 +73,7 @@ void SettingsEngine::initialize() {
|
||||
|
||||
// Set interaction to change ConfigurationManager and schedule the load
|
||||
_scenes.onChange([this, nScenes, sceneDir]() {
|
||||
if (_scenes == nScenes) {
|
||||
if (_scenes == static_cast<int>(nScenes)) {
|
||||
OsEng.scheduleLoadSingleAsset("");
|
||||
} else {
|
||||
std::string sceneFile = _scenes.getDescriptionByValue(_scenes);
|
||||
|
||||
Reference in New Issue
Block a user