summaryrefslogtreecommitdiff
path: root/scene/main/viewport.h
diff options
context:
space:
mode:
authorqarmin <mikrutrafal54@gmail.com>2020-04-18 11:00:51 +0200
committerqarmin <mikrutrafal54@gmail.com>2020-04-18 11:00:51 +0200
commit559bc3ca87042d477331ecd32f1881ce8d0b5d91 (patch)
tree7039216faa9c9261f60bcc726ac3453257dd9127 /scene/main/viewport.h
parentd817be92c2d9edce842ab37ab13117743f8a3bee (diff)
Change non-existent World to World3D
Diffstat (limited to 'scene/main/viewport.h')
-rw-r--r--scene/main/viewport.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 0cbc957307..ed179f9491 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -254,8 +254,8 @@ private:
Map<ObjectID, uint64_t> physics_2d_mouseover;
Ref<World2D> world_2d;
- Ref<World3D> world;
- Ref<World3D> own_world;
+ Ref<World3D> world_3d;
+ Ref<World3D> own_world_3d;
Rect2i to_screen_rect;
StringName input_group;
@@ -431,7 +431,7 @@ private:
void _gui_set_root_order_dirty();
- void _own_world_changed();
+ void _own_world_3d_changed();
friend class Window;
@@ -478,10 +478,10 @@ public:
Rect2 get_visible_rect() const;
RID get_viewport_rid() const;
- void set_world(const Ref<World3D> &p_world);
+ void set_world_3d(const Ref<World3D> &p_world_3d);
void set_world_2d(const Ref<World2D> &p_world_2d);
- Ref<World3D> get_world() const;
- Ref<World3D> find_world() const;
+ Ref<World3D> get_world_3d() const;
+ Ref<World3D> find_world_3d() const;
Ref<World2D> get_world_2d() const;
Ref<World2D> find_world_2d() const;
@@ -520,8 +520,8 @@ public:
Vector2 get_camera_coords(const Vector2 &p_viewport_coords) const;
Vector2 get_camera_rect_size() const;
- void set_use_own_world(bool p_world);
- bool is_using_own_world() const;
+ void set_use_own_world_3d(bool p_world_3d);
+ bool is_using_own_world_3d() const;
void input_text(const String &p_text);
void input(const Ref<InputEvent> &p_event, bool p_local_coords = false);