diff --git a/panda/src/text/dynamicTextGlyph.I b/panda/src/text/dynamicTextGlyph.I index 0320486a5e..4f6e589d03 100644 --- a/panda/src/text/dynamicTextGlyph.I +++ b/panda/src/text/dynamicTextGlyph.I @@ -74,6 +74,17 @@ operator = (const DynamicTextGlyph &) { nassertv(false); } + +//////////////////////////////////////////////////////////////////// +// Function: DynamicTextGlyph::get_page +// Access: Published +// Description: Returns the DynamicTextPage that this glyph is on. +//////////////////////////////////////////////////////////////////// +INLINE DynamicTextPage *DynamicTextGlyph:: +get_page() const { + return _page; +} + //////////////////////////////////////////////////////////////////// // Function: DynamicTextGlyph::intersects // Access: Published diff --git a/panda/src/text/dynamicTextGlyph.h b/panda/src/text/dynamicTextGlyph.h index 6c8339032e..08dc4094c4 100644 --- a/panda/src/text/dynamicTextGlyph.h +++ b/panda/src/text/dynamicTextGlyph.h @@ -44,6 +44,8 @@ private: PUBLISHED: virtual ~DynamicTextGlyph(); + INLINE DynamicTextPage *get_page() const; + INLINE bool intersects(int x, int y, int x_size, int y_size) const; INLINE PN_stdfloat get_top() const; diff --git a/panda/src/text/dynamicTextPage.h b/panda/src/text/dynamicTextPage.h index 780e65cb5e..d0266df9f0 100644 --- a/panda/src/text/dynamicTextPage.h +++ b/panda/src/text/dynamicTextPage.h @@ -40,14 +40,15 @@ public: DynamicTextGlyph *slot_glyph(int character, int x_size, int y_size, int margin); +PUBLISHED: INLINE int get_x_size() const; INLINE int get_y_size() const; - void fill_region(int x, int y, int x_size, int y_size, const LColor &color); - -PUBLISHED: INLINE bool is_empty() const; +public: + void fill_region(int x, int y, int x_size, int y_size, const LColor &color); + private: int garbage_collect(DynamicTextFont *font);