Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replaced separate RGB components of colours with vec3's.

Browse source
This commit is contained in:
Nissim Hadar 2017-10-30 12:41:09 -07:00
parent 6391282680
commit 1357877618
5 changed files with 34 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,32 +21,16 @@
#include "Haze_frag.h" #include "Haze_frag.h"
void HazeConfig::setHazeColorR(const float value) { void HazeConfig::setHazeColor(const glm::vec3 value) {
hazeColorR = value; hazeColor = value;
}
void HazeConfig::setHazeColorG(const float value) {
hazeColorG = value;
}
void HazeConfig::setHazeColorB(const float value) {
hazeColorB = value;
} }
void HazeConfig::setHazeGlareAngle_degs(const float value) { void HazeConfig::setHazeGlareAngle_degs(const float value) {
hazeGlareAngle_degs = value; hazeGlareAngle_degs = value;
} }
void HazeConfig::setHazeGlareColorR(const float value) { void HazeConfig::setHazeGlareColor(const glm::vec3 value) {
hazeGlareColorR = value; hazeGlareColor = value;
}
void HazeConfig::setHazeGlareColorG(const float value) {
hazeGlareColorG = value;
}
void HazeConfig::setHazeGlareColorB(const float value) {
hazeGlareColorB = value;
} }
void HazeConfig::setHazeBaseReference(const float value) { void HazeConfig::setHazeBaseReference(const float value) {
@ -98,10 +82,10 @@ MakeHaze::MakeHaze() {
} }
void MakeHaze::configure(const Config& config) { void MakeHaze::configure(const Config& config) {
_haze->setHazeColor(glm::vec3(config.hazeColorR, config.hazeColorG, config.hazeColorB)); _haze->setHazeColor(config.hazeColor);
_haze->setHazeGlareBlend(model::convertGlareAngleToPower(config.hazeGlareAngle_degs)); _haze->setHazeGlareBlend(model::convertGlareAngleToPower(config.hazeGlareAngle_degs));
_haze->setHazeGlareColor(glm::vec3(config.hazeGlareColorR, config.hazeGlareColorG, config.hazeGlareColorB)); _haze->setHazeGlareColor(config.hazeGlareColor);
_haze->setHazeBaseReference(config.hazeBaseReference_m); _haze->setHazeBaseReference(config.hazeBaseReference_m);
_haze->setHazeActive(config.isHazeActive); _haze->setHazeActive(config.isHazeActive);

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

@ -29,14 +29,10 @@ using LinearDepthFramebufferPointer = std::shared_ptr<LinearDepthFramebuffer>;
class MakeHazeConfig : public render::Job::Config { class MakeHazeConfig : public render::Job::Config {
Q_OBJECT Q_OBJECT
Q_PROPERTY(float hazeColorR MEMBER hazeColorR WRITE setHazeColorR NOTIFY dirty); Q_PROPERTY(glm::vec3 hazeColor MEMBER hazeColor WRITE setHazeColor NOTIFY dirty);
Q_PROPERTY(float hazeColorG MEMBER hazeColorG WRITE setHazeColorG NOTIFY dirty);
Q_PROPERTY(float hazeColorB MEMBER hazeColorB WRITE setHazeColorB NOTIFY dirty);
Q_PROPERTY(float hazeGlareAngle_degs MEMBER hazeGlareAngle_degs WRITE setHazeGlareAngle_degs NOTIFY dirty); Q_PROPERTY(float hazeGlareAngle_degs MEMBER hazeGlareAngle_degs WRITE setHazeGlareAngle_degs NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorR MEMBER hazeGlareColorR WRITE setHazeGlareColorR NOTIFY dirty); Q_PROPERTY(glm::vec3 hazeGlareColor MEMBER hazeGlareColor WRITE setHazeGlareColor NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorG MEMBER hazeGlareColorG WRITE setHazeGlareColorG NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorB MEMBER hazeGlareColorB WRITE setHazeGlareColorB NOTIFY dirty);
Q_PROPERTY(float hazeBaseReference_m MEMBER hazeBaseReference_m WRITE setHazeBaseReference NOTIFY dirty); Q_PROPERTY(float hazeBaseReference_m MEMBER hazeBaseReference_m WRITE setHazeBaseReference NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty); Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
@ -56,14 +52,10 @@ class MakeHazeConfig : public render::Job::Config {
public: public:
MakeHazeConfig() : render::Job::Config() {} MakeHazeConfig() : render::Job::Config() {}
float hazeColorR{ model::Haze::initialHazeColor.r }; glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeColorG{ model::Haze::initialHazeColor.g };
float hazeColorB{ model::Haze::initialHazeColor.b };
float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs }; float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs };
float hazeGlareColorR{ model::Haze::initialHazeGlareColor.r }; glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeGlareColorG{ model::Haze::initialHazeGlareColor.g };
float hazeGlareColorB{ model::Haze::initialHazeGlareColor.b };
float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m }; float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m };
bool isHazeActive{ false }; bool isHazeActive{ false };
@ -81,14 +73,10 @@ public:
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend }; float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
public slots: public slots:
void setHazeColorR(const float value) { hazeColorR = value; emit dirty(); } void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }
void setHazeColorG(const float value) { hazeColorG = value; emit dirty(); }
void setHazeColorB(const float value) { hazeColorB = value; emit dirty(); }
void setHazeGlareAngle_degs(const float value) { hazeGlareAngle_degs = value; emit dirty(); } void setHazeGlareAngle_degs(const float value) { hazeGlareAngle_degs = value; emit dirty(); }
void setHazeGlareColorR(const float value) { hazeGlareColorR = value; emit dirty(); } void setHazeGlareColor(const glm::vec3 value) { hazeGlareColor = value; emit dirty(); }
void setHazeGlareColorG(const float value) { hazeGlareColorG = value; emit dirty(); }
void setHazeGlareColorB(const float value) { hazeGlareColorB = value; emit dirty(); }
void setHazeBaseReference(const float value) { hazeBaseReference_m = value; ; emit dirty(); } void setHazeBaseReference(const float value) { hazeBaseReference_m = value; ; emit dirty(); }
void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); } void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }
@ -128,14 +116,10 @@ public:
HazeConfig() : render::Job::Config(true) {} HazeConfig() : render::Job::Config(true) {}
// attributes // attributes
float hazeColorR{ model::Haze::initialHazeColor.r }; glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeColorG{ model::Haze::initialHazeColor.g };
float hazeColorB{ model::Haze::initialHazeColor.b };
float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs }; float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs };
float hazeGlareColorR{ model::Haze::initialHazeGlareColor.r }; glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeGlareColorG{ model::Haze::initialHazeGlareColor.g };
float hazeGlareColorB{ model::Haze::initialHazeGlareColor.b };
float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m }; float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m };
bool isHazeActive{ false }; // Setting this to true will set haze to on bool isHazeActive{ false }; // Setting this to true will set haze to on
@ -153,14 +137,10 @@ public:
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend }; float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
// methods // methods
void setHazeColorR(const float value); void setHazeColor(const glm::vec3 value);
void setHazeColorG(const float value);
void setHazeColorB(const float value);
void setHazeGlareAngle_degs(const float value); void setHazeGlareAngle_degs(const float value);
void setHazeGlareColorR(const float value); void setHazeGlareColor(const glm::vec3 value);
void setHazeGlareColorG(const float value);
void setHazeGlareColorB(const float value);
void setHazeBaseReference(const float value); void setHazeBaseReference(const float value);
void setHazeActive(const bool active); void setHazeActive(const bool active);

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

