Updated Ghoul

Adapted to Ghoul API change
This commit is contained in:
Alexander Bock
2015-12-12 13:29:09 -05:00
parent ae55078ff8
commit 8260f5701d
3 changed files with 9 additions and 5 deletions
+7 -3
View File
@@ -56,7 +56,7 @@
#include <ghoul/logging/consolelog.h>
#include <ghoul/lua/ghoul_lua.h>
#include <ghoul/lua/lua_helper.h>
#include <ghoul/systemcapabilities/systemcapabilities.h>
#include <ghoul/systemcapabilities/systemcapabilities>
#include <ghoul/font/fontrenderer.h>
#include <iostream>
@@ -321,8 +321,12 @@ bool OpenSpaceEngine::initialize() {
clearAllWindows();
// Detect and log OpenCL and OpenGL versions and available devices
SysCap.addComponent(new ghoul::systemcapabilities::GeneralCapabilitiesComponent);
SysCap.addComponent(new ghoul::systemcapabilities::OpenGLCapabilitiesComponent);
SysCap.addComponent(
std::make_unique<ghoul::systemcapabilities::GeneralCapabilitiesComponent>()
);
SysCap.addComponent(
std::make_unique<ghoul::systemcapabilities::OpenGLCapabilitiesComponent>()
);
SysCap.detectCapabilities();
using Verbosity = ghoul::systemcapabilities::SystemCapabilitiesComponent::Verbosity;
+1 -1
View File
@@ -143,7 +143,7 @@ bool RenderEngine::initialize() {
// The default rendering method has a requirement of OpenGL 4.3, so if we are
// below that, we will fall back to frame buffer operation
if (OpenGLCap.openGLVersion() < Version(4,3)) {
if (OpenGLCap.openGLVersion() < Version{4,3}) {
LINFO("Falling back to framebuffer implementation due to OpenGL limitations");
renderingMethod = "ABufferFrameBuffer";
}