Changeset 9839 in orxonox.OLD for branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc

Timestamp:

Sep 26, 2006, 6:31:56 PM (18 years ago)

Author:

bensch

Message:

Font completely ported to the new Resource-Format.
Now all the Basic Resources previously loaded from a central ResourceManager are Distributed over the Resource-Types

File:

• branches/new_class_id/src/lib/graphics/text_engine/resource_font.cc (modified) (2 diffs)

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

@@ -6 +6 @@
 
 
-ResourceFont::ResourceFont(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceFont::type)
+ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
+  : Font(), NewResource(&ResourceFont::type)
 {
-  Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
+  assert(!fontName.empty());
+  Resources::StorePointer* ptr = this->acquireResource(fontName + ',' + MultiType((int)renderSize).getString());
 
   if (ptr)
   {
-    PRINTF(5)("FOUND FONT: %s\n", imageName.c_str());
-    this->acquireData(static_cast<ResourceFont::FontResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND FONT: %s\n", fontName.c_str());
+    this->Font::acquireData(static_cast<ResourceFont::FontResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUND FONT: %s\n", imageName.c_str());
-    std::string fileName = this->NewResource::locateFile(imageName);
-    this->Font::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceFont::FontResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Font::dataPointer()));
+    PRINTF(5)("NOT FOUND FONT: %s\n", fontName.c_str());
+    std::string fileName = this->NewResource::locateFile(fontName);
+
+    printf("FONTFILE %s TO %s\n", fontName.c_str(), fileName.c_str());
+
+    this->Font::loadFontFromTTF(fileName, renderSize);
+    this->NewResource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
   }
 }
@@ -28 +32 @@
 {
   SubString loadValues(loadString, ',');
-  std::string imageName;
-  GLenum target = GL_FONT_2D;
+  std::string fontName;
+  unsigned int renderSize = 20;
   if (loadValues.size() > 0)
-    imageName = loadValues[0];
+    fontName = loadValues[0];
   if (loadValues.size() > 1)
-    target = (GLenum)MultiType(loadValues[2]).getInt();
+    renderSize = (unsigned int)MultiType(loadValues[2]).getInt();
 
-  return ResourceFont(imageName, target);
+  return ResourceFont(fontName, renderSize);
 }