Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2005-11-11 21:40:41
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18506 Modified Files: ChangeLog Log Message: Initialize openvrml::node::ref_count_ to 0. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1029 retrieving revision 1.1030 diff -C2 -d -r1.1029 -r1.1030 *** ChangeLog 11 Nov 2005 21:28:03 -0000 1.1029 --- ChangeLog 11 Nov 2005 21:40:33 -0000 1.1030 *************** *** 1,4 **** --- 1,9 ---- 2005-11-11 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/node.cpp: Initialize + openvrml::node::ref_count_ to 0. + + 2005-11-11 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.h: Declare openvrml::browser::vrml_from_url_creator as a struct for |
|
From: Braden M. <br...@us...> - 2005-11-11 21:28:12
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15505/src/libopenvrml/openvrml Modified Files: browser.h Log Message: Declare openvrml::browser::vrml_from_url_creator as a struct for consistency with its definition. Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** browser.h 30 Oct 2005 03:20:17 -0000 1.33 --- browser.h 11 Nov 2005 21:28:03 -0000 1.34 *************** *** 180,184 **** friend class X3DVrmlParser; ! class vrml_from_url_creator; class node_class_map { --- 180,184 ---- friend class X3DVrmlParser; ! struct vrml_from_url_creator; class node_class_map { |
|
From: Braden M. <br...@us...> - 2005-11-11 21:28:11
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15505 Modified Files: ChangeLog Log Message: Declare openvrml::browser::vrml_from_url_creator as a struct for consistency with its definition. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1028 retrieving revision 1.1029 diff -C2 -d -r1.1028 -r1.1029 *** ChangeLog 7 Nov 2005 06:55:21 -0000 1.1028 --- ChangeLog 11 Nov 2005 21:28:03 -0000 1.1029 *************** *** 1,2 **** --- 1,8 ---- + 2005-11-11 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/browser.h: Declare + openvrml::browser::vrml_from_url_creator as a struct for + consistency with its definition. + 2005-11-07 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-07 06:55:30
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9556/src/libopenvrml/openvrml Modified Files: Vrml97Parser.g browser.cpp Log Message: Support parsing nodes from unrecognized EXTERNPROTOs. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** browser.cpp 3 Nov 2005 07:48:05 -0000 1.91 --- browser.cpp 7 Nov 2005 06:55:21 -0000 1.92 *************** *** 162,201 **** ! /** ! * @internal ! * ! * @brief A <code>PROTO</code> instance node. ! * ! * Like a typical node implementation, <code>proto_node</code>s have a ! * many-to-one relationship with the ! * <code>proto_node::proto_node_type</code> instance that creates them. And [...1005 lines suppressed...] + assert(pos->second); + return *pos->second; + } + + openvrml::event_emitter & + externproto_node::do_event_emitter(const std::string & id) + throw (openvrml::unsupported_interface) + { + eventout_map_t::const_iterator pos = this->eventout_map.find(id); + if (pos == this->eventout_map.end()) { + throw openvrml::unsupported_interface( + this->type(), openvrml::node_interface::eventout_id, id); + } + assert(pos->second); + return *pos->second; + } + + class OPENVRML_LOCAL default_navigation_info : public openvrml::navigation_info_node { Index: Vrml97Parser.g =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/Vrml97Parser.g,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Vrml97Parser.g 30 Oct 2005 03:20:17 -0000 1.34 --- Vrml97Parser.g 7 Nov 2005 06:55:21 -0000 1.35 *************** *** 935,948 **** options { defaultErrorHandler=false; } { openvrml::node_interface_set interfaces; ! openvrml::mfstring url_list; ! boost::shared_ptr<node_type> node_type; } : KEYWORD_EXTERNPROTO id:ID LBRACKET (externInterfaceDeclaration[interfaces])* RBRACKET ! url_list=externprotoUrlList { ! for (size_t i = 0; i < url_list.value().size(); ++i) { ! boost::shared_ptr<openvrml::node_class> node_class = ! browser.node_class_map_.find(url_list.value()[i]); if (node_class) { node_type = node_class->create_type(id->getText(), --- 935,955 ---- options { defaultErrorHandler=false; } { + using std::string; + using std::vector; + using boost::shared_ptr; + openvrml::node_interface_set interfaces; ! openvrml::mfstring uri_list; ! shared_ptr<node_type> node_type; } : KEYWORD_EXTERNPROTO id:ID LBRACKET (externInterfaceDeclaration[interfaces])* RBRACKET ! uri_list=externprotoUrlList { ! const vector<string> & alt_uris = uri_list.value(); ! for (vector<string>::const_iterator uri = alt_uris.begin(); ! uri != alt_uris.end(); ! ++uri) { ! const shared_ptr<openvrml::node_class> node_class = ! browser.node_class_map_.find(*uri); if (node_class) { node_type = node_class->create_type(id->getText(), *************** *** 951,972 **** } } ! // ! // If we weren't able to create a node_type, that means that we ! // don't already have a node_class for the node. Currently we only ! // support referring to existing node_classes with EXTERNPROTO; ! // adding new node_classes via EXTERNPROTO is not supported. In ! // practice, this means that the ordinary way of using EXTERNPROTOs ! // in VRML worlds will fail. ! // ! if (node_type) { ! if (!scope->add_type(node_type)) { ! using antlr::SemanticException; ! throw SemanticException("Node type \"" + node_type->id() ! + "\" has already been defined in " ! " this scope.", ! this->uri, ! id->getLine(), ! id->getColumn()); } } } --- 958,996 ---- } } ! ! if (!node_type) { ! const shared_ptr<node_class> externproto_class( ! new externproto_node_class(browser, alt_uris)); ! ! for (vector<string>::const_iterator uri = alt_uris.begin(); ! uri != alt_uris.end(); ! ++uri) { ! browser.node_class_map_.insert(*uri, externproto_class); } + + node_type = externproto_class->create_type(id->getText(), + interfaces); + // + // Hack alert. If we get an empty list of URIs for the + // EXTERNPROTO implementation, we have nothing to put in + // browser::node_class_map_. That means that we'd wind up + // with no owning pointer to the node class except for the + // one in this scope (which is about to go away). So, we + // store an owning pointer in the externproto_node_type. + // + boost::dynamic_pointer_cast<externproto_node_type>(node_type) + ->set_owning_ptr_to_class(externproto_class); + } + + assert(node_type); + + if (!scope->add_type(node_type)) { + using antlr::SemanticException; + throw SemanticException("Node type \"" + node_type->id() + + "\" has already been defined in " + + "this scope.", + this->uri, + id->getLine(), + id->getColumn()); } } |
|
From: Braden M. <br...@us...> - 2005-11-07 06:55:29
|
Update of /cvsroot/openvrml/openvrml/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9556/tests Modified Files: testsuite.at Log Message: Support parsing nodes from unrecognized EXTERNPROTOs. Index: testsuite.at =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/testsuite.at,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** testsuite.at 17 May 2005 04:44:48 -0000 1.3 --- testsuite.at 7 Nov 2005 06:55:21 -0000 1.4 *************** *** 99,105 **** --- 99,133 ---- AT_CLEANUP + AT_SETUP([Unrecognized EXTERNPROTO]) + AT_DATA([unrecognized-externproto.wrl], + [[#VRML V2.0 utf8 + EXTERNPROTO UnrecognizedNode [ exposedField SFBool sfboolField ] + [ "urn:unrecognized" ] + UnrecognizedNode { sfboolField TRUE } + ]]) + AT_CHECK([parse < unrecognized-externproto.wrl]) + AT_CLEANUP + + AT_SETUP([Unimplemented EXTERNPROTO]) + AT_DATA([unimplemented-externproto.wrl], + [[#VRML V2.0 utf8 + EXTERNPROTO UnimplementedNode [ exposedField SFBool sfboolField ] [] + UnimplementedNode { sfboolField TRUE } + ]]) + AT_CHECK([parse < unimplemented-externproto.wrl]) + AT_CLEANUP AT_BANNER([Parse tests: code that should be rejected]) + AT_SETUP([Unrecognized node type]) + AT_DATA([unrecognized-node.wrl], + [[#VRML V2.0 utf8 + UnrecognizedNode {} + ]]) + AT_CHECK([parse < unrecognized-node.wrl], [1], [], + [:2:17: error: Unknown node type "UnrecognizedNode". + ]) + AT_CLEANUP + AT_SETUP([PROTO with a conflicting eventIn and exposedField]) AT_DATA([proto-eventin-conflict.wrl], |
|
From: Braden M. <br...@us...> - 2005-11-07 06:55:29
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9556 Modified Files: ChangeLog Log Message: Support parsing nodes from unrecognized EXTERNPROTOs. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1027 retrieving revision 1.1028 diff -C2 -d -r1.1027 -r1.1028 *** ChangeLog 6 Nov 2005 01:03:44 -0000 1.1027 --- ChangeLog 7 Nov 2005 06:55:21 -0000 1.1028 *************** *** 1,2 **** --- 1,10 ---- + 2005-11-07 Braden McDaniel <br...@en...> + + Support parsing nodes from unrecognized EXTERNPROTOs. + + * src/libopenvrml/openvrml/Vrml97Parser.g + * src/libopenvrml/openvrml/browser.cpp + * tests/testsuite.at + 2005-11-05 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-06 01:03:52
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22822 Modified Files: ChangeLog Log Message: List antlr-generated sources in BUILT_SOURCES. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1026 retrieving revision 1.1027 diff -C2 -d -r1.1026 -r1.1027 *** ChangeLog 5 Nov 2005 04:54:32 -0000 1.1026 --- ChangeLog 6 Nov 2005 01:03:44 -0000 1.1027 *************** *** 1,2 **** --- 1,7 ---- + 2005-11-05 Braden McDaniel <br...@en...> + + * src/libopenvrml/Makefile.am: List antlr-generated sources + in BUILT_SOURCES. + 2005-11-04 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-06 01:03:52
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22822/src/libopenvrml Modified Files: Makefile.am Log Message: List antlr-generated sources in BUILT_SOURCES. Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.am 4 Nov 2005 07:47:29 -0000 1.20 --- Makefile.am 6 Nov 2005 01:03:44 -0000 1.21 *************** *** 97,110 **** openvrml/X3DVrmlParserTokenTypes.txt MAINTAINERCLEANFILES = \ ! openvrml/Vrml97Parser.cpp \ ! openvrml/Vrml97Parser.hpp \ ! openvrml/Vrml97ParserTokenTypes.hpp \ ! openvrml/Vrml97ParserTokenTypes.txt \ ! openvrml/expandedX3DVrml97Parser.g \ ! openvrml/X3DVrmlParser.cpp \ ! openvrml/X3DVrmlParser.hpp \ ! openvrml/X3DVrmlParserTokenTypes.hpp \ ! openvrml/X3DVrmlParserTokenTypes.txt $(srcdir)/openvrml/Vrml97Parser.hpp $(srcdir)/openvrml/Vrml97Parser.cpp: $(srcdir)/openvrml/Vrml97Parser.g $(srcdir)/openvrml/Vrml97TokenTypes.txt --- 97,113 ---- openvrml/X3DVrmlParserTokenTypes.txt + BUILT_SOURCES = \ + $(srcdir)/openvrml/Vrml97Parser.cpp \ + $(srcdir)/openvrml/Vrml97Parser.hpp \ + $(srcdir)/openvrml/Vrml97ParserTokenTypes.hpp \ + $(srcdir)/openvrml/X3DVrmlParser.cpp \ + $(srcdir)/openvrml/X3DVrmlParser.hpp \ + $(srcdir)/openvrml/X3DVrmlParserTokenTypes.hpp + MAINTAINERCLEANFILES = \ ! $(BUILT_SOURCES) \ ! $(srcdir)/openvrml/Vrml97ParserTokenTypes.txt \ ! $(srcdir)/openvrml/expandedX3DVrml97Parser.g \ ! $(srcdir)/openvrml/X3DVrmlParserTokenTypes.txt $(srcdir)/openvrml/Vrml97Parser.hpp $(srcdir)/openvrml/Vrml97Parser.cpp: $(srcdir)/openvrml/Vrml97Parser.g $(srcdir)/openvrml/Vrml97TokenTypes.txt |
|
From: Braden M. <br...@us...> - 2005-11-05 04:54:41
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149/src/libopenvrml/openvrml Modified Files: field_value.cpp field_value.h Log Message: Removed conversions from double-precision floating point types to single-precision ones. Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** field_value.cpp 3 Nov 2005 05:20:31 -0000 1.18 --- field_value.cpp 5 Nov 2005 04:54:33 -0000 1.19 *************** *** 1296,1308 **** /** - * @brief Construct. - * - * @param value initial value - */ - openvrml::sfdouble::sfdouble(const float value) throw (): - field_value(value, value_type_constructor_tag()) - {} - - /** * @brief Construct a copy. * --- 1296,1299 ---- *************** *** 1402,1412 **** throw (std::bad_cast) { - //allow to convert from a float to a double - const sffloat * float_val = dynamic_cast<const sffloat *>(&value); - if (!float_val) { - this->value(float_val->value()); - return *this; - } - return (*this = dynamic_cast<const sfdouble &>(value)); } --- 1393,1396 ---- *************** *** 2740,2752 **** /** - * @brief Construct. - * - * @param vec initial value. - */ - openvrml::sfvec2d::sfvec2d(const vec2f & vec) throw (): - field_value(vec2d(vec[0], vec[1]), value_type_constructor_tag()) - {} - - /** * @brief Construct a copy. * --- 2724,2727 ---- *************** *** 3106,3118 **** /** - * @brief Construct. - * - * @param vec initial value. - */ - openvrml::sfvec3d::sfvec3d(const vec3f & vec) throw (): - field_value(vec3d(vec[0], vec[1], vec[2]), value_type_constructor_tag()) - {} - - /** * @brief Construct a copy. * --- 3081,3084 ---- *************** *** 3201,3210 **** throw (std::bad_cast) { - //allow to convert from a float to a double - const sfvec3f * float_val = dynamic_cast<const sfvec3f *>(&value); - if (!float_val) { - return *this = sfvec3d(float_val->value()); - } - return (*this = dynamic_cast<const sfvec3d &>(value)); } --- 3167,3170 ---- *************** *** 3728,3746 **** /** - * @brief Construct. - * - * @param value initial value. - * - * @exception std::bad_alloc if memory allocation fails. - */ - openvrml::mfdouble::mfdouble(const std::vector<float> & value) - throw (std::bad_alloc): - field_value(std::vector<double>(), value_type_constructor_tag()) - { - std::vector<double> temp(value.begin(), value.end()); - this->value(temp); - } - - /** * @brief Construct a copy. * --- 3688,3691 ---- *************** *** 3832,3841 **** throw (std::bad_cast, std::bad_alloc) { - //allow to convert from a float to a double - const mffloat * float_val = dynamic_cast<const mffloat *>(&value); - if (!float_val) { - return *this = mfdouble(float_val->value()); - } - return (*this = dynamic_cast<const mfdouble &>(value)); } --- 3777,3780 ---- *************** *** 5212,5233 **** /** - * @brief Construct. - * - * @param value initial value. - * - * @exception std::bad_alloc if memory allocation fails. - */ - openvrml::mfvec2d::mfvec2d(const std::vector<vec2f> & value) - throw (std::bad_alloc): - field_value(std::vector<vec2d>(), value_type_constructor_tag()) - { - std::vector<vec2d> temp(value.size()); - for (std::vector<vec2d>::size_type i = 0; i < temp.size(); ++i) { - temp[i] = vec2d(value[i].x(), value[i].y()); - } - this->value(temp); - } - - /** * @brief Construct a copy. * --- 5151,5154 ---- *************** *** 5318,5327 **** throw (std::bad_cast, std::bad_alloc) { - //allow to convert from a float to a double - const mfvec2f * float_val = dynamic_cast<const mfvec2f *>(&value); - if (!float_val) { - return *this = mfvec2d(float_val->value()); - } - return (*this = dynamic_cast<const mfvec2d &>(value)); } --- 5239,5242 ---- *************** *** 5652,5673 **** /** - * @brief Construct. - * - * @param value initial value. - * - * @exception std::bad_alloc if memory allocation fails. - */ - openvrml::mfvec3d::mfvec3d(const std::vector<vec3f> & value) - throw (std::bad_alloc): - field_value(std::vector<vec3d>(), value_type_constructor_tag()) - { - std::vector<vec3d> temp(value.size()); - for (std::vector<vec3d>::size_type i = 0; i < temp.size(); ++i) { - temp[i] = vec3d(value[i].x(), value[i].y(), value[i].z()); - } - this->value(temp); - } - - /** * @brief Construct a copy. * --- 5567,5570 ---- *************** *** 5759,5768 **** throw (std::bad_cast, std::bad_alloc) { - //allow to convert from a float to a double - const mfvec3f * float_val = dynamic_cast<const mfvec3f *>(&value); - if (!float_val) { - return *this = mfvec3d(float_val->value()); - } - return (*this = dynamic_cast<const mfvec3d &>(value)); } --- 5656,5659 ---- Index: field_value.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** field_value.h 3 Nov 2005 05:20:31 -0000 1.15 --- field_value.h 5 Nov 2005 04:54:33 -0000 1.16 *************** *** 396,400 **** explicit sfdouble(double value = 0.0) throw (); - sfdouble(float value) throw (); sfdouble(const sfdouble & sfd); virtual ~sfdouble() throw (); --- 396,399 ---- *************** *** 650,654 **** explicit sfvec2d(const vec2d & vec = vec2d()) throw (); - sfvec2d(const vec2f & vec) throw (); sfvec2d(const sfvec2d & sfv); virtual ~sfvec2d() throw (); --- 649,652 ---- *************** *** 712,716 **** explicit sfvec3d(const vec3d & vec = vec3d()) throw (); - sfvec3d(const vec3f & vec) throw (); sfvec3d(const sfvec3d & sfv); virtual ~sfvec3d() throw (); --- 710,713 ---- *************** *** 813,818 **** throw (std::bad_alloc); explicit mfdouble(const value_type & value) throw (std::bad_alloc); - mfdouble(const std::vector<float> & value) - throw (std::bad_alloc); mfdouble(const mfdouble & mfd); virtual ~mfdouble() throw (); --- 810,813 ---- *************** *** 1054,1059 **** throw (std::bad_alloc); explicit mfvec2d(const value_type & value) throw (std::bad_alloc); - mfvec2d(const std::vector<vec2f> & value) - throw (std::bad_alloc); mfvec2d(const mfvec2d & mfv); virtual ~mfvec2d() throw (); --- 1049,1052 ---- *************** *** 1123,1128 **** throw (std::bad_alloc); explicit mfvec3d(const value_type & value) throw (std::bad_alloc); - mfvec3d(const std::vector<vec3f> & value) - throw (std::bad_alloc); mfvec3d(const mfvec3d & mfv); virtual ~mfvec3d() throw (); --- 1116,1119 ---- |
|
From: Braden M. <br...@us...> - 2005-11-05 04:54:40
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24149 Modified Files: ChangeLog Log Message: Removed conversions from double-precision floating point types to single-precision ones. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1025 retrieving revision 1.1026 diff -C2 -d -r1.1025 -r1.1026 *** ChangeLog 5 Nov 2005 00:45:06 -0000 1.1025 --- ChangeLog 5 Nov 2005 04:54:32 -0000 1.1026 *************** *** 1,4 **** --- 1,12 ---- 2005-11-04 Braden McDaniel <br...@en...> + Removed conversions from double-precision floating point types + to single-precision ones. + + * src/libopenvrml/openvrml/field_value.cpp + * src/libopenvrml/openvrml/field_value.h + + 2005-11-04 Braden McDaniel <br...@en...> + * tests/browser.cpp (create_vrml_from_url): Now that listeners aren't required to be nodes, the browser::create_vrml_from_url |
|
From: Braden M. <br...@us...> - 2005-11-05 00:45:20
|
Update of /cvsroot/openvrml/openvrml/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11328/tests Modified Files: browser.cpp Log Message: Now that listeners aren't required to be nodes, the browser::create_vrml_from_url test can be modified to use a condition variable rather than a hackish sleep. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/tests/browser.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** browser.cpp 30 Oct 2005 03:20:18 -0000 1.3 --- browser.cpp 5 Nov 2005 00:45:07 -0000 1.4 *************** *** 44,47 **** --- 44,74 ---- void create_vrml_from_url() { + class children_listener : public openvrml::mfnode_listener { + bool received_event_; + boost::mutex & mutex_; + boost::condition & condition_; + + public: + children_listener(boost::mutex & mutex, boost::condition & condition): + received_event_(false), + mutex_(mutex), + condition_(condition) + {} + + bool received_event() const + { + return this->received_event_; + } + + private: + virtual void do_process_event(const openvrml::mfnode &, double) + throw (std::bad_alloc) + { + boost::mutex::scoped_lock lock(this->mutex_); + this->received_event_ = true; + this->condition_.notify_all(); + } + }; + { ofstream file("test.wrl"); *************** *** 54,64 **** vector<boost::intrusive_ptr<node> > nodes = b.create_vrml_from_stream(vrmlstream); vector<string> url(1, "test.wrl"); b.create_vrml_from_url(url, nodes[0], "set_children"); ! ! boost::xtime t; ! boost::xtime_get(&t, boost::TIME_UTC); ! t.sec += 1; ! boost::thread::sleep(t); grouping_node * group = node_cast<grouping_node *>(nodes[0].get()); --- 81,101 ---- vector<boost::intrusive_ptr<node> > nodes = b.create_vrml_from_stream(vrmlstream); + + boost::mutex mutex; + boost::condition listener_received_event; + + children_listener listener(mutex, listener_received_event); + mfnode_emitter & emitter = + nodes[0]->event_emitter<mfnode>("children_changed"); + emitter.add(listener); + vector<string> url(1, "test.wrl"); b.create_vrml_from_url(url, nodes[0], "set_children"); ! { ! boost::mutex::scoped_lock lock(mutex); ! while (!listener.received_event()) { ! listener_received_event.wait(lock); ! } ! } grouping_node * group = node_cast<grouping_node *>(nodes[0].get()); |
|
From: Braden M. <br...@us...> - 2005-11-05 00:45:20
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11328 Modified Files: ChangeLog Log Message: Now that listeners aren't required to be nodes, the browser::create_vrml_from_url test can be modified to use a condition variable rather than a hackish sleep. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1024 retrieving revision 1.1025 diff -C2 -d -r1.1024 -r1.1025 *** ChangeLog 4 Nov 2005 07:47:29 -0000 1.1024 --- ChangeLog 5 Nov 2005 00:45:06 -0000 1.1025 *************** *** 1,4 **** --- 1,11 ---- 2005-11-04 Braden McDaniel <br...@en...> + * tests/browser.cpp (create_vrml_from_url): Now that listeners + aren't required to be nodes, the browser::create_vrml_from_url + test can be modified to use a condition variable rather than a + hackish sleep. + + 2005-11-04 Braden McDaniel <br...@en...> + Generate the antlr-generated sources as part of the build rather than storing them in the repository. These changes should |
|
From: Braden M. <br...@us...> - 2005-11-04 07:47:39
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837/src/libopenvrml/openvrml Modified Files: .cvsignore Removed Files: Vrml97Parser.cpp Vrml97Parser.hpp Vrml97ParserTokenTypes.hpp Vrml97ParserTokenTypes.txt X3DVrmlParser.cpp X3DVrmlParser.hpp X3DVrmlParserTokenTypes.hpp X3DVrmlParserTokenTypes.txt Log Message: Generate the antlr-generated sources as part of the build rather than storing them in the repository. These changes should continue to include these generated files in release tarballs; so release tarball users will not need to have antlr installed. Index: .cvsignore =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 7 Oct 2005 22:05:51 -0000 1.3 --- .cvsignore 4 Nov 2005 07:47:29 -0000 1.4 *************** *** 1 **** --- 1,9 ---- expandedX3DVrmlParser.g + Vrml97Parser.cpp + Vrml97Parser.hpp + Vrml97ParserTokenTypes.hpp + Vrml97ParserTokenTypes.txt + X3DVrmlParser.cpp + X3DVrmlParser.hpp + X3DVrmlParserTokenTypes.hpp + X3DVrmlParserTokenTypes.txt --- X3DVrmlParserTokenTypes.hpp DELETED --- --- Vrml97Parser.hpp DELETED --- --- X3DVrmlParser.hpp DELETED --- --- Vrml97ParserTokenTypes.txt DELETED --- --- Vrml97Parser.cpp DELETED --- --- X3DVrmlParserTokenTypes.txt DELETED --- --- X3DVrmlParser.cpp DELETED --- --- Vrml97ParserTokenTypes.hpp DELETED --- |
|
From: Braden M. <br...@us...> - 2005-11-04 07:47:39
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837 Modified Files: ChangeLog configure.ac Log Message: Generate the antlr-generated sources as part of the build rather than storing them in the repository. These changes should continue to include these generated files in release tarballs; so release tarball users will not need to have antlr installed. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** configure.ac 11 Aug 2005 22:50:13 -0000 1.81 --- configure.ac 4 Nov 2005 07:47:29 -0000 1.82 *************** *** 48,51 **** --- 48,52 ---- OV_PROG_JAVAH OV_PROG_JAR + OV_PROG_ANTLR AC_ARG_VAR([DOXYGEN], [Doxygen documentation generator]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1023 retrieving revision 1.1024 diff -C2 -d -r1.1023 -r1.1024 *** ChangeLog 3 Nov 2005 07:48:04 -0000 1.1023 --- ChangeLog 4 Nov 2005 07:47:29 -0000 1.1024 *************** *** 1,2 **** --- 1,26 ---- + 2005-11-04 Braden McDaniel <br...@en...> + + Generate the antlr-generated sources as part of the build rather + than storing them in the repository. These changes should + continue to include these generated files in release tarballs; + so release tarball users will not need to have antlr installed. + + * configure.ac: Call OV_PROG_ANTLR. + * m4/antlr: Added file. OV_PROG_ANTLR macro. + * src/libopenvrml/Makefile.am: Added make rules to build the + antlr-generated sources. + * src/libopenvrml/openvrml/Vrml97Parser.cpp: Removed file. + * src/libopenvrml/openvrml/Vrml97Parser.hpp: Removed file. + * src/libopenvrml/openvrml/Vrml97ParserTokenTypes.hpp: Removed + file. + * src/libopenvrml/openvrml/Vrml97ParserTokenTypes.txt: Removed + file. + * src/libopenvrml/openvrml/X3DVrmlParser.cpp: Removed file. + * src/libopenvrml/openvrml/X3DVrmlParser.hpp: Removed file. + * src/libopenvrml/openvrml/X3DVrmlParserTokenTypes.hpp: Removed + file. + * src/libopenvrml/openvrml/X3DVrmlParserTokenTypes.txt: Removed + file. + 2005-11-03 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-04 07:47:39
|
Update of /cvsroot/openvrml/openvrml/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837/m4 Modified Files: Makefile.am Added Files: antlr.m4 Log Message: Generate the antlr-generated sources as part of the build rather than storing them in the repository. These changes should continue to include these generated files in release tarballs; so release tarball users will not need to have antlr installed. Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/m4/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.am 11 Aug 2005 22:50:13 -0000 1.14 --- Makefile.am 4 Nov 2005 07:47:29 -0000 1.15 *************** *** 5,7 **** ax_lang_compiler_ms.m4 \ jdk.m4 \ ! ov_cxx_visibility.m4 --- 5,8 ---- ax_lang_compiler_ms.m4 \ jdk.m4 \ ! ov_cxx_visibility.m4 \ ! antlr.m4 --- NEW FILE: antlr.m4 --- AC_DEFUN([OV_PROG_ANTLR], [AC_REQUIRE([OV_PROG_JAVA]) AC_ARG_VAR([ANTLR]) AC_PATH_PROG([ANTLR], [antlr]) if test -z "$ANTLR"; then cat <<EOF > conftest.g class TestParser extends Parser; rule:; EOF AS_IF([$JAVA antlr.Tool conftest.g], [ANTLR="$JAVA antlr.Tool"], []) rm -rf conftest.g TestParser.java TestParserTokenTypes.java TestParserTokenTypes.txt fi ]) |
|
From: Braden M. <br...@us...> - 2005-11-04 07:47:39
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12837/src/libopenvrml Modified Files: Makefile.am Log Message: Generate the antlr-generated sources as part of the build rather than storing them in the repository. These changes should continue to include these generated files in release tarballs; so release tarball users will not need to have antlr installed. Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 30 Oct 2005 03:20:17 -0000 1.19 --- Makefile.am 4 Nov 2005 07:47:29 -0000 1.20 *************** *** 96,97 **** --- 96,114 ---- openvrml/X3DVrmlParser.g \ openvrml/X3DVrmlParserTokenTypes.txt + + MAINTAINERCLEANFILES = \ + openvrml/Vrml97Parser.cpp \ + openvrml/Vrml97Parser.hpp \ + openvrml/Vrml97ParserTokenTypes.hpp \ + openvrml/Vrml97ParserTokenTypes.txt \ + openvrml/expandedX3DVrml97Parser.g \ + openvrml/X3DVrmlParser.cpp \ + openvrml/X3DVrmlParser.hpp \ + openvrml/X3DVrmlParserTokenTypes.hpp \ + openvrml/X3DVrmlParserTokenTypes.txt + + $(srcdir)/openvrml/Vrml97Parser.hpp $(srcdir)/openvrml/Vrml97Parser.cpp: $(srcdir)/openvrml/Vrml97Parser.g $(srcdir)/openvrml/Vrml97TokenTypes.txt + $(ANTLR) -o $(srcdir)/openvrml $(srcdir)/openvrml/Vrml97Parser.g + + $(srcdir)/openvrml/X3DVrmlParser.hpp $(srcdir)/openvrml/X3DVrmlParser.cpp: $(srcdir)/openvrml/Vrml97Parser.g $(srcdir)/openvrml/X3DVrmlParser.g $(srcdir)/openvrml/X3DVrmlTokenTypes.txt + $(ANTLR) -o $(srcdir)/openvrml -glib $(srcdir)/openvrml/Vrml97Parser.g $(srcdir)/openvrml/X3DVrmlParser.g |
|
From: Braden M. <br...@us...> - 2005-11-03 07:48:13
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26789/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Removed helper class vrml97_node_interface_set_. This class was probably rendered unnecessary when openvrml::node_interface_set was changed from a class to a typedef of an instance of std::set. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** browser.cpp 2 Nov 2005 08:50:24 -0000 1.90 --- browser.cpp 3 Nov 2005 07:48:05 -0000 1.91 *************** *** 4156,4175 **** } - namespace { - /** - * @internal - */ - class OPENVRML_LOCAL vrml97_node_interface_set_ : - public openvrml::node_interface_set { - public: - vrml97_node_interface_set_( - const openvrml::node_interface * const begin, - const openvrml::node_interface * const end) - { - this->insert(begin, end); - } - }; - } - /** * @brief Create a root scope. --- 4156,4159 ---- *************** *** 4212,4216 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4196,4200 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4236,4240 **** "textureTransform") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = --- 4220,4224 ---- "textureTransform") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = *************** *** 4275,4279 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4259,4263 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4326,4330 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 12); node_class = --- 4310,4314 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 12); node_class = *************** *** 4359,4363 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = --- 4343,4347 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = *************** *** 4376,4380 **** field_value::sfvec3f_id, "size"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = this->node_class_map_.find("urn:X-openvrml:node:Box"); --- 4360,4364 ---- field_value::sfvec3f_id, "size"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = this->node_class_map_.find("urn:X-openvrml:node:Box"); *************** *** 4414,4418 **** "collideTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 4398,4402 ---- "collideTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 4431,4435 **** field_value::mfcolor_id, "color"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 4415,4419 ---- field_value::mfcolor_id, "color"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 4458,4462 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 4442,4446 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 4485,4489 **** "bottom") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = --- 4469,4473 ---- "bottom") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = *************** *** 4502,4506 **** field_value::mfvec3f_id, "point"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 4486,4490 ---- field_value::mfvec3f_id, "point"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 4529,4533 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 4513,4517 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 4560,4564 **** "top") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = --- 4544,4548 ---- "top") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = *************** *** 4602,4606 **** "trackPoint_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ --- 4586,4590 ---- "trackPoint_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ *************** *** 4632,4636 **** "on") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_ --- 4616,4620 ---- "on") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_ *************** *** 4689,4693 **** "zSpacing") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 14); node_class = this->node_class_map_ --- 4673,4677 ---- "zSpacing") }; ! static const node_interface_set interface_set(interfaces, interfaces + 14); node_class = this->node_class_map_ *************** *** 4746,4750 **** "spine") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 14); node_class = --- 4730,4734 ---- "spine") }; ! static const node_interface_set interface_set(interfaces, interfaces + 14); node_class = *************** *** 4776,4780 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_.find("urn:X-openvrml:node:Fog"); --- 4760,4764 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = this->node_class_map_.find("urn:X-openvrml:node:Fog"); *************** *** 4817,4821 **** "topToBottom") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = --- 4801,4805 ---- "topToBottom") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = *************** *** 4847,4851 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 5); node_class = --- 4831,4835 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 5); node_class = *************** *** 4871,4875 **** "repeatT") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ --- 4855,4859 ---- "repeatT") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ *************** *** 4940,4944 **** "texCoordIndex") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 18); node_class = this->node_class_map_ --- 4924,4928 ---- "texCoordIndex") }; ! static const node_interface_set interface_set(interfaces, interfaces + 18); node_class = this->node_class_map_ *************** *** 4976,4980 **** "coordIndex") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 4960,4964 ---- "coordIndex") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5000,5004 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = --- 4984,4988 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = *************** *** 5024,5028 **** "range") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_.find("urn:X-openvrml:node:LOD"); --- 5008,5012 ---- "range") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_.find("urn:X-openvrml:node:LOD"); *************** *** 5056,5060 **** "transparency") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = --- 5040,5044 ---- "transparency") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = *************** *** 5098,5102 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ --- 5082,5086 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = this->node_class_map_ *************** *** 5134,5138 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 5118,5122 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5151,5155 **** field_value::mfvec3f_id, "vector"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 5135,5139 ---- field_value::mfvec3f_id, "vector"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 5178,5182 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5162,5166 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5205,5209 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5189,5193 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5230,5234 **** "repeatT") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ --- 5214,5218 ---- "repeatT") }; ! static const node_interface_set interface_set(interfaces, interfaces + 3); node_class = this->node_class_map_ *************** *** 5269,5273 **** "translation_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ --- 5253,5257 ---- "translation_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ *************** *** 5305,5309 **** "radius") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = --- 5289,5293 ---- "radius") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = *************** *** 5326,5330 **** "coord") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5310,5314 ---- "coord") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5353,5357 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5337,5341 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5393,5397 **** "exitTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ --- 5377,5381 ---- "exitTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = this->node_class_map_ *************** *** 5420,5424 **** "value_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5404,5408 ---- "value_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5441,5445 **** "geometry") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5425,5429 ---- "geometry") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5486,5490 **** "spatialize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5470,5474 ---- "spatialize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5503,5507 **** field_value::sffloat_id, "radius"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = --- 5487,5491 ---- field_value::sffloat_id, "radius"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = *************** *** 5536,5540 **** "trackPoint_changed") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ --- 5520,5524 ---- "trackPoint_changed") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ *************** *** 5581,5585 **** "radius") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5565,5569 ---- "radius") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5602,5606 **** "whichChoice") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5586,5590 ---- "whichChoice") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = *************** *** 5629,5633 **** "maxExtent") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = --- 5613,5617 ---- "maxExtent") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = *************** *** 5646,5650 **** field_value::mfvec2f_id, "point"); ! static const vrml97_node_interface_set_ interface_set(&interface, &interface + 1); node_class = this->node_class_map_ --- 5630,5634 ---- field_value::mfvec2f_id, "point"); ! static const node_interface_set interface_set(&interface, &interface + 1); node_class = this->node_class_map_ *************** *** 5673,5677 **** "translation") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ --- 5657,5661 ---- "translation") }; ! static const node_interface_set interface_set(interfaces, interfaces + 4); node_class = this->node_class_map_ *************** *** 5715,5719 **** "time") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 9); node_class = --- 5699,5703 ---- "time") }; ! static const node_interface_set interface_set(interfaces, interfaces + 9); node_class = *************** *** 5751,5755 **** "touchTime") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ --- 5735,5739 ---- "touchTime") }; ! static const node_interface_set interface_set(interfaces, interfaces + 7); node_class = this->node_class_map_ *************** *** 5796,5800 **** "bboxSize") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 10); node_class = --- 5780,5784 ---- "bboxSize") }; ! static const node_interface_set interface_set(interfaces, interfaces + 10); node_class = *************** *** 5835,5839 **** "isBound") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 8); node_class = --- 5819,5823 ---- "isBound") }; ! static const node_interface_set interface_set(interfaces, interfaces + 8); node_class = *************** *** 5868,5872 **** "isActive") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ --- 5852,5856 ---- "isActive") }; ! static const node_interface_set interface_set(interfaces, interfaces + 6); node_class = this->node_class_map_ *************** *** 5889,5893 **** "title") }; ! static const vrml97_node_interface_set_ interface_set(interfaces, interfaces + 2); node_class = --- 5873,5877 ---- "title") }; ! static const node_interface_set interface_set(interfaces, interfaces + 2); node_class = |
|
From: Braden M. <br...@us...> - 2005-11-03 07:48:13
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26789 Modified Files: ChangeLog Log Message: Removed helper class vrml97_node_interface_set_. This class was probably rendered unnecessary when openvrml::node_interface_set was changed from a class to a typedef of an instance of std::set. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1022 retrieving revision 1.1023 diff -C2 -d -r1.1022 -r1.1023 *** ChangeLog 3 Nov 2005 05:20:31 -0000 1.1022 --- ChangeLog 3 Nov 2005 07:48:04 -0000 1.1023 *************** *** 1,4 **** --- 1,12 ---- 2005-11-03 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/browser.cpp + (openvrml::browser::create_root_scope): Removed helper class + vrml97_node_interface_set_. This class was probably rendered + unnecessary when openvrml::node_interface_set was changed from + a class to a typedef of an instance of std::set. + + 2005-11-03 Braden McDaniel <br...@en...> + Added std::swap specializations for sf* field_value types. |
|
From: Braden M. <br...@us...> - 2005-11-03 05:20:40
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982/src/libopenvrml/openvrml Modified Files: field_value.cpp field_value.h Log Message: Added std::swap specializations for sf* field_value types. Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** field_value.cpp 3 Nov 2005 04:54:56 -0000 1.17 --- field_value.cpp 3 Nov 2005 05:20:31 -0000 1.18 *************** *** 5831,5834 **** --- 5831,6016 ---- /** + * @fn template <> void std::swap(openvrml::sfbool & a, openvrml::sfbool & b) + * + * @relatesalso openvrml::sfbool + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfcolor & a, openvrml::sfcolor & b) + * + * @relatesalso openvrml::sfcolor + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfdouble & a, openvrml::sfdouble & b) + * + * @relatesalso openvrml::sfdouble + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sffloat & a, openvrml::sffloat & b) + * + * @relatesalso openvrml::sffloat + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfimage & a, openvrml::sfimage & b) + * + * @relatesalso openvrml::sfimage + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfint32 & a, openvrml::sfint32 & b) + * + * @relatesalso openvrml::sfint32 + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfnode & a, openvrml::sfnode & b) + * + * @relatesalso openvrml::sfnode + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfrotation & a, openvrml::sfrotation & b) + * + * @relatesalso openvrml::sfrotation + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfstring & a, openvrml::sfstring & b) + * + * @relatesalso openvrml::sfstring + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sftime & a, openvrml::sftime & b) + * + * @relatesalso openvrml::sftime + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfvec2d & a, openvrml::sfvec2d & b) + * + * @relatesalso openvrml::sfvec2d + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfvec2f & a, openvrml::sfvec2f & b) + * + * @relatesalso openvrml::sfvec2f + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfvec3d & a, openvrml::sfvec3d & b) + * + * @relatesalso openvrml::sfvec3d + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** + * @fn template <> void std::swap(openvrml::sfvec3f & a, openvrml::sfvec3f & b) + * + * @relatesalso openvrml::sfvec3f + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** * @fn template <> void std::swap(openvrml::mfcolor & a, openvrml::mfcolor & b) * Index: field_value.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** field_value.h 3 Nov 2005 04:54:56 -0000 1.14 --- field_value.h 3 Nov 2005 05:20:31 -0000 1.15 *************** *** 1152,1155 **** --- 1152,1242 ---- template <> + OPENVRML_API inline void swap(openvrml::sfbool & a, openvrml::sfbool & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfcolor & a, openvrml::sfcolor & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfdouble & a, + openvrml::sfdouble & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sffloat & a, openvrml::sffloat & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfimage & a, openvrml::sfimage & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfint32 & a, openvrml::sfint32 & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfnode & a, openvrml::sfnode & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfrotation & a, + openvrml::sfrotation & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfstring & a, + openvrml::sfstring & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sftime & a, openvrml::sftime & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfvec2d & a, openvrml::sfvec2d & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfvec2f & a, openvrml::sfvec2f & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfvec3d & a, openvrml::sfvec3d & b) + { + a.swap(b); + } + + template <> + OPENVRML_API inline void swap(openvrml::sfvec3f & a, openvrml::sfvec3f & b) + { + a.swap(b); + } + + template <> OPENVRML_API inline void swap(openvrml::mfcolor & a, openvrml::mfcolor & b) { |
|
From: Braden M. <br...@us...> - 2005-11-03 05:20:40
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982 Modified Files: ChangeLog Log Message: Added std::swap specializations for sf* field_value types. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1021 retrieving revision 1.1022 diff -C2 -d -r1.1021 -r1.1022 *** ChangeLog 3 Nov 2005 04:54:56 -0000 1.1021 --- ChangeLog 3 Nov 2005 05:20:31 -0000 1.1022 *************** *** 1,2 **** --- 1,9 ---- + 2005-11-03 Braden McDaniel <br...@en...> + + Added std::swap specializations for sf* field_value types. + + * src/libopenvrml/openvrml/field_value.cpp + * src/libopenvrml/openvrml/field_value.h + 2005-11-02 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2005-11-03 04:55:09
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3832/src/libopenvrml/openvrml Modified Files: event.cpp field_value.cpp field_value.h node_impl_util.cpp node_impl_util.h Log Message: Added bits missing for sfdouble, mfdouble, sfvec2d, mfvec2d, sfvec3d, and mfvec3d. Index: event.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/event.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** event.cpp 2 Nov 2005 08:50:24 -0000 1.8 --- event.cpp 3 Nov 2005 04:54:56 -0000 1.9 *************** *** 189,192 **** --- 189,198 ---- /** + * @typedef openvrml::sfdouble_listener + * + * @brief sfdouble event listener. + */ + + /** * @typedef openvrml::sffloat_listener * *************** *** 231,234 **** --- 237,246 ---- /** + * @typedef openvrml::sfvec2d_listener + * + * @brief sfvec2d event listener. + */ + + /** * @typedef openvrml::sfvec2f_listener * *************** *** 237,240 **** --- 249,258 ---- /** + * @typedef openvrml::sfvec3d_listener + * + * @brief sfvec3d event listener. + */ + + /** * @typedef openvrml::sfvec3f_listener * *************** *** 249,252 **** --- 267,276 ---- /** + * @typedef openvrml::mfdouble_listener + * + * @brief mfdouble event listener. + */ + + /** * @typedef openvrml::mffloat_listener * *************** *** 285,288 **** --- 309,318 ---- /** + * @typedef openvrml::mfvec2d_listener + * + * @brief mfvec2d event listener. + */ + + /** * @typedef openvrml::mfvec2f_listener * *************** *** 291,294 **** --- 321,330 ---- /** + * @typedef openvrml::mfvec3d_listener + * + * @brief mfvec3d event listener. + */ + + /** * @typedef openvrml::mfvec3f_listener * *************** *** 554,557 **** --- 590,599 ---- /** + * @typedef openvrml::sfdouble_emitter + * + * @brief sfdouble event emitter. + */ + + /** * @typedef openvrml::sffloat_emitter * *************** *** 596,599 **** --- 638,647 ---- /** + * @typedef openvrml::sfvec2d_emitter + * + * @brief sfvec2d event emitter. + */ + + /** * @typedef openvrml::sfvec2f_emitter * *************** *** 602,605 **** --- 650,659 ---- /** + * @typedef openvrml::sfvec3d_emitter + * + * @brief sfvec3d event emitter. + */ + + /** * @typedef openvrml::sfvec3f_emitter * *************** *** 614,617 **** --- 668,677 ---- /** + * @typedef openvrml::mfdouble_emitter + * + * @brief mfdouble event emitter. + */ + + /** * @typedef openvrml::mffloat_emitter * *************** *** 650,653 **** --- 710,719 ---- /** + * @typedef openvrml::mfvec2d_emitter + * + * @brief mfvec2d event emitter. + */ + + /** * @typedef openvrml::mfvec2f_emitter * *************** *** 656,659 **** --- 722,731 ---- /** + * @typedef openvrml::mfvec3d_emitter + * + * @brief mfvec3d event emitter. + */ + + /** * @typedef openvrml::mfvec3f_emitter * Index: node_impl_util.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node_impl_util.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** node_impl_util.h 2 Nov 2005 08:50:24 -0000 1.3 --- node_impl_util.h 3 Nov 2005 04:54:56 -0000 1.4 *************** *** 411,414 **** --- 411,415 ---- typedef event_emitter<sfbool> sfbool_emitter; typedef event_emitter<sfcolor> sfcolor_emitter; + typedef event_emitter<sfdouble> sfdouble_emitter; typedef event_emitter<sffloat> sffloat_emitter; typedef event_emitter<sfimage> sfimage_emitter; *************** *** 417,423 **** --- 418,427 ---- typedef event_emitter<sfstring> sfstring_emitter; typedef event_emitter<sftime> sftime_emitter; + typedef event_emitter<sfvec2d> sfvec2d_emitter; typedef event_emitter<sfvec2f> sfvec2f_emitter; + typedef event_emitter<sfvec3d> sfvec3d_emitter; typedef event_emitter<sfvec3f> sfvec3f_emitter; typedef event_emitter<mfcolor> mfcolor_emitter; + typedef event_emitter<mfdouble> mfdouble_emitter; typedef event_emitter<mffloat> mffloat_emitter; typedef event_emitter<mfnode> mfnode_emitter; *************** *** 425,429 **** --- 429,435 ---- typedef event_emitter<mfstring> mfstring_emitter; typedef event_emitter<mftime> mftime_emitter; + typedef event_emitter<mfvec2d> mfvec2d_emitter; typedef event_emitter<mfvec2f> mfvec2f_emitter; + typedef event_emitter<mfvec3d> mfvec3d_emitter; typedef event_emitter<mfvec3f> mfvec3f_emitter; Index: node_impl_util.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node_impl_util.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** node_impl_util.cpp 2 Nov 2005 08:50:24 -0000 1.5 --- node_impl_util.cpp 3 Nov 2005 04:54:56 -0000 1.6 *************** *** 664,667 **** --- 664,673 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sfdouble> openvrml::node_impl_util::abstract_node::sfdouble_emitter + * + * @brief <code>openvrml::sfdouble</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sffloat> openvrml::node_impl_util::abstract_node::sffloat_emitter * *************** *** 700,703 **** --- 706,715 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sfvec2d> openvrml::node_impl_util::abstract_node::sfvec2d_emitter + * + * @brief <code>openvrml::sfvec2d</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sfvec2f> openvrml::node_impl_util::abstract_node::sfvec2f_emitter * *************** *** 706,709 **** --- 718,727 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sfvec3d> openvrml::node_impl_util::abstract_node::sfvec3d_emitter + * + * @brief <code>openvrml::sfvec3d</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::sfvec3f> openvrml::node_impl_util::abstract_node::sfvec3f_emitter * *************** *** 718,721 **** --- 736,745 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mfdouble> openvrml::node_impl_util::abstract_node::mfdouble_emitter + * + * @brief <code>openvrml::mfdouble</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mffloat> openvrml::node_impl_util::abstract_node::mffloat_emitter * *************** *** 748,751 **** --- 772,781 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mfvec2d> openvrml::node_impl_util::abstract_node::mfvec2d_emitter + * + * @brief <code>openvrml::mfvec2d</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mfvec2f> openvrml::node_impl_util::abstract_node::mfvec2f_emitter * *************** *** 754,757 **** --- 784,793 ---- /** + * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mfvec3d> openvrml::node_impl_util::abstract_node::mfvec3d_emitter + * + * @brief <code>openvrml::mfvec3d</code> event emitter. + */ + + /** * @typedef openvrml::node_impl_util::abstract_node::event_emitter<openvrml::mfvec3f> openvrml::node_impl_util::abstract_node::mfvec3f_emitter * Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** field_value.cpp 3 Nov 2005 04:05:43 -0000 1.16 --- field_value.cpp 3 Nov 2005 04:54:56 -0000 1.17 *************** *** 707,710 **** --- 707,711 ---- * - <code>sfbool</code> * - <code>sfcolor</code> + * - <code>sfdouble</code> * - <code>sffloat</code> * - <code>sfimage</code> *************** *** 714,720 **** --- 715,724 ---- * - <code>sfstring</code> * - <code>sftime</code> + * - <code>sfvec2d</code> * - <code>sfvec2f</code> + * - <code>sfvec3d</code> * - <code>sfvec3f</code> * - <code>mfcolor</code> + * - <code>mfdouble</code> * - <code>mffloat</code> * - <code>mfint32</code> *************** *** 723,727 **** --- 727,733 ---- * - <code>mfstring</code> * - <code>mftime</code> + * - <code>mfvec2d</code> * - <code>mfvec2f</code> + * - <code>mfvec3d</code> * - <code>mfvec3f</code> */ *************** *** 5838,5841 **** --- 5844,5860 ---- /** + * @fn template <> void std::swap(openvrml::mfdouble & a, openvrml::mfdouble & b) + * + * @relatesalso openvrml::mfdouble + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** * @fn template <> void std::swap(openvrml::mffloat & a, openvrml::mffloat & b) * *************** *** 5916,5919 **** --- 5935,5951 ---- /** + * @fn template <> void std::swap(openvrml::mfvec2d & a, openvrml::mfvec2d & b) + * + * @relatesalso openvrml::mfvec2d + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** * @fn template <> void std::swap(openvrml::mfvec2f & a, openvrml::mfvec2f & b) * *************** *** 5929,5932 **** --- 5961,5977 ---- /** + * @fn template <> void std::swap(openvrml::mfvec3d & a, openvrml::mfvec3d & b) + * + * @relatesalso openvrml::mfvec3d + * + * @brief Swap the values of @p a and @p b. + * + * Does not throw. + * + * @param a + * @param b + */ + + /** * @fn template <> void std::swap(openvrml::mfvec3f & a, openvrml::mfvec3f & b) * Index: field_value.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** field_value.h 2 Nov 2005 15:41:04 -0000 1.13 --- field_value.h 3 Nov 2005 04:54:56 -0000 1.14 *************** *** 1158,1161 **** --- 1158,1168 ---- template <> + OPENVRML_API inline void swap(openvrml::mfdouble & a, + openvrml::mfdouble & b) + { + a.swap(b); + } + + template <> OPENVRML_API inline void swap(openvrml::mffloat & a, openvrml::mffloat & b) { *************** *** 1196,1199 **** --- 1203,1212 ---- template <> + OPENVRML_API inline void swap(openvrml::mfvec2d & a, openvrml::mfvec2d & b) + { + a.swap(b); + } + + template <> OPENVRML_API inline void swap(openvrml::mfvec2f & a, openvrml::mfvec2f & b) { *************** *** 1202,1205 **** --- 1215,1224 ---- template <> + OPENVRML_API inline void swap(openvrml::mfvec3d & a, openvrml::mfvec3d & b) + { + a.swap(b); + } + + template <> OPENVRML_API inline void swap(openvrml::mfvec3f & a, openvrml::mfvec3f & b) { |
|
From: Braden M. <br...@us...> - 2005-11-03 04:55:09
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3832 Modified Files: ChangeLog Log Message: Added bits missing for sfdouble, mfdouble, sfvec2d, mfvec2d, sfvec3d, and mfvec3d. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1020 retrieving revision 1.1021 diff -C2 -d -r1.1020 -r1.1021 *** ChangeLog 3 Nov 2005 04:05:43 -0000 1.1020 --- ChangeLog 3 Nov 2005 04:54:56 -0000 1.1021 *************** *** 1,4 **** --- 1,21 ---- 2005-11-02 Braden McDaniel <br...@en...> + Added bits missing for sfdouble, mfdouble, sfvec2d, mfvec2d, + sfvec3d, and mfvec3d. + + * src/libopenvrml/openvrml/event.cpp: Added missing doc- + comments. + * src/libopenvrml/openvrml/field_value.cpp: Added missing doc- + comments. + * src/libopenvrml/openvrml/field_value.h: Added specializations + of std::swap for sfdouble, mfdouble, sfvec2d, mfvec2d, sfvec3d, + and mfvec3d. + * src/libopenvrml/openvrml/node_impl_util.cpp: Added missing + doc-comments. + * src/libopenvrml/openvrml/node_impl_util.h: Added missing + typedefs for abstract_node event_emitters. + + 2005-11-02 Braden McDaniel <br...@en...> + Doc-comment improvements. |
|
From: Braden M. <br...@us...> - 2005-11-03 04:05:55
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29274/src/libopenvrml/openvrml Modified Files: field_value.cpp node.cpp Log Message: Doc-comment improvements. Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** field_value.cpp 2 Nov 2005 15:41:04 -0000 1.15 --- field_value.cpp 3 Nov 2005 04:05:43 -0000 1.16 *************** *** 59,62 **** --- 59,64 ---- /** + * @internal + * * @class openvrml::field_value::counted_impl_base * *************** *** 98,101 **** --- 100,105 ---- /** + * @internal + * * @class openvrml::field_value::counted_impl * *************** *** 115,118 **** --- 119,124 ---- * <code>value_type</code> of a * @link openvrml::FieldValueConcept Field Value@endlink. + * + * @sa http://boost.org/libs/smart_ptr/shared_ptr.htm */ *************** *** 644,654 **** * @par Refinement of * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * DefaultConstructible</a>, * <a href="http://www.boost.org/libs/utility/CopyConstructible.html"> ! * CopyConstructible</a>, * <a href="http://www.sgi.com/tech/stl/Assignable.html"> * Assignable</a>, * <a href="http://www.sgi.com/tech/stl/EqualityComparable.html"> ! * EqualityComparable</a> * * @par Associated types --- 650,660 ---- * @par Refinement of * <a href="http://www.sgi.com/tech/stl/DefaultConstructible.html"> ! * Default Constructible</a>, * <a href="http://www.boost.org/libs/utility/CopyConstructible.html"> ! * Copy Constructible</a>, * <a href="http://www.sgi.com/tech/stl/Assignable.html"> * Assignable</a>, * <a href="http://www.sgi.com/tech/stl/EqualityComparable.html"> ! * Equality Comparable</a> * * @par Associated types Index: node.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/node.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** node.cpp 2 Nov 2005 08:50:24 -0000 1.64 --- node.cpp 3 Nov 2005 04:05:43 -0000 1.65 *************** *** 690,693 **** --- 690,695 ---- * @p interfaces. * @exception std::bad_alloc if memory allocation fails. + * + * @sa http://boost.org/libs/smart_ptr/shared_ptr.htm */ const boost::shared_ptr<openvrml::node_type> *************** *** 717,720 **** --- 719,723 ---- * * @sa node_class::create_type + * @sa http://boost.org/libs/smart_ptr/shared_ptr.htm */ *************** *** 824,828 **** * fields and exposedFields. * ! * @return a node_ptr to a new node. * * @exception unsupported_interface if @p initial_values specifies a field --- 827,831 ---- * fields and exposedFields. * ! * @return a <code>boost::intrusive_ptr</code> to a new node. * * @exception unsupported_interface if @p initial_values specifies a field *************** *** 832,835 **** --- 835,840 ---- * wrong type. * @exception std::bad_alloc if memory allocation fails. + * + * @sa http://boost.org/libs/smart_ptr/intrustive_ptr.html */ const boost::intrusive_ptr<openvrml::node> *************** *** 854,858 **** * fields and exposedFields. * ! * @return a node_ptr to a new node. * * @exception unsupported_interface if @p initial_values specifies a field --- 859,863 ---- * fields and exposedFields. * ! * @return a <code>boost::intrusive_ptr</code> to a new node. * * @exception unsupported_interface if @p initial_values specifies a field *************** *** 862,865 **** --- 867,872 ---- * wrong type. * @exception std::bad_alloc if memory allocation fails. + * + * @sa http://boost.org/libs/smart_ptr/intrustive_ptr.html */ *************** *** 1399,1402 **** --- 1406,1411 ---- * * @brief The scope to which the node belongs. + * + * @sa http://boost.org/libs/smart_ptr/shared_ptr.htm */ *************** *** 1593,1596 **** --- 1602,1607 ---- * * @return the scope to which the node belongs. + * + * @sa http://boost.org/libs/smart_ptr/shared_ptr.htm */ |
|
From: Braden M. <br...@us...> - 2005-11-03 04:05:54
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29274 Modified Files: ChangeLog Log Message: Doc-comment improvements. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1019 retrieving revision 1.1020 diff -C2 -d -r1.1019 -r1.1020 *** ChangeLog 2 Nov 2005 15:41:04 -0000 1.1019 --- ChangeLog 3 Nov 2005 04:05:43 -0000 1.1020 *************** *** 1,4 **** --- 1,11 ---- 2005-11-02 Braden McDaniel <br...@en...> + Doc-comment improvements. + + * src/libopenvrml/openvrml/field_value.cpp + * src/libopenvrml/openvrml/node.cpp + + 2005-11-02 Braden McDaniel <br...@en...> + field_value's reference-counted value object needs to be protected by a mutex. |
|
From: Braden M. <br...@us...> - 2005-11-02 15:41:17
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30333/src/libopenvrml/openvrml Modified Files: field_value.cpp field_value.h Log Message: field_value's reference-counted value object needs to be protected by a mutex. Index: field_value.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** field_value.cpp 30 Oct 2005 03:20:17 -0000 1.14 --- field_value.cpp 2 Nov 2005 15:41:04 -0000 1.15 *************** *** 104,107 **** --- 104,113 ---- /** + * @var boost::mutex openvrml::field_value::counted_impl::mutex_ + * + * @brief Mutex protecting @a value_. + */ + + /** * @var boost::shared_ptr<ValueType> openvrml::field_value::counted_impl::value_ * *************** *** 122,125 **** --- 128,151 ---- /** + * @fn openvrml::field_value::counted_impl::counted_impl(const counted_impl<ValueType> & ci) throw () + * + * @brief Construct a copy. + * + * @param ci the instance to copy. + */ + + /** + * @fn openvrml::field_value::counted_impl::~counted_impl() throw () + * + * @brief Destroy. + */ + + /** + * @fn openvrml::field_value::counted_impl<ValueType> & openvrml::field_value::counted_impl::operator=(const counted_impl<ValueType> &) + * + * @brief Not implemented. + */ + + /** * @fn const ValueType & openvrml::field_value::counted_impl::value() const throw () * Index: field_value.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/field_value.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** field_value.h 30 Oct 2005 03:20:17 -0000 1.12 --- field_value.h 2 Nov 2005 15:41:04 -0000 1.13 *************** *** 32,35 **** --- 32,36 ---- # include <boost/shared_ptr.hpp> # include <boost/utility.hpp> + # include <boost/thread/mutex.hpp> # include <openvrml/basetypes.h> *************** *** 59,62 **** --- 60,64 ---- template <typename ValueType> class counted_impl : public counted_impl_base { + mutable boost::mutex mutex_; boost::shared_ptr<ValueType> value_; *************** *** 64,71 **** --- 66,79 ---- explicit counted_impl(const ValueType & value) throw (std::bad_alloc); + counted_impl(const counted_impl<ValueType> & ci) throw (); + virtual ~counted_impl() throw (); + const ValueType & value() const throw (); void value(const ValueType & val) throw (std::bad_alloc); private: + counted_impl<ValueType> & + operator=(const counted_impl<ValueType> &); + virtual std::auto_ptr<counted_impl_base> do_clone() const throw (std::bad_alloc); *************** *** 159,165 **** --- 167,187 ---- template <typename ValueType> + field_value::counted_impl<ValueType>:: + counted_impl(const counted_impl<ValueType> & ci) throw (): + counted_impl_base() + { + boost::mutex::scoped_lock lock(ci.mutex_); + value_ = ci.value_; + } + + template <typename ValueType> + field_value::counted_impl<ValueType>::~counted_impl() throw () + {} + + template <typename ValueType> const ValueType & field_value::counted_impl<ValueType>::value() const throw () { + boost::mutex::scoped_lock lock(this->mutex_); assert(this->value_); return *this->value_; *************** *** 170,173 **** --- 192,196 ---- throw (std::bad_alloc) { + boost::mutex::scoped_lock lock(this->mutex_); assert(this->value_); if (!this->value_.unique()) { *************** *** 218,222 **** { assert(this->counted_impl_.get()); ! return boost::polymorphic_downcast< counted_impl<typename FieldValue::value_type> *>( this->counted_impl_.get())->value(val); --- 241,245 ---- { assert(this->counted_impl_.get()); ! boost::polymorphic_downcast< counted_impl<typename FieldValue::value_type> *>( this->counted_impl_.get())->value(val); |
