Showing the changes to interface/src/scripting/SelectionScriptingInterface.cpp (1 of 7 files). Show all
Unified · Split
| @@ -421,7 +421,7 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 420 unmodified lines | |||
| 421 | auto colorVariant = properties["outlineUnoccludedColor"]; | 421 | auto colorVariant = properties["outlineUnoccludedColor"]; |
| 422 | if (colorVariant.isValid()) { | 422 | if (colorVariant.isValid()) { |
| 423 | bool isValid; | 423 | bool isValid; |
| 424 | auto color = vec3FromVariant(colorVariant, isValid); | 424 | auto color = u8vec3FromVariant(colorVariant, isValid); |
| 425 | if (isValid) { | 425 | if (isValid) { |
| 426 | _style._outlineUnoccluded.color = toGlm(color); | 426 | _style._outlineUnoccluded.color = toGlm(color); |
| 427 | } | 427 | } |
| @@ -429,7 +429,7 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 1 unmodified line | |||
| 429 | colorVariant = properties["outlineOccludedColor"]; | 429 | colorVariant = properties["outlineOccludedColor"]; |
| 430 | if (colorVariant.isValid()) { | 430 | if (colorVariant.isValid()) { |
| 431 | bool isValid; | 431 | bool isValid; |
| 432 | auto color = vec3FromVariant(colorVariant, isValid); | 432 | auto color = u8vec3FromVariant(colorVariant, isValid); |
| 433 | if (isValid) { | 433 | if (isValid) { |
| 434 | _style._outlineOccluded.color = toGlm(color); | 434 | _style._outlineOccluded.color = toGlm(color); |
| 435 | } | 435 | } |
| @@ -437,7 +437,7 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 1 unmodified line | |||
| 437 | colorVariant = properties["fillUnoccludedColor"]; | 437 | colorVariant = properties["fillUnoccludedColor"]; |
| 438 | if (colorVariant.isValid()) { | 438 | if (colorVariant.isValid()) { |
| 439 | bool isValid; | 439 | bool isValid; |
| 440 | auto color = vec3FromVariant(colorVariant, isValid); | 440 | auto color = u8vec3FromVariant(colorVariant, isValid); |
| 441 | if (isValid) { | 441 | if (isValid) { |
| 442 | _style._fillUnoccluded.color = toGlm(color); | 442 | _style._fillUnoccluded.color = toGlm(color); |
| 443 | } | 443 | } |
| @@ -445,7 +445,7 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 1 unmodified line | |||
| 445 | colorVariant = properties["fillOccludedColor"]; | 445 | colorVariant = properties["fillOccludedColor"]; |
| 446 | if (colorVariant.isValid()) { | 446 | if (colorVariant.isValid()) { |
| 447 | bool isValid; | 447 | bool isValid; |
| 448 | auto color = vec3FromVariant(colorVariant, isValid); | 448 | auto color = u8vec3FromVariant(colorVariant, isValid); |
| 449 | if (isValid) { | 449 | if (isValid) { |
| 450 | _style._fillOccluded.color = toGlm(color); | 450 | _style._fillOccluded.color = toGlm(color); |
| 451 | } | 451 | } |
| @@ -498,10 +498,10 @@ QVariantMap SelectionHighlightStyle::toVariantMap() const { · 46 unmodified lines | |||
| 498 | QVariantMap properties; | 498 | QVariantMap properties; |
| 499 | 499 | ||
| 500 | const float MAX_COLOR = 255.0f; | 500 | const float MAX_COLOR = 255.0f; |
| 501 | properties["outlineUnoccludedColor"] = vec3toVariant(_style._outlineUnoccluded.color * MAX_COLOR); | 501 | properties["outlineUnoccludedColor"] = u8vec3ColortoVariant(_style._outlineUnoccluded.color * MAX_COLOR); |
| 502 | properties["outlineOccludedColor"] = vec3toVariant(_style._outlineOccluded.color * MAX_COLOR); | 502 | properties["outlineOccludedColor"] = u8vec3ColortoVariant(_style._outlineOccluded.color * MAX_COLOR); |
| 503 | properties["fillUnoccludedColor"] = vec3toVariant(_style._fillUnoccluded.color * MAX_COLOR); | 503 | properties["fillUnoccludedColor"] = u8vec3ColortoVariant(_style._fillUnoccluded.color * MAX_COLOR); |
| 504 | properties["fillOccludedColor"] = vec3toVariant(_style._fillOccluded.color * MAX_COLOR); | 504 | properties["fillOccludedColor"] = u8vec3ColortoVariant(_style._fillOccluded.color * MAX_COLOR); |
| 505 | 505 | ||
| 506 | properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha; | 506 | properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha; |
| 507 | properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha; | 507 | properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha; |