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

Merge commit '5c45815b9c509cbf98d1f3c7ad1e6035c4962a81' into feature/remote_redesign

Browse Source
This commit is contained in:
Alexander Bock
2015-07-06 16:50:35 +02:00
parent 1de7a76cde 5c45815b9c
commit 174129be5e
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -40,7 +40,7 @@ include(${OPENSPACE_EXT_DIR}/ghoul/ext/CopySharedLibraries.cmake)
test_compiler_compatibility()
cleanup_project()
set_build_output_directories()
configure_openspace_version(0 1 0 "prerelease-5")
configure_openspace_version(0 1 1 "prerelease-6")
option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option(OPENSPACE_DISABLE_EXTERNAL_WARNINGS "Disable warnings in external libraries" ON)

2
apps/Launcher/syncwidget.cpp
View File

@@ -57,7 +57,7 @@
namespace {
const std::string _loggerCat = "SyncWidget";
const std::string _configurationFile = "libtorrent.config";
const std::string _configurationFile = "Launcher.config";
const int nColumns = 3;

4
apps/OpenSpace/main.cpp
View File

@@ -268,6 +268,10 @@ void mainDecodeFun() {
void mainLogCallback(const char* msg){
std::string message = msg;
if (message == ".")
// We don't want the empty '.' message that SGCT sends while it is waiting for
// connections from other network nodes
return;
// Remove the trailing \n that is passed along
LINFOC("SGCT", message.substr(0, std::max<size_t>(message.size() - 1, 0)));
}

2
ext/ghoul

Submodule ext/ghoul updated: f87ad95260...310b4ece36

2
src/engine/downloadmanager.cpp
View File

@@ -226,7 +226,7 @@ std::vector<DownloadManager::FileFuture*> DownloadManager::downloadRequestFiles(
int nFinished = 0;
while (std::getline(temporary, line)) {
++nFiles;
std::string file = ghoul::filesystem::File(line).filename();
std::string file = ghoul::filesystem::File(line, true).filename();
LDEBUG("\tLine: " << line << " ; Dest: " << destination.path() + "/" + file);

6
src/rendering/renderengine.cpp
View File

@@ -178,12 +178,12 @@ bool RenderEngine::initialize() {
_mainCamera->setPosition(psc(0.f, 0.f, 1.499823f, 11.f));
OsEng.interactionHandler()->setCamera(_mainCamera);
#ifdef GHOUL_USE_FREEIMAGE
ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderFreeImage);
#endif // GHOUL_USE_FREEIMAGE
#ifdef GHOUL_USE_DEVIL
ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderDevIL);
#endif // GHOUL_USE_DEVIL
#ifdef GHOUL_USE_FREEIMAGE
ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderFreeImage);
#endif // GHOUL_USE_FREEIMAGE
ghoul::io::TextureReader::ref().addReader(new ghoul::io::impl::TextureReaderCMAP);