GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 18:46:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preserve transparency when modifier volumes are selected

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-12-18 12:09:01 +01:00
parent accd174566
commit 54f782c121
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,8 @@ __PACKAGE__->mk_accessors( qw(_quat _dirty init
use constant TRACKBALLSIZE => 0.8; use constant TRACKBALLSIZE => 0.8;
use constant TURNTABLE_MODE => 1; use constant TURNTABLE_MODE => 1;
use constant GROUND_Z => -0.02; use constant GROUND_Z => -0.02;
use constant DEFAULT_COLOR => [1,1,0]; use constant SELECTED_COLOR => [0,1,0];
use constant SELECTED_COLOR => [0,1,0,1]; use constant HOVER_COLOR => [0.4,0.9,0];
use constant HOVER_COLOR => [0.4,0.9,0,1];
use constant PI => 3.1415927; use constant PI => 3.1415927;
# Constant to determine if Vertex Buffer objects are used to draw # Constant to determine if Vertex Buffer objects are used to draw
@ -1030,9 +1029,9 @@ sub draw_volumes {
my $b = ($volume_idx & 0x00FF0000) >> 16; my $b = ($volume_idx & 0x00FF0000) >> 16;
glColor4f($r/255.0, $g/255.0, $b/255.0, 1); glColor4f($r/255.0, $g/255.0, $b/255.0, 1);
} elsif ($volume->selected) { } elsif ($volume->selected) {
glColor4f(@{ &SELECTED_COLOR }); glColor4f(@{ &SELECTED_COLOR }, $volume->color->[3]);
} elsif ($volume->hover) { } elsif ($volume->hover) {
glColor4f(@{ &HOVER_COLOR }); glColor4f(@{ &HOVER_COLOR }, $volume->color->[3]);
} else { } else {
glColor4f(@{ $volume->color }); glColor4f(@{ $volume->color });
} }