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

3DScene plain shader moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-05-23 09:57:44 +02:00
parent 37ab7594fc
commit b4beb7aae9
10 changed files with 289 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lib/Slic3r/GUI/3DScene.pm
View file

@ -36,7 +36,6 @@ use Slic3r::Geometry qw(PI);
#==============================================================================================================================
__PACKAGE__->mk_accessors( qw(_quat init
enable_moving
use_plain_shader
on_viewport_changed
on_hover
on_select
@ -191,9 +190,7 @@ sub new {
# $self->_zoom(1);
# $self->_legend_enabled(0);
# $self->_warning_enabled(0);
#==============================================================================================================================
$self->use_plain_shader(0);
#==============================================================================================================================
# $self->use_plain_shader(0);
# $self->_apply_zoom_to_volumes_filter(0);
#==============================================================================================================================
$self->_mouse_dragging(0);
@ -1382,28 +1379,30 @@ sub InitGL {
glEnable(GL_COLOR_MATERIAL);
glEnable(GL_MULTISAMPLE) if ($self->{can_multisample});
if ($self->UseVBOs) {
my $shader = new Slic3r::GUI::_3DScene::GLShader;
#===================================================================================================================================
if (! $shader->load_from_file("gouraud.fs", "gouraud.vs")) {
Slic3r::GUI::_3DScene::init($self, $self->UseVBOs);
# if ($self->UseVBOs) {
# my $shader = new Slic3r::GUI::_3DScene::GLShader;
## if (! $shader->load($self->_fragment_shader_Phong, $self->_vertex_shader_Phong)) {
# print "Compilaton of path shader failed: \n" . $shader->last_error . "\n";
# $shader = undef;
# } else {
# $self->{plain_shader} = $shader;
# }
# }
#===================================================================================================================================
print "Compilaton of path shader failed: \n" . $shader->last_error . "\n";
$shader = undef;
} else {
$self->{plain_shader} = $shader;
}
}
}
sub DestroyGL {
my $self = shift;
if ($self->GetContext) {
$self->SetCurrent($self->GetContext);
if ($self->{plain_shader}) {
$self->{plain_shader}->release;
delete $self->{plain_shader};
}
#===================================================================================================================================
# if ($self->{plain_shader}) {
# $self->{plain_shader}->release;
# delete $self->{plain_shader};
# }
#===================================================================================================================================
if ($self->{layer_height_edit_shader}) {
$self->{layer_height_edit_shader}->release;
delete $self->{layer_height_edit_shader};
@ -1608,7 +1607,10 @@ sub Render {
glEnable(GL_LIGHTING);
# draw objects
if (! $self->use_plain_shader) {
#===================================================================================================================================
if (!Slic3r::GUI::_3DScene::is_shader_enabled($self)) {
# if (! $self->use_plain_shader) {
#===================================================================================================================================
#==============================================================================================================================
Slic3r::GUI::_3DScene::render_volumes($self, 0);
# $self->draw_volumes;
@ -1624,9 +1626,15 @@ sub Render {
# do not cull backfaces to show broken geometry, if any
glDisable(GL_CULL_FACE);
}
$self->{plain_shader}->enable if $self->{plain_shader};
#==============================================================================================================================
Slic3r::GUI::_3DScene::start_using_shader($self);
# $self->{plain_shader}->enable if $self->{plain_shader};
#==============================================================================================================================
$self->volumes->render_VBOs;
$self->{plain_shader}->disable;
#==============================================================================================================================
Slic3r::GUI::_3DScene::stop_using_shader($self);
# $self->{plain_shader}->disable;
#==============================================================================================================================
#==============================================================================================================================
glEnable(GL_CULL_FACE) if (Slic3r::GUI::_3DScene::is_picking_enabled($self));
# glEnable(GL_CULL_FACE) if ($self->enable_picking);

5
lib/Slic3r/GUI/Plater.pm
View file

@ -122,7 +122,10 @@ sub new {
$self->{canvas3D}->set_on_remove_object(sub { $self->remove() });
$self->{canvas3D}->set_on_instances_moved($on_instances_moved);
$self->{canvas3D}->set_on_enable_action_buttons($enable_action_buttons);
$self->{canvas3D}->use_plain_shader(1);
#===================================================================================================================================
Slic3r::GUI::_3DScene::enable_shader($self->{canvas3D}, 1);
# $self->{canvas3D}->use_plain_shader(1);
#===================================================================================================================================
$self->{canvas3D}->set_on_wipe_tower_moved(sub {
my ($new_pos_3f) = @_;
my $cfg = Slic3r::Config->new;

5
lib/Slic3r/GUI/Plater/3DPreview.pm
View file

@ -24,7 +24,10 @@ sub new {
# init GUI elements
my $canvas = Slic3r::GUI::3DScene->new($self);
$canvas->use_plain_shader(1);
#===================================================================================================================================
Slic3r::GUI::_3DScene::enable_shader($canvas, 1);
# $canvas->use_plain_shader(1);
#===================================================================================================================================
$self->canvas($canvas);
my $slider_low = Wx::Slider->new(
$self, -1,