From e11869a26cd14387179b4a67ba29def73d28ebbe Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 25 May 2001 04:02:28 +0000 Subject: [PATCH] removed set_billboard --- panda/src/text/textNode.I | 27 --------------------------- panda/src/text/textNode.cxx | 5 ----- panda/src/text/textNode.h | 4 ---- 3 files changed, 36 deletions(-) diff --git a/panda/src/text/textNode.I b/panda/src/text/textNode.I index c811736297..4aa16a1beb 100644 --- a/panda/src/text/textNode.I +++ b/panda/src/text/textNode.I @@ -886,33 +886,6 @@ get_draw_order() const { return _draw_order; } -//////////////////////////////////////////////////////////////////// -// Function: TextNode::set_billboard -// Access: Published -// Description: Sets the flag indicating whether the text should be -// generated as a billboard object or not. If this is -// true, the text will automatically billboard. -//////////////////////////////////////////////////////////////////// -INLINE void TextNode:: -set_billboard(bool billboard) { - if (billboard) { - _flags |= F_billboard; - } else { - _flags &= ~F_billboard; - } - rebuild(false); -} - -//////////////////////////////////////////////////////////////////// -// Function: TextNode::get_billboard -// Access: Published -// Description: -//////////////////////////////////////////////////////////////////// -INLINE bool TextNode:: -get_billboard() const { - return (_flags & F_billboard) != 0; -} - //////////////////////////////////////////////////////////////////// // Function: TextNode::set_transform // Access: Published diff --git a/panda/src/text/textNode.cxx b/panda/src/text/textNode.cxx index ac63c140d3..ed40ac1531 100644 --- a/panda/src/text/textNode.cxx +++ b/panda/src/text/textNode.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -231,10 +230,6 @@ generate() { root_arc->set_transition(new TransformTransition(mat)); - if (get_billboard()) { - root_arc->set_transition(new BillboardTransition(BillboardTransition::axis(_coordinate_system))); - } - string text = _text; if (has_wordwrap()) { text = wordwrap_to(text, _wordwrap_width); diff --git a/panda/src/text/textNode.h b/panda/src/text/textNode.h index e16ecde596..452fabc502 100644 --- a/panda/src/text/textNode.h +++ b/panda/src/text/textNode.h @@ -131,9 +131,6 @@ PUBLISHED: INLINE int set_draw_order(int draw_order); INLINE int get_draw_order() const; - INLINE void set_billboard(bool billboard); - INLINE bool get_billboard() const; - INLINE void set_transform(const LMatrix4f &transform); INLINE LMatrix4f get_transform() const; @@ -207,7 +204,6 @@ private: F_frame_corners = 0x0100, F_card_transp = 0x0200, F_has_card_border = 0x0400, - F_billboard = 0x0800, }; int _flags;