Changeset 9839 in orxonox.OLD

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

Location:

branches/new_class_id/src

Files:

• Makefile.am (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/text_engine/font.cc (modified) (2 diffs)
• lib/graphics/text_engine/resource_font.cc (modified) (2 diffs)
• lib/graphics/text_engine/resource_font.h (modified) (1 diff)
• lib/graphics/text_engine/text.cc (modified) (3 diffs)
• lib/util/loading/resource.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)

branches/new_class_id/src/Makefile.am

@@ -42 +42 @@
                 util/kill_target.cc \
                 \
-                subprojects/benchmark.cc \
-                \
-                \
-                lib/util/loading/old_resource_manager.cc
+                subprojects/benchmark.cc
 
 noinst_HEADERS = \

branches/new_class_id/src/lib/graphics/Makefile.am

@@ -21 +21 @@
                 text_engine/limited_width_text.cc \
                 text_engine/font.cc \
-                text_engine/font_data.cc
+                text_engine/font_data.cc \
+                text_engine/resource_font.cc
 
 noinst_HEADERS =\
@@ -41 +42 @@
                 text_engine/font.h \
                 text_engine/font_data.h \
+                text_engine/resource_font.h \
                 text_engine/default_font.xpm
 

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

@@ -35 +35 @@
 {
   this->init();
-
 }
 
@@ -119 +118 @@
   Material::operator=(font);
   this->data = font.data;
+  this->setTexture(this->data->textureData());
 
   return *this;

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);
 }
 

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

@@ -15 +15 @@
 {
 public:
-  ResourceFont(const std::string& imageName, GLenum target = GL_FONT_2D);
+  ResourceFont(const std::string& fontName, unsigned int renderSize);
   static ResourceFont createFromString(const std::string& loadString);
 

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

@@ -17 +17 @@
 
 #include "text.h"
+#include "resource_font.h"
 #include "font.h"
-#include "loading/old_resource_manager.h"
 #include "debug.h"
 
@@ -29 +29 @@
  */
 Text::Text(const std::string& fontFile, unsigned int textSize)
-    // : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
+// : _font(fontFile, FONT_DEFAULT_RENDER_SIZE)
 {
   this->registerObject(this, Text::_objectList);
 
   // initialize this Text
-  this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
+  if (!fontFile.empty())
+    this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
+  else
+    this->setFont("fonts/final_frontier.ttf", FONT_DEFAULT_RENDER_SIZE);
   this->_size = textSize;
   this->setSizeY2D(textSize);
@@ -170 +173 @@
 void Text::setFont(const std::string& fontFile, unsigned int fontSize)
 {
-  Font* newFont = NULL;
-  //  Font* oldFont = this->_font;
-
-  // load a new Font
-  if (!fontFile.empty())
-  {
-    newFont = (Font*)ResourceManager::getInstance()->load(fontFile, TTF, RP_GAME, (int)fontSize);
-    if (newFont == NULL)
-    {
-      //      newFont = &Font::();
-      PRINTF(2)("Font %s could not be loaded, probably file not found\n", fontFile.c_str());
-    }
-  }
-
-  if (newFont == NULL)
-    this->_font = Font();
-  else
-    this->_font = *newFont;
+  this->_font = ResourceFont(fontFile, fontSize);
 
   this->setupTextWidth();

branches/new_class_id/src/lib/util/loading/resource.cc

@@ -54 +54 @@
     if (!locatedFile.empty())
     {
-      printf("FILE found %s\n", locatedFile.c_str());
       return locatedFile;
     }
@@ -77 +76 @@
       Directory dir = directory + (*it);
       File file = dir + File(fileName);
-      printf("Testing %s (from %s in directory %s)\n", file.name().c_str(), fileName.c_str(), dir.name().c_str());
       if ((dir+ File(fileName)).exists())
         return (dir+File(fileName)).name();

branches/new_class_id/src/orxonox.cc

@@ -364 +364 @@
   }
 
-  ResourceManager::getInstance()->setDataDir(dataPath);
-
   //! @todo this is a hack and should be loadable
   Resources::ResourceManager::getInstance()->addResourceSubPath("Texture", "maps");