Removed references to Haze from Stage.

libraries/model/src/model/Stage.cpp

@@ -256,10 +256,3 @@ void SunSkyStage::setSkybox(const SkyboxPointer& skybox) {
     _skybox = skybox;
     invalidate();
 }
-
-void SunSkyStage::setHazeMode(uint32_t hazeMode) {
-    if (hazeMode < COMPONENT_MODE_ITEM_COUNT) {
-        _hazeMode = hazeMode;
-        invalidate();
-    }
-}

libraries/model/src/model/Stage.h

@@ -15,7 +15,6 @@
 
 #include "Light.h"
 #include "Skybox.h"
-#include "Haze.h"
 
 namespace model {
 
@@ -175,65 +174,8 @@ public:
     void setSkybox(const SkyboxPointer& skybox);
     const SkyboxPointer& getSkybox() const { valid(); return _skybox; }
 
-    // Haze
-    enum HazeMode {
-        HAZE_OFF,
-        HAZE_ON,
-
-        NUM_HAZE_MODES
-    };
-
-    void setHazeMode(uint32_t mode);
-    uint32_t getHazeMode() const { return _hazeMode; }
-
-    void setHazeRange(float hazeRange) { _hazeRange = hazeRange; }
-    float getHazeRange() const { return _hazeRange; }
-    void setHazeColor(const xColor hazeColor) { _hazeColor = hazeColor; }
-    xColor getHazeColor() { return _hazeColor; }
-    void setHazeGlareColor(const xColor hazeGlareColor) { _hazeGlareColor = hazeGlareColor; }
-    xColor getHazeGlareColor() const { return _hazeGlareColor; }
-    void setHazeEnableGlare(bool hazeEnableGlare) { _hazeEnableGlare = hazeEnableGlare; }
-    bool getHazeEnableGlare() const { return _hazeEnableGlare; }
-    void setHazeGlareAngle(float hazeGlareAngle) { _hazeGlareAngle = hazeGlareAngle; }
-    float getHazeGlareAngle() const { return _hazeGlareAngle; }
-
-    void setHazeAltitudeEffect(bool hazeAltitudeEffect) { _hazeAltitudeEffect = hazeAltitudeEffect; }
-    bool getHazeAltitudeEffect() const { return _hazeAltitudeEffect; }
-    void setHazeCeiling(float hazeCeiling) { _hazeCeiling = hazeCeiling; }
-    float getHazeCeiling() const { return _hazeCeiling; }
-    void setHazeBaseRef(float hazeBaseRef) { _hazeBaseRef = hazeBaseRef; }
-    float getHazeBaseRef() const { return _hazeBaseRef; }
-
-    void setHazeBackgroundBlend(float hazeBackgroundBlend) { _hazeBackgroundBlend = hazeBackgroundBlend; }
-    float getHazeBackgroundBlend() const { return _hazeBackgroundBlend; }
-
-    void setHazeAttenuateKeyLight(bool hazeAttenuateKeyLight) { _hazeAttenuateKeyLight = hazeAttenuateKeyLight; }
-    bool getHazeAttenuateKeyLight() const { return _hazeAttenuateKeyLight; }
-    void setHazeKeyLightRange(float hazeKeyLightRange) { _hazeKeyLightRange = hazeKeyLightRange; }
-    float getHazeKeyLightRange() const { return _hazeKeyLightRange; }
-    void setHazeKeyLightAltitude(float hazeKeyLightAltitude) { _hazeKeyLightAltitude = hazeKeyLightAltitude; }
-    float getHazeKeyLightAltitude() const { return _hazeKeyLightAltitude; }
-
 protected:
     BackgroundMode _backgroundMode = SKY_DEFAULT;
-    
-    uint8_t _hazeMode = (uint8_t)HAZE_OFF;
-    
-    float _hazeRange{ model::initialHazeRange_m };
-    xColor _hazeColor{ model::initialHazeColorXcolor };
-    xColor _hazeGlareColor{ model::initialHazeGlareColorXcolor };
-    bool _hazeEnableGlare{ false };
-    float _hazeGlareAngle{ model::initialGlareAngle_degs };
-
-    bool _hazeAltitudeEffect{ false };
-    float _hazeCeiling{ model::initialHazeBaseReference_m + model::initialHazeHeight_m };
-    float _hazeBaseRef;
-
-    float _hazeBackgroundBlend{ model::initialHazeBackgroundBlend };
-
-    bool _hazeAttenuateKeyLight{ false };
-    float _hazeKeyLightRange{ model::initialHazeKeyLightRange_m };
-    float _hazeKeyLightAltitude{ model::initialHazeKeyLightAltitude_m };
 
     LightPointer _sunLight;
     mutable SkyboxPointer _skybox;

libraries/script-engine/src/SceneScriptingInterface.cpp

@@ -129,101 +129,6 @@ QString SceneScripting::Stage::getBackgroundMode() const {
     };
 }
 
-void SceneScripting::Stage::setHazeMode(const QString& mode) {
-    if (mode == QString("haze off")) {
-        _skyStage->setHazeMode(model::SunSkyStage::HAZE_OFF);
-    } else if (mode == QString("haze on")) {
-        _skyStage->setHazeMode(model::SunSkyStage::HAZE_ON);
-    }
-}
-
-QString SceneScripting::Stage::getHazeMode() const {
-    switch (_skyStage->getHazeMode()) {
-    case model::SunSkyStage::HAZE_OFF:
-        return QString("haze off");
-    case model::SunSkyStage::HAZE_ON:
-        return QString("haze on");
-    default:
-        return QString("inherit");
-    };
-}
-
-void SceneScripting::Stage::setHazeRange(const float hazeRange) {
-     _skyStage->setHazeRange(hazeRange);
-}
-float SceneScripting::Stage::getHazeRange() const {
-    return _skyStage->getHazeRange();
-}
-void SceneScripting::Stage::setHazeColor(const xColor hazeColor) {
-    _skyStage->setHazeColor(hazeColor);
-}
-xColor SceneScripting::Stage::getHazeColor() const {
-    return _skyStage->getHazeColor();
-}
-void SceneScripting::Stage::setHazeGlareColor(const xColor hazeGlareColor) {
-    _skyStage->setHazeGlareColor(hazeGlareColor);
-}
-xColor SceneScripting::Stage::getHazeGlareColor() const {
-    return _skyStage->getHazeGlareColor();
-}
-void SceneScripting::Stage::setHazeEnableGlare(const bool hazeEnableGlare) {
-    _skyStage->setHazeEnableGlare(hazeEnableGlare);
-}
-bool SceneScripting::Stage::getHazeEnableGlare() const {
-    return _skyStage->getHazeEnableGlare();
-}
-void SceneScripting::Stage::setHazeGlareAngle(const float hazeGlareAngle) {
-    _skyStage->setHazeGlareAngle(hazeGlareAngle);
-}
-float SceneScripting::Stage::getHazeGlareAngle() const {
-    return _skyStage->getHazeGlareAngle();
-}
-
-void SceneScripting::Stage::setHazeAltitudeEffect(const bool hazeAltitudeEffect) {
-    _skyStage->setHazeAltitudeEffect(hazeAltitudeEffect);
-}
-bool SceneScripting::Stage::getHazeAltitudeEffect() const {
-    return _skyStage->getHazeAltitudeEffect();
-}
-void SceneScripting::Stage::setHazeCeiling(const float hazeCeiling) {
-    _skyStage->setHazeCeiling(hazeCeiling);
-}
-float SceneScripting::Stage::getHazeCeiling() const {
-    return _skyStage->getHazeCeiling();
-}
-void SceneScripting::Stage::setHazeBaseRef(const float hazeBaseRef) {
-    _skyStage->setHazeBaseRef(hazeBaseRef);
-}
-float SceneScripting::Stage::getHazeBaseRef() const {
-    return _skyStage->getHazeBaseRef();
-}
-
-void SceneScripting::Stage::setHazeBackgroundBlend(const float hazeBackgroundBlend) {
-    _skyStage->setHazeBackgroundBlend(hazeBackgroundBlend);
-}
-float SceneScripting::Stage::getHazeBackgroundBlend() const {
-    return _skyStage->getHazeBackgroundBlend();
-}
-
-void SceneScripting::Stage::setHazeAttenuateKeyLight(const bool hazeAttenuateKeyLight) {
-    _skyStage->setHazeAttenuateKeyLight(hazeAttenuateKeyLight);
-}
-bool SceneScripting::Stage::getHazeAttenuateKeyLight() const {
-    return _skyStage->getHazeAttenuateKeyLight();
-}
-void SceneScripting::Stage::setHazeKeyLightRange(const float hazeKeyLightRange) {
-    _skyStage->setHazeKeyLightRange(hazeKeyLightRange);
-}
-float SceneScripting::Stage::getHazeKeyLightRange() const {
-    return _skyStage->getHazeKeyLightRange();
-}
-void SceneScripting::Stage::setHazeKeyLightAltitude(const float hazeKeyLightAltitude) {
-    _skyStage->setHazeKeyLightAltitude(hazeKeyLightAltitude);
-}
-float SceneScripting::Stage::getHazeKeyLightAltitude() const {
-    return _skyStage->getHazeKeyLightAltitude();
-}
-
 SceneScriptingInterface::SceneScriptingInterface() : _stage{ new SceneScripting::Stage{ _skyStage } } {
     // Let's make sure the sunSkyStage is using a proceduralSkybox
     _skyStage->setSkybox(model::SkyboxPointer(new ProceduralSkybox()));

libraries/script-engine/src/SceneScriptingInterface.h

@@ -121,58 +121,6 @@ namespace SceneScripting {
         void setBackgroundMode(const QString& mode);
         QString getBackgroundMode() const;
 
-        Q_PROPERTY(QString hazeMode READ getHazeMode WRITE setHazeMode)
-        void setHazeMode(const QString& mode);
-        QString getHazeMode() const;
-
-        Q_PROPERTY(float hazeRange READ getHazeRange WRITE setHazeRange)
-        void setHazeRange(float value);
-        float getHazeRange() const;
-
-        Q_PROPERTY(xColor hazeColor READ getHazeColor WRITE setHazeColor)
-        void setHazeColor(xColor value);
-        xColor getHazeColor() const;
-
-        Q_PROPERTY(xColor hazeGlareColor READ getHazeGlareColor WRITE setHazeGlareColor)
-        void setHazeGlareColor(xColor value);
-        xColor getHazeGlareColor() const;
-
-        Q_PROPERTY(bool hazeEnableGlare READ getHazeEnableGlare WRITE setHazeEnableGlare)
-        void setHazeEnableGlare(bool value);
-        bool getHazeEnableGlare() const;
-
-        Q_PROPERTY(float hazeGlareAngle READ getHazeGlareAngle WRITE setHazeGlareAngle)
-        void setHazeGlareAngle(float value);
-        float getHazeGlareAngle() const;
-
-        Q_PROPERTY(bool hazeAltitudeEffect READ getHazeAltitudeEffect WRITE setHazeAltitudeEffect)
-        void setHazeAltitudeEffect(bool value);
-        bool getHazeAltitudeEffect() const;
-
-        Q_PROPERTY(float hazeCeiling READ getHazeCeiling WRITE setHazeCeiling)
-        void setHazeCeiling(float value);
-        float getHazeCeiling() const;
-
-        Q_PROPERTY(float hazeBaseRef READ getHazeBaseRef WRITE setHazeBaseRef)
-        void setHazeBaseRef(float value);
-        float getHazeBaseRef() const;
-
-        Q_PROPERTY(float hazeBackgroundBlend READ getHazeBackgroundBlend WRITE setHazeBackgroundBlend)
-        void setHazeBackgroundBlend(float value);
-        float getHazeBackgroundBlend() const;
-
-        Q_PROPERTY(bool hazeAttenuateKeyLight READ getHazeAttenuateKeyLight WRITE setHazeAttenuateKeyLight)
-        void setHazeAttenuateKeyLight(bool value);
-        bool getHazeAttenuateKeyLight() const;
-
-        Q_PROPERTY(float hazeKeyLightRange READ getHazeKeyLightRange WRITE setHazeKeyLightRange)
-        void setHazeKeyLightRange(float value);
-        float getHazeKeyLightRange() const;
-
-        Q_PROPERTY(float hazeKeyLightAltitude READ getHazeKeyLightAltitude WRITE setHazeKeyLightAltitude)
-        void setHazeKeyLightAltitude(float value);
-        float getHazeKeyLightAltitude() const;
-
     protected:
         model::SunSkyStagePointer _skyStage;
         LocationPointer _location;