Changeset 18550

Timestamp:

04/12/06 09:01:57 (3 years ago)

Author:

patrick

Message:

MFT [rev 18368]:

• Added method to Text for drawing full text block
  
• Fixed bug where text only worked in first context (needed to use gl
  context data)
  
• Updated perf class to use new interface and to work in multiple
  contexts.
  

Files:

• juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/PerfProbe.cpp (modified) (3 diffs)
• juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/PerfProbe.h (modified) (2 diffs)
• juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/Text.cpp (modified) (4 diffs)
• juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/Text.h (modified) (1 diff)

juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/PerfProbe.cpp

@@ -46 +46 @@
-
-#include <vrj/Kernel/Kernel.h>
+#include <vpr/Util/Debug.h>
-
-//#include <boost/format.hpp>
-
-namespace
-{
-   template<class OutIt>
-   void splitStr(
-      const std::string& s,
-      const std::string& sep,
-      OutIt dest)
-   {
-      std::string::size_type left = s.find_first_not_of( sep );
-      std::string::size_type right = s.find_first_of( sep, left );
-      while( left < right )
-      {
-         *dest = s.substr( left, right-left );
-         ++dest;
-         left = s.find_first_not_of( sep, right );
-         right = s.find_first_of( sep, left );
-      }
-   }
-
-   //std::string s = "apple, orange, cherry, peach, grapefruit, cantalope,watermelon";
-
-   //std::vector<std::string> v;
-   //split( s, " ,", std::back_inserter(v) );
-
-}
-
-
@@ -117 +93 @@
-      { mOverlayTextStream << "   "; }
-      mOverlayTextStream << (*prof_node).getName() << "  " << (*prof_node).getSTA().msecf() << std::endl;
-
-
+
-}
-
@@ -137 +112 @@
-
-void PerfProbe::drawOverlayText()
-
-
-
-
-
-
+
-   std::string overlay_text = mOverlayTextStream.str();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-   glColor3f(1.0,1.0,0.0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/PerfProbe.h

@@ -38 +38 @@
-#include <vpr/Util/Interval.h>
-#include <sstream>
+#include <vrj/Draw/OGL/GlContextData.h>
+#include <Text.h>
-
-
@@ -72 +74 @@
-
-   std::stringstream    mOverlayTextStream;  /**< Text to write out each frame. */
+   std::string          mOverlayTextToDraw;
+   vrj::GlContextData<Text>   mText;         /**< Context specific copy of text. */
-
-   std::deque<float>    mFrameRateHistory;

juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/Text.cpp

@@ -12 +12 @@
- ****************** <aqua heading END do not edit this line> ******************/
-#include "Text.h"
+#include <vector>
+#include <string>
+
+namespace
+{
+   template<class OutIt>
+   void splitStr(
+      const std::string& s,
+      const std::string& sep,
+      OutIt dest)
+   {
+      std::string::size_type left = s.find_first_not_of( sep );
+      std::string::size_type right = s.find_first_of( sep, left );
+      while( left < right )
+      {
+         *dest = s.substr( left, right-left );
+         ++dest;
+         left = s.find_first_not_of( sep, right );
+         right = s.find_first_of( sep, left );
+      }
+   }
+
+   //std::string s = "apple, orange, cherry, peach, grapefruit, cantalope,watermelon";
+
+   //std::vector<std::string> v;
+   //split( s, " ,", std::back_inserter(v) );
+
+}
-
-Text *Text::theText = NULL;
@@ -51 +79 @@
-}
-
-// Force singleton
-void *Text::operator new( size_t size )
-{
-    if( theText == NULL )
-      theText = (Text *)malloc( size );
-    return (void *)theText;
-}
-
-Text *Text::getSingleton()
@@ -13757 +13778 @@
-    GLuint base = fontmap[font];
-    if( base == 0 )
-base = loadFont(font);
+ { base = loadFont(font); }
-    glPushAttrib(GL_LIST_BIT);
-    glListBase(base);
@@ -13763 +13784 @@
-    glPopAttrib();
-}
+
+void Text::drawTextBlock(std::string text, const float xPosFactor, const float yPosFactor, 
+                           float fontHeight, 
+                           float winHeight, float winWidth)
+{
+   const float font_h_spacing(fontHeight*1.3f);
+   
+   std::vector<std::string> text_lines;
+   splitStr(text,"\n",std::back_inserter(text_lines));
+
+   float needed_h = font_h_spacing*float(text_lines.size());
+   if(needed_h > winHeight)
+   {
+      winHeight = needed_h * 1.1f;
+      winWidth = winHeight * 1.4f;
+   }
+
+   glMatrixMode( GL_PROJECTION );
+   glPushMatrix();
+   glLoadIdentity();
+   glOrtho( 0.0, winWidth, 0.0, winHeight, -1.0, 1.0);     // Setup virtual space 1000, 1000
+
+   glMatrixMode( GL_MODELVIEW );
+   glPushMatrix();
+   glLoadIdentity();
+
+   glDisable(GL_DEPTH_TEST);
+
+   /*
+   glBegin(GL_TRIANGLES);
+      glColor3f(1.0, 0.0, 0);
+      glVertex3f(100,100,-0.5);
+      glColor3f(0,1,0);
+      glVertex3f(900,100,-0.5);
+      glColor3f(0,0,1);
+      glVertex3f(450,800,-0.5);
+   glEnd();
+   */
+   //Text::getSingleton()->drawString(Text::StrokeFont, std::string("No Translation"));
+
+   glTranslatef(xPosFactor*winWidth, winHeight-(yPosFactor*winHeight), 0);
+   //float num_lines(overlay_lines.size());
+
+   for (unsigned l=0; l<text_lines.size(); ++l)
+   {
+      glPushMatrix();
+      glTranslatef(0,-font_h_spacing*float(l), 0);
+      drawString(Text::StrokeFont, text_lines[l]);
+      glPopMatrix();
+   }
+
+   glEnable(GL_DEPTH_TEST);
+
+   glMatrixMode(GL_PROJECTION);
+   glPopMatrix();
+   glMatrixMode( GL_MODELVIEW);
+   glPopMatrix();
+}
+

juggler/branches/2.0/modules/vrjuggler/test/Draw/OGL/perfAddon/Text.h

@@ -36 +36 @@
-        Text();
-        void drawString( Font, std::string );
-
-
+
+
+
+
+
+
-
-    protected: