Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding style from VariantMap

Browse source
This commit is contained in:
samcake 2017-11-14 18:21:02 -08:00
parent fc53c26190
commit d4f93b9203
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -239,6 +239,41 @@ void SelectionToSceneHandler::updateSceneFromSelectedList() {
bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) {
auto outlineColor = properties["outlineColor"];
if (outlineColor.isValid()) {
bool isValid;
auto color = xColorFromVariant(properties["outlineColor"], isValid);
if (isValid) {
_style.color = toGlm(color);
}
}
auto outlineWidth = properties["outlineWidth"];
if (outlineWidth.isValid()) {
_style.outlineWidth = outlineWidth.toFloat();
}
auto isOutlineSmooth = properties["isOutlineSmooth"];
if (isOutlineSmooth.isValid()) {
_style.isOutlineSmooth = isOutlineSmooth.toBool();
}
auto outlineIntensity = properties["outlineIntensity"];
if (outlineIntensity.isValid()) {
_style.outlineIntensity = outlineIntensity.toFloat();
}
auto isFilled = properties["isFilled"];
if (isFilled.isValid()) {
_style.isFilled = isFilled.toBool();
}
auto unoccludedFillOpacity = properties["unoccludedFillOpacity"];
if (unoccludedFillOpacity.isValid()) {
_style.unoccludedFillOpacity = unoccludedFillOpacity.toFloat();
}
auto occludedFillOpacity = properties["occludedFillOpacity"];
if (occludedFillOpacity.isValid()) {
_style.occludedFillOpacity = occludedFillOpacity.toFloat();
}
return true; return true;
} }
QVariantMap SelectionHighlightStyle::toVariantMap() const { QVariantMap SelectionHighlightStyle::toVariantMap() const {

3
interface/src/scripting/SelectionScriptingInterface.h
View file

@ -21,6 +21,7 @@
#include "RenderableEntityItem.h" #include "RenderableEntityItem.h"
#include "ui/overlays/Overlay.h" #include "ui/overlays/Overlay.h"
#include <avatar/AvatarManager.h> #include <avatar/AvatarManager.h>
#include <render/HighlightStyle.h>
class GameplayObjects { class GameplayObjects {
public: public:
@ -60,7 +61,7 @@ public:
protected: protected:
bool _isBoundToList{ false }; bool _isBoundToList{ false };
render::HighlightStyle _style;
}; };
class SelectionScriptingInterface : public QObject, public Dependency { class SelectionScriptingInterface : public QObject, public Dependency {