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

Removed ApplicationOverlay::resize()

Browse source
This commit is contained in:
barnold1953 2014-07-09 16:39:05 -07:00
parent 6e92beeb1c
commit 56ff74dd56
3 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -723,7 +723,6 @@ void Application::resizeGL(int width, int height) {
resetCamerasOnResizeGL(_myCamera, width, height);
glViewport(0, 0, width, height); // shouldn't this account for the menu???
_applicationOverlay.resize();
updateProjectionMatrix();
glLoadIdentity();

14
interface/src/ui/ApplicationOverlay.cpp
View file

@ -1189,20 +1189,12 @@ void ApplicationOverlay::renderTexturedHemisphere() {
}
void ApplicationOverlay::resize() {
if (_framebufferObject != NULL) {
delete _framebufferObject;
_framebufferObject = NULL;
}
// _framebufferObject is recreated at the correct size the next time it is accessed via getFramebufferObject().
}
QOpenGLFramebufferObject* ApplicationOverlay::getFramebufferObject() {
QSize size = Application::getInstance()->getGLWidget()->size();
if (!_framebufferObject || _framebufferObject->size() != size) {
if (_framebufferObject){
delete _framebufferObject;
}
delete _framebufferObject;
_framebufferObject = new QOpenGLFramebufferObject(size);
glBindTexture(GL_TEXTURE_2D, _framebufferObject->texture());
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

5
interface/src/ui/ApplicationOverlay.h
View file

@ -32,11 +32,8 @@ public:
void displayOverlayTexture3DTV(Camera& whichCamera, float aspectRatio, float fov);
void computeOculusPickRay(float x, float y, glm::vec3& direction) const;
void getClickLocation(int &x, int &y) const;
<<<<<<< HEAD
QPoint getOculusPalmClickLocation(const PalmData *palm) const;
=======
void resize();
>>>>>>> af6704a83cec1d69b3dc3e1145238919fcb82933
// Getters
QOpenGLFramebufferObject* getFramebufferObject();