Changeset 7753 in orxonox.OLD for trunk/src

Timestamp:

May 21, 2006, 5:24:14 PM (18 years ago)

Author:

bensch

Message:

trunk: removed GTK, and also extended the Text Class.

Location:

trunk/src/lib

Files:

• graphics/text_engine/text.cc (modified) (3 diffs)
• graphics/text_engine/text.h (modified) (3 diffs)
• shell/shell.h (modified) (2 diffs)

trunk/src/lib/graphics/text_engine/text.cc

@@ -39 +39 @@
   this->color = TEXT_DEFAULT_COLOR;
 
+  this->setAlignment(TEXT_DEFAULT_ALIGNMENT);
+
   this->setFont(fontFile, FONT_DEFAULT_RENDER_SIZE);
-
-  this->setAlignment(TEXT_DEFAULT_ALIGNMENT);
-}
+}
+
+Text::Text(const Text& text)
+{
+  this->setClassID(CL_TEXT, "Text");
+  this->font = NULL;
+
+  *this = text;
+}
+
 
 /**
@@ -53 +62 @@
 }
 
+/**
+ * @brief compare the Text with another Text.
+ * @param text the Text to compare.
+ * @returns true if all the properties Match.
+ */
+bool Text::operator==(const Text& text) const
+{
+  return (this->text == text.text &&
+          this->size == text.size &&
+          this->font == text.font &&
+          this->color == text.color &&
+          this->blending == text.blending);
+}
+
+/**
+ * @brief compare this Text's internal String with the text.
+ * @param text the Comparator Text.
+ * @returns true on a match.
+ */
+bool Text::operator==(const std::string& text) const
+{
+  return (this->text == text);
+}
+
+/**
+ * @brief Copies the properties of one text onto the other one.
+ * @param text: the Text to apply to this one.
+ * @returns This-reference.
+ */
+Text& Text::operator=(const Text& text)
+{
+  this->size = text.size;
+  this->blending = text.blending;
+  this->color = text.color;
+  this->setAlignment(text.getAlignment());
+  if (this->font != NULL)
+    ResourceManager::getInstance()->unload(this->font);
+
+  this->font = (Font*)ResourceManager::getInstance()->copy( text.font ); //!< HACK
+
+  this->text = text.text;
+  return *this;
+}
+
+/**
+ * @brief Sets a new Text to the font
+ * @param text the new text to set
+ */
+void Text::setText(const std::string& text)
+{
+  this->text = text;
+  this->setupTextWidth();
+}
+
+/**
+ * @brief append some text to the already existing Text.
+ * @param appendText The text to append to this Text.
+ */
+void Text::append(const std::string& appendText)
+{
+  this->text += appendText;
+  this->setupTextWidth();
+}
+
+/**
+ * @brief append some text to the already existing Text.
+ * @param appendText The text to append to this Text.
+ */
+const std::string& Text::operator <<(const std::string& appendText)
+{
+  this->append(appendText);
+  return this->text;
+}
 
 /**
@@ -87 +169 @@
 
 /**
- * @brief Sets a new Text to the font
- * @param text the new text to set
- */
-void Text::setText(const std::string& text)
-{
-  this->text = text;
-
-  this->setupTextWidth();
-}
-
-
-/**
  * @brief sets the Size of the Font
  * @param size :the size of the Text

trunk/src/lib/graphics/text_engine/text.h

@@ -28 +28 @@
   public:
     Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);
+    Text(const Text& text);
     virtual ~Text();
+    bool operator==(const Text& text) const;
+    bool operator==(const std::string& text) const;
+    Text& operator=(const Text& text);
 
-    // SETUP
+    /// Final Interfacing.
+    void setText(const std::string& text);
+    void append(const std::string& appendText);
+    const std::string& operator<<(const std::string& appendText);
+
+    /// SETUP
     void setFont(const std::string& fontFile, unsigned int renderSize);
-    void setText(const std::string& text);
     /** @param blending the blending intensity to set (between 0.0 and 1.0) */
     inline void setBlending(float blending) { this->blending = blending; };
@@ -39 +47 @@
     void setSize(float size);
 
+
     /// RETRIEVE
+    /** @returns the String this Text displays */
+    inline const std::string& getText() const { return this->text; };
+
     /** @returns the pointer to the stored Font (not changeable) */
     inline const Font* const getFont() const { return this->font; };
-    /** @returns the String this Text displays */
-    inline const std::string& getText() const { return this->text; };
     /** @returns the Blending Value [0 invisible 1.0 full visible */
     inline float getBlending() const { return this->blending; };
@@ -57 +67 @@
   protected:
     virtual void setupTextWidth();
+  private:
+    void init();
 
   private:

trunk/src/lib/shell/shell.h

@@ -25 +25 @@
 class Material;
 
+//! Namespace of the Shell of ORXONOX.
 namespace OrxShell
 {
@@ -37 +38 @@
    * Each Class can check itself in to the Shell, and listen for commands.
    *
-   * more info: @see ShellCommand
+   * more info:
+   * @see ShellCommand
    * @see shell_command.h
    * @see shell_buffer.h
    * @see shell_input.h
-   *
-   * !! note in order to keep shellbuffer to a minimal (it is included with
-   * !! debug.h) Display of it inside the Shell is located here !!
+   * @see shell_completion.h
    */
   class Shell : public Element2D, public EventListener