RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PNMTextMaker constructor should take FreetypeFont

This commit is contained in:
rdb 2014-09-13 17:21:38 +00:00
parent 031005d55e
commit 02e95bdba3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/pnmtext/pnmTextMaker.cxx
View File

@ -46,7 +46,7 @@ PNMTextMaker(const char *font_data, int data_length, int face_index) {
////////////////////////////////////////////////////////////////////
// Function: PNMTextMaker::Copy Constructor
// Access: Public
// Description:
// Description:
////////////////////////////////////////////////////////////////////
PNMTextMaker::
PNMTextMaker(const PNMTextMaker &copy) :
@ -59,10 +59,23 @@ PNMTextMaker(const PNMTextMaker &copy) :
{
}
////////////////////////////////////////////////////////////////////
// Function: PNMTextMaker::Copy Constructor
// Access: Public
// Description:
////////////////////////////////////////////////////////////////////
PNMTextMaker::
PNMTextMaker(const FreetypeFont &copy) :
FreetypeFont(copy),
_is_valid(true)
{
initialize();
}
////////////////////////////////////////////////////////////////////
// Function: PNMTextMaker::Destructor
// Access: Public
// Description:
// Description:
////////////////////////////////////////////////////////////////////
PNMTextMaker::
~PNMTextMaker() {

1
panda/src/pnmtext/pnmTextMaker.h
View File

@ -41,6 +41,7 @@ PUBLISHED:
PNMTextMaker(const Filename &font_filename, int face_index);
PNMTextMaker(const char *font_data, int data_length, int face_index);
PNMTextMaker(const PNMTextMaker &copy);
PNMTextMaker(const FreetypeFont &copy);
~PNMTextMaker();
enum Alignment {