From 1f50d9c7e8830f9247f178036c397a17092ef5c6 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Mon, 24 Jun 2013 20:38:20 +0200
Subject: [PATCH 01/16] https -> http in manual URL

---
 lib/Slic3r/GUI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index e4cb27600d..b590a5de96 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -170,7 +170,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);
     }
     

From 9d1b756135293881e59a3d5ab24d26a30f41f8e9 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Thu, 27 Jun 2013 11:47:07 +0200
Subject: [PATCH 02/16] Add use Slic3r::GUI::PreviewCanvas to view-mesh.pl

---
 utils/view-mesh.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
index 5d69525d02..3e4d272328 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 = ();

From 47b2c13c992359096ae80612f349c963d85748d6 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 10:43:21 +0200
Subject: [PATCH 03/16] Get rid of demo timer in PreviewCanvas

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index f70a0bba66..dd3af6982b 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -28,9 +28,6 @@ sub new {
         $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);
     
@@ -45,15 +42,6 @@ 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) = @_;
         

From bb3ebb02449c270766319f7a4c03b8d86f7610dd Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 10:43:35 +0200
Subject: [PATCH 04/16] Switch to orthographic projection

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index dd3af6982b..615e29b155 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -87,22 +87,11 @@ sub Resize {
  
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    my_gluPerspective(45, $x/$y, .5, 100);
+    glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 100);
  
     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 );
-}
- 
 sub DESTROY {
     my $self = shift;
  

From 317c911c676ba007d6a88e804be37ee9840f0be5 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 14:16:38 +0200
Subject: [PATCH 05/16] Remove leftover from 47b2c13c

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 615e29b155..88dc139761 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -94,9 +94,6 @@ sub Resize {
  
 sub DESTROY {
     my $self = shift;
- 
-    $self->timer->Stop;
-    $self->timer(undef);
 }
  
 sub InitGL {

From 43d764feffa0cbb2e3ffff5aaf48968c01ddae46 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 14:16:56 +0200
Subject: [PATCH 06/16] Implement zoom to point

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 53 ++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 88dc139761..f1904645d2 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -4,7 +4,7 @@ use warnings;
  
 use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_TIMER EVT_MOUSEWHEEL);
 # 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 Slic3r::Geometry qw(X Y Z MIN MAX triangle_normal normalize deg2rad tan);
 use Wx::GLCanvas qw(:all);
@@ -19,9 +19,8 @@ sub new {
     # prepare mesh
     {
         $self->mesh_center($mesh->center);
-        $self->zoom(0.1);
         
-        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};
@@ -45,17 +44,52 @@ sub new {
     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;
     });
     
     return $self;
 }
- 
+
+
+sub mouse_to_3d {
+  my ($self, $x, $y) = @_;
+
+  my @viewport = glGetIntegerv_p(GL_VIEWPORT);
+  my @mview = glGetDoublev_p(GL_MODELVIEW_MATRIX);
+  my @proj = glGetDoublev_p(GL_PROJECTION_MATRIX);
+
+  my @projected = gluUnProject_p($x, $viewport[3] - $y, 1.0,
+                                 $mview[0], $mview[1], $mview[2], $mview[3],
+                                 $mview[4], $mview[5], $mview[6], $mview[7],
+                                 $mview[8], $mview[9], $mview[10], $mview[11],
+                                 $mview[12], $mview[13], $mview[14], $mview[15],
+                                 $proj[0], $proj[1], $proj[2], $proj[3],
+                                 $proj[4], $proj[5], $proj[6], $proj[7],
+                                 $proj[8], $proj[9], $proj[10], $proj[11],
+                                 $proj[12], $proj[13], $proj[14], $proj[15],
+                                 $viewport[0], $viewport[1], $viewport[2], $viewport[3]);
+
+  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) = @_;
     
@@ -139,12 +173,11 @@ sub Render {
     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 });
+    glTranslatef(map -$_, @{ $self->mesh_center });
  
     $self->draw_mesh; 
 

From dd7830b1b7ff94e5a5dab03864c592d38e52fbc7 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 15:12:57 +0200
Subject: [PATCH 07/16] Add panning support

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 35 ++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index f1904645d2..92a3770bc8 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -2,15 +2,15 @@ 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 :glufunctions);
 use base qw(Wx::GLCanvas Class::Accessor);
 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 mesh_center
