History

xcolor/rgbcolor conversion

SamGondelman committed 8 years ago

Commit 16ad9cb1 parent 992952962 files · +593 −917Browse files

Showing the changes to interface/src/scripting/SelectionScriptingInterface.cpp (1 of 62 files). Show all

Unified · Split

interface/src/scripting/SelectionScriptingInterface.cpp+13−12
@@ -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 = xColorFromVariant(colorVariant, isValid);424 auto color = vec3FromVariant(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 = xColorFromVariant(colorVariant, isValid);432 auto color = vec3FromVariant(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 = xColorFromVariant(colorVariant, isValid);440 auto color = vec3FromVariant(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 = xColorFromVariant(colorVariant, isValid);448 auto color = vec3FromVariant(colorVariant, isValid);
449 if (isValid) {449 if (isValid) {
450 _style._fillOccluded.color = toGlm(color);450 _style._fillOccluded.color = toGlm(color);
451 }451 }
@@ -482,10 +482,10 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 30 unmodified lines
482 482
483/**jsdoc483/**jsdoc
484 * @typedef {object} Selection.HighlightStyle484 * @typedef {object} Selection.HighlightStyle
485 * @property {Color} outlineUnoccludedColor - Color of the specified highlight region.485 * @property {Vec3Color} outlineUnoccludedColor - Color of the specified highlight region.
486 * @property {Color} outlineOccludedColor - ""486 * @property {Vec3Color} outlineOccludedColor - ""
487 * @property {Color} fillUnoccludedColor- ""487 * @property {Vec3Color} fillUnoccludedColor- ""
488 * @property {Color} fillOccludedColor- ""488 * @property {Vec3Color} fillOccludedColor- ""
489 * @property {number} outlineUnoccludedAlpha - Alpha value ranging from <code>0.0</code> (not visible) to <code>1.0</code> 489 * @property {number} outlineUnoccludedAlpha - Alpha value ranging from <code>0.0</code> (not visible) to <code>1.0</code>
490 * (fully opaque) for the specified highlight region.490 * (fully opaque) for the specified highlight region.
491 * @property {number} outlineOccludedAlpha - ""491 * @property {number} outlineOccludedAlpha - ""
@@ -497,10 +497,11 @@ bool SelectionHighlightStyle::fromVariantMap(const QVariantMap& properties) { · 5 unmodified lines
497QVariantMap SelectionHighlightStyle::toVariantMap() const {497QVariantMap SelectionHighlightStyle::toVariantMap() const {
498 QVariantMap properties;498 QVariantMap properties;
499 499
500 properties["outlineUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._outlineUnoccluded.color));500 const float MAX_COLOR = 255.0f;
501 properties["outlineOccludedColor"] = xColorToVariant(xColorFromGlm(_style._outlineOccluded.color));501 properties["outlineUnoccludedColor"] = vec3ToVariant(_style._outlineUnoccluded.color * MAX_COLOR);
502 properties["fillUnoccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillUnoccluded.color));502 properties["outlineOccludedColor"] = vec3ToVariant(_style._outlineOccluded.color * MAX_COLOR);
503 properties["fillOccludedColor"] = xColorToVariant(xColorFromGlm(_style._fillOccluded.color));503 properties["fillUnoccludedColor"] = vec3ToVariant(_style._fillUnoccluded.color * MAX_COLOR);
504 properties["fillOccludedColor"] = vec3ToVariant(_style._fillOccluded.color * MAX_COLOR);
504 505
505 properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha;506 properties["outlineUnoccludedAlpha"] = _style._outlineUnoccluded.alpha;
506 properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha;507 properties["outlineOccludedAlpha"] = _style._outlineOccluded.alpha;