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

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
This commit is contained in:
Alexander Bock
2017-11-12 10:50:11 -05:00
parent 7e4bb0b2c6 76b26c0128
commit f227767492
187 changed files with 10004 additions and 4565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/configurationmanager.h
+2 -2
View File
@@ -131,9 +131,9 @@ public:
static const std::string PartHttpProxyPort;
/// The key that stores the authentication method of the http proxy
static const std::string PartHttpProxyAuthentication;
/// The key that stores the username to use for authentication to access the http proxy
/// Key that stores the username to use for authentication to access the http proxy
static const std::string PartHttpProxyUser;
/// The key that stores the password to use for authentication to access the http proxy
/// Key that stores the password to use for authentication to access the http proxy
static const std::string PartHttpProxyPassword;
/// The key that stores the dictionary containing information about debug contexts
static const std::string KeyOpenGLDebugContext;
include/openspace/engine/downloadmanager.h
+6 -6
View File
@@ -102,13 +102,13 @@ public:
DownloadProgressCallback progressCallback = DownloadProgressCallback()
);
std::future<MemoryFile> fetchFile(
const std::string& url,
SuccessCallback successCallback = SuccessCallback(), ErrorCallback errorCallback = ErrorCallback());
std::future<MemoryFile> fetchFile(const std::string& url,
SuccessCallback successCallback = SuccessCallback(),
ErrorCallback errorCallback = ErrorCallback());
std::vector<std::shared_ptr<FileFuture>> downloadRequestFiles(const std::string& identifier,
const ghoul::filesystem::Directory& destination, int version,
bool overrideFiles = true,
std::vector<std::shared_ptr<FileFuture>> downloadRequestFiles(
const std::string& identifier, const ghoul::filesystem::Directory& destination,
int version, bool overrideFiles = true,
DownloadFinishedCallback finishedCallback = DownloadFinishedCallback(),
DownloadProgressCallback progressCallback = DownloadProgressCallback()
);