diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index 83088f58d..a6f86e16f 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -1340,6 +1340,33 @@ sub validate { # --extrusion-multiplier die "Invalid value for --extrusion-multiplier\n" if defined first { $_ <= 0 } @{$self->extrusion_multiplier}; + + # general validation, quick and dirty + foreach my $opt_key (keys %$Options) { + my $opt = $Options->{$opt_key}; + next unless defined $self->$opt_key; + next unless defined $opt->{cli} && $opt->{cli} =~ /=(.+)$/; + my $type = $1; + my @values = (); + if ($type =~ s/\@$//) { + die "Invalid value for $opt_key\n" if ref($self->$opt_key) ne 'ARRAY'; + @values = @{ $self->$opt_key }; + } else { + @values = ($self->$opt_key); + } + foreach my $value (@values) { + if ($type eq 'i' || $type eq 'f') { + die "Invalid value for $opt_key\n" + if ($type eq 'i' && $value !~ /^-?\d+$/) + || ($type eq 'f' && $value !~ /^-?(?:\d+|\d*\.\d+)$/) + || (defined $opt->{min} && $value < $opt->{min}) + || (defined $opt->{max} && $value > $opt->{max}); + } elsif ($type eq 's' && $opt->{type} eq 'select') { + die "Invalid value for $opt_key\n" + unless first { $_ eq $value } @{ $opt->{values} }; + } + } + } } sub replace_options { diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index b29a1f597..8b5d48cfe 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -14,7 +14,7 @@ use Slic3r::GUI::SkeinPanel; use Slic3r::GUI::SimpleTab; use Slic3r::GUI::Tab; -our $have_OpenGL = 0 && eval "use Slic3r::GUI::PreviewCanvas; 1"; +our $have_OpenGL = eval "use Slic3r::GUI::PreviewCanvas; 1"; use Wx 0.9901 qw(:bitmap :dialog :frame :icon :id :misc :systemsettings :toplevelwindow); use Wx::Event qw(EVT_CLOSE EVT_MENU); @@ -173,7 +173,7 @@ sub OnInit { EVT_MENU($frame, MI_CONF_WIZARD, sub { $self->{skeinpanel}->config_wizard }); EVT_MENU($frame, MI_WEBSITE, sub { Wx::LaunchDefaultBrowser('http://slic3r.org/') }); EVT_MENU($frame, MI_VERSIONCHECK, sub { Slic3r::GUI->check_version(manual => 1) }); - EVT_MENU($frame, MI_DOCUMENTATION, sub { Wx::LaunchDefaultBrowser('https://manual.slic3r.org/') }); + EVT_MENU($frame, MI_DOCUMENTATION, sub { Wx::LaunchDefaultBrowser('http://manual.slic3r.org/') }); EVT_MENU($frame, wxID_ABOUT, \&about); } diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm index f70a0bba6..c5c82e943 100644 --- a/lib/Slic3r/GUI/PreviewCanvas.pm +++ b/lib/Slic3r/GUI/PreviewCanvas.pm @@ -1,39 +1,40 @@ package Slic3r::GUI::PreviewCanvas; use strict; use warnings; - -use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_TIMER EVT_MOUSEWHEEL); + +use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS); # must load OpenGL *before* Wx::GLCanvas -use OpenGL qw(:glconstants :glfunctions); +use OpenGL qw(:glconstants :glfunctions :glufunctions); use base qw(Wx::GLCanvas Class::Accessor); +use Math::Trig qw(asin); +use List::Util qw(reduce min max); use Slic3r::Geometry qw(X Y Z MIN MAX triangle_normal normalize deg2rad tan); use Wx::GLCanvas qw(:all); -__PACKAGE__->mk_accessors( qw(timer x_rot y_rot dirty init mesh_center zoom - verts norms) ); - +__PACKAGE__->mk_accessors( qw(quat dirty init mview_init + mesh_center mesh_size + verts norms initpos) ); + +use constant TRACKBALLSIZE => 0.8; + sub new { my ($class, $parent, $mesh) = @_; my $self = $class->SUPER::new($parent); - + + $self->quat((0, 0, 0, 1)); + # prepare mesh { $self->mesh_center($mesh->center); - $self->zoom(0.1); + $self->mesh_size($mesh->size); - my @verts = map $self->zoom * $_, map @{ $mesh->vertices->[$_] }, map @$_, @{$mesh->facets}; + my @verts = map @{ $mesh->vertices->[$_] }, map @$_, @{$mesh->facets}; $self->verts(OpenGL::Array->new_list(GL_FLOAT, @verts)); my @norms = map { @$_, @$_, @$_ } map normalize(triangle_normal(map $mesh->vertices->[$_], @$_)), @{$mesh->facets}; $self->norms(OpenGL::Array->new_list(GL_FLOAT, @norms)); } - my $timer = $self->timer( Wx::Timer->new($self) ); - $timer->Start(50); - - $self->x_rot(0); - $self->y_rot(0); - EVT_PAINT($self, sub { my $dc = Wx::PaintDC->new($self); $self->Render($dc); @@ -45,29 +46,201 @@ sub new { $self->Resize( $self->GetSizeWH ); $self->Refresh; }); - EVT_TIMER($self, -1, sub { - my ($self, $e) = @_; - - $self->x_rot( $self->x_rot - 1 ); - $self->y_rot( $self->y_rot + 2 ); - - $self->dirty(1); - Wx::WakeUpIdle; - }); EVT_MOUSEWHEEL($self, sub { my ($self, $e) = @_; - my $zoom = $self->zoom * (1.0 - $e->GetWheelRotation() / $e->GetWheelDelta() / 10); - $zoom = 0.001 if $zoom < 0.001; - $zoom = 0.1 if $zoom > 0.1; - $self->zoom($zoom); + my $zoom = ($e->GetWheelRotation() / $e->GetWheelDelta() / 10); + $zoom = $zoom > 0 ? (1.0 + $zoom) : 1 / (1.0 - $zoom); + my @pos3d = $self->mouse_to_3d($e->GetX(), $e->GetY()); + $self->ZoomTo($zoom, $pos3d[0], $pos3d[1]); $self->Refresh; }); + EVT_MOUSE_EVENTS($self, sub { + my ($self, $e) = @_; + + if ($e->Dragging() && $e->LeftIsDown()) { + $self->handle_rotation($e); + } elsif ($e->Dragging() && $e->RightIsDown()) { + $self->handle_translation($e); + } elsif ($e->LeftUp() || $e->RightUp()) { + $self->initpos(undef); + } else { + $e->Skip(); + } + }); return $self; } - + +# Given an axis and angle, compute quaternion. +sub axis_to_quat { + my ($ax, $phi) = @_; + + my $lena = sqrt(reduce { $a + $b } (map { $_ * $_ } @$ax)); + my @q = map { $_ * (1 / $lena) } @$ax; + @q = map { $_ * sin($phi / 2.0) } @q; + $q[$#q + 1] = cos($phi / 2.0); + return @q; +} + +# Project a point on the virtual trackball. +# If it is inside the sphere, map it to the sphere, if it outside map it +# to a hyperbola. +sub project_to_sphere { + my ($r, $x, $y) = @_; + + my $d = sqrt($x * $x + $y * $y); + if ($d < $r * 0.70710678118654752440) { # Inside sphere + return sqrt($r * $r - $d * $d); + } else { # On hyperbola + my $t = $r / 1.41421356237309504880; + return $t * $t / $d; + } +} + +sub cross { + my ($v1, $v2) = @_; + + return (@$v1[1] * @$v2[2] - @$v1[2] * @$v2[1], + @$v1[2] * @$v2[0] - @$v1[0] * @$v2[2], + @$v1[0] * @$v2[1] - @$v1[1] * @$v2[0]); +} + +# Simulate a track-ball. Project the points onto the virtual trackball, +# then figure out the axis of rotation, which is the cross product of +# P1 P2 and O P1 (O is the center of the ball, 0,0,0) Note: This is a +# deformed trackball-- is a trackball in the center, but is deformed +# into a hyperbolic sheet of rotation away from the center. +# It is assumed that the arguments to this routine are in the range +# (-1.0 ... 1.0). +sub trackball { + my ($p1x, $p1y, $p2x, $p2y) = @_; + + if ($p1x == $p2x && $p1y == $p2y) { + # zero rotation + return (0.0, 0.0, 0.0, 1.0); + } + + # First, figure out z-coordinates for projection of P1 and P2 to + # deformed sphere + my @p1 = ($p1x, $p1y, project_to_sphere(TRACKBALLSIZE, $p1x, $p1y)); + my @p2 = ($p2x, $p2y, project_to_sphere(TRACKBALLSIZE, $p2x, $p2y)); + + # axis of rotation (cross product of P1 and P2) + my @a = cross(\@p2, \@p1); + + # Figure out how much to rotate around that axis. + my @d = map { $_ * $_ } (map { $p1[$_] - $p2[$_] } 0 .. $#p1); + my $t = sqrt(reduce { $a + $b } @d) / (2.0 * TRACKBALLSIZE); + + # Avoid problems with out-of-control values... + $t = 1.0 if ($t > 1.0); + $t = -1.0 if ($t < -1.0); + my $phi = 2.0 * asin($t); + + return axis_to_quat(\@a, $phi); +} + +# Build a rotation matrix, given a quaternion rotation. +sub quat_to_rotmatrix { + my ($q) = @_; + + my @m = (); + + $m[0] = 1.0 - 2.0 * (@$q[1] * @$q[1] + @$q[2] * @$q[2]); + $m[1] = 2.0 * (@$q[0] * @$q[1] - @$q[2] * @$q[3]); + $m[2] = 2.0 * (@$q[2] * @$q[0] + @$q[1] * @$q[3]); + $m[3] = 0.0; + + $m[4] = 2.0 * (@$q[0] * @$q[1] + @$q[2] * @$q[3]); + $m[5] = 1.0 - 2.0 * (@$q[2] * @$q[2] + @$q[0] * @$q[0]); + $m[6] = 2.0 * (@$q[1] * @$q[2] - @$q[0] * @$q[3]); + $m[7] = 0.0; + + $m[8] = 2.0 * (@$q[2] * @$q[0] - @$q[1] * @$q[3]); + $m[9] = 2.0 * (@$q[1] * @$q[2] + @$q[0] * @$q[3]); + $m[10] = 1.0 - 2.0 * (@$q[1] * @$q[1] + @$q[0] * @$q[0]); + $m[11] = 0.0; + + $m[12] = 0.0; + $m[13] = 0.0; + $m[14] = 0.0; + $m[15] = 1.0; + + return @m; +} + +sub mulquats { + my ($q1, $rq) = @_; + + return (@$q1[3] * @$rq[0] + @$q1[0] * @$rq[3] + @$q1[1] * @$rq[2] - @$q1[2] * @$rq[1], + @$q1[3] * @$rq[1] + @$q1[1] * @$rq[3] + @$q1[2] * @$rq[0] - @$q1[0] * @$rq[2], + @$q1[3] * @$rq[2] + @$q1[2] * @$rq[3] + @$q1[0] * @$rq[1] - @$q1[1] * @$rq[0], + @$q1[3] * @$rq[3] - @$q1[0] * @$rq[0] - @$q1[1] * @$rq[1] - @$q1[2] * @$rq[2]) +} + +sub handle_rotation { + my ($self, $e) = @_; + + if (not defined $self->initpos) { + $self->initpos($e->GetPosition()); + } else { + my $orig = $self->initpos; + my $new = $e->GetPosition(); + my $size = $self->GetClientSize(); + my @quat = trackball($orig->x / ($size->width / 2) - 1, + 1 - $orig->y / ($size->height / 2), #/ + $new->x / ($size->width / 2) - 1, + 1 - $new->y / ($size->height / 2), #/ + ); + $self->quat(mulquats($self->quat, \@quat)); + $self->initpos($new); + $self->Refresh; + } +} + +sub handle_translation { + my ($self, $e) = @_; + + if (not defined $self->initpos) { + $self->initpos($e->GetPosition()); + } else { + my $new = $e->GetPosition(); + my $orig = $self->initpos; + my @orig3d = $self->mouse_to_3d($orig->x, $orig->y); #)() + my @new3d = $self->mouse_to_3d($new->x, $new->y); #)() + glTranslatef($new3d[0] - $orig3d[0], $new3d[1] - $orig3d[1], 0); + $self->initpos($new); + $self->Refresh; + } +} + +sub mouse_to_3d { + my ($self, $x, $y) = @_; + + my @viewport = glGetIntegerv_p(GL_VIEWPORT); # 4 items + my @mview = glGetDoublev_p(GL_MODELVIEW_MATRIX); # 16 items + my @proj = glGetDoublev_p(GL_PROJECTION_MATRIX); # 16 items + + my @projected = gluUnProject_p($x, $viewport[3] - $y, 1.0, @mview, @proj, @viewport); + return @projected; +} + +sub ZoomTo { + my ($self, $factor, $tox, $toy) = @_; + + glTranslatef($tox, $toy, 0); + glMatrixMode(GL_MODELVIEW); + $self->Zoom($factor); + glTranslatef(-$tox, -$toy, 0); +} + +sub Zoom { + my ($self, $factor) = @_; + glScalef($factor, $factor, 1); +} + sub GetContext { my ($self) = @_; @@ -87,7 +260,17 @@ sub SetCurrent { return $self->SUPER::SetCurrent; } } - + +sub ResetModelView { + my ($self, $factor) = @_; + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + my $win_size = $self->GetClientSize(); + my $ratio = $factor * min($win_size->width, $win_size->height) / max(@{ $self->mesh_size }); + glScalef($ratio, $ratio, 1); +} + sub Resize { my ($self, $x, $y) = @_; @@ -99,27 +282,18 @@ sub Resize { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - my_gluPerspective(45, $x/$y, .5, 100); + my $mesh_size = $self->mesh_size; + glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 2 * max(@$mesh_size)); glMatrixMode(GL_MODELVIEW); -} - -sub my_gluPerspective { - my ($fov, $ratio, $near, $far) = @_; - - my $top = tan(deg2rad($fov)*0.5) * $near; - my $bottom = -$top; - my $left = $ratio * $bottom; - my $right = $ratio * $top; - - glFrustum( $left, $right, $bottom, $top, $near, $far ); + unless ($self->mview_init) { + $self->mview_init(1); + $self->ResetModelView(0.9); + } } sub DESTROY { my $self = shift; - - $self->timer->Stop; - $self->timer(undef); } sub InitGL { @@ -161,18 +335,18 @@ sub Render { return unless $self->GetContext; $self->SetCurrent($self->GetContext); $self->InitGL; - + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - + glPushMatrix(); - glTranslatef( 0, 0, -5 ); - - # this needs to get a lot better... - glRotatef( $self->x_rot, 1, 0, 0 ); - glRotatef( $self->y_rot, 0, 0, 1 ); - glTranslatef(map -$_ * $self->zoom, @{ $self->mesh_center }); - - $self->draw_mesh; + + my $mesh_size = $self->mesh_size; + glTranslatef(0, 0, -max(@$mesh_size[0..1])); + my @rotmat = quat_to_rotmatrix($self->quat); + glMultMatrixd_p(@rotmat[0..15]); + glTranslatef(map -$_, @{ $self->mesh_center }); + + $self->draw_mesh; glPopMatrix(); glFlush(); diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl index 5d69525d0..3e4d27232 100644 --- a/utils/view-mesh.pl +++ b/utils/view-mesh.pl @@ -12,6 +12,7 @@ BEGIN { use Getopt::Long qw(:config no_auto_abbrev); use Slic3r; use Slic3r::GUI; +use Slic3r::GUI::PreviewCanvas; $|++; my %opt = ();