Commit 30031b65 authored by schultz's avatar schultz
Browse files

fixed glLoadegen for msWindows

parent a2b0e670
...@@ -2020,7 +2020,7 @@ void Core::showReducedMenuBar(bool reduced) { ...@@ -2020,7 +2020,7 @@ void Core::showReducedMenuBar(bool reduced) {
} }
void Core::finishSplash() { void Core::finishSplash() {
splash_->finish(coreWidget_); splash_->finish(coreWidget_);
} }
......
...@@ -449,7 +449,7 @@ int main(int argc, char **argv) ...@@ -449,7 +449,7 @@ int main(int argc, char **argv)
//On Apple systems the extensions are loaded automagically by qt so dont call the init functions or include the opengl headers (gl_compat_4_4). //On Apple systems the extensions are loaded automagically by qt so dont call the init functions or include the opengl headers (gl_compat_4_4).
#ifndef __APPLE__ #ifndef __APPLE__
initOpenGLFunctions(); // initOpenGLFunctions();
#endif #endif
//std::cout<<QGLFormat::openGLVersionFlags(); //std::cout<<QGLFormat::openGLVersionFlags();
......
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <common/glew_wrappers.hh> #include <common/glew_wrappers.hh>
#include <ACG/GL/gl_compat_4_4.hh>
#include "CoreWidget.hh" #include "CoreWidget.hh"
#include <OpenFlipper/common/FileTypes.hh> #include <OpenFlipper/common/FileTypes.hh>
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
// -------------------- mview // -------------------- mview
#include "CoreWidget.hh" #include "CoreWidget.hh"
#include <ACG/GL/acg_glew.hh>
//== IMPLEMENTATION ========================================================== //== IMPLEMENTATION ==========================================================
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
// -------------------- Qt event Includes // -------------------- Qt event Includes
#include <QGLFormat> #include <QGLFormat>
#include "common/glew_wrappers.hh"
#define WIDGET_HEIGHT 800 #define WIDGET_HEIGHT 800
#define WIDGET_WIDTH 800 #define WIDGET_WIDTH 800
...@@ -249,6 +250,7 @@ CoreWidget( QVector<ViewMode*>& _viewModes, ...@@ -249,6 +250,7 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
#endif #endif
glWidget_ = new QGLWidget(format,0); glWidget_ = new QGLWidget(format,0);
glWidget_->makeCurrent();
PluginFunctions::shareGLWidget (glWidget_); PluginFunctions::shareGLWidget (glWidget_);
glView_ = new QtGLGraphicsView(stackedWidget_); glView_ = new QtGLGraphicsView(stackedWidget_);
...@@ -317,6 +319,8 @@ CoreWidget( QVector<ViewMode*>& _viewModes, ...@@ -317,6 +319,8 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
// Create examiner // Create examiner
// ====================================================================== // ======================================================================
initOpenGLFunctions();
// First we analyze the scenegraph // First we analyze the scenegraph
unsigned int maxPases = 1; unsigned int maxPases = 1;
ACG::Vec3d bbmin,bbmax; ACG::Vec3d bbmin,bbmax;
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
#include <set> #include <set>
#include "OpenFlipper/common/Types.hh" #include "OpenFlipper/common/Types.hh"
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/ContextMenuInterface.hh> #include <OpenFlipper/BasePlugin/ContextMenuInterface.hh>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment