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

Another set of 3DScene methods moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-06-04 15:42:34 +02:00
parent 9729c71691
commit d74b85f3fe
13 changed files with 151 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,11 @@ 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 normalize scale unscale scaled_epsilon);
use Slic3r::Geometry::Clipper qw(offset_ex intersection_pl JT_ROUND);
#==============================================================================================================================
use Slic3r::Geometry qw(X Y);
#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);
@ -33,9 +36,7 @@ use Slic3r::Geometry qw(PI);
# volumes: reference to vector of Slic3r::GUI::3DScene::Volume.
# _camera_type: 'perspective' or 'ortho'
#==============================================================================================================================
__PACKAGE__->mk_accessors( qw(init
on_viewport_changed
on_select
__PACKAGE__->mk_accessors( qw(
volumes
) );
#__PACKAGE__->mk_accessors( qw(_quat _dirty init
@ -1268,12 +1269,10 @@ sub DestroyGL {
}
}
sub Render {
my ($self, $dc) = @_;
#==============================================================================================================================
Slic3r::GUI::_3DScene::render($self);
#sub Render {
# my ($self, $dc) = @_;
#
# # prevent calling SetCurrent() when window is not shown yet
# return unless Slic3r::GUI::_3DScene::is_shown_on_screen($self);
## return unless $self->IsShownOnScreen;
@ -1497,10 +1496,8 @@ sub Render {
# $self->draw_active_object_annotations;
#
# $self->SwapBuffers();
#==============================================================================================================================
}
#==============================================================================================================================
#}
#
#sub draw_volumes {
# # $fakecolor is a boolean indicating, that the objects shall be rendered in a color coding the object index for picking.
# my ($self, $fakecolor) = @_;
@ -2264,18 +2261,20 @@ sub load_gcode_preview {
#==============================================================================================================================
}
sub set_toolpaths_range {
my ($self, $min_z, $max_z) = @_;
$self->volumes->set_range($min_z, $max_z);
}
sub reset_legend_texture {
Slic3r::GUI::_3DScene::reset_legend_texture();
}
sub get_current_print_zs {
my ($self, $active_only) = @_;
return $self->volumes->get_current_print_zs($active_only);
}
#==============================================================================================================================
#sub set_toolpaths_range {
# my ($self, $min_z, $max_z) = @_;
# $self->volumes->set_range($min_z, $max_z);
#}
#
#sub reset_legend_texture {
# Slic3r::GUI::_3DScene::reset_legend_texture();
#}
#
#sub get_current_print_zs {
# my ($self, $active_only) = @_;
# return $self->volumes->get_current_print_zs($active_only);
#}
#==============================================================================================================================
1;