Merge branch 'develop' into SceneGraphLoader

Conflicts:
	ext/ghoul
	src/openspaceengine.cpp

.clang-format

@@ -0,0 +1,46 @@
+---
+Language: Cpp
+AccessModifierOffset: -2
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: true
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit: 90
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 6
+Cpp11BracedListStyle: true
+DerivePointerBinding: false
+IndentCaseLabels: true
+#Check next
+IndentFunctionDeclarationAfterType: true
+IndentWidth: 2
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerBindsToType: true
+#Check next
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+Standard: Cpp11
+UseTab: Never
+...

.gitignore

@@ -1,4 +1,5 @@
 bin/
 build/
 ext/SGCT
-.DS_Store
+.DS_Store
+*.swp

CMakeLists.txt

@@ -84,6 +84,14 @@ include_directories("${SPICE_ROOT_DIR}/include")
 add_subdirectory(${SPICE_ROOT_DIR})
 set(DEPENDENT_LIBS ${DEPENDENT_LIBS} Spice)
 
+# OpenCL
+find_package(OpenCL)
+if(OPENCL_FOUND)
+    add_definitions(-DGHL_OPENCL)
+    include_directories(${OPENCL_INCLUDE_DIRS})
+    set(GHOUL_DEPENDENCIES ${GHOUL_DEPENDENCIES} ${OPENCL_LIBRARIES})
+endif(OPENCL_FOUND)
+
 if (APPLE)
     include_directories(/Developer/Headers/FlatCarbon)
     find_library(CARBON_LIBRARY Carbon)

src/openspaceengine.cpp

@@ -82,7 +82,7 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
     // TODO custom assert (ticket #5)
     assert(_engine == nullptr);
     
-    // set SGCT arguments
+    // set the arguments for SGCT
     newArgc = 3;
     newArgv = new char*[3];
     newArgv[0] = "prog";
@@ -100,9 +100,9 @@ void OpenSpaceEngine::create(int argc, char** argv, int& newArgc, char**& newArg
     
     // create objects
     _engine = new OpenSpaceEngine;
-    _engine->_configurationManager = new ghoul::ConfigurationManager;
     _engine->_renderEngine = new RenderEngine;
     _engine->_interactionHandler = new InteractionHandler;
+    _engine->_configurationManager = new ghoul::ConfigurationManager;
 }
 
 void OpenSpaceEngine::destroy() {
@@ -132,10 +132,19 @@ bool OpenSpaceEngine::initialize() {
 	FileSys.registerPathToken("${SCENEPATH}", "${OPENSPACE-DATA}/scene");
 	FileSys.registerPathToken("${SHADERS}", "${BASE_PATH}/shaders");
 
-    // Load the configurationmanager with the default configuration
-    _engine->_configurationManager->initialize();
-    _engine->_configurationManager->loadConfiguration(absPath("${SCRIPTS}/DefaultConfig.lua"));
+    // initialize the configurationmanager with the default configuration
+    _configurationManager->initialize();
+    _configurationManager->loadConfiguration(absPath("${SCRIPTS}/DefaultConfig.lua"));
+    
+    // Detect and logOpenCL and OpenGL versions and available devices
+    ghoul::systemcapabilities::SystemCapabilities::initialize();
+    SysCap.addComponent(new ghoul::systemcapabilities::CPUCapabilitiesComponent);
+    SysCap.addComponent(new ghoul::systemcapabilities::OpenCLCapabilitiesComponent);
+    SysCap.addComponent(new ghoul::systemcapabilities::OpenGLCapabilitiesComponent);
+    SysCap.detectCapabilities();
+    SysCap.logCapabilities();
 
+    // initialize OpenSpace helpers
     Time::init();
     Spice::init();
     Spice::ref().loadDefaultKernels();
@@ -145,6 +154,7 @@ bool OpenSpaceEngine::initialize() {
     // initialize the RenderEngine, needs ${SCENEPATH} to be set
     _renderEngine->initialize();
 
+    // Initialize OpenSPace input devices
     DeviceIdentifier::init();
     DeviceIdentifier::ref().scanDevices();
     _engine->_interactionHandler->connectDevices();