diff options
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/animation_player_editor_plugin.cpp | 8 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/curve_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/navigation_mesh_generator.cpp | 14 | ||||
| -rw-r--r-- | editor/plugins/navigation_mesh_generator.h | 2 | ||||
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index d071d43cb7..c22e1cd88b 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -187,7 +187,7 @@ void AnimationPlayerEditor::_play_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current); } @@ -211,7 +211,7 @@ void AnimationPlayerEditor::_play_from_pressed() { if (current == player->get_assigned_animation() && player->is_playing()) { - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself } player->play(current); @@ -235,7 +235,7 @@ void AnimationPlayerEditor::_play_bw_pressed() { if (current != "") { if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); } @@ -257,7 +257,7 @@ void AnimationPlayerEditor::_play_bw_from_pressed() { float time = player->get_current_animation_position(); if (current == player->get_assigned_animation()) - player->stop(); //so it wont blend with itself + player->stop(); //so it won't blend with itself player->play(current, -1, -1, true); player->seek(time); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index f6834732a3..670f13b6c8 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1238,7 +1238,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref<InputEvent> &p_event) if (b->get_button_index() == BUTTON_LEFT && b->is_pressed()) { if (show_guides && show_rulers && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); @@ -1296,7 +1296,7 @@ void CanvasItemEditor::_gui_input_viewport_base(const Ref<InputEvent> &p_event) if (show_guides && EditorNode::get_singleton()->get_edited_scene()) { Transform2D xform = viewport_scrollable->get_transform() * transform; - // Retreive the guide lists + // Retrieve the guide lists Array vguides; if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 3be68f21af..7c49408c35 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -177,7 +177,7 @@ void CurveEditor::on_gui_input(const Ref<InputEvent> &p_event) { set_hover_point_index(i); set_selected_point(i); - // This is to prevent the user from loosing a point out of view. + // This is to prevent the user from losing a point out of view. if (point_pos.y < curve.get_min_value()) point_pos.y = curve.get_min_value(); else if (point_pos.y > curve.get_max_value()) diff --git a/editor/plugins/navigation_mesh_generator.cpp b/editor/plugins/navigation_mesh_generator.cpp index 214f982140..5d4e5520f4 100644 --- a/editor/plugins/navigation_mesh_generator.cpp +++ b/editor/plugins/navigation_mesh_generator.cpp @@ -138,12 +138,12 @@ void NavigationMeshGenerator::_convert_detail_mesh_to_native_navigation_mesh(con void NavigationMeshGenerator::_build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, rcPolyMeshDetail *detail_mesh, - Vector<float> &verticies, Vector<int> &indices) { + Vector<float> &vertices, Vector<int> &indices) { rcContext ctx; ep->step(TTR("Setting up Configuration..."), 1); - const float *verts = verticies.ptr(); - const int nverts = verticies.size() / 3; + const float *verts = vertices.ptr(); + const int nverts = vertices.size() / 3; const int *tris = indices.ptr(); const int ntris = indices.size() / 3; @@ -265,12 +265,12 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) EditorProgress ep("bake", TTR("Navigation Mesh Generator Setup:"), 11); ep.step(TTR("Parsing Geometry..."), 0); - Vector<float> verticies; + Vector<float> vertices; Vector<int> indices; - _parse_geometry(Object::cast_to<Spatial>(p_node)->get_global_transform().affine_inverse(), p_node, verticies, indices); + _parse_geometry(Object::cast_to<Spatial>(p_node)->get_global_transform().affine_inverse(), p_node, vertices, indices); - if (verticies.size() > 0 && indices.size() > 0) { + if (vertices.size() > 0 && indices.size() > 0) { rcHeightfield *hf = NULL; rcCompactHeightfield *chf = NULL; @@ -278,7 +278,7 @@ void NavigationMeshGenerator::bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node) rcPolyMesh *poly_mesh = NULL; rcPolyMeshDetail *detail_mesh = NULL; - _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, verticies, indices); + _build_recast_navigation_mesh(p_nav_mesh, &ep, hf, chf, cset, poly_mesh, detail_mesh, vertices, indices); if (hf) { rcFreeHeightField(hf); diff --git a/editor/plugins/navigation_mesh_generator.h b/editor/plugins/navigation_mesh_generator.h index 2f7bad0a82..d26f541b8d 100644 --- a/editor/plugins/navigation_mesh_generator.h +++ b/editor/plugins/navigation_mesh_generator.h @@ -54,7 +54,7 @@ protected: static void _convert_detail_mesh_to_native_navigation_mesh(const rcPolyMeshDetail *p_detail_mesh, Ref<NavigationMesh> p_nav_mesh); static void _build_recast_navigation_mesh(Ref<NavigationMesh> p_nav_mesh, EditorProgress *ep, rcHeightfield *hf, rcCompactHeightfield *chf, rcContourSet *cset, rcPolyMesh *poly_mesh, - rcPolyMeshDetail *detail_mesh, Vector<float> &verticies, Vector<int> &indices); + rcPolyMeshDetail *detail_mesh, Vector<float> &vertices, Vector<int> &indices); public: static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index e2ea853052..5e8eb06556 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -1589,7 +1589,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { float snap = spatial_editor->get_rotate_snap(); if (snap) { - angle = Math::rad2deg(angle) + snap * 0.5; //else it wont reach +180 + angle = Math::rad2deg(angle) + snap * 0.5; //else it won't reach +180 angle -= Math::fmod(angle, snap); set_message(vformat(TTR("Rotating %s degrees."), rtos(angle))); angle = Math::deg2rad(angle); |