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

Possible fix of

Browse Source 
https://github.com/prusa3d/Slic3r/issues/260
https://github.com/prusa3d/Slic3r/issues/272
by disabling opengl blending when picking.

Also the limiting region for object movement has been rounded smoothly.
This commit is contained in:
bubnikv 2017-06-08 12:23:50 +02:00
parent a15e6127cf
commit 27003dc0fd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Slic3r/GUI/3DScene.pm
View File

@ -23,7 +23,7 @@ use base qw(Wx::GLCanvas Class::Accessor);
use Math::Trig qw(asin tan); use Math::Trig qw(asin tan);
use List::Util qw(reduce min max first); use List::Util qw(reduce min max first);
use Slic3r::Geometry qw(X Y Z MIN MAX triangle_normal normalize deg2rad tan scale unscale scaled_epsilon); use Slic3r::Geometry qw(X Y Z MIN MAX triangle_normal normalize deg2rad tan scale unscale scaled_epsilon);
use Slic3r::Geometry::Clipper qw(offset_ex intersection_pl); use Slic3r::Geometry::Clipper qw(offset_ex intersection_pl JT_ROUND);
use Wx::GLCanvas qw(:all); use Wx::GLCanvas qw(:all);
use Slic3r::Geometry qw(PI); use Slic3r::Geometry qw(PI);
@ -752,7 +752,7 @@ sub set_bed_shape {
# Set the origin for painting of the coordinate system axes. # Set the origin for painting of the coordinate system axes.
$self->origin(Slic3r::Pointf->new(0,0)); $self->origin(Slic3r::Pointf->new(0,0));
$self->bed_polygon(offset_ex([$expolygon->contour], $bed_bb->radius * 1.7)->[0]->contour->clone); $self->bed_polygon(offset_ex([$expolygon->contour], $bed_bb->radius * 1.7, JT_ROUND, scale(0.5))->[0]->contour->clone);
} }
sub deselect_volumes { sub deselect_volumes {
@ -1116,8 +1116,10 @@ sub Render {
# Render the object for picking. # Render the object for picking.
# FIXME This cannot possibly work in a multi-sampled context as the color gets mangled by the anti-aliasing. # FIXME This cannot possibly work in a multi-sampled context as the color gets mangled by the anti-aliasing.
# Better to use software ray-casting on a bounding-box hierarchy. # Better to use software ray-casting on a bounding-box hierarchy.
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_MULTISAMPLE); glDisable(GL_MULTISAMPLE);
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glDisable(GL_BLEND);
$self->draw_volumes(1); $self->draw_volumes(1);
glFlush(); glFlush();
glFinish(); glFinish();
@ -1142,8 +1144,7 @@ sub Render {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glFlush(); glFlush();
glFinish(); glFinish();
glEnable(GL_LIGHTING); glPopAttrib();
glEnable(GL_MULTISAMPLE);
} }
# draw fixed background # draw fixed background