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

Fixed wrong layer height texture updates when using multiple objects

Browse Source
This commit is contained in:
Enrico Turri 2018-05-23 12:49:56 +02:00
parent c5c90620ca
commit 91b9b8aebf
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,7 @@ sub _variable_layer_thickness_action {
my ($self, $mouse_event, $do_modification) = @_;
# A volume is selected. Test, whether hovering over a layer thickness bar.
return if $self->{layer_height_edit_last_object_id} == -1;
if (defined($mouse_event)) {
my ($bar_left, $bar_top, $bar_right, $bar_bottom) = $self->_variable_layer_thickness_bar_rect_screen;
$self->{layer_height_edit_last_z} = unscale($self->{print}->get_object($self->{layer_height_edit_last_object_id})->size->z)
@ -374,8 +375,19 @@ sub _variable_layer_thickness_action {
$self->{layer_height_edit_strength},
$self->{layer_height_edit_band_width},
$self->{layer_height_edit_last_action});
$self->volumes->[$self->{layer_height_edit_last_object_id}]->generate_layer_height_texture(
# searches the id of the first volume of the selected object
my $volume_idx = 0;
for my $i (0..$self->{layer_height_edit_last_object_id} - 1) {
my $obj = $self->{print}->get_object($i);
for my $j (0..$obj->region_volumes_count - 1) {
$volume_idx += scalar @{$obj->get_region_volumes($j)};
}
}
$self->volumes->[$volume_idx]->generate_layer_height_texture(
$self->{print}->get_object($self->{layer_height_edit_last_object_id}), 1);
$self->Refresh;
# Automatic action on mouse down with the same coordinate.
$self->{layer_height_edit_timer}->Start(100, wxTIMER_CONTINUOUS);
@ -1623,6 +1635,11 @@ sub draw_active_object_annotations {
$self->{layer_height_edit_shader}->set_uniform('z_cursor', $z_max * $z_cursor_relative);
$self->{layer_height_edit_shader}->set_uniform('z_cursor_band_width', $self->{layer_height_edit_band_width});
glBindTexture(GL_TEXTURE_2D, $self->{layer_preview_z_texture_id});
#=============================================================================================================================================
print "texture id: ";
print $self->{layer_preview_z_texture_id};
print "\n";
#=============================================================================================================================================
glTexImage2D_c(GL_TEXTURE_2D, 0, GL_RGBA8, $volume->layer_height_texture_width, $volume->layer_height_texture_height,
0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
glTexImage2D_c(GL_TEXTURE_2D, 1, GL_RGBA8, $volume->layer_height_texture_width / 2, $volume->layer_height_texture_height / 2,

3
xs/xsp/Print.xsp
View File

@ -52,6 +52,9 @@ _constant()
int region_count()
%code%{ RETVAL = THIS->print()->regions.size(); %};
int region_volumes_count()
%code%{ RETVAL = THIS->region_volumes.size(); %};
Ref<Print> print();
Ref<ModelObject> model_object();
Ref<StaticPrintConfig> config()