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

Fix PR comments and generate mask

Browse Source
This commit is contained in:
Thomas Wilshaw
2022-05-02 20:47:18 +01:00
parent f9f8622682
commit 2c31fdfc0e
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/renderer.cpp
+7 -3
View File
@@ -107,14 +107,14 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job, Renderer::Col
} else {
// Create shader description
QString ocio_func_name;
if (color_job.FunctionName().isEmpty()) {
if (color_job.GetFunctionName().isEmpty()) {
ocio_func_name = "OCIODisplay";
} else {
ocio_func_name = color_job.FunctionName();
ocio_func_name = color_job.GetFunctionName();
}
auto shader_desc = OCIO::GpuShaderDesc::CreateShaderDesc();
shader_desc->setLanguage(OCIO::GPU_LANGUAGE_GLSL_ES_3_0);
shader_desc->setFunctionName(ocio_func_name.toStdString().c_str());
shader_desc->setFunctionName(ocio_func_name.toUtf8());
shader_desc->setResourcePrefix("ocio_");
// Generate shader
@@ -220,6 +220,10 @@ void Renderer::BlitColorManaged(const ColorTransformJob &color_job, Texture *des
job.InsertValue(QStringLiteral("ove_maintex_alpha"), NodeValue(NodeValue::kInt, color_job.GetInputAlphaAssociation()));
job.InsertValue(color_job.GetValues());
//if (color_job.GetInputAlphaAssociation() == AlphaAssociated::kAlphaAssociated) {
job.SetAlphaChannelRequired(GenerateJob::kAlphaForceOn);
//}
foreach (const ColorContext::LUT& l, color_ctx.lut3d_textures) {
job.InsertValue(l.name, NodeValue(NodeValue::kTexture, QVariant::fromValue(l.texture)));
job.SetInterpolation(l.name, l.interpolation);