TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
David Rose 2001-02-21 05:00:35 +00:00
parent 339036a6b0
commit 6ff72bf4af
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
panda/src/text/textNode.I
View File

@ -703,11 +703,17 @@ get_card_as_set() const {
// size of the current text; if the card was set via // size of the current text; if the card was set via
// set_card_actual(), this returns the values // set_card_actual(), this returns the values
// actually set. // actually set.
//
// If the text has no card at all, this returns the
// dimensions of the text itself, as if the card were
// set with a margin of 0, 0, 0, 0.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE LVecBase4f TextNode:: INLINE LVecBase4f TextNode::
get_card_actual() const { get_card_actual() const {
nassertr(has_card(), LVecBase4f(0.0, 0.0, 0.0, 0.0)); if (!has_card()) {
if (is_card_as_margin()) { return LVecBase4f(get_left(), get_right(), get_bottom(), get_top());
} else if (is_card_as_margin()) {
return LVecBase4f(get_left() - _card_ul[0], return LVecBase4f(get_left() - _card_ul[0],
get_right() + _card_lr[0], get_right() + _card_lr[0],
get_bottom() - _card_lr[1], get_bottom() - _card_lr[1],
@ -849,11 +855,15 @@ get_bin() const {
// This affects the sorting order assigned to the arcs // This affects the sorting order assigned to the arcs
// as they are created, and also is passed to whatever // as they are created, and also is passed to whatever
// bin may be assigned via set_bin(). // bin may be assigned via set_bin().
//
// The return value is the first unused draw_order
// number, e.g. _draw_order + 3.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void TextNode:: INLINE int TextNode::
set_draw_order(int draw_order) { set_draw_order(int draw_order) {
_draw_order = draw_order; _draw_order = draw_order;
rebuild(false); rebuild(false);
return _draw_order + 3;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
panda/src/text/textNode.h
View File

@ -128,7 +128,7 @@ PUBLISHED:
INLINE bool has_bin() const; INLINE bool has_bin() const;
INLINE const string &get_bin() const; INLINE const string &get_bin() const;
INLINE void set_draw_order(int draw_order); INLINE int set_draw_order(int draw_order);
INLINE int get_draw_order() const; INLINE int get_draw_order() const;
INLINE void set_billboard(bool billboard); INLINE void set_billboard(bool billboard);