style: unify identifier naming per updated conventions
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.
This commit is contained in:
@@ -34,9 +34,9 @@ MulticamDisplay::MulticamDisplay(QWidget *parent)
|
||||
{
|
||||
}
|
||||
|
||||
void MulticamDisplay::OnPaint()
|
||||
void MulticamDisplay::on_paint()
|
||||
{
|
||||
super::OnPaint();
|
||||
super::on_paint();
|
||||
|
||||
if (node_) {
|
||||
QPainter p(paint_device());
|
||||
@@ -45,43 +45,43 @@ void MulticamDisplay::OnPaint()
|
||||
p.setBrush(Qt::NoBrush);
|
||||
|
||||
int rows, cols;
|
||||
node_->GetRowsAndColumns(&rows, &cols);
|
||||
node_->get_rows_and_columns(&rows, &cols);
|
||||
|
||||
int multi = std::max(rows, cols);
|
||||
int cell_width = width() / multi;
|
||||
int cell_height = height() / multi;
|
||||
|
||||
int col, row;
|
||||
node_->IndexToRowCols(node_->GetCurrentSource(), rows, cols, &row,
|
||||
node_->index_to_row_cols(node_->get_current_source(), rows, cols, &row,
|
||||
&col);
|
||||
|
||||
QRect r(cell_width * col, cell_height * row, cell_width, cell_height);
|
||||
p.drawRect(GenerateWorldTransform().mapRect(r));
|
||||
p.drawRect(generate_world_transform().mapRect(r));
|
||||
}
|
||||
}
|
||||
|
||||
void MulticamDisplay::OnDestroy()
|
||||
void MulticamDisplay::on_destroy()
|
||||
{
|
||||
shader_ = QVariant();
|
||||
}
|
||||
|
||||
TexturePtr MulticamDisplay::LoadCustomTextureFromFrame(const QVariant &v)
|
||||
TexturePtr MulticamDisplay::load_custom_texture_from_frame(const QVariant &v)
|
||||
{
|
||||
if (v.canConvert<QVector<TexturePtr>>()) {
|
||||
QVector<TexturePtr> tex = v.value<QVector<TexturePtr>>();
|
||||
|
||||
TexturePtr main = renderer()->CreateTexture(this->GetViewportParams());
|
||||
TexturePtr main = renderer()->create_texture(this->get_viewport_params());
|
||||
|
||||
int rows, cols;
|
||||
MultiCamNode::GetRowsAndColumns(tex.size(), &rows, &cols);
|
||||
MultiCamNode::get_rows_and_columns(tex.size(), &rows, &cols);
|
||||
|
||||
if (shader_.isNull() || rows_ != rows || cols_ != cols) {
|
||||
if (!shader_.isNull()) {
|
||||
renderer()->DestroyNativeShader(shader_);
|
||||
renderer()->destroy_native_shader(shader_);
|
||||
}
|
||||
|
||||
shader_ = renderer()->CreateNativeShader(
|
||||
ShaderCode(GenerateShaderCode(rows, cols)));
|
||||
shader_ = renderer()->create_native_shader(
|
||||
ShaderCode(generate_shader_code(rows, cols)));
|
||||
|
||||
rows_ = rows;
|
||||
cols_ = cols;
|
||||
@@ -91,26 +91,26 @@ TexturePtr MulticamDisplay::LoadCustomTextureFromFrame(const QVariant &v)
|
||||
|
||||
for (int i = 0; i < tex.size(); i++) {
|
||||
int c, r;
|
||||
MultiCamNode::IndexToRowCols(i, rows, cols, &r, &c);
|
||||
job.Insert(QStringLiteral("tex_%1_%2")
|
||||
MultiCamNode::index_to_row_cols(i, rows, cols, &r, &c);
|
||||
job.insert(QStringLiteral("tex_%1_%2")
|
||||
.arg(QString::number(r), QString::number(c)),
|
||||
NodeValue(NodeValue::kTexture, tex.at(i)));
|
||||
NodeValue(NodeValue::k_texture, tex.at(i)));
|
||||
}
|
||||
|
||||
renderer()->BlitToTexture(shader_, job, main.get());
|
||||
renderer()->blit_to_texture(shader_, job, main.get());
|
||||
|
||||
return main;
|
||||
} else {
|
||||
return super::LoadCustomTextureFromFrame(v);
|
||||
return super::load_custom_texture_from_frame(v);
|
||||
}
|
||||
}
|
||||
|
||||
QString dblToGlsl(double d)
|
||||
QString dbl_to_glsl(double d)
|
||||
{
|
||||
return QString::number(d, 'f');
|
||||
}
|
||||
|
||||
QString MulticamDisplay::GenerateShaderCode(int rows, int cols)
|
||||
QString MulticamDisplay::generate_shader_code(int rows, int cols)
|
||||
{
|
||||
int multiplier = std::max(cols, rows);
|
||||
|
||||
@@ -139,7 +139,7 @@ QString MulticamDisplay::GenerateShaderCode(int rows, int cols)
|
||||
} else {
|
||||
shader.append(
|
||||
QStringLiteral(" if (ove_texcoord.x < %1) {")
|
||||
.arg(dblToGlsl(double(x + 1) / double(multiplier))));
|
||||
.arg(dbl_to_glsl(double(x + 1) / double(multiplier))));
|
||||
}
|
||||
|
||||
for (int y = 0; y < rows; y++) {
|
||||
@@ -151,17 +151,17 @@ QString MulticamDisplay::GenerateShaderCode(int rows, int cols)
|
||||
} else {
|
||||
shader.append(
|
||||
QStringLiteral(" if (ove_texcoord.y < %1) {")
|
||||
.arg(dblToGlsl(double(y + 1) / double(multiplier))));
|
||||
.arg(dbl_to_glsl(double(y + 1) / double(multiplier))));
|
||||
}
|
||||
QString input = QStringLiteral("tex_%1_%2")
|
||||
.arg(QString::number(y), QString::number(x));
|
||||
shader.append(
|
||||
QStringLiteral(
|
||||
" vec2 coord = vec2((ove_texcoord.x+%1)*%2, (ove_texcoord.y+%3)*%4);")
|
||||
.arg(dblToGlsl(-double(x) / double(multiplier)),
|
||||
dblToGlsl(multiplier),
|
||||
dblToGlsl(-double(y) / double(multiplier)),
|
||||
dblToGlsl(multiplier)));
|
||||
.arg(dbl_to_glsl(-double(x) / double(multiplier)),
|
||||
dbl_to_glsl(multiplier),
|
||||
dbl_to_glsl(-double(y) / double(multiplier)),
|
||||
dbl_to_glsl(multiplier)));
|
||||
shader.append(
|
||||
QStringLiteral(
|
||||
" if (%1_enabled && coord.x >= 0.0 && coord.x < 1.0 && coord.y >= 0.0 && coord.y < 1.0) {")
|
||||
@@ -183,7 +183,7 @@ QString MulticamDisplay::GenerateShaderCode(int rows, int cols)
|
||||
return shader.join('\n');
|
||||
}
|
||||
|
||||
void MulticamDisplay::SetMulticamNode(MultiCamNode *n)
|
||||
void MulticamDisplay::set_multicam_node(MultiCamNode *n)
|
||||
{
|
||||
node_ = n;
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef MULTICAMDISPLAY_H
|
||||
#define MULTICAMDISPLAY_H
|
||||
#ifndef OAK_MULTICAMDISPLAY_H
|
||||
#define OAK_MULTICAMDISPLAY_H
|
||||
|
||||
#include "node/input/multicam/multicamnode.h"
|
||||
#include "widget/viewer/viewerdisplay.h"
|
||||
@@ -33,17 +33,17 @@ class MulticamDisplay : public ViewerDisplayWidget {
|
||||
public:
|
||||
explicit MulticamDisplay(QWidget *parent = nullptr);
|
||||
|
||||
void SetMulticamNode(MultiCamNode *n);
|
||||
void set_multicam_node(MultiCamNode *n);
|
||||
|
||||
protected:
|
||||
virtual void OnPaint() override;
|
||||
virtual void on_paint() override;
|
||||
|
||||
virtual void OnDestroy() override;
|
||||
virtual void on_destroy() override;
|
||||
|
||||
virtual TexturePtr LoadCustomTextureFromFrame(const QVariant &v) override;
|
||||
virtual TexturePtr load_custom_texture_from_frame(const QVariant &v) override;
|
||||
|
||||
private:
|
||||
static QString GenerateShaderCode(int rows, int cols);
|
||||
static QString generate_shader_code(int rows, int cols);
|
||||
|
||||
MultiCamNode *node_;
|
||||
|
||||
@@ -54,4 +54,4 @@ private:
|
||||
|
||||
}
|
||||
|
||||
#endif // MULTICAMDISPLAY_H
|
||||
#endif // OAK_MULTICAMDISPLAY_H
|
||||
|
||||
@@ -43,17 +43,17 @@ MulticamWidget::MulticamWidget(QWidget *parent)
|
||||
layout->addWidget(sizer_);
|
||||
|
||||
display_ = new MulticamDisplay(this);
|
||||
display_->SetShowWidgetBackground(true);
|
||||
connect(display_, &ViewerDisplayWidget::DragStarted, this,
|
||||
&MulticamWidget::DisplayClicked);
|
||||
display_->set_show_widget_background(true);
|
||||
connect(display_, &ViewerDisplayWidget::drag_started, this,
|
||||
&MulticamWidget::display_clicked);
|
||||
|
||||
connect(sizer_, &ViewerSizer::RequestScale, display_,
|
||||
&ViewerDisplayWidget::SetMatrixZoom);
|
||||
connect(sizer_, &ViewerSizer::RequestTranslate, display_,
|
||||
&ViewerDisplayWidget::SetMatrixTranslate);
|
||||
connect(display_, &ViewerDisplayWidget::HandDragMoved, sizer_,
|
||||
&ViewerSizer::HandDragMove);
|
||||
sizer_->SetWidget(display_);
|
||||
connect(sizer_, &ViewerSizer::request_scale, display_,
|
||||
&ViewerDisplayWidget::set_matrix_zoom);
|
||||
connect(sizer_, &ViewerSizer::request_translate, display_,
|
||||
&ViewerDisplayWidget::set_matrix_translate);
|
||||
connect(display_, &ViewerDisplayWidget::hand_drag_moved, sizer_,
|
||||
&ViewerSizer::hand_drag_move);
|
||||
sizer_->set_widget(display_);
|
||||
|
||||
layout->addWidget(this->ruler());
|
||||
layout->addWidget(this->scrollbar());
|
||||
@@ -66,16 +66,16 @@ MulticamWidget::MulticamWidget(QWidget *parent)
|
||||
}
|
||||
}
|
||||
|
||||
void MulticamWidget::SetMulticamNodeInternal(ViewerOutput *viewer,
|
||||
void MulticamWidget::set_multicam_node_internal(ViewerOutput *viewer,
|
||||
MultiCamNode *n, ClipBlock *clip)
|
||||
{
|
||||
if (GetConnectedNode() != viewer) {
|
||||
ConnectViewerNode(viewer);
|
||||
if (get_connected_node() != viewer) {
|
||||
connect_viewer_node(viewer);
|
||||
}
|
||||
|
||||
if (node_ != n) {
|
||||
node_ = n;
|
||||
display_->SetMulticamNode(n);
|
||||
display_->set_multicam_node(n);
|
||||
}
|
||||
|
||||
if (clip_ != clip) {
|
||||
@@ -83,12 +83,12 @@ void MulticamWidget::SetMulticamNodeInternal(ViewerOutput *viewer,
|
||||
}
|
||||
}
|
||||
|
||||
void MulticamWidget::SetMulticamNode(ViewerOutput *viewer, MultiCamNode *n,
|
||||
ClipBlock *clip, const rational &time)
|
||||
void MulticamWidget::set_multicam_node(ViewerOutput *viewer, MultiCamNode *n,
|
||||
ClipBlock *clip, const Rational &time)
|
||||
{
|
||||
if (time.isNaN() || !GetConnectedNode() ||
|
||||
time == GetConnectedNode()->GetPlayhead()) {
|
||||
SetMulticamNodeInternal(viewer, n, clip);
|
||||
if (time.isNaN() || !get_connected_node() ||
|
||||
time == get_connected_node()->get_playhead()) {
|
||||
set_multicam_node_internal(viewer, n, clip);
|
||||
play_queue_.clear();
|
||||
} else {
|
||||
MulticamNodeQueue m = { time, viewer, n, clip };
|
||||
@@ -98,31 +98,31 @@ void MulticamWidget::SetMulticamNode(ViewerOutput *viewer, MultiCamNode *n,
|
||||
|
||||
void MulticamWidget::ConnectNodeEvent(ViewerOutput *n)
|
||||
{
|
||||
connect(n, &ViewerOutput::SizeChanged, sizer_, &ViewerSizer::SetChildSize);
|
||||
connect(n, &ViewerOutput::PixelAspectChanged, sizer_,
|
||||
&ViewerSizer::SetPixelAspectRatio);
|
||||
connect(n, &ViewerOutput::size_changed, sizer_, &ViewerSizer::set_child_size);
|
||||
connect(n, &ViewerOutput::pixel_aspect_changed, sizer_,
|
||||
&ViewerSizer::set_pixel_aspect_ratio);
|
||||
|
||||
VideoParams vp = n->GetVideoParams();
|
||||
sizer_->SetChildSize(vp.width(), vp.height());
|
||||
sizer_->SetPixelAspectRatio(vp.pixel_aspect_ratio());
|
||||
VideoParams vp = n->get_video_params();
|
||||
sizer_->set_child_size(vp.width(), vp.height());
|
||||
sizer_->set_pixel_aspect_ratio(vp.pixel_aspect_ratio());
|
||||
}
|
||||
|
||||
void MulticamWidget::DisconnectNodeEvent(ViewerOutput *n)
|
||||
{
|
||||
disconnect(n, &ViewerOutput::SizeChanged, sizer_,
|
||||
&ViewerSizer::SetChildSize);
|
||||
disconnect(n, &ViewerOutput::PixelAspectChanged, sizer_,
|
||||
&ViewerSizer::SetPixelAspectRatio);
|
||||
disconnect(n, &ViewerOutput::size_changed, sizer_,
|
||||
&ViewerSizer::set_child_size);
|
||||
disconnect(n, &ViewerOutput::pixel_aspect_changed, sizer_,
|
||||
&ViewerSizer::set_pixel_aspect_ratio);
|
||||
}
|
||||
|
||||
void MulticamWidget::TimeChangedEvent(const rational &t)
|
||||
void MulticamWidget::TimeChangedEvent(const Rational &t)
|
||||
{
|
||||
super::TimeChangedEvent(t);
|
||||
|
||||
if (!play_queue_.empty()) {
|
||||
const MulticamNodeQueue &m = play_queue_.front();
|
||||
if (m.time >= t) {
|
||||
SetMulticamNodeInternal(m.viewer, m.node, m.clip);
|
||||
set_multicam_node_internal(m.viewer, m.node, m.clip);
|
||||
play_queue_.pop_front();
|
||||
}
|
||||
}
|
||||
@@ -142,33 +142,33 @@ void MulticamWidget::Switch(int source, bool split_clip)
|
||||
BlockSplitPreservingLinksCommand *split = nullptr;
|
||||
|
||||
if (clip_ && split_clip &&
|
||||
clip_->in() < GetConnectedNode()->GetPlayhead() &&
|
||||
clip_->out() > GetConnectedNode()->GetPlayhead()) {
|
||||
clip_->in() < get_connected_node()->get_playhead() &&
|
||||
clip_->out() > get_connected_node()->get_playhead()) {
|
||||
QVector<Block *> blocks;
|
||||
|
||||
blocks.append(clip_);
|
||||
blocks.append(clip_->block_links());
|
||||
|
||||
split = new BlockSplitPreservingLinksCommand(
|
||||
blocks, { GetConnectedNode()->GetPlayhead() });
|
||||
blocks, { get_connected_node()->get_playhead() });
|
||||
split->redo_now();
|
||||
command->add_child(split);
|
||||
|
||||
clip = static_cast<ClipBlock *>(split->GetSplit(clip_, 0));
|
||||
clip = static_cast<ClipBlock *>(split->get_split(clip_, 0));
|
||||
|
||||
cam = clip->FindMulticam();
|
||||
cam = clip->find_multicam();
|
||||
}
|
||||
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(NodeInput(cam, cam->kCurrentInput)),
|
||||
NodeKeyframeTrackReference(NodeInput(cam, cam->k_current_input)),
|
||||
source));
|
||||
|
||||
for (Block *link : clip->block_links()) {
|
||||
if (ClipBlock *clink = dynamic_cast<ClipBlock *>(link)) {
|
||||
if (MultiCamNode *mlink = clink->FindMulticam()) {
|
||||
if (MultiCamNode *mlink = clink->find_multicam()) {
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(
|
||||
NodeInput(mlink, mlink->kCurrentInput)),
|
||||
NodeInput(mlink, mlink->k_current_input)),
|
||||
source));
|
||||
}
|
||||
}
|
||||
@@ -179,18 +179,18 @@ void MulticamWidget::Switch(int source, bool split_clip)
|
||||
|
||||
display_->update();
|
||||
|
||||
emit Switched();
|
||||
emit switched();
|
||||
}
|
||||
|
||||
void MulticamWidget::DisplayClicked(const QPoint &p)
|
||||
void MulticamWidget::display_clicked(const QPoint &p)
|
||||
{
|
||||
if (!node_) {
|
||||
return;
|
||||
}
|
||||
|
||||
QPointF click = display_->ScreenToScenePoint(p);
|
||||
int width = display_->GetVideoParams().width();
|
||||
int height = display_->GetVideoParams().height();
|
||||
QPointF click = display_->screen_to_scene_point(p);
|
||||
int width = display_->get_video_params().width();
|
||||
int height = display_->get_video_params().height();
|
||||
|
||||
if (click.x() < 0 || click.y() < 0 || click.x() >= width ||
|
||||
click.y() >= height) {
|
||||
@@ -198,14 +198,14 @@ void MulticamWidget::DisplayClicked(const QPoint &p)
|
||||
}
|
||||
|
||||
int rows, cols;
|
||||
node_->GetRowsAndColumns(&rows, &cols);
|
||||
node_->get_rows_and_columns(&rows, &cols);
|
||||
|
||||
int multi = std::max(cols, rows);
|
||||
|
||||
int c = click.x() / (width / multi);
|
||||
int r = click.y() / (height / multi);
|
||||
|
||||
int source = node_->RowsColsToIndex(r, c, rows, cols);
|
||||
int source = node_->rows_cols_to_index(r, c, rows, cols);
|
||||
|
||||
Switch(source, true);
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
***/
|
||||
|
||||
#ifndef MULTICAMWIDGET_H
|
||||
#define MULTICAMWIDGET_H
|
||||
#ifndef OAK_MULTICAMWIDGET_H
|
||||
#define OAK_MULTICAMWIDGET_H
|
||||
|
||||
#include "multicamdisplay.h"
|
||||
#include "node/input/multicam/multicamnode.h"
|
||||
@@ -34,24 +34,24 @@ class MulticamWidget : public TimeBasedWidget {
|
||||
public:
|
||||
explicit MulticamWidget(QWidget *parent = nullptr);
|
||||
|
||||
MulticamDisplay *GetDisplayWidget() const
|
||||
MulticamDisplay *get_display_widget() const
|
||||
{
|
||||
return display_;
|
||||
}
|
||||
|
||||
void SetMulticamNode(ViewerOutput *viewer, MultiCamNode *n, ClipBlock *clip,
|
||||
const rational &time);
|
||||
void set_multicam_node(ViewerOutput *viewer, MultiCamNode *n, ClipBlock *clip,
|
||||
const Rational &time);
|
||||
|
||||
protected:
|
||||
virtual void ConnectNodeEvent(ViewerOutput *n) override;
|
||||
virtual void DisconnectNodeEvent(ViewerOutput *n) override;
|
||||
virtual void TimeChangedEvent(const rational &t) override;
|
||||
virtual void TimeChangedEvent(const Rational &t) override;
|
||||
|
||||
signals:
|
||||
void Switched();
|
||||
void switched();
|
||||
|
||||
private:
|
||||
void SetMulticamNodeInternal(ViewerOutput *viewer, MultiCamNode *n,
|
||||
void set_multicam_node_internal(ViewerOutput *viewer, MultiCamNode *n,
|
||||
ClipBlock *clip);
|
||||
|
||||
void Switch(int source, bool split_clip);
|
||||
@@ -65,7 +65,7 @@ private:
|
||||
ClipBlock *clip_;
|
||||
|
||||
struct MulticamNodeQueue {
|
||||
rational time;
|
||||
Rational time;
|
||||
ViewerOutput *viewer;
|
||||
MultiCamNode *node;
|
||||
ClipBlock *clip;
|
||||
@@ -74,9 +74,9 @@ private:
|
||||
std::list<MulticamNodeQueue> play_queue_;
|
||||
|
||||
private slots:
|
||||
void DisplayClicked(const QPoint &p);
|
||||
void display_clicked(const QPoint &p);
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // MULTICAMWIDGET_H
|
||||
#endif // OAK_MULTICAMWIDGET_H
|
||||
|
||||
Reference in New Issue
Block a user