Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removing oglplus requirement for linux and mac

Browse source
This commit is contained in:
Brad Davis 2015-06-09 03:09:10 -07:00
parent e9587d90c4
commit 5680d58a19
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/devices/OculusManager.cpp
View file

@ -177,7 +177,6 @@ ovrLayerEyeFov OculusManager::_sceneLayer;
#else
BasicFramebufferWrapper* _transferFbo;
ovrTexture OculusManager::_eyeTextures[ovrEye_Count];
GlWindow* OculusManager::_outputWindow{ nullptr };
@ -310,10 +309,6 @@ void OculusManager::connect(QOpenGLContext* shareContext) {
}
_outputWindow->showFullScreen();
_outputWindow->makeCurrent();
_transferFbo = new BasicFramebufferWrapper();
_transferFbo->Init(toGlm(_renderTargetSize));
ovrGLConfig cfg;
memset(&cfg, 0, sizeof(cfg));

9
libraries/shared/src/OglplusHelpers.h
View file

@ -7,6 +7,12 @@
//
#pragma once
// FIXME support oglplus on all platforms
// For now it's a convenient helper for Windows
#include <QtGlobal>
#ifdef Q_OS_WIN
#include "GLMHelpers.h"
#define OGLPLUS_USE_GLCOREARB_H 0
@ -163,4 +169,5 @@ protected:
}
};
using BasicFramebufferWrapperPtr = std::shared_ptr<BasicFramebufferWrapper>;
using BasicFramebufferWrapperPtr = std::shared_ptr<BasicFramebufferWrapper>;
#endif