godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spatial selection if subscene geometry is far from origin 

(cherry picked from commit 78e72c8e79)
This commit is contained in:
Jakub Grzesik 2017-08-14 09:53:46 +02:00 committed by Rémi Verschelde
parent 34263fd39f
commit da15a1b50d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/spatial_editor_plugin.cpp
View File

@ -261,6 +261,7 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
List<_RayResult> results; List<_RayResult> results;
Vector<Spatial *> subscenes = Vector<Spatial *>(); Vector<Spatial *> subscenes = Vector<Spatial *>();
Vector<Vector3> subscenes_positions = Vector<Vector3>();
for (int i = 0; i < instances.size(); i++) { for (int i = 0; i < instances.size(); i++) {
@ -278,13 +279,16 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
if (!seg.is_valid() || found_gizmos.has(seg)) { if (!seg.is_valid() || found_gizmos.has(seg)) {
Node *subscene_candidate = spat; Node *subscene_candidate = spat;
Vector3 source_click_spatial_pos = spat->get_global_transform().origin;
while ((subscene_candidate->get_owner() != NULL) && (subscene_candidate->get_owner() != editor->get_edited_scene())) while ((subscene_candidate->get_owner() != NULL) && (subscene_candidate->get_owner() != editor->get_edited_scene()))
subscene_candidate = subscene_candidate->get_owner(); subscene_candidate = subscene_candidate->get_owner();
spat = subscene_candidate->cast_to<Spatial>(); spat = subscene_candidate->cast_to<Spatial>();
if (spat && (spat->get_filename() != "") && (subscene_candidate->get_owner() != NULL)) if (spat && (spat->get_filename() != "") && (subscene_candidate->get_owner() != NULL)) {
subscenes.push_back(spat); subscenes.push_back(spat);
subscenes_positions.push_back(source_click_spatial_pos);
}
continue; continue;
} }
@ -316,7 +320,7 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
for (int idx_subscene = 0; idx_subscene < subscenes.size(); idx_subscene++) { for (int idx_subscene = 0; idx_subscene < subscenes.size(); idx_subscene++) {
Spatial *subscene = subscenes.get(idx_subscene); Spatial *subscene = subscenes.get(idx_subscene);
float dist = ray.cross(subscene->get_global_transform().origin - pos).length(); float dist = ray.cross(subscenes_positions.get(idx_subscene) - pos).length();
if ((dist < 0) || (dist > 1.2)) if ((dist < 0) || (dist > 1.2))
continue; continue;