[openvrml-commit] openvrml/src/libopenvrml/openvrml field_value.cpp,1.18,1.19 field_value.h,1.15,1.16

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

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

Modified Files:
	field_value.cpp field_value.h 
Log Message:
Removed conversions from double-precision floating point types to single-precision ones.

Index: field_value.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** field_value.cpp	3 Nov 2005 05:20:31 -0000	1.18
--- field_value.cpp	5 Nov 2005 04:54:33 -0000	1.19
***************
*** 1296,1308 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param value initial value
-  */
- openvrml::sfdouble::sfdouble(const float value) throw ():
-     field_value(value, value_type_constructor_tag())
- {}
- 
- /**
   * @brief Construct a copy.
   *
--- 1296,1299 ----
***************
*** 1402,1412 ****
      throw (std::bad_cast)
  {
-     //allow to convert from a float to a double
-     const sffloat * float_val = dynamic_cast<const sffloat *>(&value);
-     if (!float_val) {
-         this->value(float_val->value());
-         return *this;
-     }
- 
      return (*this = dynamic_cast<const sfdouble &>(value));
  }
--- 1393,1396 ----
***************
*** 2740,2752 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param vec   initial value.
-  */
- openvrml::sfvec2d::sfvec2d(const vec2f & vec) throw ():
-     field_value(vec2d(vec[0], vec[1]), value_type_constructor_tag())
- {}
- 
- /**
   * @brief Construct a copy.
   *
--- 2724,2727 ----
***************
*** 3106,3118 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param vec   initial value.
-  */
- openvrml::sfvec3d::sfvec3d(const vec3f & vec) throw ():
-     field_value(vec3d(vec[0], vec[1], vec[2]), value_type_constructor_tag())
- {}
- 
- /**
   * @brief Construct a copy.
   *
--- 3081,3084 ----
***************
*** 3201,3210 ****
      throw (std::bad_cast)
  {
-     //allow to convert from a float to a double
-     const sfvec3f * float_val = dynamic_cast<const sfvec3f *>(&value);
-     if (!float_val) {
-         return *this = sfvec3d(float_val->value());
-     }
-     
      return (*this = dynamic_cast<const sfvec3d &>(value));
  }
--- 3167,3170 ----
***************
*** 3728,3746 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param value initial value.
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
- openvrml::mfdouble::mfdouble(const std::vector<float> & value)
-     throw (std::bad_alloc):
-     field_value(std::vector<double>(), value_type_constructor_tag())
- {
-     std::vector<double> temp(value.begin(), value.end());
-     this->value(temp);
- }
- 
- /**
   * @brief Construct a copy.
   *
--- 3688,3691 ----
***************
*** 3832,3841 ****
      throw (std::bad_cast, std::bad_alloc)
  {
-     //allow to convert from a float to a double
-     const mffloat * float_val = dynamic_cast<const mffloat *>(&value);
-     if (!float_val) {
-         return *this = mfdouble(float_val->value());
-     }
-     
      return (*this = dynamic_cast<const mfdouble &>(value));
  }
--- 3777,3780 ----
***************
*** 5212,5233 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param value initial value.
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
- openvrml::mfvec2d::mfvec2d(const std::vector<vec2f> & value)
-     throw (std::bad_alloc):
-     field_value(std::vector<vec2d>(), value_type_constructor_tag())
- {
-     std::vector<vec2d> temp(value.size());
-     for (std::vector<vec2d>::size_type i = 0; i < temp.size(); ++i) {
-         temp[i] = vec2d(value[i].x(), value[i].y());
-     }
-     this->value(temp);
- }
- 
- /**
   * @brief Construct a copy.
   *
--- 5151,5154 ----
***************
*** 5318,5327 ****
      throw (std::bad_cast, std::bad_alloc)
  {
-     //allow to convert from a float to a double
-     const mfvec2f * float_val = dynamic_cast<const mfvec2f *>(&value);
-     if (!float_val) {
-         return *this = mfvec2d(float_val->value());
-     }
-     
      return (*this = dynamic_cast<const mfvec2d &>(value));
  }
--- 5239,5242 ----
***************
*** 5652,5673 ****
  
  /**
-  * @brief Construct.
-  *
-  * @param value initial value.
-  *
-  * @exception std::bad_alloc    if memory allocation fails.
-  */
- openvrml::mfvec3d::mfvec3d(const std::vector<vec3f> & value)
-     throw (std::bad_alloc):
-     field_value(std::vector<vec3d>(), value_type_constructor_tag())
- {
-     std::vector<vec3d> temp(value.size());
-     for (std::vector<vec3d>::size_type i = 0; i < temp.size(); ++i) {
-         temp[i] = vec3d(value[i].x(), value[i].y(), value[i].z());
-     }
-     this->value(temp);
- }
- 
- /**
   * @brief Construct a copy.
   *
--- 5567,5570 ----
***************
*** 5759,5768 ****
      throw (std::bad_cast, std::bad_alloc)
  {
-     //allow to convert from a float to a double
-     const mfvec3f * float_val = dynamic_cast<const mfvec3f *>(&value);
-     if (!float_val) {
-         return *this = mfvec3d(float_val->value());
-     }
-     
      return (*this = dynamic_cast<const mfvec3d &>(value));
  }
--- 5656,5659 ----

Index: field_value.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** field_value.h	3 Nov 2005 05:20:31 -0000	1.15
--- field_value.h	5 Nov 2005 04:54:33 -0000	1.16
***************
*** 396,400 ****
  
          explicit sfdouble(double value = 0.0) throw ();
-         sfdouble(float value) throw ();
          sfdouble(const sfdouble & sfd);
          virtual ~sfdouble() throw ();
--- 396,399 ----
***************
*** 650,654 ****
  
          explicit sfvec2d(const vec2d & vec = vec2d()) throw ();
-         sfvec2d(const vec2f & vec) throw ();
          sfvec2d(const sfvec2d & sfv);
          virtual ~sfvec2d() throw ();
--- 649,652 ----
***************
*** 712,716 ****
  
          explicit sfvec3d(const vec3d & vec = vec3d()) throw ();
-         sfvec3d(const vec3f & vec) throw ();
          sfvec3d(const sfvec3d & sfv);
          virtual ~sfvec3d() throw ();
--- 710,713 ----
***************
*** 813,818 ****
              throw (std::bad_alloc);
          explicit mfdouble(const value_type & value) throw (std::bad_alloc);
-         mfdouble(const std::vector<float> & value)
-             throw (std::bad_alloc);
          mfdouble(const mfdouble & mfd);
          virtual ~mfdouble() throw ();
--- 810,813 ----
***************
*** 1054,1059 ****
              throw (std::bad_alloc);
          explicit mfvec2d(const value_type & value) throw (std::bad_alloc);
-         mfvec2d(const std::vector<vec2f> & value)
-             throw (std::bad_alloc);
          mfvec2d(const mfvec2d & mfv);
          virtual ~mfvec2d() throw ();
--- 1049,1052 ----
***************
*** 1123,1128 ****
              throw (std::bad_alloc);
          explicit mfvec3d(const value_type & value) throw (std::bad_alloc);
-         mfvec3d(const std::vector<vec3f> & value)
-             throw (std::bad_alloc);
          mfvec3d(const mfvec3d & mfv);
          virtual ~mfvec3d() throw ();
--- 1116,1119 ----