3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 07:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed DestroyGL method from 3DScene

Browse source
This commit is contained in:
Enrico Turri 2018-06-06 14:19:28 +02:00
parent e79037c44d
commit 8192580b5f
6 changed files with 90 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,19 +18,19 @@ use warnings;
use Wx qw(wxTheApp :timer :bitmap :icon :dialog);
#==============================================================================================================================
#use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS EVT_CHAR EVT_TIMER);
#==============================================================================================================================
# must load OpenGL *before* Wx::GLCanvas
use OpenGL qw(:glconstants :glfunctions :glufunctions :gluconstants);
use base qw(Wx::GLCanvas Class::Accessor);
use Math::Trig qw(asin tan);
use List::Util qw(reduce min max first);
#==============================================================================================================================
use Slic3r::Geometry qw(X Y);
#use Math::Trig qw(asin tan);
#use List::Util qw(reduce min max first);
#use Slic3r::Geometry qw(X Y normalize scale unscale scaled_epsilon);
#use Slic3r::Geometry::Clipper qw(offset_ex intersection_pl JT_ROUND);
#==============================================================================================================================
use Wx::GLCanvas qw(:all);
use Slic3r::Geometry qw(PI);
#==============================================================================================================================
#use Slic3r::Geometry qw(PI);
#==============================================================================================================================
# volumes: reference to vector of Slic3r::GUI::3DScene::Volume.
#==============================================================================================================================
@ -259,12 +259,10 @@ sub new {
sub Destroy {
my ($self) = @_;
#==============================================================================================================================
# $self->{layer_height_edit_timer}->Stop;
#==============================================================================================================================
$self->DestroyGL;
#==============================================================================================================================
Slic3r::GUI::_3DScene::remove_canvas($self);
# $self->{layer_height_edit_timer}->Stop;
# $self->DestroyGL;
#==============================================================================================================================
return $self->SUPER::Destroy;
}
@ -1247,13 +1245,11 @@ sub SetCurrent {
# }
# }
#}
#===================================================================================================================================
sub DestroyGL {
my $self = shift;
if ($self->GetContext) {
$self->SetCurrent($self->GetContext);
#===================================================================================================================================
#
#sub DestroyGL {
# my $self = shift;
# if ($self->GetContext) {
# $self->SetCurrent($self->GetContext);
# if ($self->{plain_shader}) {
# $self->{plain_shader}->release;
# delete $self->{plain_shader};
@ -1262,12 +1258,10 @@ sub DestroyGL {
# $self->{layer_height_edit_shader}->release;
# delete $self->{layer_height_edit_shader};
# }
#===================================================================================================================================
$self->volumes->release_geometry;
}
}
#==============================================================================================================================
# $self->volumes->release_geometry;
# }
#}
#
#sub Render {
# my ($self, $dc) = @_;
#
@ -2145,10 +2139,12 @@ sub DestroyGL {
package Slic3r::GUI::3DScene;
use base qw(Slic3r::GUI::3DScene::Base);
use OpenGL qw(:glconstants :gluconstants :glufunctions);
use List::Util qw(first min max);
use Slic3r::Geometry qw(scale unscale epsilon);
use Slic3r::Print::State ':steps';
#===================================================================================================================================
#use OpenGL qw(:glconstants :gluconstants :glufunctions);
#use List::Util qw(first min max);
#use Slic3r::Geometry qw(scale unscale epsilon);
#use Slic3r::Print::State ':steps';
#===================================================================================================================================
#===================================================================================================================================
#__PACKAGE__->mk_accessors(qw(

1
lib/Slic3r/GUI/MainFrame.pm
View file

@ -91,6 +91,7 @@ sub new {
# but in rare cases it may not have been called yet.
wxTheApp->{app_config}->save;
#==============================================================================================================================
$self->{plater}->{print} = undef if($self->{plater});
Slic3r::GUI::_3DScene::remove_all_canvases();
#==============================================================================================================================
# propagate event

4
lib/Slic3r/GUI/Plater/3D.pm
View file

@ -32,7 +32,9 @@ sub new {
$self->{objects} = $objects;
$self->{model} = $model;
$self->{print} = $print;
#==============================================================================================================================
# $self->{print} = $print;
#==============================================================================================================================
$self->{config} = $config;
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_print($self, $print);