+                            verts norms initpos) );
  
 sub new {
     my ($class, $parent, $mesh) = @_;
@@ -51,10 +51,39 @@ sub new {
         
         $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;
 }
 
+sub handle_translation {
+  my ($self, $e) = @_;
+
+  if (not defined $self->initpos) {
+    $self->initpos($e->GetPosition());
+  } else {
+    my ($orig, @orig3d, $new, @new3d);
+    $new = $e->GetPosition();
+    $orig = $self->initpos;
+    @orig3d = $self->mouse_to_3d($orig->x, $orig->y);
+    @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) = @_;

From 6668a81c644f00ec469d21dbd3668583fc7f5cd2 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sat, 29 Jun 2013 18:31:06 +0200
Subject: [PATCH 08/16] Start work on rotation handling

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 42 +++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 92a3770bc8..73eb6513b0 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -15,7 +15,9 @@ __PACKAGE__->mk_accessors( qw(quat dirty init mesh_center
 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);
@@ -27,9 +29,6 @@ sub new {
         $self->norms(OpenGL::Array->new_list(GL_FLOAT, @norms));
     }
     
-    $self->x_rot(0);
-    $self->y_rot(0);
-    
     EVT_PAINT($self, sub {
         my $dc = Wx::PaintDC->new($self);
         $self->Render($dc);
@@ -68,6 +67,38 @@ sub new {
     return $self;
 }
 
+sub trackball {
+  return (0, 0, 0, 1);
+}
+
+sub mulquat {
+  my ($self, @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, $new, $size, @quat);
+    $orig = $self->initpos;
+    $new = $e->GetPosition();
+    $size = $self->GetClientSize();
+    @quat = $self->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($self->mulquat($self->quat, @quat));
+    $self->initpos($new);
+    $self->Refresh;
+  }
+}
+
 sub handle_translation {
   my ($self, $e) = @_;
 
@@ -203,9 +234,6 @@ sub Render {
  
     glPushMatrix();
     
-    # this needs to get a lot better...
-    glRotatef( $self->x_rot, 1, 0, 0 );
-    glRotatef( $self->y_rot, 0, 0, 1 );
     glTranslatef(map -$_, @{ $self->mesh_center });
  
     $self->draw_mesh; 

From 1b6a9c0c3b6c6a213145a73ea98a84bad8f02723 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sun, 30 Jun 2013 15:39:03 +0200
Subject: [PATCH 09/16] Added validation on all settings. #611

---
 lib/Slic3r/Config.pm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 83088f58d8..0ef9b7803a 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 {

From e92fefb6ff866d36a20c72874e55e09020c4ec40 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 30 Jun 2013 23:51:06 +0200
Subject: [PATCH 10/16] Working rotation for mesh viewer

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 142 ++++++++++++++++++++++++++------
 1 file changed, 119 insertions(+), 23 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 73eb6513b0..bb601fd3b0 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -1,16 +1,19 @@
 package Slic3r::GUI::PreviewCanvas;
 use strict;
 use warnings;
- 
+
 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 :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(quat dirty init mesh_center
-                            verts norms initpos) );
+__PACKAGE__->mk_accessors( qw(quat dirty init mview_init
+                              mesh_center mesh_size
+                              verts norms initpos) );
  
 sub new {
     my ($class, $parent, $mesh) = @_;
@@ -21,6 +24,7 @@ sub new {
     # prepare mesh
     {
         $self->mesh_center($mesh->center);
+        $self->mesh_size($mesh->size);
         
         my @verts = map @{ $mesh->vertices->[$_] }, map @$_, @{$mesh->facets};
         $self->verts(OpenGL::Array->new_list(GL_FLOAT, @verts));
@@ -67,16 +71,85 @@ sub new {
     return $self;
 }
 
-sub trackball {
-  return (0, 0, 0, 1);
+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;
 }
 
-sub mulquat {
-  my ($self, @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 project_to_sphere {
+  my ($r, $x, $y) = @_;
+  my $d = sqrt($x * $x + $y * $y);
+  if ($d < $r * 0.70710678118654752440) {
+        return sqrt($r * $r - $d * $d);
+  } else {
+    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]);
+}
+
+sub trackball {
+  my ($p1x, $p1y, $p2x, $p2y, $r) = @_;
+
+    if ($p1x == $p2x && $p1y == $p2y) {
+      return (0.0, 0.0, 0.0, 1.0);
+    }
+
+    my @p1 = ($p1x, $p1y, project_to_sphere($r, $p1x, $p1y));
+    my @p2 = ($p2x, $p2y, project_to_sphere($r, $p2x, $p2y));
+    my @a = cross(\@p2, \@p1);
+
+    my @d = map { $_ * $_ } (map { $p1[$_] - $p2[$_] } 0 .. $#p1);
+    my $t = sqrt(reduce { $a + $b } @d) / (2.0 * $r);
+
+    $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);
+}
+
+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 {
@@ -89,11 +162,12 @@ sub handle_rotation {
     $orig = $self->initpos;
     $new = $e->GetPosition();
     $size = $self->GetClientSize();
-    @quat = $self->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($self->mulquat($self->quat, @quat));
+    @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),
+                      0.8);
+    $self->quat(mulquats($self->quat, \@quat));
     $self->initpos($new);
     $self->Refresh;
   }
@@ -169,7 +243,17 @@ sub SetCurrent {
         return $self->SUPER::SetCurrent;
     }
 }
- 
+
+sub ResetModelView {
+    my ($self, $factor) = @_;
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    my $mesh_size = $self->mesh_size;
+    my $win_size = $self->GetClientSize();
+    my $ratio = $factor * min($win_size->width, $win_size->height) / max(@$mesh_size[0..1]);
+    glScalef($ratio, $ratio, 1);
+}
+
 sub Resize {
     my ($self, $x, $y) = @_;
  
@@ -181,9 +265,14 @@ sub Resize {
  
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 100);
+    my $mesh_size = $self->mesh_size;
+    glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 2 * max(@$mesh_size[0..1]));
  
     glMatrixMode(GL_MODELVIEW);
+    unless ($self->mview_init) {
+      $self->mview_init(1);
+      $self->ResetModelView(0.9);
+    }
 }
  
 sub DESTROY {
@@ -229,14 +318,21 @@ sub Render {
     return unless $self->GetContext;
     $self->SetCurrent($self->GetContext);
     $self->InitGL;
- 
+
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- 
+
     glPushMatrix();
-    
+
+    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], $rotmat[1], $rotmat[2], $rotmat[3],
+                    $rotmat[4], $rotmat[5], $rotmat[6], $rotmat[7],
+                    $rotmat[8], $rotmat[9], $rotmat[10], $rotmat[11],
+                    $rotmat[12], $rotmat[13], $rotmat[14], $rotmat[15]);
     glTranslatef(map -$_, @{ $self->mesh_center });
- 
-    $self->draw_mesh; 
+
+    $self->draw_mesh;
 
     glPopMatrix();
     glFlush();

From 1f229f32333a513a88df0adcb556883e48b47212 Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Sun, 30 Jun 2013 23:54:13 +0200
Subject: [PATCH 11/16] Cleanup

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index bb601fd3b0..691080ae03 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -121,7 +121,7 @@ sub trackball {
 
 sub quat_to_rotmatrix {
   my ($q) = @_;
-  my (@m);
+  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]);

From b2e0c1ab42136394c2844e48d31b8fce2a3d68be Mon Sep 17 00:00:00 2001
From: Guillaume Seguin <guillaume@segu.in>
Date: Mon, 1 Jul 2013 00:08:02 +0200
Subject: [PATCH 12/16] Use max of all dimensions instead of max of first 2

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 691080ae03..868843162e 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -250,7 +250,7 @@ sub ResetModelView {
     glLoadIdentity();
     my $mesh_size = $self->mesh_size;
     my $win_size = $self->GetClientSize();
-    my $ratio = $factor * min($win_size->width, $win_size->height) / max(@$mesh_size[0..1]);
+    my $ratio = $factor * min($win_size->width, $win_size->height) / max(@$mesh_size);
     glScalef($ratio, $ratio, 1);
 }
 
@@ -266,7 +266,7 @@ sub Resize {
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
     my $mesh_size = $self->mesh_size;
-    glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 2 * max(@$mesh_size[0..1]));
+    glOrtho(-$x/2, $x/2, -$y/2, $y/2, 0.5, 2 * max(@$mesh_size));
  
     glMatrixMode(GL_MODELVIEW);
     unless ($self->mview_init) {

From dcc2b7f4ffbd4d6e5591cf065416ffebdd9fda15 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Mon, 1 Jul 2013 01:50:58 +0200
Subject: [PATCH 13/16] Enable PreviewCanvas

---
 lib/Slic3r/GUI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index b590a5de96..03f1ab1050 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);

From 8ec3ec6bda1384be78492c08606a9b624a4e293c Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Mon, 1 Jul 2013 10:58:30 +0200
Subject: [PATCH 14/16] Cosmetic changes to the new OpenGL code by iXce

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 219 ++++++++++++++++----------------
 1 file changed, 106 insertions(+), 113 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 868843162e..121a5b3f74 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -55,51 +55,54 @@ sub new {
         $self->Refresh;
     });
     EVT_MOUSE_EVENTS($self, sub {
-      my ($self, $e) = @_;
+        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();
-      }
+        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;
 }
 
 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;
+    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;
 }
 
 sub project_to_sphere {
-  my ($r, $x, $y) = @_;
-  my $d = sqrt($x * $x + $y * $y);
-  if ($d < $r * 0.70710678118654752440) {
+    my ($r, $x, $y) = @_;
+    
+    my $d = sqrt($x * $x + $y * $y);
+    if ($d < $r * 0.70710678118654752440) {
         return sqrt($r * $r - $d * $d);
-  } else {
-    my $t = $r / 1.41421356237309504880;
-    return $t * $t / $d;
-  }
+    } else {
+        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]);
+    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]);
 }
 
 sub trackball {
-  my ($p1x, $p1y, $p2x, $p2y, $r) = @_;
+    my ($p1x, $p1y, $p2x, $p2y, $r) = @_;
 
     if ($p1x == $p2x && $p1y == $p2y) {
       return (0.0, 0.0, 0.0, 1.0);
@@ -120,108 +123,101 @@ sub trackball {
 }
 
 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;
+    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[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[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;
+    $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])
+    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) = @_;
+    my ($self, $e) = @_;
 
-  if (not defined $self->initpos) {
-    $self->initpos($e->GetPosition());
-  } else {
-    my ($orig, $new, $size, @quat);
-    $orig = $self->initpos;
-    $new = $e->GetPosition();
-    $size = $self->GetClientSize();
-    @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),
-                      0.8);
-    $self->quat(mulquats($self->quat, \@quat));
-    $self->initpos($new);
-    $self->Refresh;
-  }
+    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),        #/
+                        0.8);
+        $self->quat(mulquats($self->quat, \@quat));
+        $self->initpos($new);
+        $self->Refresh;
+    }
 }
 
 sub handle_translation {
-  my ($self, $e) = @_;
+    my ($self, $e) = @_;
 
-  if (not defined $self->initpos) {
-    $self->initpos($e->GetPosition());
-  } else {
-    my ($orig, @orig3d, $new, @new3d);
-    $new = $e->GetPosition();
-    $orig = $self->initpos;
-    @orig3d = $self->mouse_to_3d($orig->x, $orig->y);
-    @new3d = $self->mouse_to_3d($new->x, $new->y);
-    glTranslatef($new3d[0] - $orig3d[0], $new3d[1] - $orig3d[1], 0);
-    $self->initpos($new);
-    $self->Refresh;
-  }
+    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 ($self, $x, $y) = @_;
 
-  my @viewport = glGetIntegerv_p(GL_VIEWPORT);
-  my @mview = glGetDoublev_p(GL_MODELVIEW_MATRIX);
-  my @proj = glGetDoublev_p(GL_PROJECTION_MATRIX);
+    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[0], $mview[1], $mview[2], $mview[3],
-                                 $mview[4], $mview[5], $mview[6], $mview[7],
-                                 $mview[8], $mview[9], $mview[10], $mview[11],
-                                 $mview[12], $mview[13], $mview[14], $mview[15],
-                                 $proj[0], $proj[1], $proj[2], $proj[3],
-                                 $proj[4], $proj[5], $proj[6], $proj[7],
-                                 $proj[8], $proj[9], $proj[10], $proj[11],
-                                 $proj[12], $proj[13], $proj[14], $proj[15],
-                                 $viewport[0], $viewport[1], $viewport[2], $viewport[3]);
-
-  return @projected;
+    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);
+    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);
+    my ($self, $factor) =  @_;
+    glScalef($factor, $factor, 1);
 }
 
 sub GetContext {
@@ -246,11 +242,11 @@ sub SetCurrent {
 
 sub ResetModelView {
     my ($self, $factor) = @_;
+    
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    my $mesh_size = $self->mesh_size;
     my $win_size = $self->GetClientSize();
-    my $ratio = $factor * min($win_size->width, $win_size->height) / max(@$mesh_size);
+    my $ratio = $factor * min($win_size->width, $win_size->height) / max(@{ $self->mesh_size });
     glScalef($ratio, $ratio, 1);
 }
 
@@ -270,8 +266,8 @@ sub Resize {
  
     glMatrixMode(GL_MODELVIEW);
     unless ($self->mview_init) {
-      $self->mview_init(1);
-      $self->ResetModelView(0.9);
+        $self->mview_init(1);
+        $self->ResetModelView(0.9);
     }
 }
  
@@ -326,10 +322,7 @@ sub Render {
     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], $rotmat[1], $rotmat[2], $rotmat[3],
-                    $rotmat[4], $rotmat[5], $rotmat[6], $rotmat[7],
-                    $rotmat[8], $rotmat[9], $rotmat[10], $rotmat[11],
-                    $rotmat[12], $rotmat[13], $rotmat[14], $rotmat[15]);
+    glMultMatrixd_p(@rotmat[0..15]);
     glTranslatef(map -$_, @{ $self->mesh_center });
 
     $self->draw_mesh;

From 63ba894260fa8282d5b0ba3e8a4e5f8b8977e76f Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Mon, 1 Jul 2013 12:23:44 +0200
Subject: [PATCH 15/16] Add some comments to OpenGL code

---
 lib/Slic3r/GUI/PreviewCanvas.pm | 45 ++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/lib/Slic3r/GUI/PreviewCanvas.pm b/lib/Slic3r/GUI/PreviewCanvas.pm
index 121a5b3f74..c5c82e943a 100644
--- a/lib/Slic3r/GUI/PreviewCanvas.pm
+++ b/lib/Slic3r/GUI/PreviewCanvas.pm
@@ -14,7 +14,9 @@ use Wx::GLCanvas qw(:all);
 __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);
