diff options
| author | Rémi Verschelde | 2017-11-17 20:04:29 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-17 20:04:29 +0100 |
| commit | 0968c8d2f65f7ac6e0d6b3718ee1028b229b3353 (patch) | |
| tree | d2265ef6e3273658171104abe9b215f961d17495 /editor/plugins/spatial_editor_plugin.h | |
| parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
| parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
| download | godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.gz godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.zst godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.zip | |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to '')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index c2b698068..0ef85b72d 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -108,7 +108,7 @@ private: Size2 prev_size; Spatial *preview_node; - Rect3 *preview_bounds; + AABB *preview_bounds; Vector<String> selected_files; AcceptDialog *accept; @@ -287,7 +287,7 @@ private: Point2i _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const; Vector3 _get_instance_position(const Point2 &p_pos) const; - static Rect3 _calculate_spatial_bounds(const Spatial *p_parent, const Rect3 p_bounds); + static AABB _calculate_spatial_bounds(const Spatial *p_parent, const AABB p_bounds); void _create_preview(const Vector<String> &files) const; void _remove_preview(); bool _cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node); @@ -314,7 +314,7 @@ public: void assign_pending_data_pointers( Spatial *p_preview_node, - Rect3 *p_preview_bounds, + AABB *p_preview_bounds, AcceptDialog *p_accept); Viewport *get_viewport_node() { return viewport; } @@ -327,7 +327,7 @@ class SpatialEditorSelectedItem : public Object { GDCLASS(SpatialEditorSelectedItem, Object); public: - Rect3 aabb; + AABB aabb; Transform original; // original location when moving Transform original_local; Transform last_xform; // last transform @@ -435,7 +435,7 @@ private: // Scene drag and drop support Spatial *preview_node; - Rect3 preview_bounds; + AABB preview_bounds; /* struct Selected { |