From 7fe048aec212c6767da7c4f1b50895dbd3381b4f Mon Sep 17 00:00:00 2001 From: Cary Sandvig Date: Wed, 21 Feb 2001 19:22:14 +0000 Subject: [PATCH] no more set/get depth --- panda/src/gui/guiLabel.I | 15 +-------------- panda/src/gui/guiLabel.h | 3 --- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/panda/src/gui/guiLabel.I b/panda/src/gui/guiLabel.I index c54c36d839..8b5c23edfe 100644 --- a/panda/src/gui/guiLabel.I +++ b/panda/src/gui/guiLabel.I @@ -14,8 +14,7 @@ INLINE GuiLabel::GuiLabel(void) : _type(GuiLabel::NONE), _background(0., 0., 0., 0.), _have_width(false), _width(0.), _have_height(false), _height(0.), - _depth(0.), _hard_pri(0), - _highest_pri(false) { + _hard_pri(0), _highest_pri(false) { } INLINE Node* GuiLabel::get_geometry(void) const { @@ -66,18 +65,6 @@ INLINE void GuiLabel::set_pos(const LVector3f& p) { recompute_transform(); } -INLINE void GuiLabel::set_depth(float x) { - float r = _pos.dot(_pos.right()); - float u = _pos.dot(_pos.up()); - _pos = LVector3f::rfu(r, x, u); - _depth = x; - recompute_transform(); -} - -INLINE float GuiLabel::get_depth(void) const { - return _pos.dot(_pos.forward()); -} - INLINE float GuiLabel::get_scale(void) const { return _scale; } diff --git a/panda/src/gui/guiLabel.h b/panda/src/gui/guiLabel.h index 2a7becbbed..5eb3e6cd9a 100644 --- a/panda/src/gui/guiLabel.h +++ b/panda/src/gui/guiLabel.h @@ -43,7 +43,6 @@ private: float _width; bool _have_height; float _height; - float _depth; PriorityMap _priorities; int _hard_pri; @@ -73,7 +72,6 @@ PUBLISHED: void get_extents(float&, float&, float&, float&); float get_width(void); float get_height(void); - INLINE float get_depth(void) const; INLINE void set_width(float); INLINE void set_height(float); @@ -81,7 +79,6 @@ PUBLISHED: INLINE void set_scale(float); INLINE void set_pos(float, float, float); INLINE void set_pos(const LVector3f&); - INLINE void set_depth(float); INLINE float get_scale(void) const; INLINE LVector3f get_pos(void) const;