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

[openvrml-commit] openvrml/src/libopenvrml/openvrml script.cpp,1.58,1.59

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

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

Modified Files:
	script.cpp 
Log Message:
Added parentheses around ternary operator; << has higher precedence.

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** script.cpp	8 Dec 2005 06:50:14 -0000	1.58
--- script.cpp	8 Dec 2005 09:21:13 -0000	1.59
***************
*** 8897,8901 ****
      out << '[';
      for (JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) {
!         out << JSVAL_TO_BOOLEAN(mfdata->array[i]) ? "TRUE" : "FALSE";
          if ((i + 1) < mfdata->array.size()) { out << ", "; }
      }
--- 8897,8901 ----
      out << '[';
      for (JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) {
!         out << (JSVAL_TO_BOOLEAN(mfdata->array[i]) ? "TRUE" : "FALSE");
          if ((i + 1) < mfdata->array.size()) { out << ", "; }
      }

[openvrml-commit] openvrml ChangeLog,1.1080,1.1081

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

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

Modified Files:
	ChangeLog 
Log Message:
Added missing case for mfbool to openvrml::add_route.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -C2 -d -r1.1080 -r1.1081
*** ChangeLog	8 Dec 2005 09:13:58 -0000	1.1080
--- ChangeLog	8 Dec 2005 09:18:00 -0000	1.1081
***************
*** 1,4 ****
--- 1,12 ----
  2005-12-08 Braden McDaniel  <br...@en...>
  
+ 	Added missing case for mfbool to openvrml::add_route.
+ 
+ 	* src/libopenvrml/openvrml/node.cpp
+ 	(openvrml::add_route(node &, const std::string &, node &, const
+ 	std::string &)): Added missing case for mfbool.
+ 
+ 2005-12-08 Braden McDaniel  <br...@en...>
+ 
  	Changed openvrml::color_rgba::rgb to openvrml::color_rgba::rgba.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml node.cpp,1.70,1.71

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

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

Modified Files:
	node.cpp 
Log Message:
Added missing case for mfbool to openvrml::add_route.

Index: node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** node.cpp	8 Dec 2005 06:50:14 -0000	1.70
--- node.cpp	8 Dec 2005 09:18:00 -0000	1.71
***************
*** 2624,2627 ****
--- 2624,2630 ----
              added_route = add_listener<sfvec3d>(emitter, listener);
              break;
+         case field_value::mfbool_id:
+             added_route = add_listener<mfbool>(emitter, listener);
+             break;
          case field_value::mfcolor_id:
              added_route = add_listener<mfcolor>(emitter, listener);

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp,1.27,1.28 basetypes.h,1.19,1.20

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

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

Modified Files:
	basetypes.cpp basetypes.h 
Log Message:
Changed openvrml::color_rgba::rgb to openvrml::color_rgba::rgba.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** basetypes.cpp	8 Dec 2005 08:21:04 -0000	1.27
--- basetypes.cpp	8 Dec 2005 09:14:01 -0000	1.28
***************
*** 305,309 ****
   * @internal
   *
!  * @var float openvrml::color_rgba::rgb[4]
   *
   * @brief RGB triplet plus alpha.
--- 305,309 ----
   * @internal
   *
!  * @var float openvrml::color_rgba::rgba[4]
   *
   * @brief RGB triplet plus alpha.
***************
*** 319,334 ****
   * @brief Construct from a 4-element float array.
   *
!  * @param rgb   an array comprising red, green, and blue components.
   */
  openvrml::color_rgba::color_rgba(const float (&rgba)[4]) throw ()
  {
      assert(rgba[0] >= 0.0 && rgba[0] <= 1.0);
!     this->rgb[0] = rgba[0];
      assert(rgba[1] >= 0.0 && rgba[1] <= 1.0);
!     this->rgb[1] = rgba[1];
      assert(rgba[2] >= 0.0 && rgba[2] <= 1.0);
!     this->rgb[2] = rgba[2];
      assert(rgba[3] >= 0.0 && rgba[3] <= 1.0);
!     this->rgb[3] = rgba[3];
  }
  
--- 319,334 ----
   * @brief Construct from a 4-element float array.
   *
!  * @param rgba   an array comprising red, green, and blue components.
   */
  openvrml::color_rgba::color_rgba(const float (&rgba)[4]) throw ()
  {
      assert(rgba[0] >= 0.0 && rgba[0] <= 1.0);
!     this->rgba[0] = rgba[0];
      assert(rgba[1] >= 0.0 && rgba[1] <= 1.0);
!     this->rgba[1] = rgba[1];
      assert(rgba[2] >= 0.0 && rgba[2] <= 1.0);
!     this->rgba[2] = rgba[2];
      assert(rgba[3] >= 0.0 && rgba[3] <= 1.0);
!     this->rgba[3] = rgba[3];
  }
  
***************
*** 344,354 ****
  {
      assert(r >= 0.0 && r <= 1.0);
!     this->rgb[0] = r;
      assert(g >= 0.0 && g <= 1.0);
!     this->rgb[1] = g;
      assert(b >= 0.0 && b <= 1.0);
!     this->rgb[2] = b;
      assert(a >= 0.0 && a <= 1.0);
!     this->rgb[3] = a;
  }
  
--- 344,354 ----
  {
      assert(r >= 0.0 && r <= 1.0);
!     this->rgba[0] = r;
      assert(g >= 0.0 && g <= 1.0);
!     this->rgba[1] = g;
      assert(b >= 0.0 && b <= 1.0);
!     this->rgba[2] = b;
      assert(a >= 0.0 && a <= 1.0);
!     this->rgba[3] = a;
  }
  
***************
*** 435,440 ****
  void openvrml::color_rgba::hsv(float (&result)[4]) const throw ()
  {
!     rgb_to_hsv(&rgb[0], &result[0]);
!     result[3] = rgb[3]; // Copy the alpha.
  }
  
--- 435,440 ----
  void openvrml::color_rgba::hsv(float (&result)[4]) const throw ()
  {
!     rgb_to_hsv(&rgba[0], &result[0]);
!     result[3] = rgba[3]; // Copy the alpha.
  }
  
***************
*** 453,459 ****
      throw ()
  {
!     hsv_to_rgb(h, s, v, &rgb[0]);
      assert(a >= 0.0 && a <= 1.0);
!     rgb[3] = a;
  }
  
--- 453,459 ----
      throw ()
  {
!     hsv_to_rgb(h, s, v, &rgba[0]);
      assert(a >= 0.0 && a <= 1.0);
!     rgba[3] = a;
  }
  
***************
*** 469,473 ****
   *         otherwise.
   */
! bool openvrml::operator==(const color_rgba & lhs, const color_rgba & rhs) throw ()
  {
      using openvrml_::fequal;
--- 469,474 ----
   *         otherwise.
   */
! bool openvrml::operator==(const color_rgba & lhs, const color_rgba & rhs)
!     throw ()
  {
      using openvrml_::fequal;

Index: basetypes.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** basetypes.h	8 Dec 2005 06:50:13 -0000	1.19
--- basetypes.h	8 Dec 2005 09:14:01 -0000	1.20
***************
*** 108,112 ****
  
      class OPENVRML_API color_rgba {
!         float rgb[4];
  
      public:
--- 108,112 ----
  
      class OPENVRML_API color_rgba {
!         float rgba[4];
  
      public:
***************
*** 144,188 ****
      {
          assert(index < 4);
!         return this->rgb[index];
      }
  
      inline float color_rgba::r() const throw ()
      {
!         return this->rgb[0];
      }
  
      inline float color_rgba::g() const throw ()
      {
!         return this->rgb[1];
      }
  
      inline float color_rgba::b() const throw ()
      {
!         return this->rgb[2];
      }
  
      inline float color_rgba::a() const throw ()
      {
!         return this->rgb[3];
      }
  
      inline void color_rgba::r(const float value) throw ()
      {
!         this->rgb[0] = value;
      }
  
      inline void color_rgba::g(const float value) throw ()
      {
!         this->rgb[1] = value;
      }
  
      inline void color_rgba::b(const float value) throw ()
      {
!         this->rgb[2] = value;
      }
  
      inline void color_rgba::a(const float value) throw ()
      {
!         this->rgb[3] = value;
      }
  
--- 144,188 ----
      {
          assert(index < 4);
!         return this->rgba[index];
      }
  
      inline float color_rgba::r() const throw ()
      {
!         return this->rgba[0];
      }
  
      inline float color_rgba::g() const throw ()
      {
!         return this->rgba[1];
      }
  
      inline float color_rgba::b() const throw ()
      {
!         return this->rgba[2];
      }
  
      inline float color_rgba::a() const throw ()
      {
!         return this->rgba[3];
      }
  
      inline void color_rgba::r(const float value) throw ()
      {
!         this->rgba[0] = value;
      }
  
      inline void color_rgba::g(const float value) throw ()
      {
!         this->rgba[1] = value;
      }
  
      inline void color_rgba::b(const float value) throw ()
      {
!         this->rgba[2] = value;
      }
  
      inline void color_rgba::a(const float value) throw ()
      {
!         this->rgba[3] = value;
      }
  

[openvrml-commit] openvrml ChangeLog,1.1079,1.1080

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

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

Modified Files:
	ChangeLog 
Log Message:
Changed openvrml::color_rgba::rgb to openvrml::color_rgba::rgba.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -C2 -d -r1.1079 -r1.1080
*** ChangeLog	8 Dec 2005 08:21:04 -0000	1.1079
--- ChangeLog	8 Dec 2005 09:13:58 -0000	1.1080
***************
*** 1,4 ****
--- 1,38 ----
  2005-12-08 Braden McDaniel  <br...@en...>
  
+ 	Changed openvrml::color_rgba::rgb to openvrml::color_rgba::rgba.
+ 
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::color_rgba::color_rgba(const float (&)[4])): Changed
+ 	references from this->rgb to this->rgba.
+ 	(openvrml::color_rgba::color_rgba(float, float, float, float)):
+ 	Changed references from this->rgb to this->rgba.
+ 	(openvrml::color_rgba::hsv(float (&)[4]) const): Changed
+ 	references from this->rgb to this->rgba.
+ 	(openvrml::color_rgba::hsv(float, float, float, float)): Changed
+ 	references from this->rgb to this->rgba.
+ 	* src/libopenvrml/openvrml/basetypes.h
+ 	(openvrml::color_rgba): Changed member rgb to rgba.
+ 	(openvrml::color_rgba::operator[](size_t) const): Changed
+ 	reference from this->rgb to this->rgba.
+ 	(openvrml::color_rgba::r() const): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::g() const): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::b() const): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::a() const): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::r(float)): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::g(float)): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::b(float)): Changed reference from
+ 	this->rgb to this->rgba.
+ 	(openvrml::color_rgba::a(float)): Changed reference from
+ 	this->rgb to this->rgba.
+ 
+ 2005-12-08 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/basetypes.cpp
  	(openvrml::color_rgba::color_rgba(const float (&)[4])): Fixed to

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp,1.26,1.27

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

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

Modified Files:
	basetypes.cpp 
Log Message:
Fixed to refer to function argument.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** basetypes.cpp	8 Dec 2005 06:50:13 -0000	1.26
--- basetypes.cpp	8 Dec 2005 08:21:04 -0000	1.27
***************
*** 323,334 ****
  openvrml::color_rgba::color_rgba(const float (&rgba)[4]) throw ()
  {
!     assert(rgb[0] >= 0.0 && rgb[0] <= 1.0);
!     this->rgb[0] = rgb[0];
!     assert(rgb[1] >= 0.0 && rgb[1] <= 1.0);
!     this->rgb[1] = rgb[1];
!     assert(rgb[2] >= 0.0 && rgb[2] <= 1.0);
!     this->rgb[2] = rgb[2];
!     assert(rgb[3] >= 0.0 && rgb[3] <= 1.0);
!     this->rgb[3] = rgb[3];
  }
  
--- 323,334 ----
  openvrml::color_rgba::color_rgba(const float (&rgba)[4]) throw ()
  {
!     assert(rgba[0] >= 0.0 && rgba[0] <= 1.0);
!     this->rgb[0] = rgba[0];
!     assert(rgba[1] >= 0.0 && rgba[1] <= 1.0);
!     this->rgb[1] = rgba[1];
!     assert(rgba[2] >= 0.0 && rgba[2] <= 1.0);
!     this->rgb[2] = rgba[2];
!     assert(rgba[3] >= 0.0 && rgba[3] <= 1.0);
!     this->rgb[3] = rgba[3];
  }
  

[openvrml-commit] openvrml ChangeLog,1.1078,1.1079

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

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

Modified Files:
	ChangeLog 
Log Message:
Fixed to refer to function argument.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -C2 -d -r1.1078 -r1.1079
*** ChangeLog	8 Dec 2005 06:50:10 -0000	1.1078
--- ChangeLog	8 Dec 2005 08:21:04 -0000	1.1079
***************
*** 1,4 ****
--- 1,10 ----
  2005-12-08 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::color_rgba::color_rgba(const float (&)[4])): Fixed to
+ 	refer to function argument.
+ 
+ 2005-12-08 Braden McDaniel  <br...@en...>
+ 
  	Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value
  	types.  Added MFBool support to the Java and JavaScript

[openvrml-commit] openvrml/java/vrml/field ConstMFBool.java,NONE,1.1 MFBool.java,NONE,1.1 Makefile.am,1.9,1.10

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

Update of /cvsroot/openvrml/openvrml/java/vrml/field
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32201/java/vrml/field

Modified Files:
	Makefile.am 
Added Files:
	ConstMFBool.java MFBool.java 
Log Message:
Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value types.  Added MFBool support to the Java and JavaScript interfaces.

--- NEW FILE: MFBool.java ---
//
// OpenVRML
//
// Copyright 2005  Braden McDaniel
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

package vrml.field;

import vrml.MField;

public class MFBool extends MField {

    public native int getSize();

    public native void clear();

    public native void delete(int index);

    /**
     * Construct a new MFBool field in OpenVRML using the given params.
     *
     * @param size Number of SFBool values passed in.
     * @param values List of booleans to initialize object with.
     */
    private native void CreateObject(int size, boolean values[]);

    /**
     * Default constructor
     */
    public MFBool() {
        CreateObject(0, null);
    }

    /**
     * Construct an MFBool field.
     *
     * @param size Number of booleans to initialize object with.
     * @param values List of booleans to initialize object with.
     */
    public MFBool(int size, boolean values[]) {
        CreateObject(size, values);
    }

    /**
     * Construct an MFBool field.
     *
     * @param values List of booleans to initialize object with.
     */
    public MFBool(boolean values[]) {
        CreateObject(values.length, values);
    }

    /**
     * Retrieves the complete list of booleans making up an MFBool field.
     *
     * @param values Array to put resulting list of booleans in.
     */
    public native void getValue(boolean values[]);

    /**
     * Retrieve a particular element from an MFBool field.
     *
     * @param index Position of desired element.
     * @return Value at specified position.
     */
    public native boolean get1Value(int index);

    /**
     * Set the value of the field.
     *
     * @param values New value for field.
     */
    public void setValue(boolean values[]) {
        setValue(values.length, values);
    }

    /**
     * Set the value of the field.
     *
     * @param size Size of new value for field.
     * @param values New value for field.
     */
    public native void setValue(int size, boolean values[]);

    /**
     * Set the value of the field.
     *
     * @param value New value for field.
     */
    public native void setValue(MFBool value);

    /**
     * Set the value of the field.
     *
     * @param value New value for field.
     */
    public native void setValue(ConstMFBool value);

    /**
     * Set a specified element in the field.
     *
     * @param index Position of element to update.
     * @param b New value for element.
     */
    public native void set1Value(int index, boolean b);

    /**
     * Set a specified element in the field.
     *
     * @param index Position of element to update.
     * @param b New value for element.
     */
    public native void set1Value(int index, ConstSFBool b);

    /**
     * Set a specified element in the field.
     *
     * @param index Position of element to update.
     * @param b New value for element.
     */
    public native void set1Value(int index, SFBool b);

    /**
     * Add a new element at the end of the list.
     *
     * @param b Element to add.
     */
    public native void addValue(boolean b);

    /**
     * Add a new element at the end of the list.
     *
     * @param b Element to add.
     */
    public native void addValue(ConstSFBool b);

    /**
     * Add a new element at the end of the list.
     *
     * @param b Element to add.
     */
    public native void addValue(SFBool b);

    /**
     * Insert a new element at the specified position.
     *
     * @param index Position to insert new element at.
     * @param b Value to insert.
     */
    public native void insertValue(int index, boolean b);

    /**
     * Insert a new element at the specified position.
     *
     * @param index Position to insert new element at.
     * @param b Value to insert.
     */
    public native void insertValue(int index, ConstSFBool b);

    /**
     * Insert a new element at the specified position.
     *
     * @param index Position to insert new element at.
     * @param b Value to insert.
     */
    public native void insertValue(int index, SFBool b);

    public native String toString();
}

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/java/vrml/field/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	5 Dec 2005 23:13:14 -0000	1.9
--- Makefile.am	8 Dec 2005 06:50:12 -0000	1.10
***************
*** 15,18 ****
--- 15,19 ----
          SFVec3d.java \
          SFVec3f.java \
+         MFBool.java \
          MFColor.java \
          MFFloat.java \
***************
*** 39,42 ****
--- 40,44 ----
          ConstSFVec3d.java \
          ConstSFVec3f.java \
+         ConstMFBool.java \
          ConstMFColor.java \
          ConstMFFloat.java \

--- NEW FILE: ConstMFBool.java ---
//
// OpenVRML
//
// Copyright 2005  Braden McDaniel
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//

package vrml.field;

import vrml.ConstMField;

/**
 * Represents a read-only VRML MFBool field in Java.
 */
public class ConstMFBool extends ConstMField {

    public native int getSize();

    /**
     * Construct a new MFBool field in OpenVRML using the given params.
     *
     * @param size Number of SFBool values passed in.
     * @param values List of booleans to initialize object with.
     */
    private native void CreateObject(int size, boolean values[]);

    /**
     * Construct a read-only MFBool field.
     *
     * @param size Number of booleans to initialize object with.
     * @param values List of booleans to initialize object with.
     */
    public ConstMFBool(int size, boolean values[]) {
        CreateObject(size, values);
    }

    /**
     * Construct a read-only MFBool field.
     *
     * @param values List of booleans to initialize object with.
     */
    public ConstMFBool(boolean values[]) {
        CreateObject(values.length, values);
    }

    /**
     * Retrieves the complete list of booleans making up an MFBool field.
     *
     * @param values Array to put resulting list of booleans in.
     */
    public native void getValue(boolean values[]);

    /**
     * Retrieve a particular element from an MFBool field.
     *
     * @param index Position of desired element.
     * @return Value at specified position.
     */
    public native boolean get1Value(int index);

    public native String toString();
}

[openvrml-commit] openvrml/java Makefile.am,1.13,1.14

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

Update of /cvsroot/openvrml/openvrml/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32201/java

Modified Files:
	Makefile.am 
Log Message:
Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value types.  Added MFBool support to the Java and JavaScript interfaces.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/java/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.am	5 Dec 2005 05:18:55 -0000	1.13
--- Makefile.am	8 Dec 2005 06:50:12 -0000	1.14
***************
*** 32,35 ****
--- 32,36 ----
          vrml/field/SFVec2f.class \
          vrml/field/SFVec3f.class \
+         vrml/field/MFBool.class \
          vrml/field/MFColor.class \
          vrml/field/MFFloat.class \
***************
*** 52,55 ****
--- 53,57 ----
          vrml/field/ConstSFVec2f.class \
          vrml/field/ConstSFVec3f.class \
+         vrml/field/ConstMFBool.class \
          vrml/field/ConstMFColor.class \
          vrml/field/ConstMFFloat.class \
***************
*** 101,104 ****
--- 103,107 ----
          vrml_field_SFVec3f.h \
          vrml_field_SFVec3d.h \
+         vrml_field_MFBool.h \
          vrml_field_MFColor.h \
          vrml_field_MFFloat.h \
***************
*** 127,130 ****
--- 130,134 ----
          vrml_field_ConstSFVec3f.h \
          vrml_field_ConstSFVec3d.h \
+         vrml_field_ConstMFBool.h \
          vrml_field_ConstMFColor.h \
          vrml_field_ConstMFFloat.h \
***************
*** 208,211 ****
--- 212,218 ----
  	$(JAVAH) -classpath . vrml.field.SFVec3d
  
+ vrml_field_MFBool.h: vrml/field/MFBool.class
+ 	$(JAVAH) -classpath . vrml.field.MFBool
+ 
  vrml_field_MFColor.h: vrml/field/MFColor.class
  	$(JAVAH) -classpath . vrml.field.MFColor
***************
*** 286,289 ****
--- 293,299 ----
  	$(JAVAH) -classpath . vrml.field.ConstSFVec3d
  
+ vrml_field_ConstMFBool.h: vrml/field/ConstMFBool.class
+ 	$(JAVAH) -classpath . vrml.field.ConstMFBool
+ 
  vrml_field_ConstMFColor.h: vrml/field/ConstMFColor.class
  	$(JAVAH) -classpath . vrml.field.ConstMFColor

[openvrml-commit] openvrml/src/libopenvrml/openvrml ScriptJDK.cpp,1.14,1.15 Vrml97Parser.g,1.43,1.44 X3DVrmlParser.g,1.8,1.9 basetypes.cpp,1.25,1.26 basetypes.h,1.18,1.19 browser.cpp,1.113,1.114 event.cpp,1.9,1.10 event.h,1.10,1.11 field_value.cpp,1.19,1.20 field_value.h,1.17,1.18 node.cpp,1.69,1.70 node.h,1.45,1.46 script.cpp,1.57,1.58 script.h,1.23,1.24

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

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

Modified Files:
	ScriptJDK.cpp Vrml97Parser.g X3DVrmlParser.g basetypes.cpp 
	basetypes.h browser.cpp event.cpp event.h field_value.cpp 
	field_value.h node.cpp node.h script.cpp script.h 
Log Message:
Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value types.  Added MFBool support to the Java and JavaScript interfaces.

Index: node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** node.cpp	5 Dec 2005 20:51:48 -0000	1.69
--- node.cpp	8 Dec 2005 06:50:14 -0000	1.70
***************
*** 1069,1072 ****
--- 1069,1078 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<sfcolorrgba>
+  *
+  * @brief <code>sfcolorrgba</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<sfdouble>
   *
***************
*** 1141,1144 ****
--- 1147,1156 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<mfbool>
+  *
+  * @brief <code>mfbool</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<mfcolor>
   *
***************
*** 1147,1153 ****
  
  /**
!  * @var class openvrml::node::field_value_listener<mffloat>
   *
!  * @brief <code>mffloat</code> <code>field_value_listener</code>.
   */
  
--- 1159,1165 ----
  
  /**
!  * @var class openvrml::node::field_value_listener<mfcolorrgba>
   *
!  * @brief <code>mfcolorrgba</code> <code>field_value_listener</code>.
   */
  
***************
*** 1159,1162 ****
--- 1171,1186 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<mffloat>
+  *
+  * @brief <code>mffloat</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
+  * @var class openvrml::node::field_value_listener<mfimage>
+  *
+  * @brief <code>mfimage</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<mfint32>
   *
