@@ -59,7 +59,7 @@ NodeMarker::remove_me()
59
59
before->remove_me ();
60
60
if (after)
61
61
after->remove_me ();
62
-
62
+
63
63
MarkerObject::remove_me ();
64
64
}
65
65
@@ -109,8 +109,8 @@ NodeMarker::editor_delete()
109
109
{
110
110
return ;
111
111
}
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 ();
114
114
update_node_time (prev, next);
115
115
m_path->m_nodes .erase (m_node);
116
116
Editor::current ()->update_node_iterators ();
@@ -123,7 +123,7 @@ NodeMarker::get_settings()
123
123
result.add_label (_ (" Press CTRL to move Bezier handles" ));
124
124
result.add_float (_ (" Time" ), &(m_node->time ));
125
125
result.add_float (_ (" Speed" ), &(m_node->speed ));
126
-
126
+
127
127
result.add_enum (_ (" Easing" ), reinterpret_cast <int *>(&(m_node->easing )),
128
128
{
129
129
_ (" No easing" ),
@@ -191,17 +191,16 @@ void NodeMarker::update_node_times() {
191
191
}
192
192
193
193
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 ) {
195
195
return ; // Nothing to do.
196
196
}
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 ;
205
204
}
206
205
}
207
206
0 commit comments