Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
30031b65
Commit
30031b65
authored
Jan 25, 2016
by
schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed glLoadegen for msWindows
parent
a2b0e670
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
2 deletions
+10
-2
Core/Core.cc
Core/Core.cc
+1
-1
OpenFlipper.cc
OpenFlipper.cc
+1
-1
widgets/coreWidget/About.cc
widgets/coreWidget/About.cc
+2
-0
widgets/coreWidget/ContextMenu.cc
widgets/coreWidget/ContextMenu.cc
+1
-0
widgets/coreWidget/CoreWidget.cc
widgets/coreWidget/CoreWidget.cc
+4
-0
widgets/coreWidget/CoreWidget.hh
widgets/coreWidget/CoreWidget.hh
+1
-0
No files found.
Core/Core.cc
View file @
30031b65
...
...
@@ -2020,7 +2020,7 @@ void Core::showReducedMenuBar(bool reduced) {
}
void
Core
::
finishSplash
()
{
splash_
->
finish
(
coreWidget_
);
splash_
->
finish
(
coreWidget_
);
}
...
...
OpenFlipper.cc
View file @
30031b65
...
...
@@ -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).
#ifndef __APPLE__
initOpenGLFunctions
();
//
initOpenGLFunctions();
#endif
//std::cout<<QGLFormat::openGLVersionFlags();
...
...
widgets/coreWidget/About.cc
View file @
30031b65
...
...
@@ -60,6 +60,8 @@
//== INCLUDES =================================================================
#include <common/glew_wrappers.hh>
#include <ACG/GL/gl_compat_4_4.hh>
#include "CoreWidget.hh"
#include <OpenFlipper/common/FileTypes.hh>
...
...
widgets/coreWidget/ContextMenu.cc
View file @
30031b65
...
...
@@ -60,6 +60,7 @@
// -------------------- mview
#include "CoreWidget.hh"
#include <ACG/GL/acg_glew.hh>
//== IMPLEMENTATION ==========================================================
...
...
widgets/coreWidget/CoreWidget.cc
View file @
30031b65
...
...
@@ -72,6 +72,7 @@
// -------------------- Qt event Includes
#include <QGLFormat>
#include "common/glew_wrappers.hh"
#define WIDGET_HEIGHT 800
#define WIDGET_WIDTH 800
...
...
@@ -249,6 +250,7 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
#endif
glWidget_
=
new
QGLWidget
(
format
,
0
);
glWidget_
->
makeCurrent
();
PluginFunctions
::
shareGLWidget
(
glWidget_
);
glView_
=
new
QtGLGraphicsView
(
stackedWidget_
);
...
...
@@ -317,6 +319,8 @@ CoreWidget( QVector<ViewMode*>& _viewModes,
// Create examiner
// ======================================================================
initOpenGLFunctions
();
// First we analyze the scenegraph
unsigned
int
maxPases
=
1
;
ACG
::
Vec3d
bbmin
,
bbmax
;
...
...
widgets/coreWidget/CoreWidget.hh
View file @
30031b65
...
...
@@ -67,6 +67,7 @@
#include <set>
#include "OpenFlipper/common/Types.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/ContextMenuInterface.hh>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment