Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27658/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g browser.cpp browser.h node.cpp node.h node_impl_util.cpp node_impl_util.h script.cpp script.h vrml97node.cpp vrml97node.h x3d_cad_geometry.cpp x3d_cad_geometry.h x3d_core.cpp x3d_core.h x3d_dis.cpp x3d_dis.h x3d_environmental_effects.cpp x3d_environmental_effects.h x3d_event_utilities.cpp x3d_event_utilities.h x3d_geometry2d.cpp x3d_geometry2d.h x3d_geospatial.cpp x3d_geospatial.h x3d_grouping.cpp x3d_grouping.h x3d_hanim.cpp x3d_hanim.h x3d_interpolation.cpp x3d_interpolation.h x3d_key_device_sensor.cpp x3d_key_device_sensor.h x3d_networking.cpp x3d_networking.h x3d_nurbs.cpp x3d_nurbs.h x3d_rendering.cpp x3d_rendering.h x3d_shape.cpp x3d_shape.h x3d_texturing.cpp x3d_texturing.h Log Message: Renamed "node_class" to "node_metatype". Index: x3d_grouping.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_grouping.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_grouping.cpp 20 Apr 2006 05:24:11 -0000 1.1 --- x3d_grouping.cpp 18 May 2006 04:11:31 -0000 1.2 *************** *** 39,48 **** * @brief Class object for StaticGroup nodes. */ ! class OPENVRML_LOCAL static_group_class : public node_class { public: static const char * const id; ! explicit static_group_class(openvrml::browser & browser); ! virtual ~static_group_class() OPENVRML_NOTHROW; private: --- 39,48 ---- * @brief Class object for StaticGroup nodes. */ ! class OPENVRML_LOCAL static_group_metatype : public node_metatype { public: static const char * const id; ! explicit static_group_metatype(openvrml::browser & browser); ! virtual ~static_group_metatype() OPENVRML_NOTHROW; private: *************** *** 54,63 **** } ! void register_grouping_node_classes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_class; ! b.add_node_class(static_group_class::id, ! shared_ptr<node_class>(new static_group_class(b))); } --- 54,64 ---- } ! void register_grouping_node_metatypes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_metatype; ! b.add_node_metatype(static_group_metatype::id, ! shared_ptr<node_metatype>( ! new static_group_metatype(b))); } *************** *** 69,73 **** public grouping_node { ! friend class static_group_class; mfnode children_; --- 70,74 ---- public grouping_node { ! friend class static_group_metatype; mfnode children_; *************** *** 102,108 **** /** ! * @brief @c node_class identifier. */ ! const char * const static_group_class::id = "urn:X-openvrml:node:StaticGroup"; --- 103,109 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const static_group_metatype::id = "urn:X-openvrml:node:StaticGroup"; *************** *** 110,117 **** * @brief Construct. * ! * @param browser the browser associated with this static_group_class. */ ! static_group_class::static_group_class(openvrml::browser & browser): ! node_class(static_group_class::id, browser) {} --- 111,118 ---- * @brief Construct. * ! * @param browser the browser associated with this static_group_metatype. */ ! static_group_metatype::static_group_metatype(openvrml::browser & browser): ! node_metatype(static_group_metatype::id, browser) {} *************** *** 119,123 **** * @brief Destroy. */ ! static_group_class::~static_group_class() OPENVRML_NOTHROW {} --- 120,124 ---- * @brief Destroy. */ ! static_group_metatype::~static_group_metatype() OPENVRML_NOTHROW {} *************** *** 131,139 **** * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by static_group_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! static_group_class::do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) --- 132,140 ---- * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by static_group_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! static_group_metatype::do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) *************** *** 215,219 **** /** ! * @var static_group_node::StaticGroup_class * * @brief Class object for StaticGroup nodes. --- 216,220 ---- /** ! * @var static_group_node::static_group_metatype * * @brief Class object for StaticGroup nodes. Index: x3d_hanim.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_hanim.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** x3d_hanim.cpp 16 Apr 2006 08:22:19 -0000 1.2 --- x3d_hanim.cpp 18 May 2006 04:11:31 -0000 1.3 *************** *** 39,48 **** * @brief Class object for HAnimDisplacer nodes. */ ! class OPENVRML_LOCAL hanim_displacer_class : public node_class { public: static const char * const id; ! explicit hanim_displacer_class(openvrml::browser & browser); ! virtual ~hanim_displacer_class() OPENVRML_NOTHROW; private: --- 39,48 ---- * @brief Class object for HAnimDisplacer nodes. */ ! class OPENVRML_LOCAL hanim_displacer_metatype : public node_metatype { public: static const char * const id; ! explicit hanim_displacer_metatype(openvrml::browser & browser); ! virtual ~hanim_displacer_metatype() OPENVRML_NOTHROW; private: *************** *** 57,66 **** * @brief Class object for HAnimHumanoid nodes. */ ! class OPENVRML_LOCAL hanim_humanoid_class : public node_class { public: static const char * const id; ! explicit hanim_humanoid_class(openvrml::browser & browser); ! virtual ~hanim_humanoid_class() OPENVRML_NOTHROW; private: --- 57,66 ---- * @brief Class object for HAnimHumanoid nodes. */ ! class OPENVRML_LOCAL hanim_humanoid_metatype : public node_metatype { public: static const char * const id; ! explicit hanim_humanoid_metatype(openvrml::browser & browser); ! virtual ~hanim_humanoid_metatype() OPENVRML_NOTHROW; private: *************** *** 75,84 **** * @brief Class object for HAnimJoint nodes. */ ! class OPENVRML_LOCAL hanim_joint_class : public node_class { public: static const char * const id; ! explicit hanim_joint_class(openvrml::browser & browser); ! virtual ~hanim_joint_class() OPENVRML_NOTHROW; private: --- 75,84 ---- * @brief Class object for HAnimJoint nodes. */ ! class OPENVRML_LOCAL hanim_joint_metatype : public node_metatype { public: static const char * const id; ! explicit hanim_joint_metatype(openvrml::browser & browser); ! virtual ~hanim_joint_metatype() OPENVRML_NOTHROW; private: *************** *** 93,102 **** * @brief Class object for HAnimSegment nodes. */ ! class OPENVRML_LOCAL hanim_segment_class : public node_class { public: static const char * const id; ! explicit hanim_segment_class(openvrml::browser & browser); ! virtual ~hanim_segment_class() OPENVRML_NOTHROW; private: --- 93,102 ---- * @brief Class object for HAnimSegment nodes. */ ! class OPENVRML_LOCAL hanim_segment_metatype : public node_metatype { public: static const char * const id; ! explicit hanim_segment_metatype(openvrml::browser & browser); ! virtual ~hanim_segment_metatype() OPENVRML_NOTHROW; private: *************** *** 111,120 **** * @brief Class object for HAnimSite nodes. */ ! class OPENVRML_LOCAL hanim_site_class : public node_class { public: static const char * const id; ! explicit hanim_site_class(openvrml::browser & browser); ! virtual ~hanim_site_class() OPENVRML_NOTHROW; private: --- 111,120 ---- * @brief Class object for HAnimSite nodes. */ ! class OPENVRML_LOCAL hanim_site_metatype : public node_metatype { public: static const char * const id; ! explicit hanim_site_metatype(openvrml::browser & browser); ! virtual ~hanim_site_metatype() OPENVRML_NOTHROW; private: *************** *** 126,143 **** } ! void register_hanim_node_classes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_class; ! b.add_node_class(hanim_displacer_class::id, ! shared_ptr<node_class>(new hanim_displacer_class(b))); ! b.add_node_class(hanim_humanoid_class::id, ! shared_ptr<node_class>(new hanim_humanoid_class(b))); ! b.add_node_class(hanim_joint_class::id, ! shared_ptr<node_class>(new hanim_joint_class(b))); ! b.add_node_class(hanim_segment_class::id, ! shared_ptr<node_class>(new hanim_segment_class(b))); ! b.add_node_class(hanim_site_class::id, ! shared_ptr<node_class>(new hanim_site_class(b))); } --- 126,147 ---- } ! void register_hanim_node_metatypes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_metatype; ! b.add_node_metatype(hanim_displacer_metatype::id, ! shared_ptr<node_metatype>( ! new hanim_displacer_metatype(b))); ! b.add_node_metatype(hanim_humanoid_metatype::id, ! shared_ptr<node_metatype>( ! new hanim_humanoid_metatype(b))); ! b.add_node_metatype(hanim_joint_metatype::id, ! shared_ptr<node_metatype>( ! new hanim_joint_metatype(b))); ! b.add_node_metatype(hanim_segment_metatype::id, ! shared_ptr<node_metatype>( ! new hanim_segment_metatype(b))); ! b.add_node_metatype(hanim_site_metatype::id, ! shared_ptr<node_metatype>(new hanim_site_metatype(b))); } *************** *** 148,152 **** public abstract_node<hanim_displacer_node> { ! friend class hanim_displacer_class; exposedfield<mfint32> coord_index_; --- 152,156 ---- public abstract_node<hanim_displacer_node> { ! friend class hanim_displacer_metatype; exposedfield<mfint32> coord_index_; *************** *** 165,169 **** public child_node { ! friend class hanim_humanoid_class; exposedfield<sfvec3f> center_; --- 169,173 ---- public child_node { ! friend class hanim_humanoid_metatype; exposedfield<sfvec3f> center_; *************** *** 196,200 **** public child_node { ! friend class hanim_joint_class; class add_children_listener : public event_listener_base<self_t>, --- 200,204 ---- public child_node { ! friend class hanim_joint_metatype; class add_children_listener : public event_listener_base<self_t>, *************** *** 251,255 **** public child_node { ! friend class hanim_segment_class; class add_children_listener : public event_listener_base<self_t>, --- 255,259 ---- public child_node { ! friend class hanim_segment_metatype; class add_children_listener : public event_listener_base<self_t>, *************** *** 299,308 **** public child_node { ! friend class hanim_site_class; ! class add_children_listener : ! public event_listener_base<self_t>, ! public mfnode_listener ! { public: explicit add_children_listener(self_t & node); --- 303,310 ---- public child_node { ! friend class hanim_site_metatype; ! class add_children_listener : public event_listener_base<self_t>, ! public mfnode_listener { public: explicit add_children_listener(self_t & node); *************** *** 347,353 **** /** ! * @brief @c node_class identifier. */ ! const char * const hanim_displacer_class::id = "urn:X-openvrml:node:HAnimDisplacer"; --- 349,355 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const hanim_displacer_metatype::id = "urn:X-openvrml:node:HAnimDisplacer"; *************** *** 356,363 **** * * @param browser the @c browser associated with this ! * @c hanim_displacer_class. */ ! hanim_displacer_class::hanim_displacer_class(openvrml::browser & browser): ! node_class(hanim_displacer_class::id, browser) {} --- 358,365 ---- * * @param browser the @c browser associated with this ! * @c hanim_displacer_metatype. */ ! hanim_displacer_metatype::hanim_displacer_metatype(openvrml::browser & browser): ! node_metatype(hanim_displacer_metatype::id, browser) {} *************** *** 365,369 **** * @brief Destroy. */ ! hanim_displacer_class::~hanim_displacer_class() OPENVRML_NOTHROW {} --- 367,371 ---- * @brief Destroy. */ ! hanim_displacer_metatype::~hanim_displacer_metatype() OPENVRML_NOTHROW {} *************** *** 374,386 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating HAnimDisplacer nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_displacer_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_displacer_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 376,389 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating HAnimDisplacer nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_displacer_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_displacer_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 502,508 **** /** ! * @brief @c node_class identifier. */ ! const char * const hanim_humanoid_class::id = "urn:X-openvrml:node:HAnimHumanoid"; --- 505,511 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const hanim_humanoid_metatype::id = "urn:X-openvrml:node:HAnimHumanoid"; *************** *** 511,518 **** * * @param browser the @c browser associated with this ! * @c hanim_humanoid_class. */ ! hanim_humanoid_class::hanim_humanoid_class(openvrml::browser & browser): ! node_class(hanim_humanoid_class::id, browser) {} --- 514,521 ---- * * @param browser the @c browser associated with this ! * @c hanim_humanoid_metatype. */ ! hanim_humanoid_metatype::hanim_humanoid_metatype(openvrml::browser & browser): ! node_metatype(hanim_humanoid_metatype::id, browser) {} *************** *** 520,524 **** * @brief Destroy. */ ! hanim_humanoid_class::~hanim_humanoid_class() OPENVRML_NOTHROW {} --- 523,527 ---- * @brief Destroy. */ ! hanim_humanoid_metatype::~hanim_humanoid_metatype() OPENVRML_NOTHROW {} *************** *** 532,541 **** * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_humanoid_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_humanoid_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 535,545 ---- * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_humanoid_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_humanoid_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 905,911 **** /** ! * @brief @c node_class identifier. */ ! const char * const hanim_joint_class::id = "urn:X-openvrml:node:HAnimJoint"; --- 909,915 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const hanim_joint_metatype::id = "urn:X-openvrml:node:HAnimJoint"; *************** *** 913,920 **** * @brief Construct. * ! * @param browser the @c browser associated with this @c hanim_joint_class. */ ! hanim_joint_class::hanim_joint_class(openvrml::browser & browser): ! node_class(hanim_joint_class::id, browser) {} --- 917,924 ---- * @brief Construct. * ! * @param browser the @c browser associated with this @c hanim_joint_metatype. */ ! hanim_joint_metatype::hanim_joint_metatype(openvrml::browser & browser): ! node_metatype(hanim_joint_metatype::id, browser) {} *************** *** 922,926 **** * @brief Destroy. */ ! hanim_joint_class::~hanim_joint_class() OPENVRML_NOTHROW {} --- 926,930 ---- * @brief Destroy. */ ! hanim_joint_metatype::~hanim_joint_metatype() OPENVRML_NOTHROW {} *************** *** 931,943 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating HAnimJoint nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_joint_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_joint_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 935,948 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating HAnimJoint nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_joint_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_joint_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 1291,1297 **** /** ! * @brief @c node_class identifier. */ ! const char * const hanim_segment_class::id = "urn:X-openvrml:node:HAnimSegment"; --- 1296,1302 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const hanim_segment_metatype::id = "urn:X-openvrml:node:HAnimSegment"; *************** *** 1300,1307 **** * * @param browser the @c browser associated with this ! * @c hanim_segment_class. */ ! hanim_segment_class::hanim_segment_class(openvrml::browser & browser): ! node_class(hanim_segment_class::id, browser) {} --- 1305,1312 ---- * * @param browser the @c browser associated with this ! * @c hanim_segment_metatype. */ ! hanim_segment_metatype::hanim_segment_metatype(openvrml::browser & browser): ! node_metatype(hanim_segment_metatype::id, browser) {} *************** *** 1309,1313 **** * @brief Destroy. */ ! hanim_segment_class::~hanim_segment_class() OPENVRML_NOTHROW {} --- 1314,1318 ---- * @brief Destroy. */ ! hanim_segment_metatype::~hanim_segment_metatype() OPENVRML_NOTHROW {} *************** *** 1318,1330 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating HAnimSegment nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_segment_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_segment_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 1323,1336 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating HAnimSegment nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_segment_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_segment_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 1544,1550 **** /** ! * @brief @c node_class identifier. */ ! const char * const hanim_site_class::id = "urn:X-openvrml:node:HAnimSite"; --- 1550,1556 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const hanim_site_metatype::id = "urn:X-openvrml:node:HAnimSite"; *************** *** 1552,1559 **** * @brief Construct. * ! * @param browser the @c browser associated with this @c hanim_site_class. */ ! hanim_site_class::hanim_site_class(openvrml::browser & browser): ! node_class(hanim_site_class::id, browser) {} --- 1558,1565 ---- * @brief Construct. * ! * @param browser the @c browser associated with this @c hanim_site_metatype. */ ! hanim_site_metatype::hanim_site_metatype(openvrml::browser & browser): ! node_metatype(hanim_site_metatype::id, browser) {} *************** *** 1561,1565 **** * @brief Destroy. */ ! hanim_site_class::~hanim_site_class() OPENVRML_NOTHROW {} --- 1567,1571 ---- * @brief Destroy. */ ! hanim_site_metatype::~hanim_site_metatype() OPENVRML_NOTHROW {} *************** *** 1570,1582 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating HAnimSite nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_site_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_site_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 1576,1589 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating HAnimSite nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by hanim_site_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! hanim_site_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 1803,1807 **** /** ! * @var hanim_displacer_node::HAnimDisplacer_class * * @brief Class object for HAnimDisplacer nodes. --- 1810,1814 ---- /** ! * @var hanim_displacer_node::hanim_displacer_metatype * * @brief Class object for HAnimDisplacer nodes. *************** *** 1864,1868 **** /** ! * @var hanim_humanoid_node::HAnimHumanoid_class * * @brief Class object for HAnimHumanoid nodes. --- 1871,1875 ---- /** ! * @var hanim_humanoid_node::hanim_humanoid_metatype * * @brief Class object for HAnimHumanoid nodes. *************** *** 1982,1986 **** * * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ hanim_humanoid_node:: --- 1989,1993 ---- * * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ hanim_humanoid_node:: *************** *** 2024,2028 **** /** ! * @var hanim_joint_node::HAnimJoint_class * * @brief Class object for HAnimJoint nodes. --- 2031,2035 ---- /** ! * @var hanim_joint_node::hanim_joint_metatype * * @brief Class object for HAnimJoint nodes. *************** *** 2220,2224 **** /** ! * @var hanim_segment_node::HAnimSegment_class * * @brief Class object for HAnimSegment nodes. --- 2227,2231 ---- /** ! * @var hanim_segment_node::hanim_segment_metatype * * @brief Class object for HAnimSegment nodes. *************** *** 2367,2371 **** /** ! * @var hanim_site_node::HAnimSite_class * * @brief Class object for HAnimSite nodes. --- 2374,2378 ---- /** ! * @var hanim_site_node::hanim_site_metatype * * @brief Class object for HAnimSite nodes. Index: vrml97node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** vrml97node.cpp 17 May 2006 07:59:50 -0000 1.104 --- vrml97node.cpp 18 May 2006 04:11:31 -0000 1.105 *************** *** 64,73 **** * @brief Class object for Anchor nodes. */ ! class OPENVRML_LOCAL anchor_class : public node_class { public: static const char * const id; ! explicit anchor_class(openvrml::browser & browser); ! virtual ~anchor_class() OPENVRML_NOTHROW; private: [...7682 lines suppressed...] ! * not supported by cad_assembly_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! cad_assembly_metatype:: do_create_type(const std::string & id, const node_interface_set & interfaces) const *************** *** 27814,27818 **** /** ! * @var cad_assembly_node::cad_assembly_class * * @brief Class object for Group nodes. --- 27842,27846 ---- /** ! * @var cad_assembly_node::cad_assembly_metatype * * @brief Class object for Group nodes. Index: x3d_key_device_sensor.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_key_device_sensor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_key_device_sensor.h 26 Mar 2006 07:42:14 -0000 1.1 --- x3d_key_device_sensor.h 18 May 2006 04:11:31 -0000 1.2 *************** *** 6,10 **** } ! extern "C" void register_key_device_sensor_node_classes(openvrml::browser & b); # endif --- 6,10 ---- } ! extern "C" void register_key_device_sensor_node_metatypes(openvrml::browser & b); # endif Index: x3d_cad_geometry.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_cad_geometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_cad_geometry.cpp 17 May 2006 07:59:50 -0000 1.1 --- x3d_cad_geometry.cpp 18 May 2006 04:11:31 -0000 1.2 *************** *** 39,53 **** * @brief Class object for CADFace nodes. */ ! class OPENVRML_LOCAL cad_face_class : public node_class { public: static const char * const id; ! explicit cad_face_class(openvrml::browser & browser); ! virtual ~cad_face_class() OPENVRML_NOTHROW; private: virtual const boost::shared_ptr<node_type> ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc); }; --- 39,53 ---- * @brief Class object for CADFace nodes. */ ! class OPENVRML_LOCAL cad_face_metatype : public node_metatype { public: static const char * const id; ! explicit cad_face_metatype(openvrml::browser & browser); ! virtual ~cad_face_metatype() OPENVRML_NOTHROW; private: virtual const boost::shared_ptr<node_type> ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc); }; *************** *** 57,86 **** * @brief Class object for IndexedQuadSet and QuadSet nodes. */ ! class OPENVRML_LOCAL quad_set_class : public node_class { public: static const char * const id; ! explicit quad_set_class(openvrml::browser & browser); ! virtual ~quad_set_class() OPENVRML_NOTHROW; private: virtual const boost::shared_ptr<node_type> ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc); }; } ! void register_cad_geometry_node_classes(openvrml::browser & b) { ! using openvrml::node_class; using boost::shared_ptr; ! b.add_node_class(cad_face_class::id, ! shared_ptr<node_class>(new cad_face_class(b))); ! //NOTE: This has been moved to vrml97node.cpp for the time being. ! //b.add_node_class("urn:X-openvrml:node:CADLayer", ! // shared_ptr<node_class>(new cad_layer_class(b))); ! b.add_node_class(quad_set_class::id, ! shared_ptr<node_class>(new quad_set_class(b))); } --- 57,83 ---- * @brief Class object for IndexedQuadSet and QuadSet nodes. */ ! class OPENVRML_LOCAL quad_set_metatype : public node_metatype { public: static const char * const id; ! explicit quad_set_metatype(openvrml::browser & browser); ! virtual ~quad_set_metatype() OPENVRML_NOTHROW; private: virtual const boost::shared_ptr<node_type> ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc); }; } ! void register_cad_geometry_node_metatypes(openvrml::browser & b) { ! using openvrml::node_metatype; using boost::shared_ptr; ! b.add_node_metatype(cad_face_metatype::id, ! shared_ptr<node_metatype>(new cad_face_metatype(b))); ! b.add_node_metatype(quad_set_metatype::id, ! shared_ptr<node_metatype>(new quad_set_metatype(b))); } *************** *** 90,94 **** class OPENVRML_LOCAL cad_face_node : public abstract_node<cad_face_node>, public grouping_node { ! friend class cad_face_class; exposedfield<sfstring> name_; --- 87,91 ---- class OPENVRML_LOCAL cad_face_node : public abstract_node<cad_face_node>, public grouping_node { ! friend class cad_face_metatype; exposedfield<sfstring> name_; *************** *** 115,130 **** class OPENVRML_LOCAL quad_set_node : public abstract_node<quad_set_node>, public geometry_node { ! friend class quad_set_class; class set_index_listener : public event_listener_base<self_t>, public mfint32_listener { ! public: ! explicit set_index_listener(self_t & node); ! virtual ~set_index_listener() OPENVRML_NOTHROW; ! private: ! virtual void do_process_event(const mfint32 & fraction, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); }; --- 112,127 ---- class OPENVRML_LOCAL quad_set_node : public abstract_node<quad_set_node>, public geometry_node { ! friend class quad_set_metatype; class set_index_listener : public event_listener_base<self_t>, public mfint32_listener { ! public: ! explicit set_index_listener(self_t & node); ! virtual ~set_index_listener() OPENVRML_NOTHROW; ! private: ! virtual void do_process_event(const mfint32 & fraction, ! double timestamp) ! OPENVRML_THROW1(std::bad_alloc); }; *************** *** 151,155 **** private: virtual const openvrml::bounding_volume & ! do_bounding_volume() const; virtual viewer::object_t do_render_geometry(openvrml::viewer & viewer, --- 148,152 ---- private: virtual const openvrml::bounding_volume & ! do_bounding_volume() const; virtual viewer::object_t do_render_geometry(openvrml::viewer & viewer, *************** *** 161,175 **** /** ! * @brief @c node_class identifier. */ ! const char * const cad_face_class::id = "urn:X-openvrml:node:CADFace"; /** * @brief Construct. * ! * @param browser the browser associated with this cad_face_class. */ ! cad_face_class::cad_face_class(openvrml::browser & browser): ! node_class(cad_face_class::id, browser) {} --- 158,172 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const cad_face_metatype::id = "urn:X-openvrml:node:CADFace"; /** * @brief Construct. * ! * @param browser the browser associated with this cad_face_metatype. */ ! cad_face_metatype::cad_face_metatype(openvrml::browser & browser): ! node_metatype(cad_face_metatype::id, browser) {} *************** *** 177,181 **** * @brief Destroy. */ ! cad_face_class::~cad_face_class() OPENVRML_NOTHROW {} --- 174,178 ---- * @brief Destroy. */ ! cad_face_metatype::~cad_face_metatype() OPENVRML_NOTHROW {} *************** *** 186,198 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating CADFace nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by cad_face_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! cad_face_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 183,196 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating CADFace nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by cad_face_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! cad_face_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 276,290 **** /** ! * @brief @c node_class identifier. */ ! const char * const quad_set_class::id = "urn:X-openvrml:node:QuadSet"; /** * @brief Construct. * ! * @param browser the browser associated with this quad_set_class. */ ! quad_set_class::quad_set_class(openvrml::browser & browser): ! node_class(cad_face_class::id, browser) {} --- 274,288 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const quad_set_metatype::id = "urn:X-openvrml:node:QuadSet"; /** * @brief Construct. * ! * @param browser the browser associated with this quad_set_metatype. */ ! quad_set_metatype::quad_set_metatype(openvrml::browser & browser): ! node_metatype(cad_face_metatype::id, browser) {} *************** *** 292,296 **** * @brief Destroy. */ ! quad_set_class::~quad_set_class() OPENVRML_NOTHROW {} --- 290,294 ---- * @brief Destroy. */ ! quad_set_metatype::~quad_set_metatype() OPENVRML_NOTHROW {} *************** *** 301,313 **** * @param interfaces the interfaces for the new node_type. * ! * @return a node_type_ptr to a node_type capable of creating IndexedQuadSet nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by quad_set_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! quad_set_class::do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { --- 299,312 ---- * @param interfaces the interfaces for the new node_type. * ! * @return a @c node_type capable of creating IndexedQuadSet nodes. * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by quad_set_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! quad_set_metatype:: ! do_create_type(const std::string & id, ! const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) { *************** *** 495,499 **** /** ! * @var cad_face_node::CADFace_class * * @brief Class object for CADFace nodes. --- 494,498 ---- /** ! * @var cad_face_node::cad_face_metatype * * @brief Class object for CADFace nodes. *************** *** 501,505 **** /** ! * @var abstract_node<self_t>::exposedfield<sfstring> >( cad_face_node::name_ * * @brief name exposedField --- 500,504 ---- /** ! * @var abstract_node<self_t>::exposedfield<sfstring> cad_face_node::name_ * * @brief name exposedField *************** *** 507,511 **** /** ! * @var abstract_node<self_t>::exposedfield<sfnode> > cad_face_node::shape_ * * @brief shape exposedField --- 506,510 ---- /** ! * @var abstract_node<self_t>::exposedfield<sfnode> cad_face_node::shape_ * * @brief shape exposedField *************** *** 570,585 **** * * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ cad_face_node:: cad_face_node(const node_type & type, ! const boost::shared_ptr<openvrml::scope> & scope): ! node(type, scope), ! bounded_volume_node(type, scope), ! child_node(type, scope), ! abstract_node<self_t>(type, scope), ! grouping_node(type, scope), ! name_(*this), ! shape_(*this) {} --- 569,584 ---- * * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ cad_face_node:: cad_face_node(const node_type & type, ! const boost::shared_ptr<openvrml::scope> & scope): ! node(type, scope), ! bounded_volume_node(type, scope), ! child_node(type, scope), ! abstract_node<self_t>(type, scope), ! grouping_node(type, scope), ! name_(*this), ! shape_(*this) {} *************** *** 597,601 **** /** ! * @var quad_set_node::IndexedQuadSet_class * * @brief Class object for IndexedQuadSet nodes. --- 596,600 ---- /** ! * @var quad_set_node::indexed_quad_set_metatype * * @brief Class object for IndexedQuadSet nodes. *************** *** 683,705 **** * @brief Construct. * ! * @param type the node_type associated with this node. ! * @param scope the scope to which the node belongs. */ quad_set_node:: quad_set_node(const node_type & type, ! const boost::shared_ptr<openvrml::scope> & scope): ! node(type, scope), ! bounded_volume_node(type, scope), ! abstract_node<self_t>(type, scope), ! geometry_node(type, scope), ! set_index_listener_(*this), ! color_(*this), ! coord_(*this), ! normal_(*this), ! tex_coord_(*this), ! ccw_(true), ! color_per_vertex_(true), ! normal_per_vertex_(true), ! solid_(true) {} --- 682,704 ---- * @brief Construct. * ! * @param type the @c node_type associated with this node. ! * @param scope the @c scope to which the node belongs. */ quad_set_node:: quad_set_node(const node_type & type, ! const boost::shared_ptr<openvrml::scope> & scope): ! node(type, scope), ! bounded_volume_node(type, scope), ! abstract_node<self_t>(type, scope), ! geometry_node(type, scope), ! set_index_listener_(*this), ! color_(*this), ! coord_(*this), ! normal_(*this), ! tex_coord_(*this), ! ccw_(true), ! color_per_vertex_(true), ! normal_per_vertex_(true), ! solid_(true) {} *************** *** 786,789 **** && this->tex_coord_.sfnode::value()->modified()); } - } --- 785,787 ---- Index: x3d_networking.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_networking.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_networking.h 28 Mar 2006 06:56:17 -0000 1.1 --- x3d_networking.h 18 May 2006 04:11:31 -0000 1.2 *************** *** 27,31 **** } ! extern "C" void register_networking_node_classes(openvrml::browser & b); # endif --- 27,31 ---- } ! extern "C" void register_networking_node_metatypes(openvrml::browser & b); # endif Index: x3d_event_utilities.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_event_utilities.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_event_utilities.h 26 Mar 2006 07:42:14 -0000 1.1 --- x3d_event_utilities.h 18 May 2006 04:11:31 -0000 1.2 *************** *** 27,31 **** } ! extern "C" void register_event_utilities_node_classes(openvrml::browser & b); # endif --- 27,31 ---- } ! extern "C" void register_event_utilities_node_metatypes(openvrml::browser & b); # endif Index: x3d_key_device_sensor.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_key_device_sensor.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** x3d_key_device_sensor.cpp 16 Apr 2006 08:22:19 -0000 1.4 --- x3d_key_device_sensor.cpp 18 May 2006 04:11:31 -0000 1.5 *************** *** 39,48 **** * @brief Class object for KeySensor nodes. */ ! class OPENVRML_LOCAL key_sensor_class : public node_class { public: static const char * const id; ! explicit key_sensor_class(openvrml::browser & browser); ! virtual ~key_sensor_class() OPENVRML_NOTHROW; private: --- 39,48 ---- * @brief Class object for KeySensor nodes. */ ! class OPENVRML_LOCAL key_sensor_metatype : public node_metatype { public: static const char * const id; ! explicit key_sensor_metatype(openvrml::browser & browser); ! virtual ~key_sensor_metatype() OPENVRML_NOTHROW; private: *************** *** 57,66 **** * @brief Class object for StringSensor nodes. */ ! class OPENVRML_LOCAL string_sensor_class : public node_class { public: static const char * const id; ! explicit string_sensor_class(openvrml::browser & browser); ! virtual ~string_sensor_class() OPENVRML_NOTHROW; private: --- 57,66 ---- * @brief Class object for StringSensor nodes. */ ! class OPENVRML_LOCAL string_sensor_metatype : public node_metatype { public: static const char * const id; ! explicit string_sensor_metatype(openvrml::browser & browser); ! virtual ~string_sensor_metatype() OPENVRML_NOTHROW; private: *************** *** 72,83 **** } ! void register_key_device_sensor_node_classes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_class; ! b.add_node_class(key_sensor_class::id, ! shared_ptr<node_class>(new key_sensor_class(b))); ! b.add_node_class(string_sensor_class::id, ! shared_ptr<node_class>(new string_sensor_class(b))); } --- 72,83 ---- } ! void register_key_device_sensor_node_metatypes(openvrml::browser & b) { using boost::shared_ptr; ! using openvrml::node_metatype; ! b.add_node_metatype(key_sensor_metatype::id, ! shared_ptr<node_metatype>(new key_sensor_metatype(b))); ! b.add_node_metatype(string_sensor_metatype::id, ! shared_ptr<node_metatype>(new string_sensor_metatype(b))); } *************** *** 88,92 **** class OPENVRML_LOCAL key_sensor_node : public abstract_node<key_sensor_node>, public child_node { ! friend class key_sensor_class; exposedfield<sfbool> enabled_; --- 88,92 ---- class OPENVRML_LOCAL key_sensor_node : public abstract_node<key_sensor_node>, public child_node { ! friend class key_sensor_metatype; exposedfield<sfbool> enabled_; *************** *** 119,123 **** public child_node { ! friend class string_sensor_class; exposedfield<sfbool> deletion_allowed_; --- 119,123 ---- public child_node { ! friend class string_sensor_metatype; exposedfield<sfbool> deletion_allowed_; *************** *** 138,144 **** /** ! * @brief @c node_class identifier. */ ! const char * const key_sensor_class::id = "urn:X-openvrml:node:KeySensor"; --- 138,144 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const key_sensor_metatype::id = "urn:X-openvrml:node:KeySensor"; *************** *** 146,153 **** * @brief Construct. * ! * @param browser the @c browser associated with this @c key_sensor_class. */ ! key_sensor_class::key_sensor_class(openvrml::browser & browser): ! node_class(key_sensor_class::id, browser) {} --- 146,153 ---- * @brief Construct. * ! * @param browser the @c browser associated with this @c key_sensor_metatype. */ ! key_sensor_metatype::key_sensor_metatype(openvrml::browser & browser): ! node_metatype(key_sensor_metatype::id, browser) {} *************** *** 155,159 **** * @brief Destroy. */ ! key_sensor_class::~key_sensor_class() OPENVRML_NOTHROW {} --- 155,159 ---- * @brief Destroy. */ ! key_sensor_metatype::~key_sensor_metatype() OPENVRML_NOTHROW {} *************** *** 167,175 **** * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by key_sensor_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! key_sensor_class::do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) --- 167,175 ---- * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by key_sensor_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! key_sensor_metatype::do_create_type(const std::string & id, const node_interface_set & interfaces) const OPENVRML_THROW2(unsupported_interface, std::bad_alloc) *************** *** 328,332 **** /** ! * @var key_sensor_node::key_sensor_class * * @brief Class object for KeySensor nodes. --- 328,332 ---- /** ! * @var key_sensor_node::key_sensor_metatype * * @brief Class object for KeySensor nodes. *************** *** 420,426 **** /** ! * @brief @c node_class identifier. */ ! const char * const string_sensor_class::id = "urn:X-openvrml:node:StringSensor"; --- 420,426 ---- /** ! * @brief @c node_metatype identifier. */ ! const char * const string_sensor_metatype::id = "urn:X-openvrml:node:StringSensor"; *************** *** 429,436 **** * * @param browser the @c browser associated with this ! * @c string_sensor_class. */ ! string_sensor_class::string_sensor_class(openvrml::browser & browser): ! node_class(string_sensor_class::id, browser) {} --- 429,436 ---- * * @param browser the @c browser associated with this ! * @c string_sensor_metatype. */ ! string_sensor_metatype::string_sensor_metatype(openvrml::browser & browser): ! node_metatype(string_sensor_metatype::id, browser) {} *************** *** 438,442 **** * @brief Destroy. */ ! string_sensor_class::~string_sensor_class() OPENVRML_NOTHROW {} --- 438,442 ---- * @brief Destroy. */ ! string_sensor_metatype::~string_sensor_metatype() OPENVRML_NOTHROW {} *************** *** 450,458 **** * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by string_sensor_class. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! string_sensor_class:: do_create_type(const std::string & id, const node_interface_set & interfaces) const --- 450,458 ---- * * @exception unsupported_interface if @p interfaces includes an interface ! * not supported by string_sensor_metatype. * @exception std::bad_alloc if memory allocation fails. */ const boost::shared_ptr<openvrml::node_type> ! string_sensor_metatype:: do_create_type(const std::string & id, const node_interface_set & interfaces) const *************** *** 576,580 **** /** ! * @var string_sensor_node::StringSensor_class * * @brief Class object for StringSensor nodes. --- 576,580 ---- /** ! * @var string_sensor_node::string_sensor_metatype * * @brief Class object for StringSensor nodes. Index: x3d_nurbs.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_nurbs.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** x3d_nurbs.cpp 18 Apr 2006 06:47:53 -0000 1.3 --- x3d_nurbs.cpp 18 May 2006 04:11:31 -0000 1.4 *************** *** 39,48 **** * @brief Class object for Contour2D nodes. */ ! class OPENVRML_LOCAL contour2d_class : public node_class { public: static const char * const id; ! explicit contour2d_class(openvrml::browser & browser); ! virtual ~contour2d_class() OPENVRML_NOTHROW; private: [...2123 lines suppressed...] --- 4393,4398 ---- * @brief Destroy. */ ! nurbs_texture_coordinate_node::~nurbs_texture_coordinate_node() ! OPENVRML_NOTHROW {} *************** *** 4374,4378 **** /** ! * @var nurbs_trimmed_surface_node::NurbsTrimmedSurface_class * * @brief Class object for NurbsTrimmedSurface nodes. --- 4405,4409 ---- /** ! * @var nurbs_trimmed_surface_node::nurbs_trimmed_surface_metatype * * @brief Class object for NurbsTrimmedSurface nodes. Index: x3d_shape.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_shape.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_shape.h 28 Mar 2006 06:56:17 -0000 1.1 --- x3d_shape.h 18 May 2006 04:11:31 -0000 1.2 *************** *** 27,31 **** } ! extern "C" void register_shape_node_classes(openvrml::browser & b); # endif --- 27,31 ---- } ! extern "C" void register_shape_node_metatypes(openvrml::browser & b); # endif Index: x3d_grouping.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/x3d_grouping.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** x3d_grouping.h 20 Apr 2006 05:24:11 -0000 1.1 --- x3d_grouping.h 18 May 2006 04:11:31 -0000 1.2 *************** *** 27,31 **** } ! extern "C" void register_grouping_node_classes(openvrml::browser & b); # endif --- 27,31 ---- } ! extern "C" void register_grouping_node_metatypes(openvrml::browser & b); # endif Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Vrml97Parser.g 17 Apr 2006 07:29:16 -0000 1.63 --- Vrml97Parser.g 18 May 2006 04:11:30 -0000 1.64 *************** *** 702,709 **** node_interface_set interfaces; ! proto_node_class::default_value_map_t default_value_map; vector<boost::intrusive_ptr<openvrml::node> > impl_nodes; ! proto_node_class::is_map_t is_map; ! proto_node_class::routes_t routes; } : KEYWORD_PROTO id:ID { --- 702,709 ---- node_interface_set interfaces; ! proto_node_metatype::default_value_map_t default_value_map; vector<boost::intrusive_ptr<openvrml::node> > impl_nodes; ! proto_node_metatype::is_map_t is_map; ! proto_node_metatype::routes_t routes; } : KEYWORD_PROTO id:ID { *************** *** 722,728 **** is_map, routes] RBRACE { ! const shared_ptr<openvrml::node_class> ! node_class( ! new proto_node_class(path(*proto_scope), scene.browser(), interfaces, --- 722,728 ---- is_map, routes] RBRACE { ! const shared_ptr<openvrml::node_metatype> ! node_metatype( ! new proto_node_metatype(path(*proto_scope), scene.browser(), interfaces, *************** *** 732,744 **** routes)); // ! // Add the new node_class (prototype definition) to the browser's ! // node_class_map. // ! scene.browser().add_node_class(node_class->id(), node_class); ! if (!dynamic_pointer_cast<proto_node_class>( ! scene.browser().node_class(node_class_id(this->uri)))) { ! scene.browser().add_node_class(node_class_id(this->uri), ! node_class); } --- 732,744 ---- routes)); // ! // Add the new node_metatype (prototype definition) to the browser's ! // node_metatype_map. // ! scene.browser().add_node_metatype(node_metatype->id(), node_metatype); ! if (!dynamic_pointer_cast<proto_node_metatype>( ! scene.browser().node_metatype(node_metatype_id(this->uri)))) { ! scene.browser().add_node_metatype(node_metatype_id(this->uri), ! node_metaty... [truncated message content] |