3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 22:54:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes of VBO rendering on Linux with wxWidgets & GTK

Browse source
This commit is contained in:
bubnikv 2017-03-30 10:25:52 +02:00
parent b60ae4745f
commit 36416d77b8
3 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/Slic3r/GUI/3DScene.pm
View file

@ -906,13 +906,16 @@ sub UseVBOs {
my ($self) = @_;
if (! defined ($self->{use_VBOs})) {
# This is a special path for wxWidgets on GTK, where an OpenGL context is initialized
# first when an OpenGL widget is shown for the first time. How ugly.
return 0 if (! $self->init && $^O eq 'linux');
# Don't use VBOs if anything fails.
$self->{use_VBOs} = 0;
if ($self->GetContext) {
$self->SetCurrent($self->GetContext);
my @gl_version = split(/\./, glGetString(GL_VERSION));
$self->{use_VBOs} = int($gl_version[0]) >= 2;
# print "InitGL $self OpenGL major: $gl_version[0], minor: $gl_version[1]. Use VBOs: ", $self->{use_VBOs}, "\n";
# print "UseVBOs $self OpenGL major: $gl_version[0], minor: $gl_version[1]. Use VBOs: ", $self->{use_VBOs}, "\n";
}
}
return $self->{use_VBOs};
@ -968,6 +971,13 @@ sub InitGL {
return unless $self->GetContext;
$self->init(1);
# This is a special path for wxWidgets on GTK, where an OpenGL context is initialized
# first when an OpenGL widget is shown for the first time. How ugly.
# In that case the volumes are wainting to be moved to Vertex Buffer Objects
# after the OpenGL context is being initialized.
$self->volumes->finalize_geometry(1)
if ($^O eq 'linux' && $self->UseVBOs);
glClearColor(0, 0, 0, 1);
glColor3f(1, 0, 0);
glEnable(GL_DEPTH_TEST);