@ -20,10 +20,10 @@ FetchHazeStage::FetchHazeStage() {
} }
void FetchHazeStage::configure(const Config& config) { void FetchHazeStage::configure(const Config& config) {
_haze->setHazeColor(glm::vec3(config.hazeColorR, config.hazeColorG, config.hazeColorB)); _haze->setHazeColor(config.hazeColor);
_haze->setHazeGlareBlend(model::convertGlareAngleToPower(config.hazeGlareAngle_degs)); _haze->setHazeGlareBlend(model::convertGlareAngleToPower(config.hazeGlareAngle_degs));
_haze->setHazeGlareColor(glm::vec3(config.hazeGlareColorR, config.hazeGlareColorG, config.hazeGlareColorB)); _haze->setHazeGlareColor(config.hazeGlareColor);
_haze->setHazeBaseReference(config.hazeBaseReference_m); _haze->setHazeBaseReference(config.hazeBaseReference_m);
_haze->setHazeActive(config.isHazeActive); _haze->setHazeActive(config.isHazeActive);

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

@ -83,14 +83,10 @@ protected:
class FetchHazeConfig : public render::Job::Config { class FetchHazeConfig : public render::Job::Config {
Q_OBJECT Q_OBJECT
Q_PROPERTY(float hazeColorR MEMBER hazeColorR WRITE setHazeColorR NOTIFY dirty); Q_PROPERTY(glm::vec3 hazeColor MEMBER hazeColor WRITE setHazeColor NOTIFY dirty);
Q_PROPERTY(float hazeColorG MEMBER hazeColorG WRITE setHazeColorG NOTIFY dirty);
Q_PROPERTY(float hazeColorB MEMBER hazeColorB WRITE setHazeColorB NOTIFY dirty);
Q_PROPERTY(float hazeGlareAngle_degs MEMBER hazeGlareAngle_degs WRITE setHazeGlareAngle_degs NOTIFY dirty); Q_PROPERTY(float hazeGlareAngle_degs MEMBER hazeGlareAngle_degs WRITE setHazeGlareAngle_degs NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorR MEMBER hazeGlareColorR WRITE setHazeGlareColorR NOTIFY dirty); Q_PROPERTY(glm::vec3 hazeGlareColor MEMBER hazeGlareColor WRITE setHazeGlareColor NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorG MEMBER hazeGlareColorG WRITE setHazeGlareColorG NOTIFY dirty);
Q_PROPERTY(float hazeGlareColorB MEMBER hazeGlareColorB WRITE setHazeGlareColorB NOTIFY dirty);
Q_PROPERTY(float hazeBaseReference_m MEMBER hazeBaseReference_m WRITE setHazeBaseReference NOTIFY dirty); Q_PROPERTY(float hazeBaseReference_m MEMBER hazeBaseReference_m WRITE setHazeBaseReference NOTIFY dirty);
Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty); Q_PROPERTY(bool isHazeActive MEMBER isHazeActive WRITE setHazeActive NOTIFY dirty);
@ -110,14 +106,10 @@ class FetchHazeConfig : public render::Job::Config {
public: public:
FetchHazeConfig() : render::Job::Config() {} FetchHazeConfig() : render::Job::Config() {}
float hazeColorR{ model::Haze::initialHazeColor.r }; glm::vec3 hazeColor{ model::Haze::initialHazeColor };
float hazeColorG{ model::Haze::initialHazeColor.g };
float hazeColorB{ model::Haze::initialHazeColor.b };
float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs }; float hazeGlareAngle_degs{ model::Haze::initialGlareAngle_degs };
float hazeGlareColorR{ model::Haze::initialHazeGlareColor.r }; glm::vec3 hazeGlareColor{ model::Haze::initialHazeGlareColor };
float hazeGlareColorG{ model::Haze::initialHazeGlareColor.g };
float hazeGlareColorB{ model::Haze::initialHazeGlareColor.b };
float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m }; float hazeBaseReference_m{ model::Haze::initialHazeBaseReference_m };
bool isHazeActive{ false }; bool isHazeActive{ false };
@ -135,14 +127,10 @@ public:
float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend }; float hazeBackgroundBlend{ model::Haze::initialHazeBackgroundBlend };
public slots: public slots:
void setHazeColorR(const float value) { hazeColorR = value; emit dirty(); } void setHazeColor(const glm::vec3 value) { hazeColor = value; emit dirty(); }
void setHazeColorG(const float value) { hazeColorG = value; emit dirty(); }
void setHazeColorB(const float value) { hazeColorB = value; emit dirty(); }
void setHazeGlareAngle_degs(const float value) { hazeGlareAngle_degs = value; emit dirty(); } void setHazeGlareAngle_degs(const float value) { hazeGlareAngle_degs = value; emit dirty(); }
void setHazeGlareColorR(const float value) { hazeGlareColorR = value; emit dirty(); } void setHazeGlareColor(const glm::vec3 value) { hazeGlareColor = value; emit dirty(); }
void setHazeGlareColorG(const float value) { hazeGlareColorG = value; emit dirty(); }
void setHazeGlareColorB(const float value) { hazeGlareColorB = value; emit dirty(); }
void setHazeBaseReference(const float value) { hazeBaseReference_m = value; ; emit dirty(); } void setHazeBaseReference(const float value) { hazeBaseReference_m = value; ; emit dirty(); }
void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); } void setHazeActive(const bool active) { isHazeActive = active; emit dirty(); }

