openvrml-commit — Changes to OpenVRML's source revision repository

[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.43.2.6, 1.43.2.7

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27609/src/libopenvrml-gl/openvrml/gl

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	viewer.cpp 
Log Message:
Removed dead code.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.43.2.6
retrieving revision 1.43.2.7
diff -C2 -d -r1.43.2.6 -r1.43.2.7
*** viewer.cpp	10 Jan 2007 03:59:21 -0000	1.43.2.6
--- viewer.cpp	10 Jan 2007 04:08:27 -0000	1.43.2.7
***************
*** 2330,2373 ****
          }
      }
- 
-     /**
-      * @brief Build an extrusion.
-      *
-      * @param[in] orientation
-      * @param[in] scale
-      * @param[in] crossSection
-      * @param[in] spine
-      * @param[out] c
-      * @param[out] tc
-      * @param[out] faces
-      */
-     OPENVRML_GL_LOCAL void
-     computeExtrusion_(const std::vector<openvrml::rotation> & orientation,
-                       const std::vector<openvrml::vec2f> & scale,
-                       const std::vector<openvrml::vec2f> & crossSection,
-                       const std::vector<openvrml::vec3f> & spine,
-                       std::vector<openvrml::vec3f> & c,
-                       std::vector<openvrml::vec2f> & tc,
-                       std::vector<openvrml::int32> & faces)
-     {
-         computeExtrusion_(orientation, scale, crossSection, spine, c, tc);
- 
-         //
-         // Compute face indices.
-         //
-         size_t polyIndex = 0;
-         for (size_t i = 0, ci = 0; i < spine.size() - 1;
-                 ++i, ci += crossSection.size()) {
-             for (size_t j = 0; j < crossSection.size() - 1; ++j) {
-                 using openvrml::int32;
-                 faces[polyIndex + 0] = int32(ci + j);
-                 faces[polyIndex + 1] = int32(ci + j + 1);
-                 faces[polyIndex + 2] = int32(ci + j + 1 + crossSection.size());
-                 faces[polyIndex + 3] = int32(ci + j + crossSection.size());
-                 faces[polyIndex + 4] = -1;
-                 polyIndex += 5;
-             }
-         }
-     }
  }
  
--- 2330,2333 ----

[openvrml-commit] openvrml ChangeLog,1.1310.2.95,1.1310.2.96

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27609

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Removed dead code.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.95
retrieving revision 1.1310.2.96
diff -C2 -d -r1.1310.2.95 -r1.1310.2.96
*** ChangeLog	10 Jan 2007 03:59:20 -0000	1.1310.2.95
--- ChangeLog	10 Jan 2007 04:08:26 -0000	1.1310.2.96
***************
*** 1,4 ****
--- 1,15 ----
  2007-01-09 Braden McDaniel  <br...@en...>
  
+ 	Removed dead code.
+ 
+ 	* src/libopenvrml-gl/openvrml/gl/viewer.cpp
+ 	(computeExtrusion(const std::vector<openvrml::rotation> &, const
+ 	std::vector<openvrml::vec2f> &, const std::vector<openvrml::vec2f>
+ 	&, const std::vector<openvrml::vec3f> &,
+ 	std::vector<openvrml::vec3f> &, std::vector<openvrml::vec2f> &,
+ 	std::vector<openvrml::int32> &)): Removed unused function.
+ 
+ 2007-01-09 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Updated
  	floating-point "near equal" comparison for parity with

[openvrml-commit] openvrml ChangeLog,1.1417,1.1418

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22881

Modified Files:
	ChangeLog 
Log Message:
Updated floating-point "near equal" comparison for parity with libopenvrml.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1417
retrieving revision 1.1418
diff -C2 -d -r1.1417 -r1.1418
*** ChangeLog	10 Jan 2007 03:45:50 -0000	1.1417
--- ChangeLog	10 Jan 2007 03:59:39 -0000	1.1418
***************
*** 1,4 ****
--- 1,10 ----
  2007-01-09 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Updated
+ 	floating-point "near equal" comparison for parity with
+ 	libopenvrml.
+ 
+ 2007-01-09 Braden McDaniel  <br...@en...>
+ 
  	Assert that rotation components are not NaN.
  

[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.52, 1.53

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22881/src/libopenvrml-gl/openvrml/gl

Modified Files:
	viewer.cpp 
Log Message:
Updated floating-point "near equal" comparison for parity with libopenvrml.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** viewer.cpp	28 Dec 2006 20:11:59 -0000	1.52
--- viewer.cpp	10 Jan 2007 03:59:39 -0000	1.53
***************
*** 1,3 ****
! // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
  //
  // OpenVRML
--- 1,3 ----
! // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
  //
  // OpenVRML
***************
*** 93,108 ****
      }
  
