Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine

Timestamp:

Sep 28, 2006, 10:17:56 AM (18 years ago)

Author:

bensch

Message:

more nice comments, and also updated the KeepLevel loading (if you want to load a Resource to a KeepLevel just append it at loadtime:
eg.:
Texture tex = ResourceTexture(orxonox.png, GL_TEXTURE_2D, GameEnd);
where GameEnd is the KeepLevel as defined in orxonox.cc→initResources()

Location:

branches/new_class_id/src/lib/graphics/text_engine

Files:

• resource_font.cc (modified) (3 diffs)
• resource_font.h (modified) (1 diff)

branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc

@@ -6 +6 @@
 
 
-ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
+ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel)
   : Font(), Resource(&ResourceFont::type)
 {
@@ -25 +25 @@
 
     this->Font::loadFontFromTTF(fileName, renderSize);
-    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
+    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), keepLevel, this->Font::dataPointer()));
   }
 }
 
-ResourceFont ResourceFont::createFromString(const std::string& loadString)
+ResourceFont ResourceFont::createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel)
 {
   SubString loadValues(loadString, ',');
@@ -39 +39 @@
     renderSize = (unsigned int)MultiType(loadValues[2]).getInt();
 
-  return ResourceFont(fontName, renderSize);
+  return ResourceFont(fontName, renderSize, keepLevel);
 }
 

branches/new_class_id/src/lib/graphics/text_engine/resource_font.h

@@ -15 +15 @@
 {
 public:
-  ResourceFont(const std::string& fontName, unsigned int renderSize);
-  static ResourceFont createFromString(const std::string& loadString);
+  ResourceFont(const std::string& fontName, unsigned int renderSize, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+  static ResourceFont createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
 
 private: