Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 05:12:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed "..Is.." from various methods.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-02 12:42:46 -07:00
parent 93bc3bec52
commit 29d5e772d4
8 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
View file

@ -338,7 +338,7 @@ void ZoneEntityRenderer::updateHazeFromEntity(const TypedEntityPointer& entity)
const auto& haze = editHaze();
haze->setIsHazeActive(entity->getHazeMode() == HAZE_MODE_ENABLED);
haze->setHazeActive(entity->getHazeMode() == HAZE_MODE_ENABLED);
haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(entity->getHazeRange()));
xColor hazeBlendInColor = entity->getHazeBlendInColor();

8
libraries/model/src/model/Haze.cpp
View file

@ -78,7 +78,7 @@ void Haze::setDirectionalLightColor(const glm::vec3 hazeDirectionalLightColor) {
_parametersBuffer.edit<Parameters>().directionalLightColor.b = hazeDirectionalLightColor.b;
}
}
void Haze::setIsHazeActive(const bool isHazeActive) {
void Haze::setHazeActive(const bool isHazeActive) {
auto& params = _parametersBuffer.get<Parameters>();
if (((params.hazeMode & HAZE_MODE_IS_ACTIVE) == HAZE_MODE_IS_ACTIVE )&& !isHazeActive) {
@ -89,7 +89,7 @@ void Haze::setIsHazeActive(const bool isHazeActive) {
}
}
void Haze::setIsAltitudeBased(const bool isAltitudeBased) {
void Haze::setAltitudeBased(const bool isAltitudeBased) {
auto& params = _parametersBuffer.get<Parameters>();
if (((params.hazeMode & HAZE_MODE_IS_ALTITUDE_BASED) == HAZE_MODE_IS_ALTITUDE_BASED )&& !isAltitudeBased) {
@ -100,7 +100,7 @@ void Haze::setIsAltitudeBased(const bool isAltitudeBased) {
}
}
void Haze::setIsDirectionaLightAttenuationActive(const bool isDirectionaLightAttenuationActive) {
void Haze::setDirectionaLightAttenuationActive(const bool isDirectionaLightAttenuationActive) {
auto& params = _parametersBuffer.get<Parameters>();
if (((params.hazeMode & HAZE_MODE_IS_DIRECTIONAL_LIGHT_ATTENUATED) == HAZE_MODE_IS_DIRECTIONAL_LIGHT_ATTENUATED ) && !isDirectionaLightAttenuationActive) {
@ -111,7 +111,7 @@ void Haze::setIsDirectionaLightAttenuationActive(const bool isDirectionaLightAtt
}
}
void Haze::setIsModulateColorActive(const bool isModulateColorActive) {
void Haze::setModulateColorActive(const bool isModulateColorActive) {
auto& params = _parametersBuffer.get<Parameters>();
if (((params.hazeMode & HAZE_MODE_IS_MODULATE_COLOR) == HAZE_MODE_IS_MODULATE_COLOR ) && !isModulateColorActive) {

8
libraries/model/src/model/Haze.h
View file

@ -70,10 +70,10 @@ namespace model {
void setDirectionalLightColor(const glm::vec3 directionalLightColor);
void setHazeBaseReference(const float hazeBaseReference);
void setIsHazeActive(const bool isHazeActive);
void setIsAltitudeBased(const bool isAltitudeBased);
void setIsDirectionaLightAttenuationActive(const bool isDirectionaLightAttenuationActive);
void setIsModulateColorActive(const bool isModulateColorActive);
void setHazeActive(const bool isHazeActive);
void setAltitudeBased(const bool isAltitudeBased);
void setDirectionaLightAttenuationActive(const bool isDirectionaLightAttenuationActive);
void setModulateColorActive(const bool isModulateColorActive);
void setHazeRangeFactor(const float hazeRange);
void setHazeAltitudeFactor(const float hazeAltitude);

1
libraries/render-utils/src/DeferredLightingEffect.cpp
View file

@ -774,7 +774,6 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) {
if (hazeStage) {
auto haze = std::make_shared<model::Haze>();
haze->setIsHazeActive(false);
_defaultHaze = haze;
_defaultHazeID = hazeStage->addHaze(_defaultHaze);

14
libraries/render-utils/src/DrawHaze.cpp
View file

@ -51,11 +51,11 @@ void HazeConfig::setHazeBaseReference(const float value) {
hazeBaseReference = value;
}
void HazeConfig::setIsHazeActive(const bool active) {
void HazeConfig::setHazeActive(const bool active) {
isHazeActive = active;
}
void HazeConfig::setIsAltitudeBased(const bool active) {
void HazeConfig::setAltitudeBased(const bool active) {
isAltitudeBased = active;
}
@ -63,7 +63,7 @@ void HazeConfig::setIsdirectionalLightAttenuationActive(const bool active) {
isDirectionalLightAttenuationActive = active;
}
void HazeConfig::setIsModulateColorActive(const bool active) {
void HazeConfig::setModulateColorActive(const bool active) {
isModulateColorActive = active;
}
@ -98,10 +98,10 @@ void MakeHaze::configure(const Config& config) {
_haze->setDirectionalLightColor(glm::vec3(config.hazeDirectionalLightColorR, config.hazeDirectionalLightColorG, config.hazeDirectionalLightColorB));
_haze->setHazeBaseReference(config.hazeBaseReference);
_haze->setIsHazeActive(config.isHazeActive);
_haze->setIsAltitudeBased(config.isAltitudeBased);
_haze->setIsDirectionaLightAttenuationActive(config.isDirectionaLightAttenuationActive);
_haze->setIsModulateColorActive(config.isModulateColorActive);
_haze->setHazeActive(config.isHazeActive);
_haze->setAltitudeBased(config.isAltitudeBased);
_haze->setDirectionaLightAttenuationActive(config.isDirectionaLightAttenuationActive);
_haze->setModulateColorActive(config.isModulateColorActive);
_haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(config.hazeRange_m));
_haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(config.hazeAltitude_m));

22
libraries/render-utils/src/DrawHaze.h
View file

@ -39,10 +39,10 @@ class MakeHazeConfig : public render::Job::Config {
Q_PROPERTY(float hazeDirectionalLightColorB MEMBER hazeDirectionalLightColorB WRITE setDirectionalLightColorB NOTIFY dirty);
Q_PROPERTY(float hazeBaseReference MEMBER hazeBaseReference WRITE setHazeBaseReference NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setIsHazeActive NOTIFY dirty);
Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setIsAltitudeBased NOTIFY dirty);
Q_PROPERTY(bool isDirectionaLightAttenuationActive MEMBER isDirectionaLightAttenuationActive WRITE setIsDirectionaLightAttenuationActive NOTIFY dirty);
Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setIsModulateColorActive NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty);
Q_PROPERTY(bool isDirectionaLightAttenuationActive MEMBER isDirectionaLightAttenuationActive WRITE setDirectionaLightAttenuationActive NOTIFY dirty);
Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty);
Q_PROPERTY(float hazeRange_m MEMBER hazeRange_m WRITE setHazeRange_m NOTIFY dirty);
Q_PROPERTY(float hazeAltitude_m MEMBER hazeAltitude_m WRITE setHazeAltitude_m NOTIFY dirty);
@ -89,10 +89,10 @@ public slots:
void setDirectionalLightColorB(const float value) { hazeDirectionalLightColorB = value; emit dirty(); }
void setHazeBaseReference(const float value) { hazeBaseReference = value; ; emit dirty(); }
void setIsHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
void setIsAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
void setIsDirectionaLightAttenuationActive(const bool active) { isDirectionaLightAttenuationActive = active; emit dirty(); }
void setIsModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
void setDirectionaLightAttenuationActive(const bool active) { isDirectionaLightAttenuationActive = active; emit dirty(); }
void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
void setHazeRange_m(const float value) { hazeRange_m = value; emit dirty(); }
void setHazeAltitude_m(const float value) { hazeAltitude_m = value; emit dirty(); }
@ -159,10 +159,10 @@ public:
void setDirectionalLightColorB(const float value);
void setHazeBaseReference(const float value);
void setIsHazeActive(const bool active);
void setIsAltitudeBased(const bool active);
void setHazeActive(const bool active);
void setAltitudeBased(const bool active);
void setIsdirectionalLightAttenuationActive(const bool active);
void setIsModulateColorActive(const bool active);
void setModulateColorActive(const bool active);
void setHazeRange_m(const float value);
void setHazeAltitude_m(const float value);

8
libraries/render-utils/src/HazeStage.cpp
View file

@ -26,10 +26,10 @@ void FetchHazeStage::configure(const Config& config) {
_haze->setDirectionalLightColor(glm::vec3(config.hazeDirectionalLightColorR, config.hazeDirectionalLightColorG, config.hazeDirectionalLightColorB));
_haze->setHazeBaseReference(config.hazeBaseReference);
_haze->setIsHazeActive(config.isHazeActive);
_haze->setIsAltitudeBased(config.isAltitudeBased);
_haze->setIsDirectionaLightAttenuationActive(config.isDirectionaLightAttenuationActive);
_haze->setIsModulateColorActive(config.isModulateColorActive);
_haze->setHazeActive(config.isHazeActive);
_haze->setAltitudeBased(config.isAltitudeBased);
_haze->setDirectionaLightAttenuationActive(config.isDirectionaLightAttenuationActive);
_haze->setModulateColorActive(config.isModulateColorActive);
_haze->setHazeRangeFactor(model::convertHazeRangeToHazeRangeFactor(config.hazeRange_m));
_haze->setHazeAltitudeFactor(model::convertHazeAltitudeToHazeAltitudeFactor(config.hazeAltitude_m));

16
libraries/render-utils/src/HazeStage.h
View file

@ -93,10 +93,10 @@ class FetchHazeConfig : public render::Job::Config {
Q_PROPERTY(float hazeDirectionalLightColorB MEMBER hazeDirectionalLightColorB WRITE setDirectionalLightColorB NOTIFY dirty);
Q_PROPERTY(float hazeBaseReference MEMBER hazeBaseReference WRITE setHazeBaseReference NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setIsHazeActive NOTIFY dirty);
Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setIsAltitudeBased NOTIFY dirty);
Q_PROPERTY(bool isDirectionaLightAttenuationActive MEMBER isDirectionaLightAttenuationActive WRITE setIsDirectionaLightAttenuationActive NOTIFY dirty);
Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setIsModulateColorActive NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
Q_PROPERTY(bool isAltitudeBased MEMBER isAltitudeBased WRITE setAltitudeBased NOTIFY dirty);
Q_PROPERTY(bool isDirectionaLightAttenuationActive MEMBER isDirectionaLightAttenuationActive WRITE setDirectionaLightAttenuationActive NOTIFY dirty);
Q_PROPERTY(bool isModulateColorActive MEMBER isModulateColorActive WRITE setModulateColorActive NOTIFY dirty);
Q_PROPERTY(float hazeRange_m MEMBER hazeRange_m WRITE setHazeRange_m NOTIFY dirty);
Q_PROPERTY(float hazeAltitude_m MEMBER hazeAltitude_m WRITE setHazeAltitude_m NOTIFY dirty);
@ -143,10 +143,10 @@ public:
void setDirectionalLightColorB(const float value) { hazeDirectionalLightColorB = value; emit dirty(); }
void setHazeBaseReference(const float value) { hazeBaseReference = value; ; emit dirty(); }
void setIsHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
void setIsAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
void setIsDirectionaLightAttenuationActive(const bool active) { isDirectionaLightAttenuationActive = active; emit dirty(); }
void setIsModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
void setAltitudeBased(const bool active) { isAltitudeBased = active; emit dirty(); }
void setDirectionaLightAttenuationActive(const bool active) { isDirectionaLightAttenuationActive = active; emit dirty(); }
void setModulateColorActive(const bool active) { isModulateColorActive = active; emit dirty(); }
void setHazeRange_m(const float value) { hazeRange_m = value; emit dirty(); }
void setHazeAltitude_m(const float value) { hazeAltitude_m = value; emit dirty(); }