mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/CMake (#1443)

Browse Source 
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
  * Add openspace-core as a subdirectory
  * Move handle_modules functionality into modules/CMakeLists.txt
  * Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
  * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
  * Build Spice multithreaded and as static library
  * Remove dependency from core to module-webbrowser
  * Remove unused dependency from kameleon
  * Remove additional unnecessary dependencies
  * Cleanup volume/kameleon/kameleonvolume modules
  * Fix visibility issues. Restrict include paths
  * Compile kameleon in parallel
* Other cleanup
  * Only copy CEF files from one target (hard-coded to OpenSpace right now)
  * Remove unused instrumentation code
  * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
  * Removing compiler and cppcheck warnings
  * Turn almost all includes into non-system includes
  * Don't warn on deprecrated copy
* Updated submodules
This commit is contained in:
Alexander Bock
2020-12-28 18:26:57 +01:00
committed by GitHub
parent feb3078641
commit ad8af3ffeb
181 changed files with 2250 additions and 2540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/openspaceengine.cpp
View File

@@ -633,7 +633,7 @@ void OpenSpaceEngine::initializeGL() {
call.parameters.begin(),
call.parameters.end(),
std::string("("),
[](std::string a, const std::unique_ptr<AbstractValue>& v) {
[](const std::string& a, const std::unique_ptr<AbstractValue>& v) {
std::stringstream s;
s << v.get();
return a + s.str() + ", ";
@@ -793,12 +793,8 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
progressInfo.progress = (*it)->progress();
if ((*it)->nTotalBytesIsKnown()) {
progressInfo.currentSize = static_cast<uint64_t>(
(*it)->nSynchronizedBytes()
);
progressInfo.totalSize = static_cast<uint64_t>(
(*it)->nTotalBytes()
);
progressInfo.currentSize = (*it)->nSynchronizedBytes();
progressInfo.totalSize = (*it)->nTotalBytes();
}
loading = true;