Changeset 9837 in orxonox.OLD

Timestamp:

Sep 26, 2006, 5:22:12 PM (18 years ago)

Author:

bensch

Message:

added new files, but with the wrong name

Location:

branches/new_class_id/src/lib/graphics/text_engine

Files:

• font.h (modified) (1 diff)
• resource_texture.cc (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.cc) (5 diffs)
• resource_texture.h (copied) (copied from branches/new_class_id/src/lib/graphics/importer/resource_texture.h) (1 diff)

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

@@ -52 +52 @@
   void debug() const;
 
+  void acquireData(const FontData::Pointer& data) { this->data = data; };
+  const FontData::Pointer& dataPointer() const { return data; };
 private:
   void init();

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

@@ -1 +1 @@
 
-#include "resource_texture.h"
+#include "resource_font.h"
 #include "substring.h"
 #include "multi_type.h"
@@ -6 +6 @@
 
 
-ResourceTexture::ResourceTexture(const std::string& imageName, GLenum target)
-    : NewResource(&ResourceTexture::type)
+ResourceFont::ResourceFont(const std::string& imageName, GLenum target)
+    : NewResource(&ResourceFont::type)
 {
   Resources::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
@@ -13 +13 @@
   if (ptr)
   {
-    PRINTF(5)("FOUND TEXTURE: %s\n", imageName.c_str());
-    this->acquireData(static_cast<ResourceTexture::TextureResourcePointer*>(ptr)->ptr());
+    PRINTF(5)("FOUND FONT: %s\n", imageName.c_str());
+    this->acquireData(static_cast<ResourceFont::FontResourcePointer*>(ptr)->ptr());
   }
   else
   {
-    PRINTF(5)("NOT FOUND TEXTURE: %s\n", imageName.c_str());
+    PRINTF(5)("NOT FOUND FONT: %s\n", imageName.c_str());
     std::string fileName = this->NewResource::locateFile(imageName);
-    this->Texture::loadImage(fileName, target);
-    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Texture::dataPointer()));
+    this->Font::loadImage(fileName, target);
+    this->NewResource::addResource(new ResourceFont::FontResourcePointer(imageName + ',' + "TEST", Resources::KeepLevel(0), this->Font::dataPointer()));
   }
 }
 
-ResourceTexture ResourceTexture::createFromString(const std::string& loadString)
+ResourceFont ResourceFont::createFromString(const std::string& loadString)
 {
   SubString loadValues(loadString, ',');
   std::string imageName;
-  GLenum target = GL_TEXTURE_2D;
+  GLenum target = GL_FONT_2D;
   if (loadValues.size() > 0)
     imageName = loadValues[0];
@@ -35 +35 @@
     target = (GLenum)MultiType(loadValues[2]).getInt();
 
-  return ResourceTexture(imageName, target);
+  return ResourceFont(imageName, target);
 }
 
 
 
-Resources::tType<ResourceTexture> ResourceTexture::type("Texture");
+Resources::tType<ResourceFont> ResourceFont::type("Font");
 
 
@@ -46 +46 @@
 
 
-ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data)
+ResourceFont::FontResourcePointer::FontResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const FontData::Pointer& data)
     : Resources::StorePointer(loadString, keepLevel) , pointer(data)
 {}

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

@@ -1 +1 @@
 /*!
- * @file resource_texture.h
- * @brief Contains the ResourceTexture class, that handles the Resource-specific loading part of the Texture.
+ * @file resource_font.h
+ * @brief Contains the ResourceFont class, that handles the Resource-specific loading part of the Font.
  *
  */
 
-#ifndef _RESOURCE_TEXTURE_H
-#define _RESOURCE_TEXTURE_H
+#ifndef _RESOURCE_FONT_H
+#define _RESOURCE_FONT_H
 
 #include "util/loading/resource.h"
-#include "texture.h"
+#include "font.h"
 
 
-class ResourceTexture : public Texture, public Resources::NewResource
+class ResourceFont : public Font, public Resources::NewResource
 {
 public:
-  ResourceTexture(const std::string& imageName, GLenum target = GL_TEXTURE_2D);
-  static ResourceTexture createFromString(const std::string& loadString);
+  ResourceFont(const std::string& imageName, GLenum target = GL_FONT_2D);
+  static ResourceFont createFromString(const std::string& loadString);
 
 private:
-class TextureResourcePointer : public Resources::StorePointer
+class FontResourcePointer : public Resources::StorePointer
   {
   public:
-    TextureResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const TextureData::Pointer& data);
-    inline const TextureData::Pointer& ptr() const { return pointer; }
+    FontResourcePointer(const std::string& loadString, const Resources::KeepLevel& keepLevel, const FontData::Pointer& data);
+    inline const FontData::Pointer& ptr() const { return pointer; }
 private:
-    TextureData::Pointer pointer;
+    FontData::Pointer pointer;
   };
 
 private:
-  static Resources::tType<ResourceTexture> type;
+  static Resources::tType<ResourceFont> type;
 };
 
 
-#endif /* _RESOURCE_TEXTURE_H */
+#endif /* _RESOURCE_FONT_H */