Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/text_engine/multi_line_text.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/text_engine/multi_line_text.cc (modified) (3 diffs)

trunk/src/lib/graphics/text_engine/multi_line_text.cc

@@ -19 +19 @@
 #include "font.h"
 
+ObjectListDefinition(MultiLineText);
+
 /**
  * @brief creates a new Text Element
@@ -27 +29 @@
   : Text(fontFile, textSize)
 {
-  this->setClassID(CL_MULTI_LINE_TEXT, "MultiLineText");
+  this->registerObject(this, MultiLineText::_objectList);
 
   this->lineSpacing = 1.0;
@@ -78 +80 @@
   glRotatef(this->getAbsDir2D(), 0, 0, 1);
 
-  Glyph* tmpGlyph;
+  const Font::Glyph* tmpGlyph;
   float posX = 0.0f;
   float posY = 0.0f;