Mike-Solar
bb40b4923e
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
96 lines
2.5 KiB
C++
96 lines
2.5 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
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/>.
|
|
|
|
***/
|
|
|
|
#include "crossdissolvetransition.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
CrossDissolveTransition::CrossDissolveTransition()
|
|
{
|
|
}
|
|
|
|
QString CrossDissolveTransition::name() const
|
|
{
|
|
return tr("Cross Dissolve");
|
|
}
|
|
|
|
QString CrossDissolveTransition::id() const
|
|
{
|
|
return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve");
|
|
}
|
|
|
|
QVector<Node::CategoryID> CrossDissolveTransition::category() const
|
|
{
|
|
return { k_category_transition };
|
|
}
|
|
|
|
QString CrossDissolveTransition::description() const
|
|
{
|
|
return tr("Smoothly transition between two clips.");
|
|
}
|
|
|
|
ShaderCode
|
|
CrossDissolveTransition::get_shader_code(const ShaderRequest &request) const
|
|
{
|
|
Q_UNUSED(request)
|
|
|
|
return ShaderCode(
|
|
FileFunctions::read_file_as_string(":/shaders/crossdissolve.frag"),
|
|
QString());
|
|
}
|
|
|
|
void CrossDissolveTransition::SampleJobEvent(const SampleBuffer &from_samples,
|
|
const SampleBuffer &to_samples,
|
|
SampleBuffer &out_samples,
|
|
double time_in) const
|
|
{
|
|
for (size_t i = 0; i < out_samples.sample_count(); i++) {
|
|
double this_sample_time =
|
|
out_samples.audio_params().samples_to_time(i).to_double() + time_in;
|
|
double progress = get_total_progress(this_sample_time);
|
|
|
|
for (int j = 0; j < out_samples.audio_params().channel_count(); j++) {
|
|
out_samples.data(j)[i] = 0;
|
|
|
|
if (from_samples.is_allocated()) {
|
|
if (i < from_samples.sample_count()) {
|
|
out_samples.data(j)[i] += from_samples.data(j)[i] *
|
|
transform_curve(1.0 - progress);
|
|
}
|
|
}
|
|
|
|
if (to_samples.is_allocated()) {
|
|
// Offset input samples from the end
|
|
size_t remain =
|
|
(out_samples.sample_count() - to_samples.sample_count());
|
|
if (i >= remain) {
|
|
qint64 in_index = i - remain;
|
|
out_samples.data(j)[i] +=
|
|
to_samples.data(j)[in_index] * transform_curve(progress);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|