ported dip to black transition to external type and reimplemented drop shadow shader

2019-12-18 01:18:31 +11:00
parent 4e6da87585
commit f616a0d123
11 changed files with 135 additions and 86 deletions
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-add_subdirectory(diptoblack)
-
 set(OLIVE_SOURCES
  ${OLIVE_SOURCES}
  node/block/transition/externaltransition.h
@@ -1,22 +0,0 @@
-# Olive - Non-Linear Video Editor
-# Copyright (C) 2019 Olive Team
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set(OLIVE_SOURCES
-  ${OLIVE_SOURCES}
-  node/block/transition/diptoblack/diptoblack.h
-  node/block/transition/diptoblack/diptoblack.cpp
-  PARENT_SCOPE
-)
@@ -1,35 +0,0 @@
-#include "diptoblack.h"
-
-Node *DipToBlackTransition::copy() const
-{
-  DipToBlackTransition* c = new DipToBlackTransition();
-
-  CopyParameters(this, c);
-
-  return c;
-}
-
-QString DipToBlackTransition::Name() const
-{
-  return tr("Dip to Black");
-}
-
-QString DipToBlackTransition::id() const
-{
-  return "org.olivevideoeditor.Olive.diptoblack";
-}
-
-QString DipToBlackTransition::Description() const
-{
-  return tr("A smooth dip to transparency and back into another clip.");
-}
-
-bool DipToBlackTransition::IsAccelerated() const
-{
-  return true;
-}
-
-QString DipToBlackTransition::AcceleratedCodeFragment() const
-{
-  return ReadFileAsString(":/shaders/diptoblack.frag");
-}
@@ -1,21 +0,0 @@
-#ifndef DIPTOBLACKTRANSITION_H
-#define DIPTOBLACKTRANSITION_H
-
-#include "../transition.h"
-
-class DipToBlackTransition : public TransitionBlock
-{
-public:
-  DipToBlackTransition() = default;
-
-  virtual Node* copy() const override;
-
-  virtual QString Name() const override;
-  virtual QString id() const override;
-  virtual QString Description() const override;
-
-  virtual bool IsAccelerated() const override;
-  virtual QString AcceleratedCodeFragment() const override;
-};
-
-#endif // DIPTOBLACKTRANSITION_H
@@ -19,11 +19,6 @@ Block::Type TransitionBlock::type() const
  return kTransition;
 }

-QString TransitionBlock::Category() const
-{
-  return tr("Transition");
-}
-
 NodeInput *TransitionBlock::out_block_input() const
 {
  return out_block_input_;
@@ -9,7 +9,6 @@ public:
  TransitionBlock();

  virtual Type type() const override;
-  virtual QString Category() const override;

  NodeInput* out_block_input() const;
  NodeInput* in_block_input() const;