node: change class sent to GetShaderCode
This commit is contained in:
@@ -46,9 +46,9 @@ QString CrossDissolveTransition::Description() const
|
|||||||
return tr("Smoothly transition between two clips.");
|
return tr("Smoothly transition between two clips.");
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode CrossDissolveTransition::GetShaderCode(const QString &shader_id) const
|
ShaderCode CrossDissolveTransition::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
|
|
||||||
//virtual void Retranslate() override;
|
//virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void ShaderJobEvent(const NodeValueRow &value, ShaderJob& job) const override;
|
virtual void ShaderJobEvent(const NodeValueRow &value, ShaderJob& job) const override;
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ QString DipToColorTransition::Description() const
|
|||||||
return tr("Transition between clips by dipping to a color.");
|
return tr("Transition between clips by dipping to a color.");
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode DipToColorTransition::GetShaderCode(const QString &shader_id) const
|
ShaderCode DipToColorTransition::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/diptoblack.frag"), QString());
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/diptoblack.frag"), QString());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public:
|
|||||||
virtual QVector<CategoryID> Category() const override;
|
virtual QVector<CategoryID> Category() const override;
|
||||||
virtual QString Description() const override;
|
virtual QString Description() const override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
static const QString kColorInput;
|
static const QString kColorInput;
|
||||||
|
|
||||||
|
|||||||
@@ -108,9 +108,9 @@ void CornerPinDistortNode::Value(const NodeValueRow &value, const NodeGlobals &g
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode CornerPinDistortNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode CornerPinDistortNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/cornerpin.frag")),
|
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/cornerpin.frag")),
|
||||||
FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/cornerpin.vert")));
|
FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/cornerpin.vert")));
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public:
|
|||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
|
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
|
||||||
|
|
||||||
|
|||||||
@@ -94,9 +94,9 @@ void CropDistortNode::Value(const NodeValueRow &value, const NodeGlobals &global
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode CropDistortNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode CropDistortNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/crop.frag")));
|
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/crop.frag")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public:
|
|||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
|
virtual void UpdateGizmoPositions(const NodeValueRow &row, const NodeGlobals &globals) override;
|
||||||
|
|
||||||
|
|||||||
@@ -69,9 +69,9 @@ void FlipDistortNode::Retranslate()
|
|||||||
SetInputName(kVerticalInput, tr("Vertical"));
|
SetInputName(kVerticalInput, tr("Vertical"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode FlipDistortNode::GetShaderCode(const QString& shader_id) const
|
ShaderCode FlipDistortNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/flip.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/flip.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
|
|||||||
@@ -119,9 +119,9 @@ void TransformDistortNode::Value(const NodeValueRow &value, const NodeGlobals &g
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode TransformDistortNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode TransformDistortNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id);
|
Q_UNUSED(request);
|
||||||
|
|
||||||
// Returns default frag and vert shader
|
// Returns default frag and vert shader
|
||||||
return ShaderCode();
|
return ShaderCode();
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public:
|
|||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
enum AutoScaleType {
|
enum AutoScaleType {
|
||||||
kAutoScaleNone,
|
kAutoScaleNone,
|
||||||
|
|||||||
@@ -37,9 +37,9 @@ void OpacityEffect::Retranslate()
|
|||||||
SetInputName(kValueInput, tr("Opacity"));
|
SetInputName(kValueInput, tr("Opacity"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode OpacityEffect::GetShaderCode(const QString &shader_id) const
|
ShaderCode OpacityEffect::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/opacity.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/opacity.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
|
|||||||
@@ -83,9 +83,9 @@ void BlurFilterNode::Retranslate()
|
|||||||
SetInputName(kRepeatEdgePixelsInput, tr("Repeat Edge Pixels"));
|
SetInputName(kRepeatEdgePixelsInput, tr("Repeat Edge Pixels"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode BlurFilterNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode BlurFilterNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/blur.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/blur.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
|
|||||||
@@ -73,9 +73,9 @@ void MosaicFilterNode::Value(const NodeValueRow &value, const NodeGlobals &globa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode MosaicFilterNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode MosaicFilterNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/mosaic.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/mosaic.frag"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public:
|
|||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
static const QString kHorizInput;
|
static const QString kHorizInput;
|
||||||
|
|||||||
@@ -101,9 +101,9 @@ void StrokeFilterNode::Value(const NodeValueRow &value, const NodeGlobals &globa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode StrokeFilterNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode StrokeFilterNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/stroke.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/stroke.frag"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public:
|
|||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
static const QString kColorInput;
|
static const QString kColorInput;
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ void NoiseGeneratorNode::Retranslate()
|
|||||||
SetInputName(kColorInput, tr("Color"));
|
SetInputName(kColorInput, tr("Color"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode NoiseGeneratorNode::GetShaderCode(const QString& shader_id) const
|
ShaderCode NoiseGeneratorNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/noise.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/noise.frag"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class NoiseGeneratorNode : public Node {
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static const QString kBaseIn;
|
static const QString kBaseIn;
|
||||||
|
|||||||
@@ -42,9 +42,9 @@ void GeneratorWithMerge::Retranslate()
|
|||||||
SetInputName(kBaseInput, tr("Base"));
|
SetInputName(kBaseInput, tr("Base"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode GeneratorWithMerge::GetShaderCode(const QString &shader_id) const
|
ShaderCode GeneratorWithMerge::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
if (shader_id == QStringLiteral("mrg")) {
|
if (request.id == QStringLiteral("mrg")) {
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
static const QString kBaseInput;
|
static const QString kBaseInput;
|
||||||
|
|
||||||
|
|||||||
@@ -61,12 +61,12 @@ void ShapeNode::Retranslate()
|
|||||||
SetComboBoxStrings(kTypeInput, {tr("Rectangle"), tr("Ellipse")});
|
SetComboBoxStrings(kTypeInput, {tr("Rectangle"), tr("Ellipse")});
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode ShapeNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode ShapeNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
if (shader_id == QStringLiteral("shape")) {
|
if (request.id == QStringLiteral("shape")) {
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/shape.frag")));
|
return ShaderCode(FileFunctions::ReadFileAsString(QStringLiteral(":/shaders/shape.frag")));
|
||||||
} else {
|
} else {
|
||||||
return super::GetShaderCode(shader_id);
|
return super::GetShaderCode(request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static QString kTypeInput;
|
static QString kTypeInput;
|
||||||
|
|||||||
@@ -68,9 +68,9 @@ void SolidGenerator::Value(const NodeValueRow &value, const NodeGlobals &globals
|
|||||||
table->Push(NodeValue::kTexture, QVariant::fromValue(job), this);
|
table->Push(NodeValue::kTexture, QVariant::fromValue(job), this);
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode SolidGenerator::GetShaderCode(const QString &shader_id) const
|
ShaderCode SolidGenerator::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/solid.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/solid.frag"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public:
|
|||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
static const QString kColorInput;
|
static const QString kColorInput;
|
||||||
|
|
||||||
|
|||||||
@@ -83,9 +83,9 @@ void ColorDifferenceKeyNode::Retranslate()
|
|||||||
SetInputName(kMaskOnlyInput, tr("Show Mask Only"));
|
SetInputName(kMaskOnlyInput, tr("Show Mask Only"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode ColorDifferenceKeyNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode ColorDifferenceKeyNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/colordifferencekey.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/colordifferencekey.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class ColorDifferenceKeyNode : public Node {
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
|
|||||||
@@ -75,8 +75,8 @@ void DespillNode::Retranslate()
|
|||||||
SetInputName(kPreserveLuminanceInput, tr("Preserve Luminance"));
|
SetInputName(kPreserveLuminanceInput, tr("Preserve Luminance"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode DespillNode::GetShaderCode(const QString& shader_id) const {
|
ShaderCode DespillNode::GetShaderCode(const ShaderRequest &request) const {
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/despill.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/despill.frag"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ class DespillNode : public Node {
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
|
||||||
|
|
||||||
static const QString kTextureInput;
|
static const QString kTextureInput;
|
||||||
|
|||||||
@@ -80,9 +80,9 @@ void MathNode::Retranslate()
|
|||||||
SetComboBoxStrings(kMethodIn, operations);
|
SetComboBoxStrings(kMethodIn, operations);
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode MathNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode MathNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
return GetShaderCodeInternal(shader_id, kParamAIn, kParamBIn);
|
return GetShaderCodeInternal(request.id, kParamAIn, kParamBIn);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MathNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
|
void MathNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
|
|
||||||
Operation GetOperation() const
|
Operation GetOperation() const
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -67,9 +67,9 @@ void MergeNode::Retranslate()
|
|||||||
SetInputName(kBlendIn, tr("Blend"));
|
SetInputName(kBlendIn, tr("Blend"));
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode MergeNode::GetShaderCode(const QString &shader_id) const
|
ShaderCode MergeNode::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
Q_UNUSED(request)
|
||||||
|
|
||||||
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
|
return ShaderCode(FileFunctions::ReadFileAsString(":/shaders/alphaover.frag"));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public:
|
|||||||
|
|
||||||
virtual void Retranslate() override;
|
virtual void Retranslate() override;
|
||||||
|
|
||||||
virtual ShaderCode GetShaderCode(const QString &shader_id) const override;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const override;
|
||||||
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
|
||||||
|
|
||||||
static const QString kBaseIn;
|
static const QString kBaseIn;
|
||||||
|
|||||||
+1
-3
@@ -1520,10 +1520,8 @@ QVector<Node *> Node::GetImmediateDependencies() const
|
|||||||
return GetDependenciesInternal(false, false);
|
return GetDependenciesInternal(false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
ShaderCode Node::GetShaderCode(const QString &shader_id) const
|
ShaderCode Node::GetShaderCode(const ShaderRequest &request) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(shader_id)
|
|
||||||
|
|
||||||
return ShaderCode(QString(), QString());
|
return ShaderCode(QString(), QString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+12
-1
@@ -660,10 +660,21 @@ public:
|
|||||||
*/
|
*/
|
||||||
QVector<Node *> GetImmediateDependencies() const;
|
QVector<Node *> GetImmediateDependencies() const;
|
||||||
|
|
||||||
|
struct ShaderRequest
|
||||||
|
{
|
||||||
|
ShaderRequest(const QString &shader_id)
|
||||||
|
{
|
||||||
|
id = shader_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString id;
|
||||||
|
QString stub;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Generate hardware accelerated code for this Node
|
* @brief Generate hardware accelerated code for this Node
|
||||||
*/
|
*/
|
||||||
virtual ShaderCode GetShaderCode(const QString& shader_id) const;
|
virtual ShaderCode GetShaderCode(const ShaderRequest &request) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief If Value() pushes a ShaderJob, this is the function that will process them.
|
* @brief If Value() pushes a ShaderJob, this is the function that will process them.
|
||||||
|
|||||||
Reference in New Issue
Block a user