3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-03 03:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Keep objects vertical in 3D preview

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-08-25 02:07:51 +02:00
parent ed0344e861
commit 6f1fd51c2e
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,15 +13,19 @@ use Wx::GLCanvas qw(:all);
__PACKAGE__->mk_accessors( qw(quat dirty init mview_init __PACKAGE__->mk_accessors( qw(quat dirty init mview_init
mesh_center mesh_size mesh_center mesh_size
verts norms initpos) ); verts norms initpos
sphi stheta) );
use constant TRACKBALLSIZE => 0.8; use constant TRACKBALLSIZE => 0.8;
use constant TURNTABLE_MODE => 1;
sub new { sub new {
my ($class, $parent, $mesh) = @_; my ($class, $parent, $mesh) = @_;
my $self = $class->SUPER::new($parent); my $self = $class->SUPER::new($parent);
$self->quat((0, 0, 0, 1)); $self->quat((0, 0, 0, 1));
$self->sphi(45);
$self->stheta(-45);
# prepare mesh # prepare mesh
{ {
@ -189,12 +193,17 @@ sub handle_rotation {
my $orig = $self->initpos; my $orig = $self->initpos;
my $new = $e->GetPosition(); my $new = $e->GetPosition();
my $size = $self->GetClientSize(); my $size = $self->GetClientSize();
my @quat = trackball($orig->x / ($size->width / 2) - 1, if (TURNTABLE_MODE) {
1 - $orig->y / ($size->height / 2), #/ $self->sphi($self->sphi + ($new->x - $orig->x)*TRACKBALLSIZE);
$new->x / ($size->width / 2) - 1, $self->stheta($self->stheta + ($new->y - $orig->y)*TRACKBALLSIZE); #-
1 - $new->y / ($size->height / 2), #/ } else {
); my @quat = trackball($orig->x / ($size->width / 2) - 1,
$self->quat(mulquats($self->quat, \@quat)); 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->initpos($new);
$self->Refresh; $self->Refresh;
} }
@ -344,6 +353,8 @@ sub Render {
glTranslatef(0, 0, -max(@$mesh_size[0..1])); glTranslatef(0, 0, -max(@$mesh_size[0..1]));
my @rotmat = quat_to_rotmatrix($self->quat); my @rotmat = quat_to_rotmatrix($self->quat);
glMultMatrixd_p(@rotmat[0..15]); glMultMatrixd_p(@rotmat[0..15]);
glRotatef($self->stheta, 1, 0, 0);
glRotatef($self->sphi, 0, 0, 1);
glTranslatef(map -$_, @{ $self->mesh_center }); glTranslatef(map -$_, @{ $self->mesh_center });
$self->draw_mesh; $self->draw_mesh;