Code cleanup branch (#618)

* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
+10 -19
View File
@@ -25,20 +25,19 @@
#ifndef __OPENSPACE_CORE___MODULEENGINE___H__
#define __OPENSPACE_CORE___MODULEENGINE___H__
#include <openspace/properties/propertyowner.h>
#include <map>
#include <memory>
#include <vector>
#include <openspace/properties/propertyowner.h>
#include <openspace/util/openspacemodule.h>
#include <ghoul/misc/assert.h>
#include <algorithm>
#include <map>
namespace ghoul { class Dictionary; }
namespace ghoul::systemcapabilities { struct Version; }
namespace openspace {
class OpenSpaceModule;
namespace scripting { struct LuaLibrary; }
/**
@@ -87,7 +86,7 @@ public:
* \pre \p module must not be nullptr
*/
void registerModule(std::unique_ptr<OpenSpaceModule> module,
const ghoul::Dictionary& configuration);
const ghoul::Dictionary& configuration);
/**
* Returns a list of all registered OpenSpaceModule%s that have been registered with
@@ -103,17 +102,7 @@ public:
* \return a pointer to the module of the given subclass
*/
template <class ModuleSubClass>
ModuleSubClass* module() const {
auto it = std::find_if(_modules.begin(), _modules.end(),
[](const std::unique_ptr<OpenSpaceModule>& m) {
return m->identifier() == ModuleSubClass::Name;
});
if (it != _modules.end()) {
return dynamic_cast<ModuleSubClass*>(it->get());
} else {
return nullptr;
}
}
ModuleSubClass* module() const;
/**
* Returns the combined minimum OpenGL version. The return value is the maximum
@@ -135,4 +124,6 @@ private:
} // namespace openspace
#include "moduleengine.inl"
#endif // __OPENSPACE_CORE___MODULEENGINE___H__