Bläddra i källkod

no more set/get depth

Cary Sandvig 25 år sedan
förälder
incheckning
7fe048aec2
2 ändrade filer med 1 tillägg och 17 borttagningar
  1. 1 14
      panda/src/gui/guiLabel.I
  2. 0 3
      panda/src/gui/guiLabel.h

+ 1 - 14
panda/src/gui/guiLabel.I

@@ -14,8 +14,7 @@ INLINE GuiLabel::GuiLabel(void) : _type(GuiLabel::NONE),
 				  _background(0., 0., 0., 0.),
 				  _background(0., 0., 0., 0.),
 				  _have_width(false), _width(0.),
 				  _have_width(false), _width(0.),
 				  _have_height(false), _height(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 {
 INLINE Node* GuiLabel::get_geometry(void) const {
@@ -66,18 +65,6 @@ INLINE void GuiLabel::set_pos(const LVector3f& p) {
   recompute_transform();
   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 {
 INLINE float GuiLabel::get_scale(void) const {
   return _scale;
   return _scale;
 }
 }

+ 0 - 3
panda/src/gui/guiLabel.h

@@ -43,7 +43,6 @@ private:
   float _width;
   float _width;
   bool _have_height;
   bool _have_height;
   float _height;
   float _height;
-  float _depth;
 
 
   PriorityMap _priorities;
   PriorityMap _priorities;
   int _hard_pri;
   int _hard_pri;
@@ -73,7 +72,6 @@ PUBLISHED:
   void get_extents(float&, float&, float&, float&);
   void get_extents(float&, float&, float&, float&);
   float get_width(void);
   float get_width(void);
   float get_height(void);
   float get_height(void);
-  INLINE float get_depth(void) const;
 
 
   INLINE void set_width(float);
   INLINE void set_width(float);
   INLINE void set_height(float);
   INLINE void set_height(float);
@@ -81,7 +79,6 @@ PUBLISHED:
   INLINE void set_scale(float);
   INLINE void set_scale(float);
   INLINE void set_pos(float, float, float);
   INLINE void set_pos(float, float, float);
   INLINE void set_pos(const LVector3f&);
   INLINE void set_pos(const LVector3f&);
-  INLINE void set_depth(float);
 
 
   INLINE float get_scale(void) const;
   INLINE float get_scale(void) const;
   INLINE LVector3f get_pos(void) const;
   INLINE LVector3f get_pos(void) const;