diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-08-03 13:34:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-03 13:34:14 +0200 |
commit | c51354f504a7892483fdce721d720aada4c53671 (patch) | |
tree | 14bc6ebac9bcc60beaa6e86efca40e093a7216b5 /servers/arvr/arvr_positional_tracker.h | |
parent | 0257ced05bf85fdd727f4c68a6ddf4c5c1876694 (diff) | |
parent | e7aed24adde416bc0fad058ee35b9ce3dfe00c10 (diff) |
Merge pull request #10062 from BastiaanOlij/arvr_add_anchor
Added ARVRAnchor support and a few small enhancements
Diffstat (limited to 'servers/arvr/arvr_positional_tracker.h')
-rw-r--r-- | servers/arvr/arvr_positional_tracker.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/servers/arvr/arvr_positional_tracker.h b/servers/arvr/arvr_positional_tracker.h index e8c613b29d..dba203b73c 100644 --- a/servers/arvr/arvr_positional_tracker.h +++ b/servers/arvr/arvr_positional_tracker.h @@ -56,7 +56,7 @@ private: bool tracks_orientation; // do we track orientation? Basis orientation; // our orientation bool tracks_position; // do we track position? - Vector3 position; // our position + Vector3 rw_position; // our position "in the real world, so without world_scale applied" protected: static void _bind_methods(); @@ -73,8 +73,10 @@ public: void set_orientation(const Basis &p_orientation); Basis get_orientation() const; bool get_tracks_position() const; - void set_position(const Vector3 &p_position); - Vector3 get_position() const; + void set_position(const Vector3 &p_position); // set position with world_scale applied + Vector3 get_position() const; // get position with world_scale applied + void set_rw_position(const Vector3 &p_rw_position); + Vector3 get_rw_position() const; Transform get_transform(bool p_adjust_by_reference_frame) const; |