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

Timestamp:

Sep 27, 2006, 11:25:43 PM (18 years ago)

Author:

bensch

Message:

renamed NewResource to Resource

Location:

branches/new_class_id/src/lib/graphics/text_engine

Files:

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

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

@@ -7 +7 @@
 
 ResourceFont::ResourceFont(const std::string& fontName, unsigned int renderSize)
-  : Font(), NewResource(&ResourceFont::type)
+  : Font(), Resource(&ResourceFont::type)
 {
   assert(!fontName.empty());
@@ -20 +20 @@
   {
     PRINTF(5)("NOT FOUND FONT: %s\n", fontName.c_str());
-    std::string fileName = this->NewResource::locateFile(fontName);
+    std::string fileName = this->Resource::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()));
+    this->Resource::addResource(new ResourceFont::FontResourcePointer(fontName + ',' + MultiType((int)renderSize).getString(), Resources::KeepLevel(0), this->Font::dataPointer()));
   }
 }

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

@@ -12 +12 @@
 
 
-class ResourceFont : public Font, public Resources::NewResource
+class ResourceFont : public Font, public Resources::Resource
 {
 public: