3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into sender

Browse source 
Conflicts:
	Build.PL
This commit is contained in:
Alessandro Ranellucci 2015-02-01 14:07:32 +01:00
commit 3ae6f2630e
106 changed files with 2262 additions and 994 deletions
Download patch file Download diff file Expand all files Collapse all files

7
utils/view-mesh.pl
View file

@ -12,7 +12,7 @@ BEGIN {
use Getopt::Long qw(:config no_auto_abbrev);
use Slic3r;
use Slic3r::GUI;
use Slic3r::GUI::PreviewCanvas;
use Slic3r::GUI::3DScene;
$|++;
my %opt = ();
@ -31,11 +31,12 @@ my %opt = ();
# make sure all objects have at least one defined instance
$model->add_default_instances;
$_->center_around_origin for @{$model->objects}; # and align to Z = 0
my $app = Slic3r::ViewMesh->new;
$app->{canvas}->enable_picking(1);
$app->{canvas}->enable_moving($opt{enable_moving});
$app->{canvas}->load_object($model->objects->[0]);
$app->{canvas}->load_object($model, 0);
$app->{canvas}->set_auto_bed_shape;
$app->{canvas}->zoom_to_volumes;
$app->{canvas}->SetCuttingPlane($opt{cut}) if defined $opt{cut};
@ -66,7 +67,7 @@ sub OnInit {
my $frame = Wx::Frame->new(undef, -1, 'Mesh Viewer', [-1, -1], [500, 400]);
my $panel = Wx::Panel->new($frame, -1);
$self->{canvas} = Slic3r::GUI::PreviewCanvas->new($panel);
$self->{canvas} = Slic3r::GUI::3DScene->new($panel);
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
$sizer->Add($self->{canvas}, 1, wxEXPAND, 0);

10
utils/view-toolpaths.pl
View file

@ -12,7 +12,7 @@ BEGIN {
use Getopt::Long qw(:config no_auto_abbrev);
use Slic3r;
use Slic3r::GUI;
use Slic3r::GUI::PreviewCanvas;
use Slic3r::GUI::3DScene;
$|++;
my %opt = ();
@ -82,13 +82,13 @@ sub OnInit {
my $canvas;
if ($d3) {
$canvas = Slic3r::GUI::PreviewCanvas->new($panel);
$canvas->print($print);
$canvas = Slic3r::GUI::3DScene->new($panel);
$canvas->set_bed_shape($print->config->bed_shape);
foreach my $object (@{$print->objects}) {
$canvas->load_object($object->model_object);
#$canvas->load_print_object_slices($object);
$canvas->load_print_object_toolpaths($object);
#$canvas->load_object($object->model_object);
}
$canvas->zoom_to_volumes;
} else {