git-svn-id: svn://db.shs.com.ru/libs@678 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2019-12-11 20:44:13 +00:00
parent 11853c0fed
commit c0c7b58892
6 changed files with 61 additions and 136 deletions

View File

@@ -55,9 +55,7 @@ class QGLView: public OpenGLWindow
Q_PROPERTY (QColor fogColor READ fogColor WRITE setFogColor)
Q_PROPERTY (bool fogEnabled READ isFogEnabled WRITE setFogEnabled)
Q_PROPERTY (float fogDensity READ fogDensity WRITE setFogDensity)
Q_PROPERTY (float fogDecayConst READ fogDecayConst WRITE setFogDecayConst)
Q_PROPERTY (float fogDecayLinear READ fogDecayLinear WRITE setFogDecayLinear)
Q_PROPERTY (float fogDecayQuadratic READ fogDecayQuadratic WRITE setFogDecayQuadratic)
Q_PROPERTY (float fogDecay READ fogDecay WRITE setFogDecay)
Q_PROPERTY (int renderMode READ renderMode WRITE setRenderMode)
Q_PROPERTY (bool grabMouse READ isGrabMouseEnabled WRITE setGrabMouseEnabled)
Q_PROPERTY (bool mouseRotate READ isMouseRotateEnabled WRITE setMouseRotateEnabled)
@@ -120,9 +118,7 @@ public:
QColor ambientColor() const {return ambientColor_;}
QColor fogColor() const {return fogColor_;}
float fogDensity() const {return fogDensity_;}
float fogDecayConst() const {return fogDecay_0;}
float fogDecayLinear() const {return fogDecay_1;}
float fogDecayQuadratic() const {return fogDecay_2;}
float fogDecay() const {return fogDecay_;}
bool isFogEnabled() const {return fogEnabled_;}
bool isLightEnabled() const {return lightEnabled_;}
bool isGrabMouseEnabled() const {return mouse.isGrabMouseEnabled();}
@@ -224,7 +220,7 @@ private:
QHash<int, QVariant> features_;
QSize prev_size;
float lineWidth_;
float fogDensity_, fps_, fps_tm, fogDecay_0, fogDecay_1, fogDecay_2;
float fps_, fps_tm, fogDensity_, fogDecay_;
float hoverHaloFill_, selectionHaloFill_, m_motionBlurFactor;
int timer, fps_cnt, sh_id_loc, deleting_;
bool is_first_draw, is_init, fogEnabled_, lightEnabled_;
@@ -244,9 +240,7 @@ public slots:
void setAmbientColor(const QColor & arg) {ambientColor_ = arg;}
void setFogColor(const QColor & arg) {fogColor_ = arg;}
void setFogDensity(const float & arg) {fogDensity_ = arg;}
void setFogDecayConst(const float & arg) {fogDecay_0 = arg;}
void setFogDecayLinear(const float & arg) {fogDecay_1 = arg;}
void setFogDecayQuadratic(const float & arg) {fogDecay_2 = arg;}
void setFogDecay(const float & arg) {fogDecay_ = arg;}
void setFogEnabled(const bool & arg) {fogEnabled_ = arg;}
void setLightEnabled(const bool & arg) {lightEnabled_ = arg;}
void setGrabMouseEnabled(const bool & arg) {mouse.setGrabMouseEnabled(arg);}