***************
*** 1225,1228 ****
--- 1249,1258 ----
  
  /**
+  * @var class openvrml::node::exposedfield<sfcolorrgba>
+  *
+  * @brief <code>sfcolorrgba</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<sfdouble>
   *
***************
*** 1297,1300 ****
--- 1327,1336 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfbool>
+  *
+  * @brief <code>mfbool</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mfcolor>
   *
***************
*** 1303,1306 ****
--- 1339,1348 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfcolorrgba>
+  *
+  * @brief <code>mfcolorrgba</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mfdouble>
   *
***************
*** 1315,1318 ****
--- 1357,1366 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfimage>
+  *
+  * @brief <code>mfimage</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mfint32>
   *
***************
*** 2288,2291 ****
--- 2336,2342 ----
                      this->out << n.field<sfcolor>(interface.id);
                      break;
+                 case field_value::sfcolorrgba_id:
+                     this->out << n.field<sfcolorrgba>(interface.id);
+                     break;
                  case field_value::sfdouble_id:
                      this->out << n.field<sfdouble>(interface.id);
***************
*** 2324,2330 ****
--- 2375,2387 ----
                      this->out << n.field<sfvec3d>(interface.id);
                      break;
+                 case field_value::mfbool_id:
+                     this->out << n.field<mfbool>(interface.id);
+                     break;
                  case field_value::mfcolor_id:
                      this->out << n.field<mfcolor>(interface.id);
                      break;
+                 case field_value::mfcolorrgba_id:
+                     this->out << n.field<mfcolorrgba>(interface.id);
+                     break;
                  case field_value::mfdouble_id:
                      this->out << n.field<mfdouble>(interface.id);
***************
*** 2333,2336 ****
--- 2390,2396 ----
                      this->out << n.field<mffloat>(interface.id);
                      break;
+                 case field_value::mfimage_id:
+                     this->out << n.field<mfimage>(interface.id);
+                     break;
                  case field_value::mfint32_id:
                      this->out << n.field<mfint32>(interface.id);
***************
*** 2525,2528 ****
--- 2585,2591 ----
              added_route = add_listener<sfcolor>(emitter, listener);
              break;
+         case field_value::sfcolorrgba_id:
+             added_route = add_listener<sfcolorrgba>(emitter, listener);
+             break;
          case field_value::sffloat_id:
              added_route = add_listener<sffloat>(emitter, listener);
***************
*** 2564,2567 ****
--- 2627,2633 ----
              added_route = add_listener<mfcolor>(emitter, listener);
              break;
+         case field_value::mfcolorrgba_id:
+             added_route = add_listener<mfcolorrgba>(emitter, listener);
+             break;
          case field_value::mffloat_id:
              added_route = add_listener<mffloat>(emitter, listener);
***************
*** 2570,2573 ****
--- 2636,2642 ----
              added_route = add_listener<mfdouble>(emitter, listener);
              break;
+         case field_value::mfimage_id:
+             added_route = add_listener<mfimage>(emitter, listener);
+             break;
          case field_value::mfint32_id:
              added_route = add_listener<mfint32>(emitter, listener);
***************
*** 2659,2662 ****
--- 2728,2734 ----
              deleted_route = remove_listener<sfcolor>(emitter, listener);
              break;
+         case field_value::sfcolorrgba_id:
+             deleted_route = remove_listener<sfcolorrgba>(emitter, listener);
+             break;
          case field_value::sffloat_id:
              deleted_route = remove_listener<sffloat>(emitter, listener);
***************
*** 2695,2701 ****
--- 2767,2779 ----
              deleted_route = remove_listener<sfvec3d>(emitter, listener);
              break;
+         case field_value::mfbool_id:
+             deleted_route = remove_listener<mfbool>(emitter, listener);
+             break;
          case field_value::mfcolor_id:
              deleted_route = remove_listener<mfcolor>(emitter, listener);
              break;
+         case field_value::mfcolorrgba_id:
+             deleted_route = remove_listener<mfcolorrgba>(emitter, listener);
+             break;
          case field_value::mffloat_id:
              deleted_route = remove_listener<mffloat>(emitter, listener);
***************
*** 2704,2707 ****
--- 2782,2788 ----
              deleted_route = remove_listener<mfdouble>(emitter, listener);
              break;
+         case field_value::mfimage_id:
+             deleted_route = remove_listener<mfimage>(emitter, listener);
+             break;
          case field_value::mfint32_id:
              deleted_route = remove_listener<mfint32>(emitter, listener);

Index: script.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** script.h	2 Nov 2005 08:50:24 -0000	1.23
--- script.h	8 Dec 2005 06:50:14 -0000	1.24
***************
*** 154,157 ****
--- 154,158 ----
          typedef script_event_listener<sfbool> sfbool_listener;
          typedef script_event_listener<sfcolor> sfcolor_listener;
+         typedef script_event_listener<sfcolorrgba> sfcolorrgba_listener;
          typedef script_event_listener<sffloat> sffloat_listener;
          typedef script_event_listener<sfdouble> sfdouble_listener;
***************
*** 166,172 ****
--- 167,176 ----
          typedef script_event_listener<sfvec3f> sfvec3f_listener;
          typedef script_event_listener<sfvec3d> sfvec3d_listener;
+         typedef script_event_listener<mfbool> mfbool_listener;
          typedef script_event_listener<mfcolor> mfcolor_listener;
+         typedef script_event_listener<mfcolorrgba> mfcolorrgba_listener;
          typedef script_event_listener<mffloat> mffloat_listener;
          typedef script_event_listener<mfdouble> mfdouble_listener;
+         typedef script_event_listener<mfimage> mfimage_listener;
          typedef script_event_listener<mfint32> mfint32_listener;
          typedef script_event_listener<mfnode> mfnode_listener;

Index: node.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** node.h	30 Oct 2005 03:20:17 -0000	1.45
--- node.h	8 Dec 2005 06:50:14 -0000	1.46
***************
*** 338,341 ****
--- 338,342 ----
          friend class field_value_listener<sfbool>;
          friend class field_value_listener<sfcolor>;
+         friend class field_value_listener<sfcolorrgba>;
          friend class field_value_listener<sffloat>;
          friend class field_value_listener<sfdouble>;
***************
*** 350,356 ****
--- 351,360 ----
          friend class field_value_listener<sfvec3f>;
          friend class field_value_listener<sfvec3d>;
+         friend class field_value_listener<mfbool>;
          friend class field_value_listener<mfcolor>;
+         friend class field_value_listener<mfcolorrgba>;
          friend class field_value_listener<mffloat>;
          friend class field_value_listener<mfdouble>;
+         friend class field_value_listener<mfimage>;
          friend class field_value_listener<mfint32>;
          friend class field_value_listener<mfnode>;
***************
*** 365,368 ****
--- 369,373 ----
          friend class exposedfield<sfbool>;
          friend class exposedfield<sfcolor>;
+         friend class exposedfield<sfcolorrgba>;
          friend class exposedfield<sffloat>;
          friend class exposedfield<sfdouble>;
***************
*** 377,383 ****
--- 382,391 ----
          friend class exposedfield<sfvec3f>;
          friend class exposedfield<sfvec3d>;
+         friend class exposedfield<mfbool>;
          friend class exposedfield<mfcolor>;
+         friend class exposedfield<mfcolorrgba>;
          friend class exposedfield<mffloat>;
          friend class exposedfield<mfdouble>;
+         friend class exposedfield<mfimage>;
          friend class exposedfield<mfint32>;
          friend class exposedfield<mfnode>;

Index: ScriptJDK.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/ScriptJDK.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ScriptJDK.cpp	7 Oct 2005 22:05:51 -0000	1.14
--- ScriptJDK.cpp	8 Dec 2005 06:50:12 -0000	1.15
***************
*** 60,63 ****
--- 60,64 ----
  #   include <vrml_field_SFVec3f.h>
  #   include <vrml_field_SFVec3d.h>
+ #   include <vrml_field_MFBool.h>
  #   include <vrml_field_MFColor.h>
  #   include <vrml_field_MFFloat.h>
***************
*** 86,89 ****
--- 87,91 ----
  #   include <vrml_field_ConstSFVec3f.h>
  #   include <vrml_field_ConstSFVec3d.h>
+ #   include <vrml_field_ConstMFBool.h>
  #   include <vrml_field_ConstMFColor.h>
  #   include <vrml_field_ConstMFFloat.h>
***************
*** 163,166 ****
--- 165,169 ----
    "SFVec3f",
    "SFVec3d",
+   "MFBool",
    "MFColor",
    "MFFloat",
***************
*** 546,549 ****
--- 549,554 ----
      case field_value::sfvec3d_id:
        return new sfvec3d;
+     case field_value::mfbool_id:
+       return new mfbool;
      case field_value::mfcolor_id:
        return new mfcolor;
***************
*** 3029,3032 ****
--- 3034,3407 ----
  }
  
+ void JNICALL Java_vrml_field_ConstMFBool_CreateObject(JNIEnv * env,
+                                                       jobject obj,
+                                                       jint size,
+                                                       jboolArray value)
+ {
+     try {
+         jbool *pjf = env->GetBoolArrayElements(value, NULL);
+         std::auto_ptr<openvrml::mfbool>
+             mfbool(new openvrml::mfbool(pjf, pjf + size));
+         env->ReleaseBoolArrayElements(value, pjf, JNI_ABORT);
+         jfieldID fid = getFid(env, obj, "FieldPtr", "I");
+         if (!fid) { return; }
+         env->SetIntField(obj, fid, reinterpret_cast<int>(mfbool.release()));
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ jint JNICALL Java_vrml_field_ConstMFBool_getSize(JNIEnv * env, jobject obj)
+ {
+     mfbool * mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     if (!mff) return 0;
+     return mff->value.size();
+ }
+ 
+ void JNICALL Java_vrml_field_ConstMFBool_getValue(JNIEnv * env,
+                                                   jobject obj,
+                                                   jboolArray jarr)
+ {
+     const mfbool * const mff =
+         static_cast<mfbool *>(getFieldValue(env, obj));
+     if (!mff) { return; }
+     const size_t size = mff->value.size();
+     if (size > 0) {
+         env->SetBoolArrayRegion(jarr, 0, size,
+                                  const_cast<jbool *>(&mff->value[0]));
+     }
+ }
+ 
+ jbool JNICALL Java_vrml_field_ConstMFBool_get1Value(JNIEnv * env,
+                                                     jobject obj,
+                                                     jint index)
+ {
+     mfbool * mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     if (!mff) { return 0.0; }
+     return mff->value[index];
+ }
+ 
+ /**
+  * @brief JNI implementation of ConstMFBool::toString.
+  *
+  * @param env JNI environment
+  * @param obj ConstMFBool object
+  * @return String representation of ConstMFBool.
+  */
+ jstring JNICALL Java_vrml_field_ConstMFBool_toString(JNIEnv * env,
+                                                      jobject obj)
+ {
+     return fieldToString(env, obj);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_CreateObject(JNIEnv * env,
+                                                  jobject obj,
+                                                  jint size,
+                                                  jboolArray value)
+ {
+     Java_vrml_field_ConstMFBool_CreateObject(env, obj, size, value);
+ }
+ 
+ jint JNICALL Java_vrml_field_MFBool_getSize(JNIEnv * env, jobject obj)
+ {
+     return Java_vrml_field_ConstMFBool_getSize(env, obj);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_clear(JNIEnv * env, jobject obj)
+ {
+     mfbool * const mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     if (!mff) { return; }
+     mff->value.clear();
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_delete(JNIEnv * env,
+                                            jobject obj,
+                                            jint index)
+ {
+     mfbool * mff = static_cast<mfbool*>(getFieldValue(env, obj));
+     if (!mff) { return; }
+     if (!(size_t(index) < mff->value.size())) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass =
+                 env->FindClass("java/lang/ArrayIndexOutOfBoundsException");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, "index out of bounds");
+         return;
+     }
+     mff->value.erase(mff->value.begin() + index);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_getValue(JNIEnv * env,
+                                              jobject obj,
+                                              jboolArray jarr)
+ {
+     Java_vrml_field_ConstMFBool_getValue(env, obj, jarr);
+ }
+ 
+ jbool JNICALL Java_vrml_field_MFBool_get1Value(JNIEnv * env,
+                                                jobject obj,
+                                                jint index)
+ {
+     return Java_vrml_field_ConstMFBool_get1Value(env, obj, index);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_setValue__I_3F(JNIEnv * env,
+                                                    jobject obj,
+                                                    jint size,
+                                                    jboolArray value)
+ {
+     try {
+         mfbool * const mff = static_cast<mfbool *>(getFieldValue(env, obj));
+         if (!mff) { return; }
+         mff->value.resize(size); // Throws bad_alloc.
+         jbool * const bools = env->GetBoolArrayElements(value, 0);
+         if (!bools) {
+             // Presumably we raised an OutOfMemoryError.
+             return;
+         }
+         for (size_t i = 0; i < mff->value.size(); ++i) {
+             if (!(jint(i) < env->GetArrayLength(value))) {
+                 env->ExceptionDescribe();
+                 env->ExceptionClear();
+                 jclass exceptionClass =
+                     env->FindClass("java/lang/ArrayIndexOutOfBoundsException");
+                 if (!exceptionClass) {
+                     // Presumably FindClass raised an exception.
+                     break;
+                 }
+                 env->ThrowNew(exceptionClass, "size larger than "
+                                               "values.length");
+                 break;
+             }
+             mff->value[i] = bools[i];
+         }
+         env->ReleaseBoolArrayElements(value, bools, JNI_ABORT);
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_setValue__Lvrml_field_MFBool_2(JNIEnv * env,
+                                                       jobject obj,
+                                                       jobject value)
+ {
+     mfbool * const mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     const mfbool * const newMFBool =
+         static_cast<mfbool*>(getFieldValue(env, value));
+     if (!mff || !newMFBool) return;
+     try {
+         *mff = *newMFBool; // Throws bad_alloc.
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_setValue__Lvrml_field_ConstMFBool_2(JNIEnv * env,
+                                                            jobject obj,
+                                                            jobject value)
+ {
+     Java_vrml_field_MFBool_setValue__Lvrml_field_MFBool_2(env, obj, value);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_set1Value__IF(JNIEnv * env,
+                                                   jobject obj,
+                                                   jint index,
+                                                   jbool value)
+ {
+     mfbool * mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     mff->value[index] = value;
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_set1Value__ILvrml_field_ConstSFBool_2(JNIEnv * env,
+                                                              jobject obj,
+                                                              jint index,
+                                                              jobject sfboolObj)
+ {
+     mfbool * mff = static_cast<mfbool*>(getFieldValue(env, obj));
+     sfbool * sff = static_cast<sfbool*>(getFieldValue(env, sfboolObj));
+     if (!mff || !sff) { return; }
+     mff->value[index] = sff->value;
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_set1Value__ILvrml_field_SFBool_2(JNIEnv * env,
+                                                         jobject obj,
+                                                         jint index,
+                                                         jobject sfbool)
+ {
+   Java_vrml_field_MFBool_set1Value__ILvrml_field_ConstSFBool_2
+     (env, obj, index, sfbool);
+ }
+ 
+ 
+ /**
+  * @brief JNI implementation of MFBool.addValue.
+  *
+  * @param env JNI environment
+  * @param obj MFBool object
+  * @param value Value to add to end of list
+  */
+ void JNICALL Java_vrml_field_MFBool_addValue__F(JNIEnv * env,
+                                                 jobject obj,
+                                                 jbool value)
+ {
+     mfbool * mff = static_cast<mfbool*>(getFieldValue(env, obj));
+     if (!mff) { return; }
+     try {
+         mff->value.push_back(value);
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ /**
+  * @brief JNI implementation of MFBool.addValue.
+  *
+  * @param env JNI environment
+  * @param obj MFBool object
+  * @param value Value to add to end of list
+  */
+ void JNICALL
+ Java_vrml_field_MFBool_addValue__Lvrml_field_ConstSFBool_2(JNIEnv * env,
+                                                            jobject obj,
+                                                            jobject value)
+ {
+     mfbool * mff = static_cast<mfbool*>(getFieldValue(env, obj));
+     sfbool * sff = static_cast<sfbool*>(getFieldValue(env, value));
+     if (!mff || !sff) { return; }
+     try {
+         mff->value.push_back(sff->value);
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ /**
+  * @brief JNI implementation of MFBool.addValue.
+  *
+  * @param env JNI environment
+  * @param obj MFBool object
+  * @param value Value to add to end of list
+  */
+ void JNICALL
+ Java_vrml_field_MFBool_addValue__Lvrml_field_SFBool_2(JNIEnv * env,
+                                                       jobject obj,
+                                                       jobject value)
+ {
+     Java_vrml_field_MFBool_addValue__Lvrml_field_ConstSFBool_2(env,
+                                                                obj,
+                                                                value);
+ }
+ 
+ void JNICALL Java_vrml_field_MFBool_insertValue__IF(JNIEnv * env,
+                                                     jobject obj,
+                                                     jint index,
+                                                     jbool value)
+ {
+     mfbool * mff = static_cast<mfbool *>(getFieldValue(env, obj));
+     if (!mff) { return; }
+     if (!(size_t(index) < mff->value.size())) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass =
+                 env->FindClass("java/lang/ArrayIndexOutOfBoundsException");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, "index out of bounds");
+     }
+     try {
+         mff->value.insert(mff->value.begin() + index, value);
+     } catch (std::bad_alloc & ex) {
+         env->ExceptionDescribe();
+         env->ExceptionClear();
+         jclass exceptionClass = env->FindClass("java/lang/OutOfMemoryError");
+         if (!exceptionClass) {
+             // Presumably FindClass raised an exception.
+             return;
+         }
+         env->ThrowNew(exceptionClass, ex.what());
+     }
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_insertValue__ILvrml_field_ConstSFBool_2(JNIEnv * env,
+                                                                jobject obj,
+                                                                jint index,
+                                                                jobject value)
+ {
+     sfbool * sff = static_cast<sfbool*>(getFieldValue(env, value));
+     if (!sff) { return; }
+     Java_vrml_field_MFBool_insertValue__IF(env, obj, index, sff->value);
+ }
+ 
+ void JNICALL
+ Java_vrml_field_MFBool_insertValue__ILvrml_field_SFBool_2(JNIEnv * env,
+                                                           jobject obj,
+                                                           jint index,
+                                                           jobject value)
+ {
+   Java_vrml_field_MFBool_insertValue__ILvrml_field_ConstSFBool_2(env,
+                                                                  obj,
+                                                                  index,
+                                                                  value);
+ }
+ 
+ /**
+  * @brief JNI implementation of MFBool.toString.
+  *
+  * @param env JNI environment
+  * @param obj MFBool object
+  * @return String representation of MFBool.
+  */
+ jstring JNICALL Java_vrml_field_MFBool_toString(JNIEnv * env, jobject obj)
+ {
+     return fieldToString(env, obj);
+ }
+ 
+ 
  void JNICALL Java_vrml_field_ConstMFColor_CreateObject___3_3F(
      JNIEnv * env,

Index: field_value.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** field_value.cpp	5 Nov 2005 04:54:33 -0000	1.19
--- field_value.cpp	8 Dec 2005 06:50:14 -0000	1.20
***************
*** 215,218 ****
--- 215,224 ----
  
  /**
+  * @var openvrml::field_value::sfcolorrgba_id
+  *
+  * @brief Designates an <code>sfcolorrgba</code>.
+  */
+ 
+ /**
   * @var openvrml::field_value::sffloat_id
[...1011 lines suppressed...]
***************
*** 5943,5946 ****
--- 6822,6838 ----
  
  /**
+  * @fn template <> void std::swap(openvrml::mfimage & a, openvrml::mfimage & b)
+  *
+  * @relatesalso openvrml::mfimage
+  *
+  * @brief Swap the values of @p a and @p b.
+  *
+  * Does not throw.
+  *
+  * @param a
+  * @param b
+  */
+ 
+ /**
   * @fn template <> void std::swap(openvrml::mfint32 & a, openvrml::mfint32 & b)
   *

Index: field_value.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** field_value.h	15 Nov 2005 02:35:08 -0000	1.17
--- field_value.h	8 Dec 2005 06:50:14 -0000	1.18
***************
*** 88,91 ****
--- 88,92 ----
              sfbool_id,
              sfcolor_id,
+             sfcolorrgba_id,
              sffloat_id,
              sfdouble_id,
***************
*** 100,106 ****
--- 101,110 ----
              sfvec3f_id,
              sfvec3d_id,
+             mfbool_id,
              mfcolor_id,
+             mfcolorrgba_id,
              mffloat_id,
              mfdouble_id,
+             mfimage_id,
              mfint32_id,
              mfnode_id,
***************
*** 360,363 ****
--- 364,398 ----
  
  
+     class OPENVRML_API sfcolorrgba : public field_value {
+     public:
+         typedef color_rgba value_type;
+ 
+         static const type_id field_value_type_id;
+ 
+         explicit sfcolorrgba(const value_type & value = color_rgba()) throw ();
+         sfcolorrgba(const sfcolorrgba & sfc);
+         virtual ~sfcolorrgba() throw ();
+ 
+         sfcolorrgba & operator=(const sfcolorrgba & sfc) throw (std::bad_alloc);
+ 
+         const value_type & value() const throw ();
+         void value(const value_type & val) throw (std::bad_alloc);
+         void swap(sfcolorrgba & sfc) throw ();
+ 
+     private:
+         virtual std::auto_ptr<field_value> do_clone() const
+             throw (std::bad_alloc);
+         virtual sfcolorrgba & do_assign(const field_value & value)
+             throw (std::bad_cast);
+         virtual type_id do_type() const throw ();
+         virtual void print(std::ostream & out) const;
+     };
+ 
+     OPENVRML_API bool operator==(const sfcolorrgba & lhs, const sfcolorrgba & rhs)
+         throw ();
+     OPENVRML_API bool operator!=(const sfcolorrgba & lhs, const sfcolorrgba & rhs)
+         throw ();
+ 
+ 
      class OPENVRML_API sffloat : public field_value {
      public:
***************
*** 734,737 ****
--- 769,804 ----
          throw ();
  
+     class OPENVRML_API mfbool : public field_value {
+     public:
+         typedef std::vector<bool> value_type;
+ 
+         static const type_id field_value_type_id;
+ 
+         explicit mfbool(value_type::size_type n = 0, bool value = false)
+             throw (std::bad_alloc);
+         explicit mfbool(const value_type & value) throw (std::bad_alloc);
+         mfbool(const mfbool & mfc);
+         virtual ~mfbool() throw ();
+ 
+         mfbool & operator=(const mfbool & mfc) throw (std::bad_alloc);
+ 
+         const value_type & value() const throw ();
+         void value(const value_type & val) throw (std::bad_alloc);
+         void swap(mfbool & mfc) throw ();
+ 
+     private:
+         virtual std::auto_ptr<field_value> do_clone() const
+             throw (std::bad_alloc);
+         virtual mfbool & do_assign(const field_value & value)
+             throw (std::bad_cast, std::bad_alloc);
+         virtual type_id do_type() const throw ();
+         virtual void print(std::ostream &) const;
+     };
+ 
+     OPENVRML_API bool operator==(const mfbool & lhs, const mfbool & rhs)
+         throw ();
+     OPENVRML_API bool operator!=(const mfbool & lhs, const mfbool & rhs)
+         throw ();
+ 
      class OPENVRML_API mfcolor : public field_value {
      public:
***************
*** 767,770 ****
--- 834,872 ----
          throw ();
  
+     class OPENVRML_API mfcolorrgba : public field_value {
+     public:
+         typedef std::vector<color_rgba> value_type;
+ 
+         static const type_id field_value_type_id;
+ 
+         explicit mfcolorrgba(value_type::size_type n = 0,
+                              const color_rgba & value = color_rgba())
+             throw (std::bad_alloc);
+         explicit mfcolorrgba(const value_type & value) throw (std::bad_alloc);
+         mfcolorrgba(const mfcolorrgba & mfc);
+         virtual ~mfcolorrgba() throw ();
+ 
+         mfcolorrgba & operator=(const mfcolorrgba & mfc)
+             throw (std::bad_alloc);
+ 
+         const value_type & value() const throw ();
+         void value(const value_type & val) throw (std::bad_alloc);
+         void swap(mfcolorrgba & mfc) throw ();
+ 
+     private:
+         virtual std::auto_ptr<field_value> do_clone() const
+             throw (std::bad_alloc);
+         virtual mfcolorrgba & do_assign(const field_value & value)
+             throw (std::bad_cast, std::bad_alloc);
+         virtual type_id do_type() const throw ();
+         virtual void print(std::ostream &) const;
+     };
+ 
+     OPENVRML_API bool operator==(const mfcolorrgba & lhs,
+                                  const mfcolorrgba & rhs)
+         throw ();
+     OPENVRML_API bool operator!=(const mfcolorrgba & lhs,
+                                  const mfcolorrgba & rhs)
+         throw ();
  
      class OPENVRML_API mffloat : public field_value {
***************
*** 834,837 ****
--- 936,972 ----
          throw ();
  
+     class OPENVRML_API mfimage : public field_value {
+     public:
+         typedef std::vector<image> value_type;
+ 
+         static const type_id field_value_type_id;
+ 
+         explicit mfimage(value_type::size_type n = 0,
+                          const image & value = image())
+             throw (std::bad_alloc);
+         explicit mfimage(const value_type & value) throw (std::bad_alloc);
+         mfimage(const mfimage & mfi);
+         virtual ~mfimage() throw ();
+ 
+         mfimage & operator=(const mfimage & mfi) throw (std::bad_alloc);
+ 
+         const value_type & value() const throw ();
+         void value(const value_type & val) throw (std::bad_alloc);
+         void swap(mfimage & mfi) throw ();
+ 
+     private:
+         virtual std::auto_ptr<field_value> do_clone() const
+             throw (std::bad_alloc);
+         virtual mfimage & do_assign(const field_value & value)
+             throw (std::bad_cast, std::bad_alloc);
+         virtual type_id do_type() const throw ();
+         virtual void print(std::ostream &) const;
+     };
+ 
+     OPENVRML_API bool operator==(const mfimage & lhs, const mfimage & rhs)
+         throw ();
+     OPENVRML_API bool operator!=(const mfimage & lhs, const mfimage & rhs)
+         throw ();
+ 
      class OPENVRML_API mfint32 : public field_value {
      public:
***************
*** 1144,1148 ****
  
      template <>
!     OPENVRML_API inline void swap(openvrml::sfbool & a, openvrml::sfbool & b)
      {
          a.swap(b);
--- 1279,1283 ----
  
      template <>
!     OPENVRML_API inline void swap(openvrml::sfcolor & a, openvrml::sfcolor & b)
      {
          a.swap(b);
***************
*** 1150,1154 ****
  
      template <>
!     OPENVRML_API inline void swap(openvrml::sfcolor & a, openvrml::sfcolor & b)
      {
          a.swap(b);
--- 1285,1290 ----
  
      template <>
!     OPENVRML_API inline void swap(openvrml::sfcolorrgba & a,
!                                   openvrml::sfcolorrgba & b)
      {
          a.swap(b);
***************
*** 1231,1234 ****
--- 1367,1382 ----
  
      template <>
+     OPENVRML_API inline void swap(openvrml::mfbool & a, openvrml::mfbool & b)
+     {
+         a.swap(b);
+     }
+ 
+     template <>
+     OPENVRML_API inline void swap(openvrml::sfbool & a, openvrml::sfbool & b)
+     {
+         a.swap(b);
+     }
+ 
+     template <>
      OPENVRML_API inline void swap(openvrml::mfcolor & a, openvrml::mfcolor & b)
      {
***************
*** 1237,1240 ****
--- 1385,1395 ----
  
      template <>
+     OPENVRML_API inline void swap(openvrml::mfcolorrgba & a,
+                                   openvrml::mfcolorrgba & b)
+     {
+         a.swap(b);
+     }
+ 
+     template <>
      OPENVRML_API inline void swap(openvrml::mfdouble & a,
                                    openvrml::mfdouble & b)
***************
*** 1250,1253 ****
--- 1405,1414 ----
  
      template <>
+     OPENVRML_API inline void swap(openvrml::mfimage & a, openvrml::mfimage & b)
+     {
+         a.swap(b);
+     }
+ 
+ 	template <>
      OPENVRML_API inline void swap(openvrml::mfint32 & a, openvrml::mfint32 & b)
      {

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** script.cpp	5 Dec 2005 22:00:09 -0000	1.57
--- script.cpp	8 Dec 2005 06:50:14 -0000	1.58
***************
*** 262,265 ****
--- 262,270 ----
                      output->second.get()), timestamp);
              break;
+         case field_value::sfcolorrgba_id:
+             dynamic_cast<sfcolorrgba_listener &>(*output->first)
+                 .process_event(*polymorphic_downcast<sfcolorrgba *>(
+                     output->second.get()), timestamp);
+             break;
          case field_value::sffloat_id:
              dynamic_cast<sffloat_listener &>(*output->first)
***************
*** 322,325 ****
--- 327,335 ----
                      output->second.get()), timestamp);
              break;
+         case field_value::mfbool_id:
+             dynamic_cast<mfbool_listener &>(*output->first)
+                 .process_event(*polymorphic_downcast<mfbool *>(
+                     output->second.get()), timestamp);
+             break;
          case field_value::mfcolor_id:
              dynamic_cast<mfcolor_listener &>(*output->first)
***************
*** 327,330 ****
--- 337,345 ----
                      output->second.get()), timestamp);
              break;
+         case field_value::mfcolorrgba_id:
+             dynamic_cast<mfcolorrgba_listener &>(*output->first)
+                 .process_event(*polymorphic_downcast<mfcolorrgba *>(
+                     output->second.get()), timestamp);
+             break;
          case field_value::mffloat_id:
              dynamic_cast<mffloat_listener &>(*output->first)
***************
*** 337,340 ****
--- 352,360 ----
                      output->second.get()), timestamp);
              break;
+         case field_value::mfimage_id:
+             dynamic_cast<mfimage_listener &>(*output->first)
+                 .process_event(*polymorphic_downcast<mfimage *>(
+                     output->second.get()), timestamp);
+             break;
          case field_value::mfint32_id:
              dynamic_cast<mfint32_listener &>(*output->first)
***************
*** 817,820 ****
--- 837,848 ----
   * @internal
   *
+  * @typedef openvrml::script_node::sfcolorrgba_listener
+  *
+  * @brief sfcolorrgba event listener.
+  */
+ 
+ /**
+  * @internal
+  *
   * @typedef openvrml::script_node::sffloat_listener
   *
***************
*** 905,908 ****
--- 933,944 ----
   * @internal
   *
+  * @typedef openvrml::script_node::mfbool_listener
+  *
+  * @brief mfbool event listener.
+  */
+ 
+ /**
+  * @internal
+  *
   * @typedef openvrml::script_node::mfcolor_listener
   *
***************
*** 921,924 ****
--- 957,968 ----
   * @internal
   *
+  * @typedef openvrml::script_node::mfcolorrgba_listener
+  *
+  * @brief mfcolorrgba event listener.
+  */
+ 
+ /**
+  * @internal
+  *
   * @typedef openvrml::script_node::mffloat_listener
   *
***************
*** 929,932 ****
--- 973,984 ----
   * @internal
   *
+  * @typedef openvrml::script_node::mfimage_listener
+  *
+  * @brief mfimage event listener.
+  */
+ 
+ /**
+  * @internal
+  *
   * @typedef openvrml::script_node::mfint32_listener
   *
***************
*** 1025,1028 ****
--- 1077,1083 ----
          listener.reset(new sfcolor_listener(id, node));
          break;
+     case field_value::sfcolorrgba_id:
+         listener.reset(new sfcolorrgba_listener(id, node));
+         break;
      case field_value::sffloat_id:
          listener.reset(new sffloat_listener(id, node));
***************
*** 1061,1067 ****
--- 1116,1128 ----
          listener.reset(new sfvec3d_listener(id, node));
          break;
+     case field_value::mfbool_id:
+         listener.reset(new mfbool_listener(id, node));
+         break;
      case field_value::mfcolor_id:
          listener.reset(new mfcolor_listener(id, node));
          break;
+     case field_value::mfcolorrgba_id:
+         listener.reset(new mfcolorrgba_listener(id, node));
+         break;
      case field_value::mffloat_id:
          listener.reset(new mffloat_listener(id, node));
***************
*** 1070,1073 ****
--- 1131,1137 ----
          listener.reset(new mfdouble_listener(id, node));
          break;
+     case field_value::mfimage_id:
+         listener.reset(new mfimage_listener(id, node));
+         break;
      case field_value::mfint32_id:
          listener.reset(new mfint32_listener(id, node));
***************
*** 1135,1138 ****
--- 1199,1207 ----
                            *polymorphic_downcast<const sfcolor *>(&value)));
          break;
+     case field_value::sfcolorrgba_id:
+         emitter.reset(new script_event_emitter<sfcolorrgba>(
+                           node,
+                           *polymorphic_downcast<const sfcolorrgba *>(&value)));
+         break;
      case field_value::sffloat_id:
          emitter.reset(new script_event_emitter<sffloat>(
***************
*** 1195,1198 ****
--- 1264,1272 ----
                            *polymorphic_downcast<const sfvec3d *>(&value)));
          break;
+     case field_value::mfbool_id:
+         emitter.reset(new script_event_emitter<mfbool>(
+                           node,
+                           *polymorphic_downcast<const mfbool *>(&value)));
+         break;
      case field_value::mfcolor_id:
          emitter.reset(new script_event_emitter<mfcolor>(
***************
*** 1200,1203 ****
--- 1274,1282 ----
                            *polymorphic_downcast<const mfcolor *>(&value)));
          break;
+     case field_value::mfcolorrgba_id:
+         emitter.reset(new script_event_emitter<mfcolorrgba>(
+                           node,
+                           *polymorphic_downcast<const mfcolorrgba *>(&value)));
+         break;
      case field_value::mffloat_id:
          emitter.reset(new script_event_emitter<mffloat>(
***************
*** 1210,1213 ****
--- 1289,1297 ----
                            *polymorphic_downcast<const mfdouble *>(&value)));
          break;
+     case field_value::mfimage_id:
+         emitter.reset(new script_event_emitter<mfimage>(
+                           node,
+                           *polymorphic_downcast<const mfimage *>(&value)));
+         break;
      case field_value::mfint32_id:
          emitter.reset(new script_event_emitter<mfint32>(
***************
*** 2664,2667 ****
--- 2748,2777 ----
  };
  
+ class OPENVRML_LOCAL MFBool : public MField {
+ public:
+     static JSClass jsclass;
+ 
+     static JSBool toJsval(const std::vector<bool> & bools,
+                           JSContext * cx, JSObject * obj, jsval * rval)
+         throw ();
+     static std::auto_ptr<openvrml::mfbool>
+     createFromJSObject(JSContext * cx, JSObject * obj)
+         throw (bad_conversion, std::bad_alloc);
+ 
+ private:
+     static JSBool construct(JSContext * cx, JSObject * obj,
+                             uintN argc, jsval * argv,
+                             jsval * vp);
+     static JSBool initObject(JSContext * cx, JSObject * obj,
+                              uintN argc, jsval * argv);
+     static JSBool setElement(JSContext * cx, JSObject * obj,
+                              jsval id, jsval * vp);
+     static JSBool setLength(JSContext * cx, JSObject * obj,
+                             jsval id, jsval * vp);
+     static JSBool toString(JSContext * cx, JSObject * obj,
+                            uintN argc, jsval * argv, jsval * rval);
+     static void finalize(JSContext * cx, JSObject * obj);
+ };
+ 
  class OPENVRML_LOCAL MFColor : public MFJSObject<MFColor> {
  public:
***************
*** 3352,3355 ****
--- 3462,3476 ----
          break;
  
+     case field_value::mfbool_id:
+         {
+             const openvrml::mfbool & mfbool =
+                     static_cast<const openvrml::mfbool &>(fieldValue);
+             if (!MFBool::toJsval(mfbool.value(), this->cx, globalObj, &rval)) 
+             {
+                 rval = JSVAL_NULL;
+             }
+         }
+         break;
+ 
      case field_value::mfcolor_id:
          {
***************
*** 3959,3962 ****
--- 4080,4088 ----
              (SFVec3d::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release());
  
+     case field_value::mfbool_id:
+         if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); }
+         return auto_ptr<field_value>
+             (MFBool::createFromJSObject(cx, JSVAL_TO_OBJECT(v)).release());
+ 
      case field_value::mfcolor_id:
          if (!JSVAL_IS_OBJECT(v)) { throw bad_conversion("Object expected."); }
***************
*** 8578,8581 ****
--- 8704,8917 ----
  }
  
+ JSClass MFBool::jsclass = {
+     "MFBool",            // name
+     JSCLASS_HAS_PRIVATE, // flags
+     JS_PropertyStub,     // addProperty
+     JS_PropertyStub,     // delProperty
+     getElement,          // getProperty
+     setElement,          // setProperty
+     JS_EnumerateStub,    // enumerate
+     JS_ResolveStub,      // resolve
+     JS_ConvertStub,      // convert
+     finalize,            // finalize
+     0,                   // getObjectOps
+     0,                   // checkAccess
+     0,                   // call
+     0,                   // construct
+     0,                   // xdrObject
+     0,                   // hasInstance
+     0,                   // mark
+     0                    // spare
+ };
+ 
+ std::auto_ptr<openvrml::mfbool>
+ MFBool::createFromJSObject(JSContext * const cx, JSObject * const obj)
+     throw (bad_conversion, std::bad_alloc)
+ {
+     assert(cx);
+     assert(obj);
+ 
+     if (!JS_InstanceOf(cx, obj, &MFBool::jsclass, 0)) {
+         throw bad_conversion("MFBool object expected.");
+     }
+ 
+     MField::MFData * const mfdata =
+             static_cast<MField::MFData *>(JS_GetPrivate(cx, obj));
+     assert(mfdata);
+     std::auto_ptr<openvrml::mfbool>
+             mfbool(new openvrml::mfbool(mfdata->array.size()));
+     std::vector<bool> temp = mfbool->value();
+     for (MField::JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) {
+         assert(JSVAL_IS_BOOLEAN(mfdata->array[i]));
+         temp[i] = JSVAL_TO_BOOLEAN(mfdata->array[i]);
+     }
+     mfbool->value(temp);
+     return mfbool;
+ }
+ 
+ JSBool MFBool::toJsval(const std::vector<bool> & bools,
+                        JSContext * const cx,
+                        JSObject * const obj,
+                        jsval * const rval)
+     throw ()
+ {
+     JSObject * const mfboolObj = JS_ConstructObject(cx, &jsclass, 0, obj);
+     if (!mfboolObj) { return JS_FALSE; }
+ 
+     jsval length = INT_TO_JSVAL(bools.size());
+     if (!setLength(cx, mfboolObj, 0, &length)) { return JS_FALSE; }
+ 
+     MFData * const mfdata =
+         static_cast<MFData *>(JS_GetPrivate(cx, mfboolObj));
+     for (size_t i = 0; i < bools.size(); ++i) {
+         mfdata->array[i] = BOOLEAN_TO_JSVAL(bools[i]);
+     }
+     *rval = OBJECT_TO_JSVAL(mfboolObj);
+     return JS_TRUE;
+ }
+ 
+ JSBool MFBool::construct(JSContext * const cx, JSObject * obj,
+                          const uintN argc, jsval * const argv,
+                          jsval * const rval)
+ {
+     assert(cx);
+     assert(obj);
+     assert(rval);
+ 
+     //
+     // If called without new, replace obj with a new object.
+     //
+     if (!JS_IsConstructing(cx)) {
+         obj = JS_NewObject(cx, &jsclass, 0, 0);
+         if (!obj) { return JS_FALSE; }
+         *rval = OBJECT_TO_JSVAL(obj);
+     }
+     return initObject(cx, obj, argc, argv);
+ }
+ 
+ JSBool MFBool::initObject(JSContext * const cx,
+                           JSObject * const obj,
+                           const uintN argc,
+                           jsval * const argv)
+ {
+     assert(cx);
+     assert(obj);
+ 
+     try {
+         std::auto_ptr<MFData> mfdata(new MFData(argc));
+         for (uintN i = 0; i < argc; ++i) {
+             //
+             // Convert the jsval to an int32 and back to a jsval in order
+             // to remove any decimal part.
+             //
+             JSBool boolean;
+             if (!JS_ValueToBoolean(cx, argv[i], &boolean)) {
+                 return JS_FALSE;
+             }
+             mfdata->array[i] = BOOLEAN_TO_JSVAL(boolean);
+         }
+         if (!JS_SetPrivate(cx, obj, mfdata.get())) { return JS_FALSE; }
+         mfdata.release();
+     } catch (std::bad_alloc & ex) {
+         OPENVRML_PRINT_EXCEPTION_(ex);
+         return JS_FALSE;
+     }
+     return JS_TRUE;
+ }
+ 
+ JSBool MFBool::setElement(JSContext * const cx,
+                           JSObject * const obj,
+                           const jsval id,
+                           jsval * const vp)
+ {
+     assert(cx);
+     assert(obj);
+     assert(vp);
+ 
+     if (JSVAL_IS_INT(id) && JSVAL_TO_INT(id) >= 0) {
+         const size_t index = JSVAL_TO_INT(id);
+ 
+         MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+         assert(mfdata);
+ 
+         //
+         // Grow array if necessary.
+         //
+         if (index >= mfdata->array.size()) {
+             jsval newLength = INT_TO_JSVAL(JSVAL_TO_INT(id) + 1);
+             if (!setLength(cx, obj, 0, &newLength)) { return JS_FALSE; }
+         }
+ 
+         //
+         // Convert the jsval to an int32 and back to a jsval in order
+         // to remove any decimal part.
+         //
+         JSBool b;
+         if (!JS_ValueToBoolean(cx, *vp, &b)) { return JS_FALSE; }
+         mfdata->array[index] = BOOLEAN_TO_JSVAL(b);
+         mfdata->changed = true;
+     }
+     return JS_TRUE;
+ }
+ 
+ JSBool MFBool::setLength(JSContext * const cx,
+                          JSObject * const obj,
+                          jsval,
+                          jsval * const vp)
+ {
+     assert(cx);
+     assert(obj);
+     assert(vp);
+ 
+     MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+     assert(mfdata);
+ 
+     uint32 new_length;
+     if (!JS_ValueToECMAUint32(cx, *vp, &new_length)) { return JS_FALSE; }
+ 
+     try {
+         if (size_t(JSVAL_TO_INT(*vp)) != mfdata->array.size()) {
+             mfdata->array.resize(JSVAL_TO_INT(*vp));
+         }
+     } catch (std::bad_alloc &) {
+         JS_ReportOutOfMemory(cx);
+         return JS_FALSE;
+     }
+     mfdata->changed = true;
+     return JS_TRUE;
+ }
+ 
+ JSBool MFBool::toString(JSContext * const cx,
+                         JSObject * const obj,
+                         uintN,
+                         jsval *,
+                         jsval * const rval)
+ {
+     assert(cx);
+     assert(obj);
+ 
+     MFData * const mfdata = static_cast<MFData *>(JS_GetPrivate(cx, obj));
+     assert(mfdata);
+ 
+     std::ostringstream out;
+     out << '[';
+     for (JsvalArray::size_type i = 0; i < mfdata->array.size(); ++i) {
+         out << JSVAL_TO_BOOLEAN(mfdata->array[i]) ? "TRUE" : "FALSE";
+         if ((i + 1) < mfdata->array.size()) { out << ", "; }
+     }
+     out << ']';
+ 
+     JSString * const jsstr = JS_NewStringCopyZ(cx, out.str().c_str());
+     if (!jsstr) { return JS_FALSE; }
+     *rval = STRING_TO_JSVAL(jsstr);
+     return JS_TRUE;
+ }
+ 
+ void MFBool::finalize(JSContext * const cx, JSObject * const obj)
+ {
+     delete static_cast<MFData *>(JS_GetPrivate(cx, obj));
+     JS_SetPrivate(cx, obj, 0);
+ }
+ 
  JSClass MFColor::jsclass = {
      "MFColor",           // name

Index: Vrml97Parser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Vrml97Parser.g	30 Nov 2005 03:17:20 -0000	1.43
--- Vrml97Parser.g	8 Dec 2005 06:50:12 -0000	1.44
***************
*** 1861,1891 ****
      size_t x, y, comp;
      int32 pixel;
-     size_t pixel_index = 0;
  }
      :   x=intValue y=intValue comp=intValue {
              img.comp(comp);
              img.resize(x, y);
          } (
              pixel=intValue {
!                 if (!(pixel_index < x * y)) {
!                     throw SemanticException("too many pixel values for image",
!                                             this->uri,
!                                             LT(1)->getLine(),
!                                             LT(1)->getColumn());
!                 }
!                 img.pixel(pixel_index++, pixel);
!             }
!         )* {
!             if (pixel_index != x * y) {
!                 throw antlr::SemanticException("insufficient pixel values for "
!                                                "image",
!                                                this->uri,
!                                                LT(1)->getLine(),
!                                                LT(1)->getColumn());
              }
          }
      ;
  
- 
  sfInt32Value returns [boost::shared_ptr<field_value> siv]
  options { defaultErrorHandler=false; }
--- 1861,1880 ----
      size_t x, y, comp;
      int32 pixel;
  }
      :   x=intValue y=intValue comp=intValue {
              img.comp(comp);
              img.resize(x, y);
+             const size_t img_size = x * y;
+             for (size_t pixel_index = 0; pixel_index < img_size; ++pixel_index)
+             ANTLR_LBRACE
          } (
              pixel=intValue {
!                 img.pixel(pixel_index, pixel);
              }
+         ) {
+             ANTLR_RBRACE
          }
      ;
  
  sfInt32Value returns [boost::shared_ptr<field_value> siv]
  options { defaultErrorHandler=false; }

Index: event.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/event.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** event.cpp	3 Nov 2005 04:54:56 -0000	1.9
--- event.cpp	8 Dec 2005 06:50:14 -0000	1.10
***************
*** 189,192 ****
--- 189,198 ----
  
  /**
+  * @typedef openvrml::sfcolorrgba_listener
+  *
+  * @brief sfcolorrgba event listener.
+  */
+ 
+ /**
   * @typedef openvrml::sfdouble_listener
   *
***************
*** 267,270 ****
--- 273,288 ----
  
  /**
+  * @typedef openvrml::mfbool_listener
+  *
+  * @brief mfbool event listener.
+  */
+ 
+ /**
+  * @typedef openvrml::mfcolorrgba_listener
+  *
+  * @brief mfcolorrgba event listener.
+  */
+ 
+ /**
   * @typedef openvrml::mfdouble_listener
   *
***************
*** 279,282 ****
--- 297,306 ----
  
  /**
+  * @typedef openvrml::mfimage_listener
+  *
+  * @brief mfimage event listener.
+  */
+ 
+ /**
   * @typedef openvrml::mfint32_listener
   *
***************
*** 590,593 ****
--- 614,623 ----
  
  /**
+  * @typedef openvrml::sfcolorrgba_emitter
+  *
+  * @brief sfcolorrgba event emitter.
+  */
+ 
+ /**
   * @typedef openvrml::sfdouble_emitter
   *
***************
*** 662,665 ****
--- 692,701 ----
  
  /**
+  * @typedef openvrml::mfbool_emitter
+  *
+  * @brief mfbool event emitter.
+  */
+ 
+ /**
   * @typedef openvrml::mfcolor_emitter
   *
***************
*** 668,671 ****
--- 704,713 ----
  
  /**
+  * @typedef openvrml::mfcolorrgba_emitter
+  *
+  * @brief mfcolorrgba event emitter.
+  */
+ 
+ /**
   * @typedef openvrml::mfdouble_emitter
   *
***************
*** 674,677 ****
--- 716,725 ----
  
  /**
+  * @typedef openvrml::mfimage_emitter
+  *
+  * @brief mfimage event emitter.
+  */
+ 
+ /**
   * @typedef openvrml::mffloat_emitter
   *

Index: X3DVrmlParser.g
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/X3DVrmlParser.g,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** X3DVrmlParser.g	27 Nov 2005 16:58:15 -0000	1.8
--- X3DVrmlParser.g	8 Dec 2005 06:50:12 -0000	1.9
***************
*** 168,172 ****
  }
  
- 
  } // namespace
  
--- 168,171 ----
***************
*** 249,258 ****
      using openvrml::field_value;
  }
!     :   FIELDTYPE_MFBOOL      { ft = field_value::invalid_type_id; }
      |   FIELDTYPE_MFCOLOR     { ft = field_value::mfcolor_id; }
!     |   FIELDTYPE_MFCOLORRGBA { ft = field_value::invalid_type_id; }
      |   FIELDTYPE_MFFLOAT     { ft = field_value::mffloat_id; }
      |   FIELDTYPE_MFDOUBLE    { ft = field_value::mfdouble_id; }
!     |   FIELDTYPE_MFIMAGE     { ft = field_value::invalid_type_id; }
      |   FIELDTYPE_MFINT32     { ft = field_value::mfint32_id; }
      |   FIELDTYPE_MFNODE      { ft = field_value::mfnode_id; }
--- 248,257 ----
      using openvrml::field_value;
  }
!     :   FIELDTYPE_MFBOOL      { ft = field_value::mfbool_id; }
      |   FIELDTYPE_MFCOLOR     { ft = field_value::mfcolor_id; }
!     |   FIELDTYPE_MFCOLORRGBA { ft = field_value::mfcolorrgba_id; }
      |   FIELDTYPE_MFFLOAT     { ft = field_value::mffloat_id; }
      |   FIELDTYPE_MFDOUBLE    { ft = field_value::mfdouble_id; }
!     |   FIELDTYPE_MFIMAGE     { ft = field_value::mfimage_id; }
      |   FIELDTYPE_MFINT32     { ft = field_value::mfint32_id; }
      |   FIELDTYPE_MFNODE      { ft = field_value::mfnode_id; }
***************
*** 266,270 ****
      |   FIELDTYPE_SFBOOL      { ft = field_value::sfbool_id; }
      |   FIELDTYPE_SFCOLOR     { ft = field_value::sfcolor_id; }
!     |   FIELDTYPE_SFCOLORRGBA { ft = field_value::invalid_type_id; }
      |   FIELDTYPE_SFFLOAT     { ft = field_value::sffloat_id; }
      |   FIELDTYPE_SFDOUBLE    { ft = field_value::sfdouble_id; }
--- 265,269 ----
      |   FIELDTYPE_SFBOOL      { ft = field_value::sfbool_id; }
      |   FIELDTYPE_SFCOLOR     { ft = field_value::sfcolor_id; }
!     |   FIELDTYPE_SFCOLORRGBA { ft = field_value::sfcolorrgba_id; }
      |   FIELDTYPE_SFFLOAT     { ft = field_value::sffloat_id; }
      |   FIELDTYPE_SFDOUBLE    { ft = field_value::sfdouble_id; }
***************
*** 286,289 ****
--- 285,289 ----
      :   { ft == field_value::sfbool_id }? fv=sfBoolValue
      |   { ft == field_value::sfcolor_id }? fv=sfColorValue
+     |   { ft == field_value::sfcolorrgba_id }? fv=sfColorRgbaValue
      |   { ft == field_value::sffloat_id }? fv=sfFloatValue
      |   { ft == field_value::sfdouble_id }? fv=sfDoubleValue
***************
*** 297,303 ****
--- 297,306 ----
      |   { ft == field_value::sfvec3f_id }? fv=sfVec3fValue
      |   { ft == field_value::sfvec3d_id }? fv=sfVec3dValue
+     |   { ft == field_value::mfbool_id }? fv=mfBoolValue
      |   { ft == field_value::mfcolor_id }? fv=mfColorValue
+     |   { ft == field_value::mfcolorrgba_id }? fv=mfColorRgbaValue
      |   { ft == field_value::mffloat_id }? fv=mfFloatValue
      |   { ft == field_value::mfdouble_id }? fv=mfDoubleValue
+     |   { ft == field_value::mfimage_id }? fv=mfImageValue
      |   { ft == field_value::mfint32_id }? fv=mfInt32Value
      |   { ft == field_value::mfrotation_id }? fv=mfRotationValue
***************
*** 310,313 ****
--- 313,391 ----
      ;
  
+ mfBoolValue
+ returns [boost::shared_ptr<field_value> mfv =
+          boost::shared_ptr<field_value>(new mfbool)]
+ options { defaultErrorHandler=false; }
+ {
+     using std::vector;
+ 
+     bool b;
+     mfbool & bools = static_cast<mfbool &>(*mfv);
+ }
+     :   b=boolValue { bools.value(vector<bool>(1, b)); }
+     |   LBRACKET {
+             vector<bool> value;
+         } (b=boolValue { value.push_back(b); })* RBRACKET {
+             bools.value(value);
+         }
+     ;
+ 
+ sfColorRgbaValue returns [boost::shared_ptr<field_value> scv]
+ options { defaultErrorHandler=false; }
+ {
+     color_rgba c;
+ }
+     : colorRgbaValue[c] { scv.reset(new sfcolorrgba(c)); }
+     ;
+ 
+ mfColorRgbaValue
+ returns [boost::shared_ptr<field_value> mcv =
+             boost::shared_ptr<field_value>(new mfcolorrgba)]
+ options { defaultErrorHandler=false; }
+ {
+     using std::vector;
+ 
+     color_rgba c;
+     mfcolorrgba & colors = static_cast<mfcolorrgba &>(*mcv);
+ }
+     :   colorRgbaValue[c] { colors.value(vector<color_rgba>(1, c)); }
+     |   LBRACKET {
+             vector<color_rgba> value;
+         } (colorRgbaValue[c] { value.push_back(c); })* RBRACKET {
+             colors.value(value);
+         }
+     ;
+ 
+ colorRgbaValue[color_rgba & c]
+ options { defaultErrorHandler=false; }
+ {
+     float r, g, b, a;
+ }
+     :   r=colorComponent g=colorComponent b=colorComponent a=colorComponent {
+             c.r(r);
+             c.g(g);
+             c.b(b);
+             c.a(a);
+         }
+     ;
+ 
+ mfImageValue
+ returns [boost::shared_ptr<field_value> mcv =
+             boost::shared_ptr<field_value>(new mfimage)]
+ options { defaultErrorHandler=false; }
+ {
+     using std::vector;
+ 
+     image img;
+     mfimage & imgs = static_cast<mfimage &>(*mcv);
+ }
+     :   imageValue[img] { imgs.value(vector<image>(1, img)); }
+     |   LBRACKET {
+             vector<image> value;
+         } (imageValue[img] { value.push_back(img); })*
+         RBRACKET {
+             imgs.value(value);
+         }
+     ;
  
  sfDoubleValue returns [boost::shared_ptr<field_value> sfv...
 
[truncated message content]

[openvrml-commit] openvrml ChangeLog,1.1077,1.1078

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

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

Modified Files:
	ChangeLog 
Log Message:
Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value types.  Added MFBool support to the Java and JavaScript interfaces.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1077
retrieving revision 1.1078
diff -C2 -d -r1.1077 -r1.1078
*** ChangeLog	6 Dec 2005 03:43:43 -0000	1.1077
--- ChangeLog	8 Dec 2005 06:50:10 -0000	1.1078
***************
*** 1,2 ****
--- 1,320 ----
+ 2005-12-08 Braden McDaniel  <br...@en...>
+ 
+ 	Added sfcolorrgba, mfbool, mfcolorrgba, and mfimage field_value
+ 	types.  Added MFBool support to the Java and JavaScript
+ 	interfaces.  From Andrew Grieve <sg...@us...>
+ 
+ 	* java/Makefile.am (CLASSES): Added vrml/field/MFBool.class,
+ 	vrml/field/ConstMFBool.class.
+ 	(JNI_HFILES): Added vrml_field_MFBool.h, vrml_field_ConstMFBool.h.
+ 	(vrml_field_MFBool.h): Added rule.
+ 	(vrml_field_ConstMFBool.h): Added rule.
+ 	* java/vrml/field/ConstMFBool.java: Added file.
+ 	* java/vrml/field/MFBool.java: Added file.
+ 	* java/vrml/field/Makefile.am (JAVA_FILES): Added MFBool.java and
+ 	ConstMFBool.java.
+ 	* src/libopenvrml/openvrml/ScriptJDK.cpp: Include
+ 	vrml_field_MFBool.h and vrml_field_ConstMFBool.h.
+ 	(ftn): Added "MFBool".
+ 	(newField): Added case for mfbool.
+ 	(Java_vrml_field_ConstMFBool_CreateObject): Added function
+ 	definition.
+ 	(Java_vrml_field_ConstMFBool_getSize): Added function definition.
+ 	(Java_vrml_field_ConstMFBool_getValue): Added function definition.
+ 	(Java_vrml_field_ConstMFBool_get1Value): Added function
+ 	definition.
+ 	(Java_vrml_field_ConstMFBool_toString): Added function definition.
+ 	(Java_vrml_field_MFBool_CreateObject): Added function definition.
+ 	(Java_vrml_field_MFBool_getSize): Added function definition.
+ 	(Java_vrml_field_MFBool_clear): Added function definition.
+ 	(Java_vrml_field_MFBool_delete): Added function definition.
+ 	(Java_vrml_field_MFBool_getValue): Added function definition.
+ 	(Java_vrml_field_MFBool_get1Value): Added function definition.
+ 	(Java_vrml_field_MFBool_setValue__I_3F): Added function
+ 	definition.
+ 	(Java_vrml_field_MFBool_setValue__Lvrml_field_MFBool_2): Added
+ 	function definition.
+ 	(Java_vrml_field_MFBool_setValue__Lvrml_field_ConstMFBool_2):
+ 	Added function definition.
+ 	(Java_vrml_field_MFBool_set1Value__IF): Added function definition.
+ 	(Java_vrml_field_MFBool_set1Value__ILvrml_field_ConstSFBool_2):
+ 	Added function definition.
+ 	(Java_vrml_field_MFBool_set1Value__ILvrml_field_SFBool_2): Added
+ 	function definition.
+ 	(Java_vrml_field_MFBool_addValue__F): Added function definition.
+ 	(Java_vrml_field_MFBool_addValue__Lvrml_field_ConstSFBool_2):
+ 	Added function definition.
+ 	(Java_vrml_field_MFBool_addValue__Lvrml_field_SFBool_2): Added
+ 	function definition.
+ 	(Java_vrml_field_MFBool_insertValue__IF): Added function
+ 	definition.
+ 	(Java_vrml_field_MFBool_insertValue__ILvrml_field_ConstSFBool_2):
+ 	Added function definition.
+ 	(Java_vrml_field_MFBool_insertValue__ILvrml_field_SFBool_2): Added
+ 	function definition.
+ 	(Java_vrml_field_MFBool_toString): Added function definition.
+ 	* src/libopenvrml/openvrml/Vrml97Parser.g
+ 	(Vrml97Parser::imageValue): Changed grammar such that mfImageValue
+ 	in X3DVrmlParser.g is not ambiguous.
+ 	* src/libopenvrml/openvrml/X3DVrmlParser.g
+ 	(X3DVrmlparser::fieldType): Added support for MFBool, MFColorRGBA,
+ 	and MFImage.
+ 	(X3DVrmlParser::nonNodeFieldValue): Added support for MFBool,
+ 	MFColorRGBA, and MFImage.
+ 	(X3DVrmlParser::mfBoolValue): Added production.
+ 	(X3DVrmlParser::sfColorRgbaValue): Added production.
+ 	(X3DVrmlParser::mfColorRgbaValue): Added production.
+ 	(X3DVrmlParser::colorRgbaValue): Added production.
+ 	(X3DVrmlParser::mfImageValue): Added production.
+ 	* src/libopenvrml/openvrml/basetypes.cpp (rgb_to_hsv): Added
+ 	function; relocated logic in openvrml::color::hsv accessor to
+ 	here.
+ 	(hsv_to_rgb): Added function; relocated logic in
+ 	openvrml::color::hsv mutator to here.
+ 	(openvrml::color::hsv(float (&)[3]) const): Delegate to
+ 	rgb_to_hsv.
+ 	(openvrml::color::hsv(float, float, float)): Delegate to
+ 	hsv_to_rgb.
+ 	(openvrml::color_rgba::color_rgba()): Added function definition.
+ 	(openvrml::color_rgba::color_rgba(const float (&)[4])): Added
+ 	function definition.
+ 	(openvrml::color_rgba::color_rgba(float, float, float, float)):
+ 	Added function definition.
+ 	(openvrml::color_rgba::operator[](size_t) const): Added function
+ 	definition.
+ 	(openvrml::color_rgba::hsv(float (&)[4]) const): Added function
+ 	definition.
+ 	(openvrml::color_rgba::hsv(float, float, float, float)): Added
+ 	function definition.
+ 	(openvrml::operator==(const color_rgba &, const color_rgba &)):
+ 	Added function definition.
+ 	(openvrml::operator!=(const color_rgba &, const color_rgba &)):
+ 	Added function definition.
+ 	(openvrml::operator<<(std::ostream &, const color_rgba &)): Added
+ 	function definition.
+ 	* src/libopenvrml/openvrml/basetypes.h: Added openvrml::color_rgba
+ 	class.
+ 	(openvrml::color_rgba::operator[](size_t)): Added function
+ 	definition.
+ 	(openvrml::color_rgba::r() const): Added function definition.
+ 	(openvrml::color_rgba::r(float)): Added function definition.
+ 	(openvrml::color_rgba::g() const): Added function definition.
+ 	(openvrml::color_rgba::g(float)): Added function definition.
+ 	(openvrml::color_rgba::b() const): Added function definition.
+ 	(openvrml::color_rgba::b(float)): Added function definition.
+ 	(openvrml::color_rgba::a() const): Added function definition.
+ 	(openvrml::color_rgba::a(float)): Added function definition.
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::abstract_proto_node::create_eventin): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::abstract_proto_node::eventin_is): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::abstract_proto_node::create_eventout): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::abstract_proto_node::eventout_is): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::proto_node::create_exposedfield): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::externproto_node::create_exposedfield): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	* src/libopenvrml/openvrml/event.cpp: Added doc-comments for
+ 	sfcolorrgba_listener, mfbool_listener, mfcolorrgba_listener,
+ 	mfimage_listener, sfcolorrgba_emitter, mfbool_emitter,
+ 	mfcolorrgba_emitter, and mfimage_emitter typedefs.
+ 	* src/libopenvrml/openvrml/event.h: Added sfcolorrgba_listener,
+ 	mfbool_listener, mfcolorrgba_listener, mfimage_listener,
+ 	sfcolorrgba_emitter, mfbool_emitter, mfcolorrgba_emitter, and
+ 	mfimage_emitter typedefs.
+ 	* src/libopenvrml/openvrml/field_value.cpp
+ 	(openvrml::field_value::create): Added cases for sfcolorrgba,
+ 	mfbool, mfcolorrgba, and mfimage.
+ 	(field_value_type_id_): Added entries for sfcolorrgba, mfbool,
+ 	mfcolorrgba, and mfimage.
+ 	(openvrml::sfcolorrgba::field_value_type_id): Added static member
+ 	definition.
+ 	(openvrml::sfcolorrgba::sfcolorrgba(const value_type &)): Added
+ 	function definition.
+ 	(openvrml::sfcolorrgba::sfcolorrgba(const sfcolorrgba &)): Added
+ 	function definition.
+ 	(openvrml::sfcolorrgba::~sfcolorrgba()): Added function
+ 	definition.
+ 	(openvrml::sfcolorrgba::operator=(const sfcolorrgba &)): Added
+ 	function definition.
+ 	(openvrml::sfcolorrgba::value() const): Added function definition.
+ 	(openvrml::sfcolorrgba::value(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::sfcolorrgba::swap(sfcolorrgba &)): Added function
+ 	definition.
+ 	(openvrml::sfcolorrgba::do_clone() const): Added function
+ 	definition.
+ 	(openvrml::sfcolorrgba::do_assign(const field_value &)): Added
+ 	function definition.
+ 	(openvrml::sfcolorrgba::print(std::ostream &) const): Added
+ 	function definition.
+ 	(openvrml::sfcolorrgba::do_type() const): Added function
+ 	definition.
+ 	(openvrml::operator==(const sfcolorrgba &, const sfcolorrgba &)):
+ 	Added function definition.
+ 	(openvrml::operator!=(const sfcolorrgba &, const sfcolorrgba &)):
+ 	Added function definition.
+ 	(openvrml::mfbool::field_value_type_id): Added static member
+ 	definition.
+ 	(openvrml::mfbool::mfbool(value_type::size_type n, bool)
+ 	(openvrml::mfbool::mfbool(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::mfbool::mfbool(const mfbool &)): Added function
+ 	definition.
+ 	(openvrml::mfbool::~mfbool()): Added function definition.
+ 	(openvrml::mfbool::operator=(const mfbool &)): Added function
+ 	definition.
+ 	(openvrml::mfbool::value() const): Added function definition.
+ 	(openvrml::mfbool::value(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::mfbool::swap(mfbool & mfb)): Added function definition.
+ 	(openvrml::mfbool::do_clone() const): Added function definition.
+ 	(openvrml::mfbool::do_assign(const field_value &)): Added function
+ 	definition.
+ 	(openvrml::mfbool::do_type() const): Added function definition.
+ 	(openvrml::mfbool::print(std::ostream &) const): Added function
+ 	definition.
+ 	(openvrml::operator==(const mfbool &, const mfbool &)): Added
+ 	function definition.
+ 	(openvrml::operator!=(const mfbool &, const mfbool &)): Added
+ 	function definition.
+ 	(openvrml::mfcolorrgba::field_value_type_id): Added static member
+ 	definition.
+ 	(openvrml::mfcolorrgba::mfcolorrgba(value_type::size_type, const
+ 	color_rgba &)): Added function definition.
+ 	(openvrml::mfcolorrgba::mfcolorrgba(const value_type &)): Added
+ 	function definition.
+ 	(openvrml::mfcolorrgba::mfcolorrgba(const mfcolorrgba &)): Added
+ 	function definition.
+ 	(openvrml::mfcolorrgba::~mfcolorrgba()): Added function
+ 	definition.
+ 	(openvrml::mfcolorrgba::operator=(const mfcolorrgba &)): Added
+ 	function definition.
+ 	(openvrml::mfcolorrgba::value() const): Added function definition.
+ 	(openvrml::mfcolorrgba::value(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::mfcolorrgba::swap(mfcolorrgba &)): Added function
+ 	definition.
+ 	(openvrml::mfcolorrgba::do_clone() const): Added function
+ 	definition.
+ 	(openvrml::mfcolorrgba::do_assign(const field_value &)): Added
+ 	function definition.
+ 	(openvrml::mfcolorrgba::do_type()): Added function definition.
+ 	(openvrml::mfcolorrgba::print(std::ostream &)): Added function
+ 	definition.
+ 	(openvrml::operator==(const mfcolorrgba &, const mfcolorrgba &)):
+ 	Added function definition.
+ 	(openvrml::operator!=(const mfcolorrgba &, const mfcolorrgba &)):
+ 	Added function definition.
+ 	(openvrml::mfimage::field_value_type_id): Added static member
+ 	definition.
+ 	(openvrml::mfimage::mfimage(value_type::size_type, const image&)):
+ 	Added function definition.
+ 	(openvrml::mfimage::mfimage(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::mfimage::mfimage(const mfimage &)): Added function
+ 	definition.
+ 	(openvrml::mfimage::~mfimage()): Added function definition.
+ 	(openvrml::mfimage::operator=(const mfimage &)): Added function
+ 	definition.
+ 	(openvrml::mfimage::value() const): Added function definition.
+ 	(openvrml::mfimage::value(const value_type &)): Added function
+ 	definition.
+ 	(openvrml::mfimage::swap(mfimage &)): Added function definition.
+ 	(openvrml::mfimage::do_clone() const): Added function definition.
+ 	(openvrml::mfimage::do_assign(const field_value &)): Added
+ 	function definition.
+ 	(openvrml::mfimage::type_id() const): Added function definition.
+ 	(openvrml::mfimage::print(std::ostream &) const): Added function
+ 	definition.
+ 	(openvrml::operator==(const mfimage &, const mfimage &)): Added
+ 	function definition.
+ 	(openvrml::operator!=(const mfimage &, const mfimage &)): Added
+ 	function definition.
+ 	* src/libopenvrml/openvrml/field_value.h
+ 	(openvrml::field_value::type_id): Added enumerants sfcolorrgba_id,
+ 	mfbool_id, mfcolorrgba_id, and mfimage_id.
+ 	(openvrml::sfcolorrgba): Added class definition.
+ 	(openvrml::operator==(const sfcolorrgba &, const sfcolorrgba &)):
+ 	Added function declaration.
+ 	(openvrml::operator!=(const sfcolorrgba &, const sfcolorrgba &)):
+ 	Added function declaration.
+ 	(openvrml::mfbool): Added class definition.
+ 	(openvrml::operator==(const mfbool &, const mfbool &)): Added
+ 	function declaration.
+ 	(openvrml::operator!=(const mfbool &, const mfbool &)): Added
+ 	function declaration.
+ 	(openvrml::mfcolorrgba): Added class definition.
+ 	(openvrml::operator==(const mfcolorrgba &, const mfcolorrgba &)):
+ 	Added function declaration.
+ 	(openvrml::operator!=(const mfcolorrgba &, const mfcolorrgba &)):
+ 	Added function declaration.
+ 	(openvrml::mfimage): Added class definition.
+ 	(openvrml::operator==(const mfimage &, const mfimage &)): Added
+ 	function declaration.
+ 	(openvrml::operator!=(const mfimage &, const mfimage &)): Added
+ 	function declaration.
+ 	(std::swap(openvrml::sfcolorrgba &, openvrml::sfcolorrgba &)):
+ 	Added function definition.
+ 	(std::swap(openvrml::mfbool &, openvrml::mfbool &)): Added
+ 	function definition.
+ 	(std::swap(openvrml::mfcolorrgba &, openvrml::mfcolorrgba &)):
+ 	Added function definition.
+ 	(std::swap(openvrml::mfimage &, openvrml::mfimage &)): Added
+ 	function definition.
+ 	* src/libopenvrml/openvrml/node.cpp
+ 	(print_field_::operator()(const openvrml::node_interface &)
+ 	const): Added cases for sfcolorrgba, mfbool, mfcolorrgba, and
+ 	mfimage.
+ 	(openvrml::add_route(node &, const std::string &, node &, const
+ 	std::string &)): Added cases for sfcolorrgba, mfbool, mfcolorrgba,
+ 	and mfimage.
+ 	(openvrml::delete_route(node &, const std::string &, node &, const
+ 	std::string &)): Added cases for sfcolorrgba, mfbool, mfcolorrgba,
+ 	and mfimage.
+ 	* src/libopenvrml/openvrml/node.h
+ 	(openvrml::node): Added friends field_value_listener<sfcolorrgba>,
+ 	field_value_listener<mfbool>, field_value_listener<mfcolorrgba>,
+ 	field_value_listener<mfimage>, exposedfield<sfcolorrgba>,
+ 	exposedfield<mfbool>, exposedfield<mfcolorrgba>,
+ 	exposedfield<mfimage>.
+ 	* src/libopenvrml/openvrml/script.cpp
+ 	(openvrml::script::process_direct_output(double)): Added cases for
+ 	sfcolorrgba, mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::script_node::create_listener(field_value::type_id,
+ 	const std::string &, script_node &)): Added cases for sfcolorrgba,
+ 	mfbool, mfcolorrgba, and mfimage.
+ 	(openvrml::script_node::create_emitter(script_node &, const
+ 	openvrml::field_value &)): Added cases for sfcolorrgba, mfbool,
+ 	mfcolorrgba, and mfimage.
+ 	(js_::MFBool): Added class definition.
+ 	(js_::script::vrmlFieldToJSVal(const openvrml::field_value &)):
+ 	Added case for mfbool.
+ 	(js_::createFieldValueFromJsval(JSContext *, jsval,
+ 	openvrml::field_value::type_id)): Added case for mfbool.
+ 	(js_::MFBool::jsclass): Added static member definition.
+ 	(js_::MFBool::createFromJSObject(JSContext *, JSObject *)): Added
+ 	function definition.
+ 	(js_::MFBool::toJsval(const std::vector<bool> &, JSContext *,
+ 	JSObject *, jsval *)): Added function definition.
+ 	(js_::MFBool::construct(JSContext *, JSObject *, uintN, jsval *,
+ 	jsval *)): Added function definition.
+ 	(js_::MFBool::initObject(JSContext *, JSObject *, uintN, jsval*)):
+ 	Added function definition.
+ 	(js_::MFBool::setElement(JSContext *, JSObject *, jsval, jsval*)):
+ 	Added function definition.
+ 	(js_::MFBool::setLength(JSContext *, JSObject *, jsval, jsval *)):
+ 	Added function definition.
+ 	(js_::MFBool::toString(JSContext *, JSObject *, uintN, jsval *,
+ 	jsval *)): Added function definition.
+ 	(js_::MFBool::finalize(JSContext *, JSObject *)): Added function
+ 	definition.
+ 	* src/libopenvrml/openvrml/script.h
+ 	(openvrml::script_node): Added typedefs for sfcolorrgba_listener,
+ 	mfbool_listener, mfcolorrgba_listener, and mfimage_listener.
+ 
  2005-12-05 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml ChangeLog,1.1076,1.1077

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

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

Modified Files:
	ChangeLog 
Log Message:
Doc-comment improvements--stop faking em-dash.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -C2 -d -r1.1076 -r1.1077
*** ChangeLog	5 Dec 2005 23:13:14 -0000	1.1076
--- ChangeLog	6 Dec 2005 03:43:43 -0000	1.1077
***************
*** 1,4 ****
--- 1,9 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/basetypes.cpp: Doc-comment
+ 	improvements--stop faking em-dash.
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* java/vrml/field/Makefile.am (JAVA_FILES): Added SFVec2d.java,
  	SFVec3d.java, MFVec2d.java, MFVec3d.java, ConstSFVec2d.java,

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp,1.24,1.25

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

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

Modified Files:
	basetypes.cpp 
Log Message:
Doc-comment improvements--stop faking em-dash.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** basetypes.cpp	5 Dec 2005 07:11:21 -0000	1.24
--- basetypes.cpp	6 Dec 2005 03:43:43 -0000	1.25
***************
*** 46,50 ****
   *
   * VRML colors are represented as three single precision floating point
!  * components--red, green, and blue--ranging from 0.0 to 1.0.
   */
  
--- 46,50 ----
   *
   * VRML colors are represented as three single precision floating point
!  * components—red, green, and blue—ranging from 0.0 to 1.0.
   */
  

[openvrml-commit] openvrml/java/vrml/field Makefile.am,1.8,1.9

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

Update of /cvsroot/openvrml/openvrml/java/vrml/field
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15317/java/vrml/field

Modified Files:
	Makefile.am 
Log Message:
Added SFVec2d.java, SFVec3d.java, MFVec2d.java, MFVec3d.java, ConstSFVec2d.java, ConstSFVec3d.java, ConstMFVec2d.java, and ConstMFVec3d.java to JAVA_FILES variable.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/java/vrml/field/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am	26 Jan 2004 19:07:26 -0000	1.8
--- Makefile.am	5 Dec 2005 23:13:14 -0000	1.9
***************
*** 11,15 ****
--- 11,17 ----
          SFString.java \
          SFTime.java \
+         SFVec2d.java \
          SFVec2f.java \
+         SFVec3d.java \
          SFVec3f.java \
          MFColor.java \
***************
*** 20,24 ****
--- 22,28 ----
          MFString.java \
          MFTime.java \
+         MFVec2d.java \
          MFVec2f.java \
+         MFVec3d.java \
          MFVec3f.java \
          ConstSFBool.java \
***************
*** 31,35 ****
--- 35,41 ----
          ConstSFString.java \
          ConstSFTime.java \
+         ConstSFVec2d.java \
          ConstSFVec2f.java \
+         ConstSFVec3d.java \
          ConstSFVec3f.java \
          ConstMFColor.java \
***************
*** 40,44 ****
--- 46,52 ----
          ConstMFString.java \
          ConstMFTime.java \
+         ConstMFVec2d.java \
          ConstMFVec2f.java \
+         ConstMFVec3d.java \
          ConstMFVec3f.java
  

[openvrml-commit] openvrml ChangeLog,1.1075,1.1076

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

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

Modified Files:
	ChangeLog 
Log Message:
Added SFVec2d.java, SFVec3d.java, MFVec2d.java, MFVec3d.java, ConstSFVec2d.java, ConstSFVec3d.java, ConstMFVec2d.java, and ConstMFVec3d.java to JAVA_FILES variable.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1075
retrieving revision 1.1076
diff -C2 -d -r1.1075 -r1.1076
*** ChangeLog	5 Dec 2005 22:00:04 -0000	1.1075
--- ChangeLog	5 Dec 2005 23:13:14 -0000	1.1076
***************
*** 1,4 ****
--- 1,10 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* java/vrml/field/Makefile.am (JAVA_FILES): Added SFVec2d.java,
+ 	SFVec3d.java, MFVec2d.java, MFVec3d.java, ConstSFVec2d.java,
+ 	ConstSFVec3d.java, ConstMFVec2d.java, and ConstMFVec3d.java.
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/script.cpp: Doc-comment improvements.
  

[openvrml-commit] openvrml ChangeLog,1.1074,1.1075

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

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

Modified Files:
	ChangeLog 
Log Message:
Doc-comment improvements.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1074
retrieving revision 1.1075
diff -C2 -d -r1.1074 -r1.1075
*** ChangeLog	5 Dec 2005 20:51:48 -0000	1.1074
--- ChangeLog	5 Dec 2005 22:00:04 -0000	1.1075
***************
*** 1,4 ****
--- 1,8 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/script.cpp: Doc-comment improvements.
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/node.cpp: Doc-comment improvements.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml script.cpp,1.56,1.57

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

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

Modified Files:
	script.cpp 
Log Message:
Doc-comment improvements.

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** script.cpp	2 Nov 2005 08:50:24 -0000	1.56
--- script.cpp	5 Dec 2005 22:00:09 -0000	1.57
***************
*** 795,799 ****
   * @typedef openvrml::script_node::sfbool_listener
   *
!  * @brief sfbool event listener.
   */
  
--- 795,799 ----
   * @typedef openvrml::script_node::sfbool_listener
   *
!  * @brief @c sfbool event listener.
   */
  
***************
*** 803,807 ****
   * @typedef openvrml::script_node::sfcolor_listener
   *
!  * @brief sfcolor event listener.
   */
  
--- 803,815 ----
   * @typedef openvrml::script_node::sfcolor_listener
   *
!  * @brief @c sfcolor event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::sfdouble_listener
!  *
!  * @brief @c sfdouble event listener.
   */
  
***************
*** 811,815 ****
   * @typedef openvrml::script_node::sffloat_listener
   *
!  * @brief sffloat event listener.
   */
  
--- 819,823 ----
   * @typedef openvrml::script_node::sffloat_listener
   *
!  * @brief @c sffloat event listener.
   */
  
***************
*** 819,823 ****
   * @typedef openvrml::script_node::sfimage_listener
   *
!  * @brief sfimage event listener.
   */
  
--- 827,831 ----
   * @typedef openvrml::script_node::sfimage_listener
   *
!  * @brief @c sfimage event listener.
   */
  
***************
*** 827,831 ****
   * @typedef openvrml::script_node::sfint32_listener
   *
!  * @brief sfint32 event listener.
   */
  
--- 835,839 ----
   * @typedef openvrml::script_node::sfint32_listener
   *
!  * @brief @c sfint32 event listener.
   */
  
***************
*** 835,839 ****
   * @typedef openvrml::script_node::sfnode_listener
   *
!  * @brief sfnode event listener.
   */
  
--- 843,847 ----
   * @typedef openvrml::script_node::sfnode_listener
   *
!  * @brief @c sfnode event listener.
   */
  
***************
*** 843,847 ****
   * @typedef openvrml::script_node::sfrotation_listener
   *
!  * @brief sfrotation event listener.
   */
  
--- 851,855 ----
   * @typedef openvrml::script_node::sfrotation_listener
   *
!  * @brief @c sfrotation event listener.
   */
  
***************
*** 851,855 ****
   * @typedef openvrml::script_node::sfstring_listener
   *
!  * @brief sfstring event listener.
   */
  
--- 859,863 ----
   * @typedef openvrml::script_node::sfstring_listener
   *
!  * @brief @c sfstring event listener.
   */
  
***************
*** 859,863 ****
   * @typedef openvrml::script_node::sftime_listener
   *
!  * @brief sftime event listener.
   */
  
--- 867,879 ----
   * @typedef openvrml::script_node::sftime_listener
   *
!  * @brief @c sftime event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::sfvec2d_listener
!  *
!  * @brief @c sfvec2d event listener.
   */
  
***************
*** 867,871 ****
   * @typedef openvrml::script_node::sfvec2f_listener
   *
!  * @brief sfvec2f event listener.
   */
  
--- 883,895 ----
   * @typedef openvrml::script_node::sfvec2f_listener
   *
!  * @brief @c sfvec2f event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::sfvec3d_listener
!  *
!  * @brief @c sfvec3d event listener.
   */
  
***************
*** 875,879 ****
   * @typedef openvrml::script_node::sfvec3f_listener
   *
!  * @brief sfvec3f event listener.
   */
  
--- 899,903 ----
   * @typedef openvrml::script_node::sfvec3f_listener
   *
!  * @brief @c sfvec3f event listener.
   */
  
***************
*** 883,887 ****
   * @typedef openvrml::script_node::mfcolor_listener
   *
!  * @brief mfcolor event listener.
   */
  
--- 907,919 ----
   * @typedef openvrml::script_node::mfcolor_listener
   *
!  * @brief @c mfcolor event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::mfdouble_listener
!  *
!  * @brief @c mfdouble event listener.
   */
  
***************
*** 891,895 ****
   * @typedef openvrml::script_node::mffloat_listener
   *
!  * @brief mffloat event listener.
   */
  
--- 923,927 ----
   * @typedef openvrml::script_node::mffloat_listener
   *
!  * @brief @c mffloat event listener.
   */
  
***************
*** 899,903 ****
   * @typedef openvrml::script_node::mfint32_listener
   *
!  * @brief mfint32 event listener.
   */
  
--- 931,935 ----
   * @typedef openvrml::script_node::mfint32_listener
   *
!  * @brief @c mfint32 event listener.
   */
  
***************
*** 907,911 ****
   * @typedef openvrml::script_node::mfnode_listener
   *
!  * @brief mfnode event listener.
   */
  
--- 939,943 ----
   * @typedef openvrml::script_node::mfnode_listener
   *
!  * @brief @c mfnode event listener.
   */
  
***************
*** 915,919 ****
   * @typedef openvrml::script_node::mfrotation_listener
   *
!  * @brief mfrotation event listener.
   */
  
--- 947,951 ----
   * @typedef openvrml::script_node::mfrotation_listener
   *
!  * @brief @c mfrotation event listener.
   */
  
***************
*** 923,927 ****
   * @typedef openvrml::script_node::mfstring_listener
   *
!  * @brief mfstring event listener.
   */
  
--- 955,959 ----
   * @typedef openvrml::script_node::mfstring_listener
   *
!  * @brief @c mfstring event listener.
   */
  
***************
*** 931,935 ****
   * @typedef openvrml::script_node::mftime_listener
   *
!  * @brief mftime event listener.
   */
  
--- 963,975 ----
   * @typedef openvrml::script_node::mftime_listener
   *
!  * @brief @c mftime event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::mfvec2d_listener
!  *
!  * @brief @c mfvec2d event listener.
   */
  
***************
*** 939,943 ****
   * @typedef openvrml::script_node::mfvec2f_listener
   *
!  * @brief mfvec2f event listener.
   */
  
--- 979,991 ----
   * @typedef openvrml::script_node::mfvec2f_listener
   *
!  * @brief @c mfvec2f event listener.
!  */
! 
! /**
!  * @internal
!  *
!  * @typedef openvrml::script_node::mfvec3d_listener
!  *
!  * @brief @c mfvec3d event listener.
   */
  
***************
*** 947,951 ****
   * @typedef openvrml::script_node::mfvec3f_listener
   *
!  * @brief mfvec3f event listener.
   */
  
--- 995,999 ----
   * @typedef openvrml::script_node::mfvec3f_listener
   *
!  * @brief @c mfvec3f event listener.
   */
  

[openvrml-commit] openvrml ChangeLog,1.1073,1.1074

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

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

Modified Files:
	ChangeLog 
Log Message:
Doc-comment improvements.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1073
retrieving revision 1.1074
diff -C2 -d -r1.1073 -r1.1074
*** ChangeLog	5 Dec 2005 07:14:36 -0000	1.1073
--- ChangeLog	5 Dec 2005 20:51:48 -0000	1.1074
***************
*** 1,4 ****
--- 1,8 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/node.cpp: Doc-comment improvements.
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/browser.cpp
  	(openvrml::abstract_proto_node::create_eventin): Added missing

[openvrml-commit] openvrml/src/libopenvrml/openvrml node.cpp,1.68,1.69

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

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

Modified Files:
	node.cpp 
Log Message:
Doc-comment improvements.

Index: node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** node.cpp	27 Nov 2005 06:13:00 -0000	1.68
--- node.cpp	5 Dec 2005 20:51:48 -0000	1.69
***************
*** 1051,1054 ****
--- 1051,1060 ----
  
  /**
+  * @var class openvrml::node::proto_node
+  *
+  * @brief A <code>PROTO</code> instance.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<sfbool>
   *
***************
*** 1063,1066 ****
--- 1069,1078 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<sfdouble>
+  *
+  * @brief <code>sfdouble</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<sffloat>
   *
***************
*** 1105,1108 ****
--- 1117,1126 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<sfvec2d>
+  *
+  * @brief <code>sfvec2d</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<sfvec2f>
   *
***************
*** 1111,1114 ****
--- 1129,1138 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<sfvec3d>
+  *
+  * @brief <code>sfvec3d</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<sfvec3f>
   *
***************
*** 1129,1132 ****
--- 1153,1162 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<mfdouble>
+  *
+  * @brief <code>mfdouble</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<mfint32>
   *
***************
*** 1159,1162 ****
--- 1189,1198 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<mfvec2d>
+  *
+  * @brief <code>mfvec2d</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<mfvec2f>
   *
***************
*** 1165,1168 ****
--- 1201,1210 ----
  
  /**
+  * @var class openvrml::node::field_value_listener<mfvec3d>
+  *
+  * @brief <code>mfvec3d</code> <code>field_value_listener</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::field_value_listener<mfvec3f>
   *
***************
*** 1183,1186 ****
--- 1225,1234 ----
  
  /**
+  * @var class openvrml::node::exposedfield<sfdouble>
+  *
+  * @brief <code>sfdouble</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<sffloat>
   *
***************
*** 1225,1228 ****
--- 1273,1282 ----
  
  /**
+  * @var class openvrml::node::exposedfield<sfvec2d>
+  *
+  * @brief <code>sfvec2d</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<sfvec2f>
   *
***************
*** 1231,1234 ****
--- 1285,1294 ----
  
  /**
+  * @var class openvrml::node::exposedfield<sfvec3d>
+  *
+  * @brief <code>sfvec3d</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<sfvec3f>
   *
***************
*** 1243,1246 ****
--- 1303,1312 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfdouble>
+  *
+  * @brief <code>mfdouble</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mffloat>
   *
***************
*** 1279,1282 ****
--- 1345,1354 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfvec2d>
+  *
+  * @brief <code>mfvec2d</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mfvec2f>
   *
***************
*** 1285,1288 ****
--- 1357,1366 ----
  
  /**
+  * @var class openvrml::node::exposedfield<mfvec3d>
+  *
+  * @brief <code>mfvec3d</code> <code>exposedfield</code>.
+  */
+ 
+ /**
   * @var class openvrml::node::exposedfield<mfvec3f>
   *

[openvrml-commit] openvrml ChangeLog,1.1072,1.1073

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

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

Modified Files:
	ChangeLog 
Log Message:
Added missing case for mfdouble.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1072
retrieving revision 1.1073
diff -C2 -d -r1.1072 -r1.1073
*** ChangeLog	5 Dec 2005 07:11:21 -0000	1.1072
--- ChangeLog	5 Dec 2005 07:14:36 -0000	1.1073
***************
*** 1,4 ****
--- 1,11 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/browser.cpp
+ 	(openvrml::abstract_proto_node::create_eventin): Added missing
+ 	case for mfdouble.
+ 	From Andrew Grieve <sg...@us...>
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* src/libopenvrml/openvrml/basetypes.cpp
  	(openvrml::image::pixel(size_t, size_t)): Fixed doc-comment.

[openvrml-commit] openvrml/src/libopenvrml/openvrml browser.cpp,1.112,1.113

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

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

Modified Files:
	browser.cpp 
Log Message:
Added missing case for mfdouble.

Index: browser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** browser.cpp	29 Nov 2005 12:44:52 -0000	1.112
--- browser.cpp	5 Dec 2005 07:14:36 -0000	1.113
***************
*** 1140,1149 ****
              result.reset(new proto_eventin<sfcolor>(node));
              break;
-         case field_value::sffloat_id:
-             result.reset(new proto_eventin<sffloat>(node));
-             break;
          case field_value::sfdouble_id:
              result.reset(new proto_eventin<sfdouble>(node));
              break;
          case field_value::sfimage_id:
              result.reset(new proto_eventin<sfimage>(node));
--- 1140,1149 ----
              result.reset(new proto_eventin<sfcolor>(node));
              break;
          case field_value::sfdouble_id:
              result.reset(new proto_eventin<sfdouble>(node));
              break;
+         case field_value::sffloat_id:
+             result.reset(new proto_eventin<sffloat>(node));
+             break;
          case field_value::sfimage_id:
              result.reset(new proto_eventin<sfimage>(node));
***************
*** 1179,1182 ****
--- 1179,1185 ----
              result.reset(new proto_eventin<mfcolor>(node));
              break;
+         case field_value::mfdouble_id:
+             result.reset(new proto_eventin<mfdouble>(node));
+             break;
          case field_value::mffloat_id:
              result.reset(new proto_eventin<mffloat>(node));

[openvrml-commit] openvrml ChangeLog,1.1071,1.1072

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

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

Modified Files:
	ChangeLog 
Log Message:
Doc-comment fixes.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1071
retrieving revision 1.1072
diff -C2 -d -r1.1071 -r1.1072
*** ChangeLog	5 Dec 2005 05:18:54 -0000	1.1071
--- ChangeLog	5 Dec 2005 07:11:21 -0000	1.1072
***************
*** 1,4 ****
--- 1,11 ----
  2005-12-05 Braden McDaniel  <br...@en...>
  
+ 	* src/libopenvrml/openvrml/basetypes.cpp
+ 	(openvrml::image::pixel(size_t, size_t)): Fixed doc-comment.
+ 	(openvrml::image::pixel(size_t, size_t, unsigned_long)): Fixed
+ 	doc-comment.
+ 
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
  	* java/Makefile.am: List Java class files in CLASSES variable.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml basetypes.cpp,1.23,1.24

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

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

Modified Files:
	basetypes.cpp 
Log Message:
Doc-comment fixes.

Index: basetypes.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/basetypes.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** basetypes.cpp	1 Dec 2005 01:00:18 -0000	1.23
--- basetypes.cpp	5 Dec 2005 07:11:21 -0000	1.24
***************
*** 3269,3273 ****
  
  /**
!  * @fn openvrml::int32 openvrml::image::pixel(size_t index) const throw ()
   *
   * @brief Pixel value.
--- 3269,3273 ----
  
  /**
!  * @fn unsigned long openvrml::image::pixel(size_t index) const throw ()
   *
   * @brief Pixel value.
***************
*** 3281,3285 ****
  
  /**
!  * @fn void openvrml::image::pixel(size_t index, int32 value) throw ()
   *
   * @brief Set a pixel value.
--- 3281,3285 ----
  
  /**
!  * @fn void openvrml::image::pixel(size_t index, unsigned long value) throw ()
   *
   * @brief Set a pixel value.
***************
*** 3292,3296 ****
  
  /**
!  * @fn openvrml::int32 openvrml::image::pixel(size_t x, size_t y) const throw ()
   *
   * @brief Pixel value.
--- 3292,3296 ----
  
  /**
!  * @fn unsigned long openvrml::image::pixel(size_t x, size_t y) const throw ()
   *
   * @brief Pixel value.
***************
*** 3305,3309 ****
  
  /**
!  * @fn void openvrml::image::pixel(size_t x, size_t y, int32 value) throw ()
   *
   * @brief Set a pixel value.
--- 3305,3309 ----
  
  /**
!  * @fn void openvrml::image::pixel(size_t x, size_t y, unsigned long value) throw ()
   *
   * @brief Set a pixel value.

[openvrml-commit] openvrml/java Makefile.am,1.12,1.13

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

Update of /cvsroot/openvrml/openvrml/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18600/java

Modified Files:
	Makefile.am 
Log Message:
List Java class files in CLASSES variable.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/java/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.am	7 Oct 2005 22:05:51 -0000	1.12
--- Makefile.am	5 Dec 2005 05:18:55 -0000	1.13
***************
*** 6,40 ****
  javapkgdata_DATA = script.jar
  
! script.jar: vrml/InvalidEventInException.class \
! vrml/InvalidEventOutException.class vrml/InvalidExposedFieldException.class \
! vrml/InvalidFieldChangeException.class vrml/InvalidFieldException.class \
! vrml/InvalidRouteException.class vrml/InvalidVRMLSyntaxException.class \
! vrml/Browser.class vrml/Event.class vrml/Field.class vrml/ConstMField.class \
! vrml/MField.class vrml/ConstField.class vrml/BaseNode.class \
! vrml/field/SFBool.class vrml/field/SFColor.class vrml/field/SFFloat.class \
! vrml/field/SFImage.class vrml/field/SFInt32.class vrml/field/SFNode.class \
! vrml/field/SFRotation.class vrml/field/SFString.class vrml/field/SFTime.class \
! vrml/field/SFVec2f.class vrml/field/SFVec3f.class vrml/field/MFColor.class \
! vrml/field/MFFloat.class vrml/field/MFInt32.class vrml/field/MFNode.class \
! vrml/field/MFRotation.class vrml/field/MFString.class vrml/field/MFTime.class \
! vrml/field/MFVec2f.class vrml/field/MFVec3f.class \
! vrml/field/ConstSFBool.class vrml/field/ConstSFColor.class \
! vrml/field/ConstSFFloat.class vrml/field/ConstSFImage.class \
! vrml/field/ConstSFInt32.class vrml/field/ConstSFNode.class \
! vrml/field/ConstSFRotation.class vrml/field/ConstSFString.class \
! vrml/field/ConstSFTime.class vrml/field/ConstSFVec2f.class \
! vrml/field/ConstSFVec3f.class vrml/field/ConstMFColor.class \
! vrml/field/ConstMFFloat.class vrml/field/ConstMFInt32.class \
! vrml/field/ConstMFNode.class vrml/field/ConstMFRotation.class \
! vrml/field/ConstMFString.class vrml/field/ConstMFTime.class \
! vrml/field/ConstMFVec2f.class vrml/field/ConstMFVec3f.class \
! vrml/field/SFVec2d.class vrml/field/MFVec2f.class \
! vrml/field/ConstSFVec2d.class vrml/field/ConstMFVec2d.class \
! vrml/field/SFDouble.class vrml/field/MFDouble.class \
! vrml/field/ConstSFDouble.class vrml/field/ConstMFDouble.class \
! vrml/field/SFVec3d.class vrml/field/MFVec3f.class \
! vrml/field/ConstSFVec3d.class vrml/field/ConstMFVec3d.class
  
! vrml/node/Node.class vrml/node/Script.class
  	$(JAR) cvf $@ $^
  
--- 6,80 ----
  javapkgdata_DATA = script.jar
  
! CLASSES = \
!         vrml/InvalidEventInException.class \
!         vrml/InvalidEventOutException.class \
!         vrml/InvalidExposedFieldException.class \
!         vrml/InvalidFieldChangeException.class \
!         vrml/InvalidFieldException.class \
!         vrml/InvalidRouteException.class \
!         vrml/InvalidVRMLSyntaxException.class \
!         vrml/Browser.class \
!         vrml/Event.class \
!         vrml/Field.class \
!         vrml/ConstMField.class \
!         vrml/MField.class \
!         vrml/ConstField.class \
!         vrml/BaseNode.class \
!         vrml/field/SFBool.class \
!         vrml/field/SFColor.class \
!         vrml/field/SFFloat.class \
!         vrml/field/SFImage.class \
!         vrml/field/SFInt32.class \
!         vrml/field/SFNode.class \
!         vrml/field/SFRotation.class \
!         vrml/field/SFString.class \
!         vrml/field/SFTime.class \
!         vrml/field/SFVec2f.class \
!         vrml/field/SFVec3f.class \
!         vrml/field/MFColor.class \
!         vrml/field/MFFloat.class \
!         vrml/field/MFInt32.class \
!         vrml/field/MFNode.class \
!         vrml/field/MFRotation.class \
!         vrml/field/MFString.class \
!         vrml/field/MFTime.class \
!         vrml/field/MFVec2f.class \
!         vrml/field/MFVec3f.class \
!         vrml/field/ConstSFBool.class \
!         vrml/field/ConstSFColor.class \
!         vrml/field/ConstSFFloat.class \
!         vrml/field/ConstSFImage.class \
!         vrml/field/ConstSFInt32.class \
!         vrml/field/ConstSFNode.class \
!         vrml/field/ConstSFRotation.class \
!         vrml/field/ConstSFString.class \
!         vrml/field/ConstSFTime.class \
!         vrml/field/ConstSFVec2f.class \
!         vrml/field/ConstSFVec3f.class \
!         vrml/field/ConstMFColor.class \
!         vrml/field/ConstMFFloat.class \
!         vrml/field/ConstMFInt32.class \
!         vrml/field/ConstMFNode.class \
!         vrml/field/ConstMFRotation.class \
!         vrml/field/ConstMFString.class \
!         vrml/field/ConstMFTime.class \
!         vrml/field/ConstMFVec2f.class \
!         vrml/field/ConstMFVec3f.class \
!         vrml/field/SFVec2d.class \
!         vrml/field/MFVec2f.class \
!         vrml/field/ConstSFVec2d.class \
!         vrml/field/ConstMFVec2d.class \
!         vrml/field/SFDouble.class \
!         vrml/field/MFDouble.class \
!         vrml/field/ConstSFDouble.class \
!         vrml/field/ConstMFDouble.class \
!         vrml/field/SFVec3d.class \
!         vrml/field/MFVec3f.class \
!         vrml/field/ConstSFVec3d.class \
!         vrml/field/ConstMFVec3d.class \
!         vrml/node/Node.class \
!         vrml/node/Script.class
  
! script.jar: $(CLASSES)
  	$(JAR) cvf $@ $^
  

[openvrml-commit] openvrml ChangeLog,1.1070,1.1071

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

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

Modified Files:
	ChangeLog 
Log Message:
List Java class files in CLASSES variable.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1070
retrieving revision 1.1071
diff -C2 -d -r1.1070 -r1.1071
*** ChangeLog	1 Dec 2005 01:00:37 -0000	1.1070
--- ChangeLog	5 Dec 2005 05:18:54 -0000	1.1071
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-12-05 Braden McDaniel  <br...@en...>
+ 
+ 	* java/Makefile.am: List Java class files in CLASSES variable.
+ 
  2005-11-30 Braden McDaniel  <br...@en...>