@@ -71,6 +73,7 @@ sub new {
     return $self;
 }
 
+# Given an axis and angle, compute quaternion.
 sub axis_to_quat {
     my ($ax, $phi) = @_;
     
@@ -81,13 +84,16 @@ sub axis_to_quat {
     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) {
+    if ($d < $r * 0.70710678118654752440) {     # Inside sphere
         return sqrt($r * $r - $d * $d);
-    } else {
+    } else {                                    # On hyperbola
         my $t = $r / 1.41421356237309504880;
         return $t * $t / $d;
     }
@@ -101,20 +107,34 @@ sub cross {
             @$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, $r) = @_;
-
+    my ($p1x, $p1y, $p2x, $p2y) = @_;
+    
     if ($p1x == $p2x && $p1y == $p2y) {
-      return (0.0, 0.0, 0.0, 1.0);
+        # zero rotation
+        return (0.0, 0.0, 0.0, 1.0);
     }
-
-    my @p1 = ($p1x, $p1y, project_to_sphere($r, $p1x, $p1y));
-    my @p2 = ($p2x, $p2y, project_to_sphere($r, $p2x, $p2y));
+    
+    # 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 * $r);
-
+    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);
@@ -122,6 +142,7 @@ sub trackball {
     return axis_to_quat(\@a, $phi);
 }
 
+# Build a rotation matrix, given a quaternion rotation.
 sub quat_to_rotmatrix {
     my ($q) = @_;
   
@@ -172,7 +193,7 @@ sub handle_rotation {
                         1 - $orig->y / ($size->height / 2),       #/
                         $new->x / ($size->width / 2) - 1,
                         1 - $new->y / ($size->height / 2),        #/
-                        0.8);
+                        );
         $self->quat(mulquats($self->quat, \@quat));
         $self->initpos($new);
         $self->Refresh;

From 71057b54a95f99ccceb8c5044b8b37f990a1a5fd Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 3 Jul 2013 10:51:44 +0200
Subject: [PATCH 16/16] Allow negative values in validation...

---
 lib/Slic3r/Config.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 0ef9b7803a..a6f86e16fb 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -1357,8 +1357,8 @@ sub validate {
         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+)$/)
+                    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') {