!     template <typename Float>
!     struct OPENVRML_GL_LOCAL fequal :
!         std::binary_function<Float, Float, bool> {
          bool operator()(Float a, Float b) const
          {
              const Float diff = fabs(a - b);
              if (diff == 0.0) { return true; }
!             const Float e = std::numeric_limits<Float>::epsilon();
!             return diff / fabs(a) <= e && diff / fabs(b) <= e;
          }
      };
  
      class OPENVRML_GL_LOCAL gl_capabilities {
      public:
--- 93,112 ----
      }
  
!     struct OPENVRML_GL_LOCAL fequal_t {
!         template <typename Float>
          bool operator()(Float a, Float b) const
          {
              const Float diff = fabs(a - b);
              if (diff == 0.0) { return true; }
!             static const int rounding_errors = 10;
!             static const Float e = std::numeric_limits<Float>::epsilon();
!             static const Float tolerance = e * rounding_errors / 2;
!             return diff / fabs(a) <= tolerance
!                 && diff / fabs(b) <= tolerance;
          }
      };
  
+     OPENVRML_GL_LOCAL const fequal_t fequal = fequal_t();
+ 
      class OPENVRML_GL_LOCAL gl_capabilities {
      public:
***************
*** 2046,2051 ****
          float dx = xz[1] - xz[0];
          float dz = xz[3] - xz[2];
!         if (!fequal<float>()(dx, 0.0f)) { dx = float(1.0 / dx); }
!         if (!fequal<float>()(dz, 0.0f)) { dz = float(1.0 / dz); }
  
          // If geometry is in dlists, should just always use the tesselator...
--- 2050,2055 ----
          float dx = xz[1] - xz[0];
          float dz = xz[3] - xz[2];
!         if (!fequal(dx, 0.0f)) { dx = float(1.0 / dx); }
!         if (!fequal(dz, 0.0f)) { dz = float(1.0 / dz); }
  
          // If geometry is in dlists, should just always use the tesselator...
***************
*** 2189,2193 ****
              const vec3f v = (spine[i - 1] - spine[i])
                              * (spine[i + 1] - spine[i]);
!             if (!fequal<float>()(v.length(), 0.0f)) {
                  spineStraight = false;
                  lastZ = v.normalize();
--- 2193,2197 ----
              const vec3f v = (spine[i - 1] - spine[i])
                              * (spine[i + 1] - spine[i]);
!             if (!fequal(v.length(), 0.0f)) {
                  spineStraight = false;
                  lastZ = v.normalize();
***************
*** 2202,2206 ****
              vec3f v3 = v2 * v1;
              float len = v3.length();
!             if (!fequal<float>()(len, 0.0f)) {
                  //
                  // Not aligned with Y axis.
--- 2206,2210 ----
              vec3f v3 = v2 * v1;
              float len = v3.length();
!             if (!fequal(len, 0.0f)) {
                  //
                  // Not aligned with Y axis.
***************
*** 2220,2224 ****
          mat4f om;
          if (orientation.size() == 1
!                 && !fequal<float>()(orientation.front().angle(), 0.0f)) {
              om = make_rotation_mat4f(orientation.front());
          }
--- 2224,2228 ----
          mat4f om;
          if (orientation.size() == 1
!                 && !fequal(orientation.front().angle(), 0.0f)) {
              om = make_rotation_mat4f(orientation.front());
          }
***************
*** 2273,2277 ****
  
                  float VlenZ = Zscp.length();
!                 if (fequal<float>()(VlenZ, 0.0f)) {
                      Zscp = lastZ;
                  } else {
--- 2277,2281 ----
  
                  float VlenZ = Zscp.length();
!                 if (fequal(VlenZ, 0.0f)) {
                      Zscp = lastZ;
                  } else {
***************
*** 2304,2308 ****
              // Apply orientation.
              //
!             if (!fequal<float>()(r->angle(), 0.0f)) {
                  if (orientation.size() > 1) { om = make_rotation_mat4f(*r); }
  
--- 2308,2312 ----
              // Apply orientation.
              //
!             if (!fequal(r->angle(), 0.0f)) {
                  if (orientation.size() > 1) { om = make_rotation_mat4f(*r); }
  
***************
*** 2626,2633 ****
  
          // If two of the dimensions are zero, give up.
!         if (fequal<float>()(params[1], 0.0f)
!                 || fequal<float>()(params[3], 0.0f)) {
!             return;
!         }
  
          params[1] = float(1.0 / params[1]);
--- 2630,2634 ----
  
          // If two of the dimensions are zero, give up.
!         if (fequal(params[1], 0.0f) || fequal(params[3], 0.0f)) { return; }
  
          params[1] = float(1.0 / params[1]);
***************
*** 2854,2859 ****
          // do the bounds intersect the radius of any active positional lights.
          texGenParams(bounds, texAxes, texParams);
!         if (fequal<float>()(texParams[1], 0.0f)
!                 || fequal<float>()(texParams[3], 0.0f)) {
              return 0;
          }
--- 2855,2859 ----
          // do the bounds intersect the radius of any active positional lights.
          texGenParams(bounds, texAxes, texParams);
!         if (fequal(texParams[1], 0.0f) || fequal(texParams[3], 0.0f)) {
              return 0;
          }
***************
*** 3379,3383 ****
  
      // XXX doesn't work right yet (need alpha render pass...)
!     if (this->blend && !fequal<float>()(transparency, 0.0f)) {
          glEnable(GL_BLEND);
      }
--- 3379,3383 ----
  
      // XXX doesn't work right yet (need alpha render pass...)
!     if (this->blend && !fequal(transparency, 0.0f)) {
          glEnable(GL_BLEND);
      }
***************
*** 3631,3635 ****
      glTranslatef(-center.x(), -center.y(), 0.0);
      glScalef(scale.x(), scale.y(), 1.0);
!     if (!fequal<float>()(rotation, 0.0f)) {
          glRotatef(GLfloat(rotation * 180.0 / pi), 0.0, 0.0, 1.0);
      }
--- 3631,3635 ----
      glTranslatef(-center.x(), -center.y(), 0.0);
      glScalef(scale.x(), scale.y(), 1.0);
!     if (!fequal(rotation, 0.0f)) {
          glRotatef(GLfloat(rotation * 180.0 / pi), 0.0, 0.0, 1.0);
      }
***************
*** 3862,3866 ****
      assert(this->browser());
  
!     if (fequal<float>()(rot.angle(), 0.0f)) { return; }
  
      viewpoint_node & activeViewpoint = this->browser()->active_viewpoint();
--- 3862,3866 ----
      assert(this->browser());
  
!     if (fequal(rot.angle(), 0.0f)) { return; }
  
      viewpoint_node & activeViewpoint = this->browser()->active_viewpoint();
***************
*** 3930,3934 ****
      GLdouble z_c = 0.5;
      float visibilityLimit = nav_info.visibility_limit();
!     if (fequal<float>()(visibilityLimit, 0.0f)) { visibilityLimit = 30000.0; }
      GLdouble ox, oy, oz;
      gluUnProject(x_c, y_c, z_c,
--- 3930,3934 ----
      GLdouble z_c = 0.5;
      float visibilityLimit = nav_info.visibility_limit();
!     if (fequal(visibilityLimit, 0.0f)) { visibilityLimit = 30000.0; }
      GLdouble ox, oy, oz;
      gluUnProject(x_c, y_c, z_c,
***************
*** 3952,3956 ****
      float speed = nav_info.speed();
      dist = speed / dist;
!     if (fequal<float>()(float(dist), 0.0f)) { return; }
      dx *= dist;
      dy *= dist;
--- 3952,3956 ----
      float speed = nav_info.speed();
      dist = speed / dist;
!     if (fequal(float(dist), 0.0f)) { return; }
      dx *= dist;
      dy *= dist;

[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.43.2.5, 1.43.2.6

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22820/src/libopenvrml-gl/openvrml/gl

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	viewer.cpp 
Log Message:
Updated floating-point "near equal" comparison for parity with libopenvrml.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
diff -C2 -d -r1.43.2.5 -r1.43.2.6
*** viewer.cpp	28 Dec 2006 20:10:25 -0000	1.43.2.5
--- viewer.cpp	10 Jan 2007 03:59:21 -0000	1.43.2.6
***************
*** 1,3 ****
! // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; -*-
  //
  // OpenVRML
--- 1,3 ----
! // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
  //
  // OpenVRML
***************
*** 93,108 ****
      }
  
!     template <typename Float>
!     struct OPENVRML_GL_LOCAL fequal :
!         std::binary_function<Float, Float, bool> {
          bool operator()(Float a, Float b) const
          {
              const Float diff = fabs(a - b);
              if (diff == 0.0) { return true; }
!             const Float e = std::numeric_limits<Float>::epsilon();
!             return diff / fabs(a) <= e && diff / fabs(b) <= e;
          }
      };
  
      class OPENVRML_GL_LOCAL gl_capabilities {
      public:
--- 93,112 ----
      }
  
!     struct OPENVRML_GL_LOCAL fequal_t {
!         template <typename Float>
          bool operator()(Float a, Float b) const
          {
              const Float diff = fabs(a - b);
              if (diff == 0.0) { return true; }
!             static const int rounding_errors = 10;
!             static const Float e = std::numeric_limits<Float>::epsilon();
!             static const Float tolerance = e * rounding_errors / 2;
!             return diff / fabs(a) <= tolerance
!                 && diff / fabs(b) <= tolerance;
          }
      };
  
+     OPENVRML_GL_LOCAL const fequal_t fequal = fequal_t();
+ 
      class OPENVRML_GL_LOCAL gl_capabilities {
      public:
***************
*** 2035,2040 ****
          float dx = xz[1] - xz[0];
          float dz = xz[3] - xz[2];
!         if (!fequal<float>()(dx, 0.0f)) { dx = float(1.0 / dx); }
!         if (!fequal<float>()(dz, 0.0f)) { dz = float(1.0 / dz); }
  
          // If geometry is in dlists, should just always use the tesselator...
--- 2039,2044 ----
          float dx = xz[1] - xz[0];
          float dz = xz[3] - xz[2];
!         if (!fequal(dx, 0.0f)) { dx = float(1.0 / dx); }
!         if (!fequal(dz, 0.0f)) { dz = float(1.0 / dz); }
  
          // If geometry is in dlists, should just always use the tesselator...
***************
*** 2177,2181 ****
              const vec3f v = (spine[i - 1] - spine[i])
                              * (spine[i + 1] - spine[i]);
!             if (!fequal<float>()(v.length(), 0.0f)) {
                  spineStraight = false;
                  lastZ = v.normalize();
--- 2181,2185 ----
              const vec3f v = (spine[i - 1] - spine[i])
                              * (spine[i + 1] - spine[i]);
!             if (!fequal(v.length(), 0.0f)) {
                  spineStraight = false;
                  lastZ = v.normalize();
***************
*** 2190,2194 ****
              vec3f v3 = v2 * v1;
              float len = v3.length();
!             if (!fequal<float>()(len, 0.0f)) {
                  //
                  // Not aligned with Y axis.
--- 2194,2198 ----
              vec3f v3 = v2 * v1;
              float len = v3.length();
!             if (!fequal(len, 0.0f)) {
                  //
                  // Not aligned with Y axis.
***************
*** 2207,2211 ****
          mat4f om;
          if (orientation.size() == 1
!                 && !fequal<float>()(orientation.front().angle(), 0.0f)) {
              om = mat4f::rotation(orientation.front());
          }
--- 2211,2215 ----
          mat4f om;
          if (orientation.size() == 1
!             && !fequal(orientation.front().angle(), 0.0f)) {
              om = mat4f::rotation(orientation.front());
          }
***************
*** 2260,2264 ****
  
                  float VlenZ = Zscp.length();
!                 if (fequal<float>()(VlenZ, 0.0f)) {
                      Zscp = lastZ;
                  } else {
--- 2264,2268 ----
  
                  float VlenZ = Zscp.length();
!                 if (fequal(VlenZ, 0.0f)) {
                      Zscp = lastZ;
                  } else {
***************
*** 2291,2295 ****
              // Apply orientation.
              //
!             if (!fequal<float>()(r->angle(), 0.0f)) {
                  if (orientation.size() > 1) { om = mat4f::rotation(*r); }
  
--- 2295,2299 ----
              // Apply orientation.
              //
!             if (!fequal(r->angle(), 0.0f)) {
                  if (orientation.size() > 1) { om = mat4f::rotation(*r); }
  
***************
*** 2613,2620 ****
  
          // If two of the dimensions are zero, give up.
!         if (fequal<float>()(params[1], 0.0f)
!                 || fequal<float>()(params[3], 0.0f)) {
!             return;
!         }
  
          params[1] = float(1.0 / params[1]);
--- 2617,2621 ----
  
          // If two of the dimensions are zero, give up.
!         if (fequal(params[1], 0.0f) || fequal(params[3], 0.0f)) { return; }
  
          params[1] = float(1.0 / params[1]);
***************
*** 2840,2845 ****
          // do the bounds intersect the radius of any active positional lights.
          texGenParams(bounds, texAxes, texParams);
!         if (fequal<float>()(texParams[1], 0.0f)
!                 || fequal<float>()(texParams[3], 0.0f)) {
              return 0;
          }
--- 2841,2845 ----
          // do the bounds intersect the radius of any active positional lights.
          texGenParams(bounds, texAxes, texParams);
!         if (fequal(texParams[1], 0.0f) || fequal(texParams[3], 0.0f)) {
              return 0;
          }
***************
*** 3365,3369 ****
  
      // XXX doesn't work right yet (need alpha render pass...)
!     if (this->blend && !fequal<float>()(transparency, 0.0f)) {
          glEnable(GL_BLEND);
      }
--- 3365,3369 ----
  
      // XXX doesn't work right yet (need alpha render pass...)
!     if (this->blend && !fequal(transparency, 0.0f)) {
          glEnable(GL_BLEND);
      }
***************
*** 3616,3620 ****
      glTranslatef(-center.x(), -center.y(), 0.0);
      glScalef(scale.x(), scale.y(), 1.0);
!     if (!fequal<float>()(rotation, 0.0f)) {
          glRotatef(GLfloat(rotation * 180.0 / pi), 0.0, 0.0, 1.0);
      }
--- 3616,3620 ----
      glTranslatef(-center.x(), -center.y(), 0.0);
      glScalef(scale.x(), scale.y(), 1.0);
!     if (!fequal(rotation, 0.0f)) {
          glRotatef(GLfloat(rotation * 180.0 / pi), 0.0, 0.0, 1.0);
      }
***************
*** 3846,3850 ****
      assert(this->browser());
  
!     if (fequal<float>()(rot.angle(), 0.0f)) { return; }
  
      viewpoint_node & activeViewpoint = this->browser()->active_viewpoint();
--- 3846,3850 ----
      assert(this->browser());
  
!     if (fequal(rot.angle(), 0.0f)) { return; }
  
      viewpoint_node & activeViewpoint = this->browser()->active_viewpoint();
***************
*** 3914,3918 ****
      GLdouble z_c = 0.5;
      float visibilityLimit = nav_info.visibility_limit();
!     if (fequal<float>()(visibilityLimit, 0.0f)) { visibilityLimit = 30000.0; }
      GLdouble ox, oy, oz;
      gluUnProject(x_c, y_c, z_c,
--- 3914,3918 ----
      GLdouble z_c = 0.5;
      float visibilityLimit = nav_info.visibility_limit();
!     if (fequal(visibilityLimit, 0.0f)) { visibilityLimit = 30000.0; }
      GLdouble ox, oy, oz;
      gluUnProject(x_c, y_c, z_c,
***************
*** 3936,3940 ****
      float speed = nav_info.speed();
      dist = speed / dist;
!     if (fequal<float>()(float(dist), 0.0f)) { return; }
      dx *= dist;
      dy *= dist;
--- 3936,3940 ----
      float speed = nav_info.speed();
      dist = speed / dist;
!     if (fequal(float(dist), 0.0f)) { return; }
      dx *= dist;
      dy *= dist;

[openvrml-commit] openvrml ChangeLog,1.1310.2.94,1.1310.2.95

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22820

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Updated floating-point "near equal" comparison for parity with libopenvrml.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.94
retrieving revision 1.1310.2.95
diff -C2 -d -r1.1310.2.94 -r1.1310.2.95
*** ChangeLog	10 Jan 2007 03:45:37 -0000	1.1310.2.94
--- ChangeLog	10 Jan 2007 03:59:20 -0000	1.1310.2.95
***************
*** 1,4 ****
--- 1,10 ----
  2007-01-09 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml-gl/openvrml/gl/viewer.cpp: Updated
+ 	floating-point "near equal" comparison for parity with
+ 	libopenvrml.
+ 
+ 2007-01-09 Braden McDaniel  <br...@en...>
+ 
  	Assert that rotation components are not NaN.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp, 1.40, 1.41

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15999/src/libopenvrml/openvrml

Modified Files:
	basetypes.cpp 
Log Message:
Assert that rotation components are not NaN.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** basetypes.cpp	22 Nov 2006 04:51:36 -0000	1.40
--- basetypes.cpp	10 Jan 2007 03:45:50 -0000	1.41
***************
*** 2674,2677 ****
--- 2674,2685 ----
      OPENVRML_NOTHROW
  {
+     //
+     // Ensure the elements of rot are not NaN.
+     //
+     assert(rot[0] == rot[0]);
+     assert(rot[1] == rot[1]);
+     assert(rot[2] == rot[2]);
+     assert(rot[3] == rot[3]);
+ 
      assert(openvrml_::fequal(1.0f,
                               make_vec3f(rot[0], rot[1], rot[2]).length()));
***************
*** 2702,2705 ****
--- 2710,2721 ----
      OPENVRML_NOTHROW
  {
+     //
+     // Ensure x, y, z, and angle are not NaN.
+     //
+     assert(x == x);
+     assert(y == y);
+     assert(z == z);
+     assert(angle == angle);
+ 
      assert(openvrml_::fequal(1.0f, make_vec3f(x, y, z).length()));
      const rotation r = { { x, y, z, angle } };
***************
*** 2725,2728 ****
--- 2741,2749 ----
      OPENVRML_NOTHROW
  {
+     //
+     // Ensure angle is not NaN.
+     //
+     assert(angle == angle);
+ 
      assert(openvrml_::fequal(1.0f, axis.length()));
      const rotation r = { { axis.x(), axis.y(), axis.z(), angle } };

[openvrml-commit] openvrml ChangeLog,1.1416,1.1417

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15999

Modified Files:
	ChangeLog 
Log Message:
Assert that rotation components are not NaN.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1416
retrieving revision 1.1417
diff -C2 -d -r1.1416 -r1.1417
*** ChangeLog	4 Jan 2007 06:34:01 -0000	1.1416
--- ChangeLog	10 Jan 2007 03:45:50 -0000	1.1417
***************
*** 1,2 ****
--- 1,14 ----
+ 2007-01-09 Braden McDaniel  <br...@en...>
+ 
+ 	Assert that rotation components are not NaN.
+ 
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::rotation::rotation(const float (&)[4])): Assert that
+ 	rotation components are not NaN.
+ 	(openvrml::rotation::rotation(float, float, float, float)): Assert
+ 	that rotation components are not NaN.
+ 	(openvrml::rotation::rotation(const vec3f &, float)): Assert
+ 	that rotation components are not NaN.
+ 
  2007-01-03 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml ChangeLog,1.1310.2.93,1.1310.2.94

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15959

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Assert that rotation components are not NaN.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.93
retrieving revision 1.1310.2.94
diff -C2 -d -r1.1310.2.93 -r1.1310.2.94
*** ChangeLog	4 Jan 2007 06:33:50 -0000	1.1310.2.93
--- ChangeLog	10 Jan 2007 03:45:37 -0000	1.1310.2.94
***************
*** 1,2 ****
--- 1,14 ----
+ 2007-01-09 Braden McDaniel  <br...@en...>
+ 
+ 	Assert that rotation components are not NaN.
+ 
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::rotation::rotation(const float (&)[4])): Assert that
+ 	rotation components are not NaN.
+ 	(openvrml::rotation::rotation(float, float, float, float)): Assert
+ 	that rotation components are not NaN.
+ 	(openvrml::rotation::rotation(const vec3f &, float)): Assert
+ 	that rotation components are not NaN.
+ 
  2007-01-03 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp, 1.37.2.2, 1.37.2.3

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15959/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	basetypes.cpp 
Log Message:
Assert that rotation components are not NaN.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -d -r1.37.2.2 -r1.37.2.3
*** basetypes.cpp	22 Nov 2006 04:51:22 -0000	1.37.2.2
--- basetypes.cpp	10 Jan 2007 03:45:37 -0000	1.37.2.3
***************
*** 2578,2581 ****
--- 2578,2589 ----
  openvrml::rotation::rotation(const float (&rot)[4]) OPENVRML_NOTHROW
  {
+     //
+     // Ensure the elements of rot are not NaN.
+     //
+     assert(rot[0] == rot[0]);
+     assert(rot[1] == rot[1]);
+     assert(rot[2] == rot[2]);
+     assert(rot[3] == rot[3]);
+ 
      assert(openvrml_::fequal(1.0f, vec3f(rot[0], rot[1], rot[2]).length()));
      std::copy(rot, rot + 4, this->rot);
***************
*** 2598,2601 ****
--- 2606,2617 ----
      OPENVRML_NOTHROW
  {
+     //
+     // Ensure x, y, z, and angle are not NaN.
+     //
+     assert(x == x);
+     assert(y == y);
+     assert(z == z);
+     assert(angle == angle);
+ 
      assert(openvrml_::fequal(1.0f, vec3f(x, y, z).length()));
      this->rot[0] = x;
***************
*** 2616,2619 ****
--- 2632,2640 ----
      OPENVRML_NOTHROW
  {
+     //
+     // Ensure angle is not NaN.
+     //
+     assert(angle == angle);
+ 
      assert(openvrml_::fequal(1.0f, axis.length()));
      this->axis(axis);

[openvrml-commit] openvrml/src/openvrml-gtkplug main.cpp,1.9,1.10

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13476/src/openvrml-gtkplug

Modified Files:
	main.cpp 
Log Message:
Call gdk_threads_init.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main.cpp	4 Jan 2007 02:12:46 -0000	1.9
--- main.cpp	4 Jan 2007 06:34:01 -0000	1.10
***************
*** 336,339 ****
--- 336,340 ----
  
      g_thread_init(0);
+     gdk_threads_init();
  
      g_set_application_name(application_name);

[openvrml-commit] openvrml ChangeLog,1.1415,1.1416

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13476

Modified Files:
	ChangeLog 
Log Message:
Call gdk_threads_init.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -C2 -d -r1.1415 -r1.1416
*** ChangeLog	4 Jan 2007 03:44:11 -0000	1.1415
--- ChangeLog	4 Jan 2007 06:34:01 -0000	1.1416
***************
*** 1,4 ****
--- 1,9 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/main.cpp
+ 	(main(int, char *[])): Call gdk_threads_init.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
  	(resource_fetcher::do_get_resource(const std::string &)): Dismiss

[openvrml-commit] openvrml ChangeLog,1.1310.2.92,1.1310.2.93

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13442

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Call gdk_threads_init.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.92
retrieving revision 1.1310.2.93
diff -C2 -d -r1.1310.2.92 -r1.1310.2.93
*** ChangeLog	4 Jan 2007 03:43:39 -0000	1.1310.2.92
--- ChangeLog	4 Jan 2007 06:33:50 -0000	1.1310.2.93
***************
*** 1,4 ****
--- 1,9 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/main.cpp
+ 	(main(int, char *[])): Call gdk_threads_init.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
  	(browser::do_get_resource(const std::string &)): Dismiss the

[openvrml-commit] openvrml/src/openvrml-gtkplug main.cpp, 1.2.2.8, 1.2.2.9

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13442/src/openvrml-gtkplug

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	main.cpp 
Log Message:
Call gdk_threads_init.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/main.cpp,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -C2 -d -r1.2.2.8 -r1.2.2.9
*** main.cpp	4 Jan 2007 02:12:24 -0000	1.2.2.8
--- main.cpp	4 Jan 2007 06:33:51 -0000	1.2.2.9
***************
*** 336,339 ****
--- 336,340 ----
  
      g_thread_init(0);
+     gdk_threads_init();
  
      g_set_application_name(application_name);

[openvrml-commit] openvrml ChangeLog,1.1414,1.1415

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7087

Modified Files:
	ChangeLog 
Log Message:
Dismiss the error_guard.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1414
retrieving revision 1.1415
diff -C2 -d -r1.1414 -r1.1415
*** ChangeLog	4 Jan 2007 03:25:22 -0000	1.1414
--- ChangeLog	4 Jan 2007 03:44:11 -0000	1.1415
***************
*** 1,4 ****
--- 1,10 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
+ 	(resource_fetcher::do_get_resource(const std::string &)): Dismiss
+ 	the error_guard.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp: Use scope_guard from
  	boost::multi_index.

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.8, 1.9

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7087/src/openvrml-gtkplug

Modified Files:
	gtkvrmlbrowser.cpp 
Log Message:
Dismiss the error_guard.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gtkvrmlbrowser.cpp	4 Jan 2007 03:25:23 -0000	1.8
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:44:11 -0000	1.9
***************
*** 537,540 ****
--- 537,542 ----
                      this->setstate(std::ios_base::badbit);
                  }
+ 
+                 error_guard.dismiss();
              }
  

[openvrml-commit] openvrml ChangeLog,1.1310.2.91,1.1310.2.92

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6677

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Dismiss the error_guard.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.91
retrieving revision 1.1310.2.92
diff -C2 -d -r1.1310.2.91 -r1.1310.2.92
*** ChangeLog	4 Jan 2007 03:25:08 -0000	1.1310.2.91
--- ChangeLog	4 Jan 2007 03:43:39 -0000	1.1310.2.92
***************
*** 1,4 ****
--- 1,10 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
+ 	(browser::do_get_resource(const std::string &)): Dismiss the
+ 	error_guard.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp: Use scope_guard from
  	boost::multi_index.

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.2.2.6, 1.2.2.7

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6677/src/openvrml-gtkplug

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	gtkvrmlbrowser.cpp 
Log Message:
Dismiss the error_guard.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -C2 -d -r1.2.2.6 -r1.2.2.7
*** gtkvrmlbrowser.cpp	4 Jan 2007 03:25:09 -0000	1.2.2.6
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:43:40 -0000	1.2.2.7
***************
*** 541,544 ****
--- 541,546 ----
                      this->setstate(std::ios_base::badbit);
                  }
+ 
+                 error_guard.dismiss();
              }
  

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.7, 1.8

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31392/src/openvrml-gtkplug

Modified Files:
	gtkvrmlbrowser.cpp 
Log Message:
Use scope_guard from boost::multi_index.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gtkvrmlbrowser.cpp	4 Jan 2007 03:21:50 -0000	1.7
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:25:23 -0000	1.8
***************
*** 21,24 ****
--- 21,25 ----
  # include <iostream>
  # include <sstream>
+ # include <boost/multi_index/detail/scope_guard.hpp>
  // Must include before X11 headers.
  # include <boost/numeric/conversion/converter.hpp>
***************
*** 30,33 ****
--- 31,36 ----
  # include "plugin_streambuf.h"
  
+ using namespace boost::multi_index::detail; // for scope_guard
+ 
  extern "C" {
      void gtk_vrml_browser_class_init(GtkVrmlBrowserClass * klass);
***************
*** 495,498 ****
--- 498,502 ----
              {
                  using std::ostringstream;
+                 using boost::ref;
                  using openvrml_player::uninitialized_plugin_streambuf_map_;
  
***************
*** 506,509 ****
--- 510,514 ----
                  GError * error = 0;
                  scope_guard error_guard = make_guard(g_error_free, ref(error));
+                 boost::ignore_unused_variable_warning(error_guard);
                  GIOStatus io_status =
                      g_io_channel_write_chars(this->request_channel_,

[openvrml-commit] openvrml ChangeLog,1.1413,1.1414

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31392

Modified Files:
	ChangeLog 
Log Message:
Use scope_guard from boost::multi_index.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1413
retrieving revision 1.1414
diff -C2 -d -r1.1413 -r1.1414
*** ChangeLog	4 Jan 2007 03:21:50 -0000	1.1413
--- ChangeLog	4 Jan 2007 03:25:22 -0000	1.1414
***************
*** 1,4 ****
--- 1,9 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp: Use scope_guard from
+ 	boost::multi_index.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
  	(GtkGLViewer::GtkGLViewer(GIOChannel &, GtkVrmlBrowser &)): Since

[openvrml-commit] openvrml ChangeLog,1.1310.2.90,1.1310.2.91

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31311

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Use scope_guard from boost::multi_index.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.90
retrieving revision 1.1310.2.91
diff -C2 -d -r1.1310.2.90 -r1.1310.2.91
*** ChangeLog	4 Jan 2007 03:21:34 -0000	1.1310.2.90
--- ChangeLog	4 Jan 2007 03:25:08 -0000	1.1310.2.91
***************
*** 1,4 ****
--- 1,9 ----
  2007-01-03 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp: Use scope_guard from
+ 	boost::multi_index.
+ 
+ 2007-01-03 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
  	(browser::browser(GIOChannel &)): Since stdout is used to

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.2.2.5, 1.2.2.6

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31311/src/openvrml-gtkplug

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	gtkvrmlbrowser.cpp 
Log Message:
Use scope_guard from boost::multi_index.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -d -r1.2.2.5 -r1.2.2.6
*** gtkvrmlbrowser.cpp	4 Jan 2007 03:21:35 -0000	1.2.2.5
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:25:09 -0000	1.2.2.6
***************
*** 21,24 ****
--- 21,25 ----
  # include <iostream>
  # include <sstream>
+ # include <boost/multi_index/detail/scope_guard.hpp>
  // Must include before X11 headers.
  # include <boost/numeric/conversion/converter.hpp>
***************
*** 30,33 ****
--- 31,36 ----
  # include "plugin_streambuf.h"
  
+ using namespace boost::multi_index::detail; // for scope_guard
+ 
  extern "C" {
      void gtk_vrml_browser_class_init(GtkVrmlBrowserClass * klass);
***************
*** 499,502 ****
--- 502,506 ----
              {
                  using std::ostringstream;
+                 using boost::ref;
                  using openvrml_player::uninitialized_plugin_streambuf_map_;
  
***************
*** 510,513 ****
--- 514,518 ----
                  GError * error = 0;
                  scope_guard error_guard = make_guard(g_error_free, ref(error));
+                 boost::ignore_unused_variable_warning(error_guard);
                  GIOStatus io_status =
                      g_io_channel_write_chars(this->request_channel_,

[openvrml-commit] openvrml ChangeLog,1.1412,1.1413

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29694

Modified Files:
	ChangeLog 
Log Message:
Since stdout is used to communicate with the host process, send all browser output to stderr.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1412
retrieving revision 1.1413
diff -C2 -d -r1.1412 -r1.1413
*** ChangeLog	4 Jan 2007 02:43:37 -0000	1.1412
--- ChangeLog	4 Jan 2007 03:21:50 -0000	1.1413
***************
*** 2,8 ****
  
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
! 	(browser::do_get_resource(const std::string &)): Check the return
! 	status given by g_io_channel_write_chars and g_io_channel_flush;
! 	set badbit and bail if there's a problem.
  
  2007-01-03 Braden McDaniel  <br...@en...>
--- 2,15 ----
  
  	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
! 	(GtkGLViewer::GtkGLViewer(GIOChannel &, GtkVrmlBrowser &)): Since
! 	stdout is used to communicate with the host process, send all
! 	browser output to stderr.
! 
! 2007-01-03 Braden McDaniel  <br...@en...>
! 
! 	* src/openvrml-gtkplug/gtkvrmlbrowser.cpp
! 	(resource_fetcher::do_get_resource(const std::string &)): Check
! 	the return status given by g_io_channel_write_chars and
! 	g_io_channel_flush; set badbit and bail if there's a problem.
  
  2007-01-03 Braden McDaniel  <br...@en...>

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.6, 1.7

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29694/src/openvrml-gtkplug

Modified Files:
	gtkvrmlbrowser.cpp 
Log Message:
Since stdout is used to communicate with the host process, send all browser output to stderr.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtkvrmlbrowser.cpp	4 Jan 2007 02:43:37 -0000	1.6
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:21:50 -0000	1.7
***************
*** 554,561 ****
      }
  
      GtkGLViewer::GtkGLViewer(GIOChannel & request_channel,
                               GtkVrmlBrowser & vrml_browser):
          fetcher_(request_channel),
!         browser_(this->fetcher_, std::cout, std::cerr),
          vrml_browser_(vrml_browser),
          timer(0),
--- 554,565 ----
      }
  
+     //
+     // We use stdout for communication with the host process; so send
+     // all browser output to stderr.
+     //
      GtkGLViewer::GtkGLViewer(GIOChannel & request_channel,
                               GtkVrmlBrowser & vrml_browser):
          fetcher_(request_channel),
!         browser_(this->fetcher_, std::cerr, std::cerr),
          vrml_browser_(vrml_browser),
          timer(0),

[openvrml-commit] openvrml/src/openvrml-gtkplug gtkvrmlbrowser.cpp, 1.2.2.4, 1.2.2.5

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29653/src/openvrml-gtkplug

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	gtkvrmlbrowser.cpp 
Log Message:
Since stdout is used to communicate with the host process, send all browser output to stderr.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -d -r1.2.2.4 -r1.2.2.5
*** gtkvrmlbrowser.cpp	4 Jan 2007 02:43:24 -0000	1.2.2.4
--- gtkvrmlbrowser.cpp	4 Jan 2007 03:21:35 -0000	1.2.2.5
***************
*** 473,478 ****
  namespace {
  
      browser::browser(GIOChannel & request_channel):
!         openvrml::browser(std::cout, std::cerr),
          request_channel_(&request_channel)
      {}
--- 473,482 ----
  namespace {
  
+     //
+     // We use stdout for communication with the host process; so send
+     // all browser output to stderr.
+     //
      browser::browser(GIOChannel & request_channel):
!         openvrml::browser(std::cerr, std::cerr),
          request_channel_(&request_channel)
      {}