Skip to content

ovis: consistently use 0..1 value range for colors #3135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2021
Merged

ovis: consistently use 0..1 value range for colors #3135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions modules/ovis/src/ovis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,10 @@ static SceneNode& _getSceneNode(SceneManager* sceneMgr, const String& name)
return *mo->getParentSceneNode();
}

/// BGR to RGB 0..1
static ColourValue convertColor(const Scalar& val)
{
// BGR 0..255 (uchar) to RGB 0..1
ColourValue ret = ColourValue(val[2], val[1], val[0]) / 255;
ret.saturate();
return ret;
return ColourValue(val[2], val[1], val[0]).saturateCopy();
}

class WindowSceneImpl;
Expand Down Expand Up @@ -614,9 +612,8 @@ class WindowSceneImpl : public WindowScene
const Scalar& specularColour) CV_OVERRIDE
{
Light* light = sceneMgr->createLight(name);
// convert to BGR
light->setDiffuseColour(ColourValue(diffuseColour[2], diffuseColour[1], diffuseColour[0]));
light->setSpecularColour(ColourValue(specularColour[2], specularColour[1], specularColour[0]));
light->setDiffuseColour(convertColor(diffuseColour));
light->setSpecularColour(convertColor(specularColour));

Quaternion q;
Vector3 t;
Expand Down