Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the linux build and correct the name of the property Intensity to Opacity

Browse source
This commit is contained in:
Sam Gateau 2017-12-10 10:13:49 -08:00
parent 429d54d65d
commit eec4e966a7
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/scripting/SelectionScriptingInterface.cpp
View file

@ -410,19 +410,19 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) {
} }
} }
auto intensityVariant = properties["outlineUnoccludedIntensity"]; auto intensityVariant = properties["outlineUnoccludedOpacity"];
if (intensityVariant.isValid()) { if (intensityVariant.isValid()) {
_style._outlineUnoccluded.alpha = intensityVariant.toFloat(); _style._outlineUnoccluded.alpha = intensityVariant.toFloat();
} }
intensityVariant = properties["outlineOccludedIntensity"]; intensityVariant = properties["outlineOccludedOpacity"];
if (intensityVariant.isValid()) { if (intensityVariant.isValid()) {
_style._outlineOccluded.alpha = intensityVariant.toFloat(); _style._outlineOccluded.alpha = intensityVariant.toFloat();
} }
intensityVariant = properties["fillUnoccludedIntensity"]; intensityVariant = properties["fillUnoccludedOpacity"];
if (intensityVariant.isValid()) { if (intensityVariant.isValid()) {
_style._fillUnoccluded.alpha = intensityVariant.toFloat(); _style._fillUnoccluded.alpha = intensityVariant.toFloat();
} }
intensityVariant = properties["fillOccludedIntensity"]; intensityVariant = properties["fillOccludedOpacity"];
if (intensityVariant.isValid()) { if (intensityVariant.isValid()) {
_style._fillOccluded.alpha = intensityVariant.toFloat(); _style._fillOccluded.alpha = intensityVariant.toFloat();
} }
@ -447,10 +447,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const {
properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color)); properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color));
properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color)); properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color));
properties["outlineUnoccludedIntensity"] = _style._outlineUnoccluded.alpha; properties["outlineUnoccludedOpacity"] = _style._outlineUnoccluded.alpha;
properties["outlineOccludedIntensity"] = _style._outlineOccluded.alpha; properties["outlineOccludedOpacity"] = _style._outlineOccluded.alpha;
properties["fillUnoccludedIntensity"] = _style._fillUnoccluded.alpha; properties["fillUnoccludedOpacity"] = _style._fillUnoccluded.alpha;
properties["fillOccludedIntensity"] = _style._fillOccluded.alpha; properties["fillOccludedOpacity"] = _style._fillOccluded.alpha;
properties["outlineWidth"] = _style._outlineWidth; properties["outlineWidth"] = _style._outlineWidth;
properties["isOutlineSmooth"] = _style._isOutlineSmooth; properties["isOutlineSmooth"] = _style._isOutlineSmooth;

2
libraries/render/src/render/HighlightStyle.h
View file

@ -23,6 +23,8 @@ namespace render {
struct RGBA { struct RGBA {
glm::vec3 color{ 1.f, 0.7f, 0.2f }; glm::vec3 color{ 1.f, 0.7f, 0.2f };
float alpha{ 0.9f }; float alpha{ 0.9f };
RGBA(const glm::vec3& c, float a) : color(c), alpha(a) {}
}; };
RGBA _outlineUnoccluded{ { 1.f, 0.7f, 0.2f }, 0.9f }; RGBA _outlineUnoccluded{ { 1.f, 0.7f, 0.2f }, 0.9f };

8
scripts/developer/utilities/render/highlight/HighlightStyle.qml
View file

@ -64,10 +64,10 @@ Item {
Repeater { Repeater {
model: [ model: [
"Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedIntensity", "Outline Unoccluded:outlineUnoccludedColor:outlineUnoccludedOpacity",
"Outline Occluded:outlineOccludedColor:outlineOccludedIntensity", "Outline Occluded:outlineOccludedColor:outlineOccludedOpacity",
"Fill Unoccluded:fillUnoccludedColor:fillUnoccludedIntensity", "Fill Unoccluded:fillUnoccludedColor:fillUnoccludedOpacity",
"Fill Occluded:fillOccludedColor:fillOccludedIntensity"] "Fill Occluded:fillOccludedColor:fillOccludedOpacity"]
Column { Column {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right