Changeset 7919 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

May 28, 2006, 3:48:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the gui branche back
merged with command:
​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/graphics

Files:

• graphics_engine.cc (modified) (2 diffs)
• importer/material.cc (modified) (4 diffs)
• importer/material.h (modified) (2 diffs)
• render2D/element_2d.cc (modified) (4 diffs)
• render2D/element_2d.h (modified) (2 diffs)
• text_engine/multi_line_text.cc (modified) (2 diffs)
• text_engine/text.cc (modified) (6 diffs)
• text_engine/text.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -286 +286 @@
   SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);   //Use at least 16 bits for the depth buffer
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);  //Enable double buffering
+
+  glEnable(GL_CULL_FACE);
+  glCullFace(GL_FRONT);
 }
 
@@ -576 +579 @@
 void GraphicsEngine::drawBackgroundElements() const
 {
+  GraphicsEngine::storeMatrices();
+
   Render2D::getInstance()->draw(E2D_LAYER_BELOW_ALL, E2D_LAYER_BELOW_ALL);
 }

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

@@ -108 +108 @@
       return true;
 
-
-  // setting diffuse color
+  if (likely(Material::selectedMaterial != NULL))
+  {
+    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
+    {
+        glActiveTexture(Material::glTextureArbs[i]);
+        //glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+    }
+  }
+
+    // setting diffuse color
   glColor4f (diffuse[0], diffuse[1], diffuse[2], this->transparency);
   // setting ambient color
@@ -118 +127 @@
   glMaterialf(GL_FRONT, GL_SHININESS, this->shininess);
 
-
   // setting the transparency
   if (this->transparency < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
@@ -138 +146 @@
     glShadeModel(GL_SMOOTH);
 
-  if (likely(Material::selectedMaterial != NULL))
-  {
-    for(unsigned int i = 0; i < Material::selectedMaterial->textures.size(); ++i)
-    {
-        glActiveTexture(Material::glTextureArbs[i]);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_2D);
-    }
-  }
 
   for(unsigned int i = 0; i < this->textures.size(); ++i)
@@ -159 +158 @@
   }
   Material::selectedMaterial = this;
-
-  /*  if (this->diffuseTexture != NULL)
-      {
-        glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
-      }
-    else
-      {
-        glDisable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, 0);
-      }*/
 }
 

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

@@ -16 +16 @@
 
 #include <vector>
-#include "SDL_image.h"
-
 #include "texture.h"
 
@@ -51 +49 @@
     void setTransparency (char* trans);
 
+    void getDiffuseColor(float& r, float& g, float& b) const { r = diffuse[0], g = diffuse[1], b = diffuse[2]; }
 
     // MAPPING //

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -62 +62 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
+
+  this->size = Vector2D(0,0);
   this->toSize = NULL;
-  this->setSize2D(1, 1);
 
 
@@ -448 +449 @@
   this->relCoordinate += shift;
   this->bRelCoorChanged = true;
-
 }
 
@@ -847 +847 @@
     if (unlikely(this->toSize != NULL))
     {
-      Vector2D shiftSize = (*this->toSize - Vector2D(this->sizeX, this->sizeY)) *fabsf(dt)*bias;
+      Vector2D shiftSize = (*this->toSize - this->size) *fabsf(dt)*bias;
       if (likely((shiftSize).len() >= .001))//PNODE_ITERATION_DELTA))
       {
-        this->sizeX += shiftSize.x;
-        this->sizeY += shiftSize.y;
+        this->size += shiftSize;
       }
       else
@@ -1109 +1108 @@
   if (level == 0)
     glPopAttrib();
-
 }
 

trunk/src/lib/graphics/render2D/element_2d.h

@@ -125 +125 @@
     inline const PNode* getBindNode() const { return this->bindNode; };
 
-    inline void setSize2D(float x, float y) { this->sizeX = x, this->sizeY = y; };
+    inline void setSize2D(float x, float y) { this->size = Vector2D(x, y); };
+    inline void setSize2D(const Vector2D& size) { this->size = size; };
+    inline const Vector2D& getSize2D() const { return this->size; };
     void setSizeSoft2D(float x, float y, float bias = 1.0);
-    inline void setSizeX2D(float x) { this->sizeX = x; };
-    inline void setSizeY2D(float y) { this->sizeY = y; };
-    inline float getSizeX2D() const { return this->sizeX; };
-    inline float getSizeY2D() const { return this->sizeY; };
+    inline void setSizeX2D(float x) { this->size.x = x; };
+    inline void setSizeY2D(float y) { this->size.y = y; };
+    inline float getSizeX2D() const { return this->size.x; };
+    inline float getSizeY2D() const { return this->size.y; };
 
   public:
@@ -238 +240 @@
   private:
     const PNode*            bindNode;           //!< a node over which to display this 2D-element
-    float                   sizeX;              //!< The size of the rendered item in x-direction
-    float                   sizeY;              //!< The size of the rendered Item in y-direction
+    Vector2D                size;               //!< The size of the rendered item
     Vector2D*               toSize;             //!< The Size to iterate to.
 

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

@@ -64 +64 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   // TODO make the Stuff with the alignment
@@ -117 +118 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }

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

@@ -36 +36 @@
   this->font = NULL;
   this->size = textSize;
+  this->setSizeY2D(size);
   this->blending = TEXT_DEFAULT_BLENDING;
   this->color = TEXT_DEFAULT_COLOR;
@@ -127 +128 @@
 
 /**
+ * @brief appends one Character to the String.
+ */
+void Text::appendCharacter(char character)
+{
+  this->text += character;
+  this->setupTextWidth();
+}
+
+
+/**
  * @brief append some text to the already existing Text.
  * @param appendText The text to append to this Text.
@@ -135 +146 @@
   return this->text;
 }
+
+/**
+ * @brief removes char characters from the Text.
+ *
+ * @note this function checks, if the count can be removed, and if so does it.
+ * Otherwise the maximum count of characters will be removed.
+ */
+void Text::removeCharacters(unsigned int chars)
+{
+  if (text.size() > chars)
+    this->text.resize(this->text.size()-chars);
+  else if (!text.empty())
+    text.clear();
+  this->setupTextWidth();
+}
+
 
 /**
@@ -188 +215 @@
     return;
   glPushMatrix();
+  glPushAttrib(GL_ENABLE_BIT);
   // transform for alignment.
   if (this->getAlignment() == TEXT_ALIGN_RIGHT)
@@ -229 +257 @@
   }
   glEnd();
+  glPopAttrib();
   glPopMatrix();
 }
@@ -242 +271 @@
     if(this->font->getGlyphArray()[this->text[i]] != NULL)
       width += this->font->getGlyphArray()[this->text[i]]->advance;
-  this->setSizeX2D(width *this->getSize());
+  this->setSizeX2D(width * this->getSize());
 }
 

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

@@ -37 +37 @@
     void setText(const std::string& text);
     void append(const std::string& appendText);
+    void appendCharacter(char character);
     const std::string& operator<<(const std::string& appendText);
+    void removeCharacters(unsigned int chars);
 
     /// SETUP