[Playerstage-commit] SF.net SVN: playerstage:[7032] code/gazebo/trunk/server/rendering

[natepak]

Revision: 7032
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7032&view=rev
Author:   natepak
Date:     2008-09-21 22:47:47 +0000 (Sun, 21 Sep 2008)

Log Message:
-----------
Applied patch 2106098

Modified Paths:
--------------
    code/gazebo/trunk/server/rendering/MovableText.cc
    code/gazebo/trunk/server/rendering/MovableText.hh

Modified: code/gazebo/trunk/server/rendering/MovableText.cc
===================================================================
--- code/gazebo/trunk/server/rendering/MovableText.cc   2008-09-21 22:42:08 UTC 
(rev 7031)
+++ code/gazebo/trunk/server/rendering/MovableText.cc   2008-09-21 22:47:47 UTC 
(rev 7032)
@@ -228,7 +228,6 @@
   Ogre::VertexBufferBinding *bind = NULL;
   Ogre::HardwareVertexBufferSharedPtr ptbuf;
   Ogre::HardwareVertexBufferSharedPtr cbuf;
-  size_t charlen = this->text.size();
   float *pVert = NULL;
   float largestWidth = 0;
   float left = 0;

Modified: code/gazebo/trunk/server/rendering/MovableText.hh
===================================================================
--- code/gazebo/trunk/server/rendering/MovableText.hh   2008-09-21 22:42:08 UTC 
(rev 7031)
+++ code/gazebo/trunk/server/rendering/MovableText.hh   2008-09-21 22:47:47 UTC 
(rev 7032)
@@ -117,32 +117,30 @@
   /// \brief Get the squared view depth (from MovableObject)
   protected: float getSquaredViewDepth(const Ogre::Camera *cam) const;
 
-  private: float viewportAspectCoef;
-
   private: std::string fontName;
   private: Ogre::UTFString text;
 
-  private: HorizAlign horizAlign;
-  private: VertAlign vertAlign;
-
   private: Ogre::ColourValue color;
   private: Ogre::RenderOperation renderOp;
   private: Ogre::AxisAlignedBox aabb;
   private: Ogre::LightList lightList;
 
   private: float charHeight;
-  private: float spaceWidth;
 
   private: bool needUpdate;
-  private: bool updateColors;
-  private: bool onTop;
 
   private: float radius;
-  private: float baseline;
 
   private: Ogre::Camera *camera;
   private: Ogre::RenderWindow *renderWindow;
+  private: float viewportAspectCoef;
   private: Ogre::Font *font;
+  private: float spaceWidth;
+  private: bool updateColors;
+  private: VertAlign vertAlign;
+  private: HorizAlign horizAlign;
+  private: bool onTop;
+  private: float baseline;
   private: Ogre::MaterialPtr material;
   private: Ogre::MaterialPtr backgroundMaterial;
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit