3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Serialized camera type and fixed Mac build

Browse source
This commit is contained in:
Enrico Turri 2019-06-20 10:02:52 +02:00
parent 6af69667a3
commit b7f67369c9
5 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/slic3r/GUI/Camera.cpp
View file

@ -2,9 +2,8 @@
#include "Camera.hpp"
#include "3DScene.hpp"
#if ENABLE_CAMERA_STATISTICS
#include "GUI_App.hpp"
#endif // ENABLE_CAMERA_STATISTICS
#include "AppConfig.hpp"
#include <GL/glew.h>
@ -44,23 +43,44 @@ std::string Camera::get_type_as_string() const
{
switch (m_type)
{
default:
case Unknown:
return "unknown";
case Perspective:
return "perspective";
default:
case Ortho:
return "orthographic";
};
}
void Camera::set_type(EType type)
{
if (m_type != type)
{
m_type = type;
wxGetApp().app_config->set("camera_type", std::to_string(m_type));
wxGetApp().app_config->save();
}
}
void Camera::set_type(const std::string& type)
{
if (!type.empty() && (type != "1"))
{
unsigned char type_id = atoi(type.c_str());
if (((unsigned char)Ortho < type_id) && (type_id < (unsigned char)Num_types))
set_type((Camera::EType)type_id);
}
}
void Camera::select_next_type()
{
unsigned char next = (unsigned char)m_type + 1;
if (next == (unsigned char)Num_types)
next = 1;
m_type = (EType)next;
set_type((EType)next);
}
void Camera::set_target(const Vec3d& target)