SF.net SVN: openvrml:[4162] trunk

[<br...@us...>]

Revision: 4162
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4162&view=rev
Author:   braden
Date:     2010-07-10 06:50:29 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Fixed to compile without OPENVRML_ENABLE_RENDER_TEXT_NODE.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/node/vrml97/text.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-07-09 17:05:15 UTC (rev 4161)
+++ trunk/ChangeLog	2010-07-10 06:50:29 UTC (rev 4162)
@@ -1,3 +1,8 @@
+2010-07-10 Braden McDaniel  <br...@en...>
+
+	* src/node/vrml97/text.cpp: Fixed to compile without
+	OPENVRML_ENABLE_RENDER_TEXT_NODE.
+
 2010-07-09 Braden McDaniel  <br...@en...>
 
 	Removed OPENVRML_API from event listener/emitter class templates.

Modified: trunk/src/node/vrml97/text.cpp
===================================================================
--- trunk/src/node/vrml97/text.cpp	2010-07-09 17:05:15 UTC (rev 4161)
+++ trunk/src/node/vrml97/text.cpp	2010-07-10 06:50:29 UTC (rev 4162)
@@ -130,6 +130,7 @@
         max_extent_exposedfield max_extent_;
         openvrml::sfbool solid_;
 
+# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
         class glyph_geometry {
             std::vector<openvrml::vec2f> coord_;
             std::vector<openvrml::int32> coord_index_;
@@ -225,7 +226,6 @@
 
         boost::scoped_ptr<text_geometry> text_geometry_;
 
-# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
         typedef std::vector<std::vector<char32_t> > ucs4_string_t;
         typedef std::map<FT_UInt, glyph_geometry> glyph_geometry_map_t;
 
@@ -620,6 +620,8 @@
      * @brief maxExtent exposedField.
      */
 
+# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
+
     /**
      * @internal
      *
@@ -654,8 +656,6 @@
      *      glyph.
      */
 
-# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
-
     /**
      * @internal
      *
@@ -1219,7 +1219,6 @@
         }
         return 0;
     }
-# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
 
     /**
      * @brief Construct from a set of contours.
@@ -1238,7 +1237,6 @@
         advance_width_(0),
         advance_height_(0)
     {
-# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
         using std::vector;
 
         FT_Error error = FT_Err_Ok;
@@ -1282,7 +1280,6 @@
             get_polygons_(glyphContours.contours);
         std::for_each(polygons.begin(), polygons.end(),
                       draw_glyph_polygon(this->coord_, this->coord_index_));
-# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
     }
 
     /**
@@ -1923,6 +1920,7 @@
      * glyph_geometry_map for rapid retrieval the next time the glyph is
      * encountered.
      */
+# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
 
     /**
      * @var text_node::text_geometry text_node::text_geometry_
@@ -1958,8 +1956,10 @@
      */
     text_node::~text_node() OPENVRML_NOTHROW
     {
+# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
         // shutdown sets this->face to 0.
         assert(this->face == 0);
+# endif
     }
 
     /**
@@ -1984,6 +1984,7 @@
     void text_node::do_render_geometry(openvrml::viewer & v,
                                        openvrml::rendering_context)
     {
+# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
         using openvrml::int32;
         if (this->text_geometry_) {
             v.insert_shell(*this,
@@ -1997,6 +1998,7 @@
                            this->text_geometry_->tex_coord(),
                            std::vector<int32>()); // texCoordIndex
         }
+# endif
         if (this->font_style_.value()) {
             this->font_style_.value()->modified(false);
         }


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