Skip to content

Commit 5d01dfa

Browse files
committed
Small code style improvement
1 parent b02e260 commit 5d01dfa

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/editor/node_marker.cpp

+12-13
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ NodeMarker::remove_me()
5959
before->remove_me();
6060
if (after)
6161
after->remove_me();
62-
62+
6363
MarkerObject::remove_me();
6464
}
6565

@@ -109,8 +109,8 @@ NodeMarker::editor_delete()
109109
{
110110
return;
111111
}
112-
std::vector<Path::Node>::iterator prev = prev_node();
113-
std::vector<Path::Node>::const_iterator next = next_node();
112+
auto prev = prev_node();
113+
auto next = next_node();
114114
update_node_time(prev, next);
115115
m_path->m_nodes.erase(m_node);
116116
Editor::current()->update_node_iterators();
@@ -123,7 +123,7 @@ NodeMarker::get_settings()
123123
result.add_label(_("Press CTRL to move Bezier handles"));
124124
result.add_float(_("Time"), &(m_node->time));
125125
result.add_float(_("Speed"), &(m_node->speed));
126-
126+
127127
result.add_enum(_("Easing"), reinterpret_cast<int*>(&(m_node->easing)),
128128
{
129129
_("No easing"),
@@ -191,17 +191,16 @@ void NodeMarker::update_node_times() {
191191
}
192192

193193
void NodeMarker::update_node_time(std::vector<Path::Node>::iterator current, std::vector<Path::Node>::const_iterator next) {
194-
if (current == m_path->m_nodes.end() || next == m_path->m_nodes.end()) {
194+
if (current == m_path->m_nodes.end() || next == m_path->m_nodes.end() || current->speed <= 0) {
195195
return; // Nothing to do.
196196
}
197-
if (current->speed > 0) {
198-
float delta = Bezier::get_length(current->position,
199-
current->bezier_after,
200-
next->bezier_before,
201-
next->position);
202-
if (delta > 0) {
203-
current->time = delta / current->speed;
204-
}
197+
198+
float delta = Bezier::get_length(current->position,
199+
current->bezier_after,
200+
next->bezier_before,
201+
next->position);
202+
if (delta > 0) {
203+
current->time = delta / current->speed;
205204
}
206205
}
207206

0 commit comments

Comments
 (0)