Changeset 5306 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 7, 2005, 6:17:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManage-fixes

Location:

trunk/src/lib

Files:

• graphics/importer/material.cc (modified) (2 diffs)
• graphics/importer/texture.cc (modified) (1 diff)
• graphics/text_engine.cc (modified) (2 diffs)
• graphics/text_engine.h (modified) (2 diffs)
• shell/shell_input.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/material.cc

@@ -31 +31 @@
 
 /**
- *  creates a Material.
+ * creates a Material.
  * @param mtlName Name of the Material to be added to the Material List
-*/
+ */
 Material::Material (const char* mtlName)
 {
@@ -105 +105 @@
     glShadeModel(GL_SMOOTH);
 
-  if (this->diffuseTexture)
+  if (this->diffuseTexture != NULL)
     {
       glEnable(GL_TEXTURE_2D);

trunk/src/lib/graphics/importer/texture.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_TEXTURE, "Texture");
+  this->setName(imageName);
 
   this->bAlpha = false;

trunk/src/lib/graphics/text_engine.cc

@@ -42 +42 @@
 /// TEXT ///
 ////////////
+
+/**
+ *  creates a new Text Element
+ * @param fontFile the Font to render this text in
+ * @param type The renderType to display this font in
+ */
+Text::Text(const char* fontFile, unsigned int fontSize, TEXT_RENDER_TYPE type)
+{
+  this->init();
+
+  if (fontFile != NULL)
+    this->setFont(fontFile, fontSize);
+  this->setType(type);
+}
+
 /**
  *  creates a new Text Element
  * @param font the Font to render this text in
  * @param type The renderType to display this font in
-
-   this constructor is private, because the user should initialize
-   a text with the TextEngine.
-*/
+ *
+ * this constructor is private, because the user should initialize
+ * a text with the TextEngine.
+ */
 Text::Text(Font* font, TEXT_RENDER_TYPE type)
 {
+  this->init();
+
+  this->font = font;
+  this->setType(type);
+}
+
+/**
+ *  deletes a Text out of memory
+ *
+ * This also ereases the text from the textList of the TextEngine
+*/
+Text::~Text()
+{
+  if (this->font != NULL)
+    ResourceManager::getInstance()->unload(this->font);
+
+  if (this->text)
+    delete[] this->text;
+}
+
+void Text::init()
+{
   this->setClassID(CL_TEXT, "Text");
 
   // initialize this Text
-  this->font = font;
+  this->font = NULL;
   this->text = NULL;
   this->externText = NULL;
@@ -62 +99 @@
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
-  this->setType(type);
+  this->setType(TEXT_RENDER_DYNAMIC);
 
   this->setText(NULL);
-}
-
-/**
- *  deletes a Text out of memory
- *
- * This also ereases the text from the textList of the TextEngine
-*/
-Text::~Text()
-{
-  if (this->font != NULL)
-    ResourceManager::getInstance()->unload(this->font);
-
-  if (this->text)
-    delete[] this->text;
 }
 

trunk/src/lib/graphics/text_engine.h

@@ -105 +105 @@
 class Text : public Element2D
 {
+  friend class TextEngine;
  public:
-   Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+   Text(const char* fontFile, unsigned int fontSize = FONT_DEFAULT_SIZE, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
   ~Text();
 
-  void setFont(Font* font);
+  void init();
+
   void setFont(const char* fontFile, unsigned int fontSize);
   void setType(TEXT_RENDER_TYPE type);
@@ -128 +130 @@
 
  private:
-  static GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
-  static int powerOfTwo(int input);
+   Text(Font* font = NULL, TEXT_RENDER_TYPE type = TEXT_RENDER_DYNAMIC);
+   void setFont(Font* font);
+
+   static GLuint loadTexture(SDL_Surface* surface, TexCoord* texCoord);
+   static int powerOfTwo(int input);
 
  private:

trunk/src/lib/shell/shell_input.cc

@@ -41 +41 @@
  * this also generates a ShellCompletion automatically.
 */
-ShellInput::ShellInput ()
+ShellInput::ShellInput () : Text ((const char*)NULL)
 {
   this->pressedKey = SDLK_FIRST;