removed set_billboard
This commit is contained in:
parent
85e54125fa
commit
e11869a26c
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
#include <geom.h>
|
||||
#include <geomprimitives.h>
|
||||
#include <renderRelation.h>
|
||||
#include <billboardTransition.h>
|
||||
#include <notify.h>
|
||||
#include <sceneGraphReducer.h>
|
||||
#include <geomBinTransition.h>
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue