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

Correct Z positioning of multiple objects in 3D plater

Browse source
This commit is contained in:
Alessandro Ranellucci 2014-07-16 17:06:58 +02:00
parent 983cf09ee5
commit 16a3d29a1d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Slic3r/GUI/PreviewCanvas.pm
View file

@ -152,7 +152,9 @@ sub set_bed_shape {
sub load_object { sub load_object {
my ($self, $object, $all_instances) = @_; my ($self, $object, $all_instances) = @_;
# group mesh(es) by material my $z_min = $object->raw_bounding_box->z_min;
# color mesh(es) by material
my @materials = (); my @materials = ();
# sort volumes: non-modifiers first # sort volumes: non-modifiers first
@ -175,6 +177,7 @@ sub load_object {
push @{$self->volumes}, my $v = { push @{$self->volumes}, my $v = {
mesh => $mesh, mesh => $mesh,
color => $color, color => $color,
z_min => $z_min,
}; };
{ {
@ -517,9 +520,6 @@ sub Render {
# draw objects # draw objects
$self->draw_mesh; $self->draw_mesh;
# raise everything so that we draw our plane at Z = 0
glTranslatef(0, 0, +$bb->z_min);
# draw ground and axes # draw ground and axes
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
my $z0 = 0; my $z0 = 0;
@ -610,6 +610,8 @@ sub draw_mesh {
glEnableClientState(GL_NORMAL_ARRAY); glEnableClientState(GL_NORMAL_ARRAY);
foreach my $volume (@{$self->volumes}) { foreach my $volume (@{$self->volumes}) {
glTranslatef(0, 0, -$volume->{z_min});
glVertexPointer_p(3, $volume->{verts}); glVertexPointer_p(3, $volume->{verts});
glCullFace(GL_BACK); glCullFace(GL_BACK);
@ -620,6 +622,8 @@ sub draw_mesh {
glColor4f(@{ $volume->{color} }); glColor4f(@{ $volume->{color} });
} }
glDrawArrays(GL_TRIANGLES, 0, $volume->{verts}->elements / 3); glDrawArrays(GL_TRIANGLES, 0, $volume->{verts}->elements / 3);
glTranslatef(0, 0, +$volume->{z_min});
} }
glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_NORMAL_ARRAY);
glDisable(GL_BLEND); glDisable(GL_BLEND);