SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Бычков Андрей
2021-05-31 12:47:46 +03:00
parent 5eaa20202b
commit a9f7408e71
44 changed files with 86 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
qglview.h
View File

@@ -33,17 +33,7 @@
class QGLView: public OpenGLWindow
{
friend class MouseController;
friend class GLRendererBase;
friend class TextureManager;
friend class ObjectBase;
friend class Scene;
friend class RendererBase;
friend class Renderer;
friend class RendererMaterial;
friend class RendererService;
friend class RendererSelection;
friend class TonemappingProc;
Q_OBJECT
Q_PROPERTY (QColor backColor READ backColor WRITE setBackColor)
Q_PROPERTY (float lineWidth READ lineWidth WRITE setLineWidth)
@@ -115,8 +105,8 @@ public:
QColor backColor() const {return backColor_;}
float lineWidth() const {return lineWidth_;}
float FOV() const {return camera()->fov_;}
float depthStart() const {return camera()->depth_start;}
float FOV() const {return camera()->FOV();}
float depthStart() const {return camera()->depthStart();}
float currentFPS() const {return fps_;}
float gamma() const {return renderer_.gamma_;}
bool autoExposure() const {return renderer_.tone_proc.enabled;}
@@ -186,6 +176,7 @@ public:
QImage materialThumbnail(Material * m) {return renderer_.materialThumbnail(m);}
void setCurrentAction(RendererService::HandleAction ha) {renderer_.rend_service.setCurrentAction(ha);}
void setContextActions(QList<QAction*> al) {context_menu.clear(); context_menu.addActions(al);}
void popupMenu(const QPoint &pos, QAction *at = nullptr) {context_menu.popup(pos, at);}
GLfloat aspect, iaspect;
Renderer renderer_;
@@ -241,8 +232,8 @@ private slots:
public slots:
void setBackColor(const QColor & arg) {backColor_ = arg;}
void setLineWidth(const float & arg) {lineWidth_ = arg;}
void setFOV(const float & arg) {camera()->fov_ = arg;}
void setDepthStart(const float & arg) {camera()->depth_start = arg;}
void setFOV(const float & arg) {camera()->setFOV(arg);}
void setDepthStart(const float & arg) {camera()->setDepthStart(arg);}
void setGamma(const float & arg) {renderer_.gamma_ = arg;}
void setAutoExposure(bool arg) {renderer_.tone_proc.enabled = arg;}
void setAmbientColor(const QColor & arg) {ambientColor_ = arg;}
@@ -287,7 +278,6 @@ signals:
void materialsChanged();
void materialThumbnailCreated(Material*);
void doubleClick();
};
#endif // QGLVIEW_H