20
scripts/developer/debugging/debugHaze.qml
View file

@ -68,7 +68,7 @@ Item {
label: "Haze Color R" label: "Haze Color R"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeColorR" property: "hazeColor.r"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -78,7 +78,7 @@ Item {
label: "Haze Color G" label: "Haze Color G"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeColorG" property: "hazeColor.g"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -88,7 +88,7 @@ Item {
label: "Haze Color B" label: "Haze Color B"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeColorB" property: "hazeColor.b"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -98,7 +98,7 @@ Item {
label: "Sun R" label: "Sun R"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeDirectionalLightColorR" property: "hazeGlareColor.r"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -108,7 +108,7 @@ Item {
label: "Sun G" label: "Sun G"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeDirectionalLightColorG" property: "hazeGlareColor.g"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -118,7 +118,7 @@ Item {
label: "Sun B" label: "Sun B"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeDirectionalLightColorB" property: "hazeGlareColor.b"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -128,7 +128,7 @@ Item {
label: "Sun glare angle" label: "Sun glare angle"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeDirectionalLightAngle_degs" property: "hazeGlareAngle_degs"
max: 70.0 max: 70.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -148,7 +148,7 @@ Item {
label: "BG Blend" label: "BG Blend"
integral: false integral: false
config: root.hazeModel config: root.hazeModel
property: "hazeBackgroundBlendValue" property: "hazeBackgroundBlend"
max: 1.0 max: 1.0
min: 0.0 min: 0.0
width: 280 width: 280
@ -156,9 +156,9 @@ Item {
CheckBox { CheckBox {
text: "Keylight Attenuation" text: "Keylight Attenuation"
checked: root.hazeModel["isDirectionaLightAttenuationActive"] checked: root.hazeModel["isKeyLightAttenuationActive"]
onCheckedChanged: { onCheckedChanged: {
root.hazeModel["isDirectionaLightAttenuationActive"] = checked; root.hazeModel["isKeyLightAttenuationActive"] = checked;
} }
} }