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

nodes are given a time range

Browse Source
This commit is contained in:
itsmattkc
2019-10-22 14:58:06 +11:00
parent 9da5e7c9be
commit 5f86b9b9c7
32 changed files with 110 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/blend/alphaover/alphaover.cpp
+3 -3
View File
@@ -49,7 +49,7 @@ void AlphaOverBlend::Release()
{
}
QVariant AlphaOverBlend::Value(NodeOutput *param, const rational &time)
QVariant AlphaOverBlend::Value(NodeOutput *param, const rational &in, const rational &out)
{
// Find the current Renderer instance
RenderInstance* renderer = VideoRendererProcessor::CurrentInstance();
@@ -61,8 +61,8 @@ QVariant AlphaOverBlend::Value(NodeOutput *param, const rational &time)
// The only parameter should be texture output, but for future proofing we put this here
if (param == texture_output()) {
RenderTexturePtr base = base_input()->get_value(time).value<RenderTexturePtr>();
RenderTexturePtr blend = blend_input()->get_value(time).value<RenderTexturePtr>();
RenderTexturePtr base = base_input()->get_value(in, out).value<RenderTexturePtr>();
RenderTexturePtr blend = blend_input()->get_value(in, out).value<RenderTexturePtr>();
if (base == nullptr && blend == nullptr) {
return 0;
app/node/blend/alphaover/alphaover.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
virtual void Release() override;
protected:
virtual QVariant Value(NodeOutput* param, const rational& time) override;
virtual QVariant Value(NodeOutput* param, const rational &in, const rational &out) override;
private:
};