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

3DScene member variables moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-06-06 12:36:52 +02:00
parent 2dee4d1a83
commit e79037c44d
10 changed files with 104 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2150,19 +2150,23 @@ use List::Util qw(first min max);
use Slic3r::Geometry qw(scale unscale epsilon);
use Slic3r::Print::State ':steps';
__PACKAGE__->mk_accessors(qw(
color_by
select_by
drag_by
));
#===================================================================================================================================
#__PACKAGE__->mk_accessors(qw(
# color_by
# select_by
# drag_by
#));
#===================================================================================================================================
sub new {
my $class = shift;
my $self = $class->SUPER::new(@_);
$self->color_by('volume'); # object | volume
$self->select_by('object'); # object | volume | instance
$self->drag_by('instance'); # object | instance
#===================================================================================================================================
# $self->color_by('volume'); # object | volume
# $self->select_by('object'); # object | volume | instance
# $self->drag_by('instance'); # object | instance
#===================================================================================================================================
return $self;
}

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

@ -22,11 +22,13 @@ sub new {
#==============================================================================================================================
Slic3r::GUI::_3DScene::enable_picking($self, 1);
Slic3r::GUI::_3DScene::enable_moving($self, 1);
Slic3r::GUI::_3DScene::set_select_by($self, 'object');
Slic3r::GUI::_3DScene::set_drag_by($self, 'instance');
# $self->enable_picking(1);
# $self->enable_moving(1);
# $self->select_by('object');
# $self->drag_by('instance');
#==============================================================================================================================
$self->select_by('object');
$self->drag_by('instance');
$self->{objects} = $objects;
$self->{model} = $model;

8
lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
View file

@ -155,11 +155,7 @@ sub new {
$canvas = $self->{canvas} = Slic3r::GUI::3DScene->new($self);
#==============================================================================================================================
Slic3r::GUI::_3DScene::enable_picking($canvas, 1);
# $canvas->enable_picking(1);
#==============================================================================================================================
$canvas->select_by('volume');
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_select_by($canvas, 'volume');
Slic3r::GUI::_3DScene::register_on_select_callback($canvas, sub {
my ($volume_idx) = @_;
# convert scene volume to model object volume
@ -169,6 +165,8 @@ sub new {
Slic3r::GUI::_3DScene::set_auto_bed_shape($canvas);
Slic3r::GUI::_3DScene::set_axes_length($canvas, 2.0 * max(@{ Slic3r::GUI::_3DScene::get_volumes_bounding_box($canvas)->size }));
# $canvas->enable_picking(1);
# $canvas->select_by('volume');
# $canvas->on_select(sub {
# my ($volume_idx) = @_;
# # convert scene volume to model object volume