oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

colordialog: updated to show input/reference/display values

Browse Source
This commit is contained in:
itsmattkc
2020-04-15 18:11:46 +10:00
parent 9cc4349054
commit 32969d2403
11 changed files with 267 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/opengl/openglcolorprocessor.cpp
+4 -4
View File
@@ -77,8 +77,8 @@ OpenGLColorProcessor::OpenGLColorProcessor(OCIO::ConstConfigRcPtr config, const
{
}
OpenGLColorProcessor::OpenGLColorProcessor(OCIO::ConstConfigRcPtr config, const QString &source_space, QString display, QString view, const QString &look) :
ColorProcessor(config, source_space, display, view, look),
OpenGLColorProcessor::OpenGLColorProcessor(OCIO::ConstConfigRcPtr config, const QString &source_space, QString display, QString view, const QString &look, Direction dir) :
ColorProcessor(config, source_space, display, view, look, dir),
ocio_lut_(0)
{
}
@@ -93,9 +93,9 @@ OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr conf
return std::make_shared<OpenGLColorProcessor>(config, source_space, dest_space);
}
OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &display, const QString &view, const QString &look)
OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &display, const QString &view, const QString &look, Direction dir)
{
return std::make_shared<OpenGLColorProcessor>(config, source_space, display, view, look);
return std::make_shared<OpenGLColorProcessor>(config, source_space, display, view, look, dir);
}
OLIVE_NAMESPACE_EXIT
app/render/backend/opengl/openglcolorprocessor.h
+4 -2
View File
@@ -39,7 +39,8 @@ public:
const QString& source_space,
QString display,
QString view,
const QString& look);
const QString& look,
Direction dir);
~OpenGLColorProcessor();
@@ -49,7 +50,8 @@ public:
const QString& source_space,
const QString& display,
const QString& view,
const QString& look);
const QString& look,
Direction dir = kNormal);
void Enable(QOpenGLContext* context, bool alpha_is_associated);
bool IsEnabled() const;