mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Started cleanup of module structure

Browse Source
This commit is contained in:
Alexander Bock
2015-12-14 10:50:38 -08:00
parent e26f1d41a4
commit 2fce471743
25 changed files with 298 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/basemodule.cpp
View File

@@ -55,11 +55,7 @@ BaseModule::BaseModule()
: OpenSpaceModule("Base")
{}
bool BaseModule::create() {
bool success = OpenSpaceModule::create();
if (!success)
return false;
void BaseModule::internalCreate() {
FactoryManager::ref().addFactory(new ghoul::TemplateFactory<planetgeometry::PlanetGeometry>);
FactoryManager::ref().addFactory(new ghoul::TemplateFactory<modelgeometry::ModelGeometry>);
@@ -89,8 +85,6 @@ bool BaseModule::create() {
auto fModelGeometry = FactoryManager::ref().factory<modelgeometry::ModelGeometry>();
ghoul_assert(fModelGeometry, "Model geometry factory was not created");
fModelGeometry->registerClass<modelgeometry::WavefrontGeometry>("WavefrontGeometry");
return true;
}
} // namespace openspace

4
modules/base/basemodule.h
View File

@@ -32,7 +32,9 @@ namespace openspace {
class BaseModule : public OpenSpaceModule {
public:
BaseModule();
bool create() override;
protected:
void internalCreate() override;
};
} // namespace openspace