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

Make the subcomponents not pointers in the first place

Browse Source
This commit is contained in:
Alexander Bock
2014-09-27 18:41:03 +02:00
parent 72aac7b240
commit dd15c4e3d0
2 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/engine/openspaceengine.h
+6 -12
View File
@@ -41,6 +41,7 @@
#include <ghoul/opencl/clprogram.h>
#include <ghoul/opencl/clkernel.h>
#include <ghoul/cmdparser/commandlineparser.h>
// #define FLARE_ONLY
#include <openspace/flare/flare.h>
@@ -53,13 +54,6 @@
// #define OPENSPACE_VIDEO_EXPORT
namespace ghoul {
namespace cmdparser {
class CommandlineParser;
class CommandlineCommand;
}
}
namespace openspace {
namespace scripting {
@@ -107,11 +101,11 @@ private:
static OpenSpaceEngine* _engine;
std::unique_ptr<ConfigurationManager> _configurationManager;
std::unique_ptr<InteractionHandler> _interactionHandler;
std::unique_ptr<RenderEngine> _renderEngine;
std::unique_ptr<scripting::ScriptEngine> _scriptEngine;
std::unique_ptr<ghoul::cmdparser::CommandlineParser> _commandlineParser;
ConfigurationManager _configurationManager;
InteractionHandler _interactionHandler;
RenderEngine _renderEngine;
scripting::ScriptEngine _scriptEngine;
ghoul::cmdparser::CommandlineParser _commandlineParser;
#ifdef OPENSPACE_VIDEO_EXPORT
bool _doVideoExport;
#endif