mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
e9d57c932a
18 changed files with 230 additions and 58 deletions
|
@ -1589,6 +1589,9 @@ struct Plater::priv
|
|||
Sidebar *sidebar;
|
||||
Bed3D bed;
|
||||
Camera camera;
|
||||
#if ENABLE_ENVIRONMENT_MAP
|
||||
GLTexture environment_texture;
|
||||
#endif // ENABLE_ENVIRONMENT_MAP
|
||||
Mouse3DController mouse3d_controller;
|
||||
View3D* view3D;
|
||||
GLToolbar view_toolbar;
|
||||
|
@ -2101,7 +2104,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
|
|||
});
|
||||
wxGetApp().other_instance_message_handler()->init(this->q);
|
||||
|
||||
|
||||
// collapse sidebar according to saved value
|
||||
bool is_collapsed = wxGetApp().app_config->get("collapsed_sidebar") == "1";
|
||||
sidebar->collapse(is_collapsed);
|
||||
|
@ -5570,6 +5572,19 @@ Camera& Plater::get_camera()
|
|||
return p->camera;
|
||||
}
|
||||
|
||||
#if ENABLE_ENVIRONMENT_MAP
|
||||
void Plater::init_environment_texture()
|
||||
{
|
||||
if (p->environment_texture.get_id() == 0)
|
||||
p->environment_texture.load_from_file(resources_dir() + "/icons/Pmetal_001.png", false, GLTexture::SingleThreaded, false);
|
||||
}
|
||||
|
||||
unsigned int Plater::get_environment_texture_id() const
|
||||
{
|
||||
return p->environment_texture.get_id();
|
||||
}
|
||||
#endif // ENABLE_ENVIRONMENT_MAP
|
||||
|
||||
const Bed3D& Plater::get_bed() const
|
||||
{
|
||||
return p->bed;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue